Better collision detection, more pokémon

I added more Pokémon to the map and added collision detection for the
edges of the map so you cannot go outside the map.