# Conflicts: # include/battle.h # include/cable_club.h # src/battle_anim_fire.c # src/battle_anim_ghost.c # src/battle_anim_ground.c # src/battle_message.c # src/cable_club.c