mirror of
https://github.com/pret/pokeemerald.git
synced 2026-05-15 16:10:01 -05:00
92301398bc
# Conflicts: # asm/macros/battle_script.inc # data/battle_anim_scripts.s # data/battle_scripts_1.s # include/battle.h # include/battle_controllers.h # include/battle_interface.h # include/config/battle.h # include/constants/battle.h # include/constants/battle_anim.h # include/constants/battle_move_effects.h # include/constants/battle_string_ids.h # include/data.h # include/random.h # sound/cry_tables.inc # src/battle_anim_new.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controller_player_partner.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/species_info.h # src/data/text/move_names.h # test/test_runner_battle.c |
||
|---|---|---|
| .. | ||
| battle_frontier | ||
| asm.inc | ||
| battle_ai_script.inc | ||
| battle_anim_script.inc | ||
| battle_script.inc | ||
| battle_tent.inc | ||
| contest_ai_script.inc | ||
| event.inc | ||
| field_effect_script.inc | ||
| function.inc | ||
| m4a.inc | ||
| map.inc | ||
| movement.inc | ||
| music_voice.inc | ||
| trainer_hill.inc | ||