Minor modifications to get the battle system working with mapscene properly