Fixed transition to and from battle and overworld