Replaced inAction.inBattle with a global currentBattle