mirror of
https://github.com/pret/pokeemerald.git
synced 2026-05-06 05:17:25 -05:00
2945c83bbc
Conflicts: include/battle.h include/battle_ai_script_commands.h include/battle_anim.h include/battle_controllers.h include/battle_gfx_sfx_util.h include/battle_main.h include/battle_script_commands.h include/battle_util.h include/pokemon.h include/recorded_battle.h src/battle_ai_script_commands.c src/battle_anim.c src/battle_anim_mons.c src/battle_anim_sound_tasks.c src/battle_anim_status_effects.c src/battle_controller_link_opponent.c src/battle_controller_link_partner.c src/battle_controller_opponent.c src/battle_controller_player.c src/battle_controller_player_partner.c src/battle_controller_recorded_opponent.c src/battle_controller_recorded_player.c src/battle_controller_wally.c src/battle_controllers.c src/battle_gfx_sfx_util.c src/battle_interface.c src/battle_main.c src/battle_message.c src/battle_records.c src/battle_script_commands.c src/battle_tv.c src/battle_util.c src/battle_util2.c src/pokeball.c src/pokemon.c src/recorded_battle.c src/reshow_battle_screen.c |
||
|---|---|---|
| .. | ||
| aif2pcm | ||
| bin2c | ||
| gbafix | ||
| gbagfx | ||
| jsonproc | ||
| learnset_helpers | ||
| mapjson | ||
| mgba | ||
| mgba-rom-test-hydra | ||
| mid2agb | ||
| patchelf | ||
| preproc | ||
| ramscrgen | ||
| rsfont | ||
| scaninc | ||
| trainerproc | ||