# Conflicts:
#	src/battle_ai_main.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_script_commands.c
#	src/pokemon.c
#	src/pokemon_summary_screen.c

…figs

# Conflicts:
#	src/battle_script_commands.c

…_LATEST, to help edit all at once.

…factor

# Conflicts:
#	include/constants/battle_config.h