# Conflicts: # data/battle_scripts_1.s # data/scripts/debug.inc # src/battle_util.c # test/ability_contrary.c