Merge branch 'master' into Unbound

strings/Pokemon_Name_Table.string

@@ -3307,3 +3307,489 @@ Pichu
 
 #org @NAME_XERNEAS_NATURAL
 Xerneas
+
+#org @NAME_GROOKEY
+Grookey
+
+#org @NAME_THWACKEY
+Thwackey
+
+#org @NAME_RILLABOOM
+Rillaboom
+
+#org @NAME_SCORBUNNY
+Scorbunny
+
+#org @NAME_RABOOT
+Raboot
+
+#org @NAME_CINDERACE
+Cinderace
+
+#org @NAME_SOBBLE
+Sobble
+
+#org @NAME_DRIZZILE
+Drizzile
+
+#org @NAME_INTELEON
+Inteleon
+
+#org @NAME_SKWOVET
+Skwovet
+
+#org @NAME_GREEDENT
+Greedent
+
+#org @NAME_ROOKIDEE
+Rookidee
+
+#org @NAME_CORVISQUIRE
+Corvsquire
+
+#org @NAME_CORVIKNIGHT
+Corvknight
+
+#org @NAME_BLIPBUG
+Blipbug
+
+#org @NAME_DOTTLER
+Dottler
+
+#org @NAME_ORBEETLE
+Orbeetle
+
+#org @NAME_NICKIT
+Nickit
+
+#org @NAME_THIEVUL
+Thievul
+
+#org @NAME_GOSSIFLEUR
+Gossifleur
+
+#org @NAME_ELDEGOSS
+Eldegoss
+
+#org @NAME_WOOLOO
+Wooloo
+
+#org @NAME_DUBWOOL
+Dubwool
+
+#org @NAME_CHEWTLE
+Chewtle
+
+#org @NAME_DREDNAW
+Drednaw
+
+#org @NAME_YAMPER
+Yamper
+
+#org @NAME_BOLTUND
+Boltund
+
+#org @NAME_ROLYCOLY
+Rolycoly
+
+#org @NAME_CARKOL
+Carkol
+
+#org @NAME_COALOSSAL
+Coalossal
+
+#org @NAME_APPLIN
+Applin
+
+#org @NAME_FLAPPLE
+Flapple
+
+#org @NAME_APPLETUN
+Appletun
+
+#org @NAME_SILICOBRA
+Silicobra
+
+#org @NAME_SANDACONDA
+Sandaconda
+
+#org @NAME_CRAMORANT
+Cramorant
+
+#org @NAME_ARROKUDA
+Arrokuda
+
+#org @NAME_BARRASKEWDA
+Baraskewda
+
+#org @NAME_TOXEL
+Toxel
+
+#org @NAME_TOXTRICITY
+Toxtricity
+
+#org @NAME_SIZZLIPEDE
+Sizzlipede
+
+#org @NAME_CENTISKORCH
+Centskorch
+
+#org @NAME_CLOBBOPUS
+Clobbopus
+
+#org @NAME_GRAPPLOCT
+Grapploct
+
+#org @NAME_SINISTEA
+Sinistea
+
+#org @NAME_POLTEAGEIST
+Poltegeist
+
+#org @NAME_HATENNA
+Hatenna
+
+#org @NAME_HATTREM
+Hattrem
+
+#org @NAME_HATTERENE
+Hatterene
+
+#org @NAME_IMPIDIMP
+Impidimp
+
+#org @NAME_MORGREM
+Morgrem
+
+#org @NAME_GRIMMSNARL
+Grimmsnarl
+
+#org @NAME_OBSTAGOON
+Obstagoon
+
+#org @NAME_PERRSERKER
+Perrserker
+
+#org @NAME_CURSOLA
+Cursola
+
+#org @NAME_SIRFETCHD
+Sirfetch'd
+
+#org @NAME_MR_RIME
+Mr. Rime
+
+#org @NAME_RUNERIGUS
+Runerigus
+
+#org @NAME_MILCERY
+Milcery
+
+#org @NAME_ALCREMIE_STRAWBERRY
+Alcremie
+
+#org @NAME_FALINKS
+Falinks
+
+#org @NAME_PINCURCHIN
+Pincurchin
+
+#org @NAME_SNOM
+Snom
+
+#org @NAME_FROSMOTH
+Frosmoth
+
+#org @NAME_STONJOURNER
+Stonjorner
+
+#org @NAME_EISCUE
+Eiscue
+
+#org @NAME_INDEEDEE
+Indeedee
+
+#org @NAME_MORPEKO
+Morpeko
+
+#org @NAME_CUFANT
+Cufant
+
+#org @NAME_COPPERAJAH
+Copperajah
+
+#org @NAME_DRACOZOLT
+Dracozolt
+
+#org @NAME_ARCTOZOLT
+Arctozolt
+
+#org @NAME_DRACOVISH
+Dracovish
+
+#org @NAME_ARCTOVISH
+Arctovish
+
+#org @NAME_DURALUDON
+Duraludon
+
+#org @NAME_DREEPY
+Dreepy
+
+#org @NAME_DRAKLOAK
+Drakloak
+
+#org @NAME_DRAGAPULT
+Dragapult
+
+#org @NAME_ZACIAN
+Zacian
+
+#org @NAME_ZAMAZENTA
+Zamazenta
+
+#org @NAME_ETERNATUS
+Eternatus
+
+#org @NAME_KUBFU
+Kubfu
+
+#org @NAME_URSHIFU_SINGLE
+Urshifu
+
+#org @NAME_ZARUDE
+Zarude
+
+#org @NAME_UNKNOWN_MYTHICAL
+??????
+
+#org @NAME_CALYREX
+Calyrex
+
+#org @NAME_REGIELEKI
+Regieleki
+
+#org @NAME_REGIDRAGO
+Regidrago
+
+#org @NAME_CRAMORANT_GULPING
+Cramorant
+
+#org @NAME_CRAMORANT_GORGING
+Cramorant
+
+#org @NAME_TOXTRICITY_LOW_KEY
+Toxtricity
+
+#org @NAME_SINISTEA_CHIPPED
+Sinistea
+
+#org @NAME_POLTEAGEIST_CHIPPED
+Poltegeist
+
+#org @NAME_ALCREMIE_BERRY
+Alcremie
+
+#org @NAME_ALCREMIE_CLOVER
+Alcremie
+
+#org @NAME_ALCREMIE_FLOWER
+Alcremie
+
+#org @NAME_ALCREMIE_LOVE
+Alcremie
+
+#org @NAME_ALCREMIE_RIBBON
+Alcremie
+
+#org @NAME_ALCREMIE_STAR
+Alcremie
+
+#org @NAME_EISCUE_NOICE
+Eiscue
+
+#org @NAME_INDEEDEE_FEMALE
+Indeedee
+
+#org @NAME_MORPEKO_HANGRY
+Morpeko
+
+#org @NAME_ZACIAN_CROWNED
+Zacian
+
+#org @NAME_ZAMAZENTA_CROWNED
+Zamazenta
+
+#org @NAME_ETERNATUS_ETERNAMAX
+Eternatus
+
+#org @NAME_URSHIFU_RAPID
+Urshifu
+
+#org @NAME_MEOWTH_G
+Meowth
+
+#org @NAME_PONYTA_G
+Ponyta
+
+#org @NAME_RAPIDASH_G
+Rapidash
+
+#org @NAME_SLOWPOKE_G
+Slowpoke
+
+#org @NAME_SLOWBRO_G
+Slowbro
+
+#org @NAME_FARFETCHD_G
+Farfetch'd
+
+#org @NAME_KOFFING_G
+Koffing
+
+#org @NAME_WEEZING_G
+Weezing
+
+#org @NAME_MR_MIME_G
+Mr. Mime
+
+#org @NAME_ARTICUNO_G
+Articuno
+
+#org @NAME_ZAPDOS_G
+Zapdos
+
+#org @NAME_MOLTRES_G
+Moltres
+
+#org @NAME_SLOWKING_G
+Slowking
+
+#org @NAME_CORSOLA_G
+Corsola
+
+#org @NAME_ZIGZAGOON_G
+Zigzagoon
+
+#org @NAME_LINOONE_G
+Linoone
+
+#org @NAME_MIME_JR_G
+Mime Jr.
+
+#org @NAME_DARUMAKA_G
+Darumaka
+
+#org @NAME_DARMANITAN_G
+Darmanitan
+
+#org @NAME_DARMANITAN_G_ZEN
+Darmanitan
+
+#org @NAME_YAMASK_G
+Yamask
+
+#org @NAME_STUNFISK_G
+Stunfisk
+
+#org @NAME_VENUSAUR_GIGA
+Venusaur
+
+#org @NAME_CHARIZARD_GIGA
+Charizard
+
+#org @NAME_BLASTOISE_GIGA
+Blastoise
+
+#org @NAME_BUTTERFREE_GIGA
+Butterfree
+
+#org @NAME_PIKACHU_GIGA
+Pikachu
+
+#org @NAME_MEOWTH_GIGA
+Meowth
+
+#org @NAME_MACHAMP_GIGA
+Machamp
+
+#org @NAME_GENGAR_GIGA
+Gengar
+
+#org @NAME_KINGLER_GIGA
+Kingler
+
+#org @NAME_LAPRAS_GIGA
+Lapras
+
+#org @NAME_EEVEE_GIGA
+Eevee
+
+#org @NAME_SNORLAX_GIGA
+Snorlax
+
+#org @NAME_GARBODOR_GIGA
+Garbodor
+
+#org @NAME_MELMETAL_GIGA
+Melmetal
+
+#org @NAME_RILLABOOM_GIGA
+Rillaboom
+
+#org @NAME_CINDERACE_GIGA
+Cinderace
+
+#org @NAME_INTELEON_GIGA
+Inteleon
+
+#org @NAME_CORVIKNIGHT_GIGA
+Corvknight
+
+#org @NAME_ORBEETLE_GIGA
+Orbeetle
+
+#org @NAME_DREDNAW_GIGA
+Drednaw
+
+#org @NAME_COALOSSAL_GIGA
+Coalossal
+
+#org @NAME_FLAPPLE_GIGA
+Flapple
+
+#org @NAME_APPLETUN_GIGA
+Appletun
+
+#org @NAME_SANDACONDA_GIGA
+Sandaconda
+
+#org @NAME_TOXTRICITY_GIGA
+Toxtricity
+
+#org @NAME_TOXTRICITY_LOW_KEY_GIGA
+Toxtricity
+
+#org @NAME_CENTISKORCH_GIGA
+Centskorch
+
+#org @NAME_HATTERENE_GIGA
+Hatterene
+
+#org @NAME_GRIMMSNARL_GIGA
+Grimmsnarl
+
+#org @NAME_ALCREMIE_GIGA
+Alcremie
+
+#org @NAME_COPPERAJAH_GIGA
+Copperajah
+
+#org @NAME_DURALUDON_GIGA
+Duraludon
+
+#org @NAME_URSHIFU_SINGLE_GIGA
+Urshifu
+
+#org @NAME_URSHIFU_RAPID_GIGA
+Urshifu