modified/updated pokedex 2