More Gen 6 work

* Added X/Y to enums
* Started conversion functions
* team_pokemon: allowing for 12-character nicknames for Gen6 pokemon