mirror of
https://github.com/pret/pokeemerald.git
synced 2026-04-03 08:05:10 -05:00
Conflicts: asm/macros/battle_script.inc data/battle_anim_scripts.s include/battle.h include/battle_controllers.h include/battle_setup.h include/constants/battle.h src/battle_anim_normal.c src/battle_anim_utility_funcs.c src/battle_bg.c src/battle_controllers.c src/battle_main.c src/battle_script_commands.c |
||
|---|---|---|
| .. | ||
| clock_small.png | ||
| confetti.png | ||
| emotes.pal | ||
| emotes.png | ||
| evo_sparkle.png | ||
| japanese_hof.png | ||
| mirage_tower_crumbles.png | ||
| mirage_tower.bin | ||
| mirage_tower.png | ||