Pokedex Generator: further improve parsing