Commit Graph

277 Commits

Author SHA1 Message Date
crater-git
940f9f1726 Moved branch defs to config.h, now only for compat 2022-08-24 16:10:32 -04:00
Eduardo Quezada
75ac960365 Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms 2022-08-22 17:27:21 -04:00
ExpoSeed
807c3fd17f Delete item and ability defines in configs 2022-08-02 00:28:42 -05:00
ExpoSeed
49da2ee53f Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION 2022-08-02 00:15:55 -05:00
Greenphx9
05cbd6a906 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 16-letter-move-names 2022-07-29 18:49:25 +10:00
Eduardo Quezada D'Ottone
bfb86fdc86 Config for Gen 3 faint switch mechanics 2022-07-24 14:57:47 -04:00
Eduardo Quezada D'Ottone
56b9a50109 Merge remote-tracking branch 'RHH/battle_engine' into BE_plusMinus
# Conflicts:
#	include/constants/battle_config.h
2022-07-21 16:28:16 -04:00
ghoulslash
30a494f964
Merge pull request #2197 from AsparagusEduardo/BE_explosion
Config for Explosion halving defense
2022-07-21 16:11:32 -04:00
ghoulslash
504600c996
Merge pull request #2201 from AsparagusEduardo/BE_sturdy
Config for Sturdy's Gen5+ effect.
2022-07-21 16:09:01 -04:00
Eduardo Quezada D'Ottone
0f3fdd410a Config for Sturdy's Gen5+ effect. 2022-07-20 13:06:41 -04:00
Eduardo Quezada D'Ottone
e14afd8957 Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5. 2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone
cb34119711 Config for Charge raising Sp. Def. 2022-07-20 10:13:18 -04:00
Eduardo Quezada D'Ottone
1cfb267b34 Config for Explosion halving defense 2022-07-18 13:10:27 -04:00
Eduardo Quezada D'Ottone
1dcbf59686 Config for Plus and Minus interaction 2022-07-18 08:11:02 -04:00
ghoulslash
6b84a9f0b3 merge w be 2022-07-17 12:40:43 -04:00
Greenphx9
4294682d8c 16-letter move names
Move define, add spaces between comments, fix include
if TRUE -> if set to TRUE

Co-Authored-By: LOuroboros <lunosouroboros@gmail.com>
2022-07-11 12:49:30 +10:00
ghoulslash
02a62e245b
Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney
Config for lost money after losing a battle
2022-07-01 11:58:36 -04:00
sneed
bceccf5474 changes 2022-05-10 08:17:31 +03:00
sneed
709f583390 Initial commit 2022-05-10 02:58:24 +03:00
sneed
f83875cf0f remove item expansion check 2022-05-07 23:34:38 +03:00
sneed
c6b529ed50 add missing constant 2022-05-07 22:09:08 +03:00
Eduardo Quezada D'Ottone
dc25bc6145 Merge branch 'battle_engine' into BE_WhiteOutMoney
# Conflicts:
#	include/constants/battle_string_ids.h
#	src/battle_message.c
2022-05-07 11:16:34 -04:00
Eduardo Quezada D'Ottone
096fe3c11d Removed unecessary B_LEEK_ALWAYS_CRIT config 2022-05-07 10:56:31 -04:00
Eduardo Quezada D'Ottone
4e7ce0b663 Merge branch 'battle_engine' into BE_configs
# Conflicts:
#	include/constants/battle_config.h
2022-05-07 10:25:34 -04:00
ghoulslash
adfb336a3f
Merge pull request #2105 from Sneed69/healblock
Add missing Heal Block functionalities
2022-05-07 09:13:18 -04:00
sneed
865b771db7 initial commit 2022-05-05 00:57:19 +03:00
sneed
b17d1f7816 Add generation specific interactions 2022-05-02 17:56:09 +03:00
LOuroboros
434f6cf5ad Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-03-26 08:43:55 -03:00
ExpoSeed
f50a406b18 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2022-03-22 12:56:23 -05:00
Eduardo Quezada D'Ottone
dde65d5cea Config for Sheer Cold being less accurate when not used by Ice type Pokémon 2022-02-13 01:07:42 -03:00
Eduardo Quezada D'Ottone
c849197a88 Config for Minimize raising 2 stages 2022-02-13 00:45:35 -03:00
Eduardo Quezada D'Ottone
d73e6faab8 Config for Growth being affected by sunlight 2022-02-13 00:30:37 -03:00
Eduardo Quezada D'Ottone
748ce99de3 Config for Ingrain grounding the user 2022-02-13 00:17:37 -03:00
Eduardo Quezada D'Ottone
76e0b38960 Config for Pokémon with Oblivious being affected by Taunt 2022-02-12 23:57:23 -03:00
Eduardo Quezada D'Ottone
389a38b3cd Config for Facade being affected by burns 2022-02-12 23:55:54 -03:00
LOuroboros
92d8268603
Update include/constants/battle_config.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-02-12 00:18:24 -03:00
LOuroboros
b52233ec31 Updated Conversion's effect 2022-02-11 21:42:39 -03:00
ghoulslash
bc94a2bb16
Merge pull request #1979 from AsparagusEduardo/BE_wildNaturalEnemies
Wild mon natural enemies in double wild battles
2022-01-23 18:43:12 -05:00
LOuroboros
a8a8c7e2fa Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-01-23 02:37:07 -03:00
Eduardo Quezada D'Ottone
e880e4afdd
Merge branch 'battle_engine' into be_recalc_turn_order_after_actions 2022-01-22 19:01:45 -03:00
Eduardo Quezada D'Ottone
925f65c450 Realigned config to previous state 2022-01-16 21:10:09 -03:00
Eduardo Quezada D'Ottone
d40119010e Merge branch 'BattleEngine' into BE_wildNaturalEnemies
# Conflicts:
#	include/constants/battle_config.h
2022-01-16 16:23:12 -03:00
LOuroboros
24b5a5709a Allow Galarian Darmanitan's Zen Mode to work 2022-01-10 23:01:18 -03:00
Eduardo Quezada D'Ottone
221e38ff86
Merge pull request #1957 from ghoulslash/be/ability_popup
Ability Popup Fixes + Longer Ability Names config
2022-01-01 19:39:55 -03:00
Eduardo Quezada D'Ottone
5b54986e6b
Merge pull request #1980 from LOuroboros/multiBattles
Multi battle updates
2021-12-29 22:09:06 -03:00
Eduardo Quezada D'Ottone
7bffe6d1d5
Merge pull request #2004 from ghoulslash/be/sports
Add sport effects back
2021-12-24 18:59:50 -03:00
Eduardo Quezada D'Ottone
2ebe427a42 Merge branch 'BattleEngine' into BE_wildNaturalEnemies
# Conflicts:
#	src/battle_controller_opponent.c
2021-12-23 21:19:59 -03:00
Eduardo Quezada D'Ottone
67697d2de3
Merge pull request #1582 from ghoulslash/smart_wild_ai
Smart Wild AI Option
2021-12-23 20:18:18 -03:00
LOuroboros
713d97891f
Update include/constants/battle_config.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-12-22 21:32:10 -03:00
ghoulslash
05f91bc243
Update include/constants/battle_config.h
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-20 14:06:32 -05:00