Pokedex Generator: more improvements to parsing