added some concrete NPCs and renamed some pokemons