ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 13:45:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,042 Commits 1 Branch 0 Tags 235 MiB
208b964a56
Commit Graph

86 Commits

Author SHA1 Message Date
ghoulslash
d5004638a9
Update include/constants/battle_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-03-09 16:35:47 -07:00
Evan
a49b5d1ad0 prankster updated to gen 7 2021-01-16 16:14:36 -07:00
Evan
f1d89b2d79 merge with be 2021-01-15 11:17:45 -07:00
ExpoSeed
b166e9a5e3
Merge pull request #1276 from LOuroboros/x_items_BE 
Reworked the effects of the X Items #1
 2021-01-15 12:05:07 -06:00
ultima-soul
b5b4efdaa0
Merge pull request #1314 from LOuroboros/battle_debug_constant 
battle_config.h tweaks
 2021-01-09 12:36:37 -08:00
LOuroboros
3d124944b3 Review correction to B_X_ITEMS_BUFF's comment 2021-01-07 16:09:23 -03:00
LOuroboros
dbc3690282 Tweaked preprocessor directives 
Changed #ifdef X_ITEMS_REWORK == FALSE to #ifndef ITEM_EXPANSION
Changed #ifdef X_ITEMS_REWORK == TRUE to #ifdef ITEM_EXPANSION
 2021-01-04 03:58:31 -03:00
BuffelSaft
10cf5b3673 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only 2021-01-04 10:55:30 +13:00
Evan
59813c9ce7 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be_config 2020-12-23 10:27:54 -07:00
ghoulslash
450ac70ab2
Merge pull request #1288 from LOuroboros/comments 
Some more small battle_config.h tweaks
 2020-12-23 10:27:09 -07:00
LOuroboros
320cc37ac9 USE_BATTLE_DEBUG -> B_ENABLE_DEBUG 2020-12-23 14:04:14 -03:00
LOuroboros
b3c5613ff7 battle_config.h tweaks 
-Moved the USE_BATTLE_DEBUG constant from include/battle_debug.h
-Slight correction to a few comments in battle_config.h
 2020-12-23 13:16:01 -03:00
Evan
97172fc5b5 merge with be 2020-12-13 17:21:22 -07:00
Eduardo Quezada D'Ottone
47d96aed3c
Merge pull request #1285 from LOuroboros/spite 
Updated Spite
 2020-12-12 22:27:26 -03:00
LOuroboros
31d483ef44 Some more battle_config.h tweaks 2020-12-12 11:35:05 -03:00
LOuroboros
33d7f22494 Improved the comment of B_STANCE_CHANGE_FAIL 2020-12-11 21:54:17 -03:00
LOuroboros
17a9555715 Oopsie. 2020-12-11 21:43:18 -03:00
LOuroboros
9ec2e44f4c Updated Spite 2020-12-11 21:36:59 -03:00
LOuroboros
791d561f14 Reworked the effects of the X Items 
Thanks to Karathan's indications.
 2020-12-08 18:24:42 -03:00
BuffelSaft
72b769ec75 Add config options for Jump Kick 
Added options for:
- Gen 4 style recoil when target is immune (user takes 50% of target's max HP)
- Gen 3 style recoil when target is immune (i.e no recoil)
- Gen 5+ recoil was already implemented but was bugged
 2020-12-07 19:30:31 +13:00
Evan
dcefaf2563 anim particle changes false by default 2020-12-01 18:01:02 -05:00
Evan
7c6e74ab69 update terrain bg config option comment 2020-11-24 21:17:31 -05:00
Evan
5c658c6950 config option for terrain bg change 2020-11-17 20:26:09 -07:00
Eduardo Quezada D'Ottone
4da357aef4 Fixed compatibility with Pokémon Expansion 2020-11-15 13:35:02 -03:00
Eduardo Quezada D'Ottone
4b9d0d8e24 Added config option for Steel type resistances. 2020-11-11 17:48:02 -03:00
Eduardo Quezada D'Ottone
e021a4aa87
Critical Capture Config Option And Catching Charm #556 from ghoulslash 
Critical Capture Config Option And Catching Charm
 2020-11-10 17:31:08 -03:00
LOuroboros
bb4f00737e B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE 2020-11-10 14:26:47 -03:00
Evan
de0518121e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-11-10 09:00:30 -07:00
LOuroboros
e179b9b5fe Updated Intimidate to Gen. 8 standard 2020-11-10 10:18:16 -03:00
Eduardo Quezada D'Ottone
df4d927e31 Moved BATTLE_ENGINE define to global.h to fix reading from other branches 2020-11-09 12:45:31 -03:00
Evan
980f208b78 use NATIONAL_DEX_COUNT for critical capture odds 2020-11-08 14:07:43 -07:00
Evan
b3d1e8b5b8 turn crit capture odds into a ratio 2020-11-03 08:57:11 -07:00
Evan
e7372e7c5b add B_ prefix to critical capture configs 2020-11-01 21:50:34 -07:00
Evan
59692e8e7f styling fix 2020-11-01 21:08:58 -07:00
Evan
a6c3d950f6 critical capture config option and catching charm 2020-11-01 16:15:42 -07:00
Eduardo Quezada D'Ottone
5a201f006f
More exp options in battle_config (#530) from MandL27 2020-11-01 19:41:29 -03:00
ExpoSeed
1b65e1a1f0
Merge pull request #520 from ghoulslash/battle_engine 
Add Toggle Healthbox Visibility Feature
 2020-10-31 23:07:39 -05:00
Eduardo Quezada
d596fa7e12 Merge remote-tracking branch 'RHH/battle_engine' into PR-MoveSplitOption 
# Conflicts:
#	include/battle_util.h
#	include/constants/battle_config.h
#	src/battle_util.c
 2020-10-23 21:49:59 -03:00
ExpoSeed
34729ce99c
Merge pull request #150 from AsparagusEduardo/PR-MoreBattleConfigs 
More Battle Config options
 2020-10-23 10:59:12 -05:00
MandL27
6d5547bdb4 fix indentation 2020-10-21 16:20:49 -04:00
MandL27
efdaa25640 Add B_SCALED_EXP and B_SPLIT_EXP 2020-10-21 16:19:07 -04:00
LOuroboros
503134167a Review corrections 2020-10-21 15:01:53 -03:00
LOuroboros
4794c63066 Reincorporated badge based stat boosts 2020-10-21 12:57:57 -03:00
Eduardo Quezada
a23e9a8a37 Adapting move changes (part 2) + Hyperspace Fury type. 2020-10-18 12:07:11 -03:00
Eduardo Quezada
3342573881 Updated name of setting. 2020-10-18 11:19:39 -03:00
Eduardo Quezada
b1903af8c1 Adapting move changes (part 1) 2020-10-17 23:08:39 -03:00
Eduardo Quezada
faca6c4867 Organized interface settings into their own category. 2020-10-17 14:31:58 -03:00
Eduardo Quezada
815b525855 Configurable double wild battle chance, surfing double battles and flag for forcing them. 2020-10-17 14:25:43 -03:00
Eduardo Quezada
6c9f864651 Tweaking battle_config to accomodate pokemon_config and item_config 2020-10-17 10:52:44 -03:00
Evan
bd26919acc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-10-15 18:25:21 -06:00