Updated player and pokemon.
Battle needs a lot of work....