mirror of
https://github.com/pret/pokeemerald.git
synced 2026-05-09 12:23:20 -05:00
Conflicts: Makefile data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc data/maps/MtChimney/scripts.inc data/maps/MtPyre_Summit/scripts.inc data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc include/constants/event_objects.h include/constants/expansion.h src/battle_script_commands.c src/battle_util.c src/field_screen_effect.c |
||
|---|---|---|
| .. | ||
| battle | ||
| daycare.c | ||
| fpmath.c | ||
| pokemon.c | ||
| random.c | ||
| script.c | ||
| species.c | ||
| sprite.c | ||
| test_runner_args.c | ||
| test_runner_battle.c | ||
| test_runner.c | ||
| text.c | ||