added current location to pokedex
Merge branch 'master' of https://github.com/jaysenparmar/tritonmon
types appear on battle screen
added types to battle screen