Fix Pokemon Ordering

New order to match all other gens + add Porygon2