Eduardo Quezada 5b8be2a144 Merge remote-tracking branch 'RHH_origin/wip-2.0.0' into RHH/pr/breaking/speciesReorder ... # Conflicts: # data/battle_scripts_1.s # src/data/pokemon/level_up_learnsets.h # src/data/pokemon_graphics/front_pic_anims.h # src/pokemon.c		2022-11-21 17:52:19 -03:00
..
layouts
maps
scripts
text
tilesets
battle_anim_scripts.s
battle_scripts_1.s	Merge remote-tracking branch 'RHH_origin/wip-2.0.0' into RHH/pr/breaking/speciesReorder	2022-11-21 17:52:19 -03: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