Added nextFrame method. Named all the methods
Combined battle and map controllers