mirror of
https://github.com/pret/pokeemerald.git
synced 2026-04-15 17:56:14 -05:00
Conflicts: include/constants/battle_ai.h src/battle_ai_script_commands.c src/battle_gfx_sfx_util.c src/pokemon_summary_screen.c src/trainer_pokemon_sprites.c |
||
|---|---|---|
| .. | ||
| constants.inc | ||
| gba_constants.inc | ||
| global.inc | ||
| m4a_constants.inc | ||
| tms_hms.inc | ||