Change some misplaced loops in Battle