pokeemerald-expansion/data
Eduardo Quezada 952bacd858 Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
#	.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
#	.github/ISSUE_TEMPLATE/04_other_errors.yaml
2023-08-11 17:50:28 -04:00
..
layouts
maps
scripts Added a debug feature to hatch eggs (#3155) 2023-07-21 12:06:05 +02:00
text
tilesets
battle_anim_scripts.s solve conflics 2023-08-07 14:25:30 +02:00
battle_scripts_1.s Merge branch 'RHH/master' into RHH/upcoming 2023-08-11 17:50:28 -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