Merge remote-tracking branch 'upstream/master'

data/pokemon/dex_order_alpha.asm

@@ -7,6 +7,7 @@ AlphabeticalPokedexOrder:
 	dw AIPOM
 	dw ALAKAZAM
 	dw AMPHAROS
+	dw ANNIHILAPE
 	dw ARBOK
 	dw ARCANINE
 	dw ARIADOS
@@ -17,12 +18,14 @@ AlphabeticalPokedexOrder:
 	dw BELLIGNAN
 	dw BELLOSSOM
 	dw BELLSPROUT
+	dw BITTYBAT
 	dw BLASTOISE
 	dw BLASTYKE
 	dw BLISSEY
 	dw BULBASAUR
 	dw BURGELA
 	dw BUTTERFREE
+	dw CARAPTHOR
 	dw CATERPIE
 	dw CELEBI
 	dw CHANSEY
@@ -35,6 +38,7 @@ AlphabeticalPokedexOrder:
 	dw CLEFAIRY
 	dw CLEFFA
 	dw CLOYSTER
+	dw COINPUR
 	dw CORSOLA
 	dw CROBAT
 	dw CROCONAW
@@ -70,9 +74,12 @@ AlphabeticalPokedexOrder:
 	dw FORRETRESS
 	dw FURRET
 	dw GASTLY
+	dw GAOTORA
 	dw GENGAR
+	dw GENTLARVA
 	dw GEODUDE
 	dw GIRAFARIG
+	dw GLACEON
 	dw GLIGAR
 	dw GLOOM
 	dw GOLBAT
@@ -80,6 +87,7 @@ AlphabeticalPokedexOrder:
 	dw GOLDUCK
 	dw GOLEM
 	dw GOROCHU
+	dw GOROTORA
 	dw GRANBULL
 	dw GRAVELER
 	dw GRIMER
@@ -113,10 +121,12 @@ AlphabeticalPokedexOrder:
 	dw KINGLER
 	dw KLEAVOR
 	dw KOFFING
+	dw KOTORA
 	dw KRABBY
 	dw LANTURN
 	dw LAPRAS
 	dw LARVITAR
+	dw LEAFEON
 	dw LEDIAN
 	dw LEDYBA
 	dw LICKILICKY
@@ -166,6 +176,8 @@ AlphabeticalPokedexOrder:
 	dw ONIX
 	dw PARAS
 	dw PARASECT
+	dw PARASPOR
+	dw PERRSERKER
 	dw PERSIAN
 	dw PHANPY
 	dw PICHU
@@ -185,11 +197,14 @@ AlphabeticalPokedexOrder:
 	dw PORYGON2
 	dw PRIMEAPE
 	dw PSYDUCK
+	dw PUPAL
 	dw PUPITAR
+	dw PUPPERON
 	dw QUAGSIRE
 	dw QUILAVA
 	dw QWILFISH
 	dw RAICHU
+	dw RAITORA
 	dw RAIKOU
 	dw RAPIDASH
 	dw RATICATE
@@ -231,6 +246,7 @@ AlphabeticalPokedexOrder:
 	dw SUNFLORA
 	dw SUNKERN
 	dw SWINUB
+	dw SYLVEON
 	dw TANGELA
 	dw TANGROWTH
 	dw TAUROS
@@ -255,6 +271,7 @@ AlphabeticalPokedexOrder:
 	dw VICTREEBEL
 	dw VILEPLUME
 	dw VOLTORB
+	dw VULPIII
 	dw VULPIX
 	dw WALKING_WAKE
 	dw WARTORTLE