# Conflicts: # include/battle.h # include/constants/battle_script_commands.h # include/constants/pokemon.h # src/battle_ai_util.c # src/battle_main.c # src/battle_util.c # test/battle/ai.c
# Conflicts: # include/battle.h # include/constants/battle_script_commands.h # include/constants/pokemon.h # src/battle_ai_util.c # src/battle_main.c # src/battle_util.c # test/battle/ai.c