Eduardo Quezada 231727d02b Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge ... # Conflicts: # asm/macros/event.inc # data/specials.inc # include/constants/species.h # src/data/pokemon/base_stats.h		2022-07-22 23:33:04 -04:00
..
layouts
maps	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge	2022-07-22 22:57:02 -04:00
scripts	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge	2022-07-22 22:57:02 -04:00
text	Merge pull request #1687 from SimplyBLGDev/patch-1	2022-06-18 11:04:39 -04:00
tilesets
battle_anim_scripts.s	Merge branch 'battle_engine' into BE_pretmerge	2022-07-20 08:50:30 -04:00
battle_scripts_1.s	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
battle_scripts_2.s
contest_ai_scripts.s
event_scripts.s
field_effect_scripts.s
map_events.s
maps.s
mb_berry_fix.gba
mb_colosseum.gba
mb_ereader.gba
multiboot_berry_glitch_fix.s
multiboot_ereader.s
multiboot_pokemon_colosseum.s
mystery_event_script_cmd_table.s
mystery_gift.s
script_cmd_table.inc
sound_data.s
specials.inc	Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge	2022-07-22 23:33:04 -04:00
tilesets.s