Use English names for Pokémon whose Japanese names were already final (#190)

Affects Hoothoot, Flaaffy, Ampharos, Cleffa, Igglybuff, Natu, Xatu, Marill, Politoed, Slowking, Unown, Ledyba, Espeon, Umbreon, Remoraid, Octillery, Hitmontop, Magby, Bellossom, Miltank, Murkrow, Steelix, Sneasel, Ho-Oh, Togepi, and Snubbull.
2026-10-01 12:56:45 -05:00 · 2026-08-08 17:08:26 -04:00
parent 7663557441
commit 9075545b5f
200 changed files with 819 additions and 848 deletions
--- a/constants/icon_constants.asm
+++ b/constants/icon_constants.asm
@@ -25,7 +25,7 @@
 	const ICON_BULBASAUR
 	const ICON_CHARMANDER
 	const ICON_WEEDLE
-	const ICON_ANNON
+	const ICON_UNOWN
 	const ICON_GEODUDE
 	const ICON_MACHOP
 	const ICON_EGG
--- a/constants/pokedex_constants.asm
+++ b/constants/pokedex_constants.asm
@@ -159,32 +159,32 @@ DEF NUM_KANTO_POKEMON EQU const_value - 1
 	const DEX_HONOGUMA      ; 9b
 	const DEX_VOLBEAR       ; 9c
 	const DEX_DYNABEAR      ; 9d
-	const DEX_KURUSU        ; 9e
+	const DEX_CRUISE        ; 9e
 	const DEX_AQUA          ; 9f
 	const DEX_AQUARIA       ; a0
-	const DEX_HOHO          ; a1 HOOTHOOT
+	const DEX_HOOTHOOT      ; a1
 	const DEX_BOBO          ; a2 NOCTOWL
 	const DEX_PACHIMEE      ; a3 MAREEP
-	const DEX_MOKOKO        ; a4 FLAAFFY
-	const DEX_DENRYU        ; a5 AMPHAROS
+	const DEX_FLAAFFY       ; a4
+	const DEX_AMPHAROS      ; a5
 	const DEX_MIKON         ; a6 (baby VULPIX)
 	const DEX_MONJA         ; a7 (baby TANGELA)
 	const DEX_JARANRA       ; a8 TANGROWTH (evolved TANGELA)
 	const DEX_HANEEI        ; a9 MANTINE
 	const DEX_PUKU          ; aa QWILFISH
 	const DEX_SHIBIREFUGU   ; ab (evolved QWILFISH)
-	const DEX_PICHU         ; ac PICHU
-	const DEX_PY            ; ad CLEFFA
-	const DEX_PUPURIN       ; ae IGGLYPUFF
+	const DEX_PICHU         ; ac
+	const DEX_CLEFFA        ; ad
+	const DEX_IGGLYBUFF     ; ae
 	const DEX_MIZUUO        ; af QUAGSIRE
-	const DEX_NATY          ; b0 NATU
-	const DEX_NATIO         ; b1 XATU
+	const DEX_NATU          ; b0
+	const DEX_XATU          ; b1
 	const DEX_GYOPIN        ; b2 (baby GOLDEEN)
-	const DEX_MARIL         ; b3 MARILL
+	const DEX_MARILL        ; b3
 	const DEX_MANBO1        ; b4
 	const DEX_IKARI         ; b5
-	const DEX_GROTESS       ; b6
-	const DEX_EKSING        ; b7 CROBAT
+	const DEX_GROTESQUE     ; b6
+	const DEX_X_ING         ; b7 CROBAT
 	const DEX_PARA          ; b8 (baby PARAS)
 	const DEX_KOKUMO        ; b9 SPINARAK
 	const DEX_TWOHEAD       ; ba ARIADOS
@@ -195,25 +195,25 @@ DEF NUM_KANTO_POKEMON EQU const_value - 1
 	const DEX_PAON          ; bf PHANPY
 	const DEX_DONPHAN       ; c0 DONPHAN
 	const DEX_TWINZ         ; c1 (baby GIRAFARIG)
-	const DEX_KIRINRIKI     ; c2 GIRAFARIG
+	const DEX_GIRAFARIG     ; c2
 	const DEX_PAINTER       ; c3 SMEARGLE
 	const DEX_KOUNYA        ; c4 (baby MEOWTH)
 	const DEX_RINRIN        ; c5
 	const DEX_BERURUN       ; c6
-	const DEX_NYOROTONO     ; c7 POLITOED
-	const DEX_YADOKING      ; c8 SLOWKING
-	const DEX_ANNON         ; c9 UNOWN
-	const DEX_REDIBA        ; ca LEDYBA
+	const DEX_POLITOED      ; c7
+	const DEX_SLOWKING      ; c8
+	const DEX_UNOWN         ; c9
+	const DEX_LEDYBA        ; ca
 	const DEX_MITSUBOSHI    ; cb LEDIAN
 	const DEX_PUCHICORN     ; cc (baby PONYTA)
-	const DEX_EIFIE         ; cd ESPEON
-	const DEX_BLACKY        ; ce UMBREON
+	const DEX_ESPEON        ; cd
+	const DEX_UMBREON       ; ce
 	const DEX_TURBAN        ; cf
 	const DEX_BETBABY       ; d0 (baby GRIMER)
-	const DEX_TEPPOUO       ; d1 REMORAID
-	const DEX_OKUTANK       ; d2 OCTILLERY
-	const DEX_GONGU         ; d3 TYROGUE
-	const DEX_KAPOERER      ; d4 HITMONTOP
+	const DEX_REMORAID      ; d1
+	const DEX_OCTILLERY     ; d2
+	const DEX_GONG          ; d3 TYROGUE
+	const DEX_HITMONTOP     ; d4
 	const DEX_PUDIE         ; d5 (baby GROWLITHE)
 	const DEX_HANEKO        ; d6 HOPPIP
 	const DEX_POPONEKO      ; d7 SKIPLOOM
@@ -221,10 +221,10 @@ DEF NUM_KANTO_POKEMON EQU const_value - 1
 	const DEX_BARIRINA      ; d9 MIME_JR (baby MR__MIME)
 	const DEX_LIP           ; da SMOOCHUM
 	const DEX_ELEBABY       ; db ELEKID
-	const DEX_BOOBY         ; dc MAGBY
-	const DEX_KIREIHANA     ; dd BELLOSSOM
+	const DEX_MAGBY         ; dc
+	const DEX_BELLOSSOM     ; dd
 	const DEX_TSUBOMITTO    ; de (evolved WEEPINBELL)
-	const DEX_MILTANK       ; df MILTANK
+	const DEX_MILTANK       ; df
 	const DEX_BOMBSEEKER    ; e0
 	const DEX_GIFT          ; e1 DELIBIRD
 	const DEX_KOTORA        ; e2
@@ -232,25 +232,25 @@ DEF NUM_KANTO_POKEMON EQU const_value - 1
 	const DEX_MADAME        ; e4 (evolved FARFETCH_D)
 	const DEX_NOROWARA      ; e5
 	const DEX_KYONPAN       ; e6
-	const DEX_YAMIKARASU    ; e7 MURKROW
-	const DEX_HAPPI         ; e8 BLISSEY
+	const DEX_MURKROW       ; e7
+	const DEX_HAPPY         ; e8 BLISSEY
 	const DEX_SCISSORS      ; e9 SCIZOR
-	const DEX_PURAKKUSU     ; ea (evolved PINSIR)
+	const DEX_PLUCKS        ; ea (evolved PINSIR)
 	const DEX_DEVIL         ; eb HOUNDOUR
-	const DEX_HELGAA        ; ec HOUNDOOM
+	const DEX_HOUNDOOM      ; ec
 	const DEX_WOLFMAN       ; ed
 	const DEX_WARWOLF       ; ee
 	const DEX_PORYGON2      ; ef PORYGON2
 	const DEX_NAMEIL        ; f0 LICKILICKY (evolved LICKITUNG)
-	const DEX_HAGANEIL      ; f1 STEELIX
-	const DEX_KINGDRA       ; f2 KINGDRA
+	const DEX_STEELIX       ; f1
+	const DEX_KINGDRA       ; f2
 	const DEX_RAI           ; f3 RAIKOU
 	const DEX_EN            ; f4 ENTEI
 	const DEX_SUI           ; f5 SUICUNE
-	const DEX_NYULA         ; f6 SNEASEL
-	const DEX_HOUOU         ; f7 HO_OH
-	const DEX_TOGEPY        ; f8 TOGEPI
-	const DEX_BULU          ; f9 SNUBBULL
+	const DEX_SNEASEL       ; f6
+	const DEX_HO_OH         ; f7
+	const DEX_TOGEPI        ; f8
+	const DEX_SNUBBULL      ; f9
 	const DEX_TAIL          ; fa AIPOM
 	const DEX_LEAFY         ; fb LEAFEON (evolved EEVEE)
 DEF NUM_POKEMON EQU const_value - 1
@@ -259,32 +259,32 @@ DEF NUM_POKEMON EQU const_value - 1
 DEF NUM_POKEMON_OLD EQU const_value - 1 ; Original count according to FightDebugMenu, perhaps DEX_EGG was originally in $fe?
 	const DEX_FE            ; fe

-  ;  Annon forms
+; Unown forms
 	const_def 1
-	const     ANNON_A         ; 1
-	const     ANNON_B         ; 2
-	const     ANNON_C         ; 3
-	const     ANNON_D         ; 4
-	const     ANNON_E         ; 5
-	const     ANNON_F         ; 6
-	const     ANNON_G         ; 7
-	const     ANNON_H         ; 8
-	const     ANNON_I         ; 9
-	const     ANNON_J         ; 10
-	const     ANNON_K         ; 11
-	const     ANNON_L         ; 12
-	const     ANNON_M         ; 13
-	const     ANNON_N         ; 14
-	const     ANNON_O         ; 15
-	const     ANNON_P         ; 16
-	const     ANNON_Q         ; 17
-	const     ANNON_R         ; 18
-	const     ANNON_S         ; 19
-	const     ANNON_T         ; 20
-	const     ANNON_U         ; 21
-	const     ANNON_V         ; 22
-	const     ANNON_W         ; 23
-	const     ANNON_X         ; 24
-	const     ANNON_Y         ; 25
-	const     ANNON_Z         ; 26
-DEF NUM_ANNON EQU const_value - 1 ; 26
+	const UNOWN_A ;  1
+	const UNOWN_B ;  2
+	const UNOWN_C ;  3
+	const UNOWN_D ;  4
+	const UNOWN_E ;  5
+	const UNOWN_F ;  6
+	const UNOWN_G ;  7
+	const UNOWN_H ;  8
+	const UNOWN_I ;  9
+	const UNOWN_J ; 10
+	const UNOWN_K ; 11
+	const UNOWN_L ; 12
+	const UNOWN_M ; 13
+	const UNOWN_N ; 14
+	const UNOWN_O ; 15
+	const UNOWN_P ; 16
+	const UNOWN_Q ; 17
+	const UNOWN_R ; 18
+	const UNOWN_S ; 19
+	const UNOWN_T ; 20
+	const UNOWN_U ; 21
+	const UNOWN_V ; 22
+	const UNOWN_W ; 23
+	const UNOWN_X ; 24
+	const UNOWN_Y ; 25
+	const UNOWN_Z ; 26
+DEF NUM_UNOWN EQU const_value - 1 ; 26
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -32,7 +32,7 @@
 	const MON_BLASTOISE     ; 1c
 	const MON_PINSIR        ; 1d
 	const MON_TANGELA       ; 1e
-	const MON_KAPOERER      ; 1f HITMONTOP
+	const MON_HITMONTOP     ; 1f
 	const MON_PUDIE         ; 20 (baby GROWLITHE)
 	const MON_GROWLITHE     ; 21
 	const MON_ONIX          ; 22
@@ -69,8 +69,8 @@
 	const MON_VENONAT       ; 41
 	const MON_DRAGONITE     ; 42
 	const MON_ELEBABY       ; 43 ELEKID
-	const MON_BOOBY         ; 44 MAGBY
-	const MON_KIREIHANA     ; 45 BELLOSSOM
+	const MON_MAGBY         ; 44
+	const MON_BELLOSSOM     ; 45
 	const MON_DODUO         ; 46
 	const MON_POLIWAG       ; 47
 	const MON_JYNX          ; 48
@@ -123,12 +123,12 @@
 	const MON_VENOMOTH      ; 77
 	const MON_DEWGONG       ; 78
 	const MON_KYONPAN       ; 79 (MISSINGNO)
-	const MON_YAMIKARASU    ; 7a MURKROW
+	const MON_MURKROW       ; 7a
 	const MON_CATERPIE      ; 7b
 	const MON_METAPOD       ; 7c
 	const MON_BUTTERFREE    ; 7d
 	const MON_MACHAMP       ; 7e
-	const MON_HAPPI         ; 7f BLISSEY
+	const MON_HAPPY         ; 7f BLISSEY
 	const MON_GOLDUCK       ; 80
 	const MON_HYPNO         ; 81
 	const MON_GOLBAT        ; 82
@@ -136,12 +136,12 @@
 	const MON_SNORLAX       ; 84
 	const MON_MAGIKARP      ; 85
 	const MON_SCISSORS      ; 86 SCIZOR
-	const MON_PURAKKUSU     ; 87 (evolved PINSIR)
+	const MON_PLUCKS        ; 87 (evolved PINSIR)
 	const MON_MUK           ; 88
 	const MON_DEVIL         ; 89 HOUNDOUR
 	const MON_KINGLER       ; 8a
 	const MON_CLOYSTER      ; 8b
-	const MON_HELGAA        ; 8c HOUNDOOM
+	const MON_HOUNDOOM      ; 8c
 	const MON_ELECTRODE     ; 8d
 	const MON_CLEFABLE      ; 8e
 	const MON_WEEZING       ; 8f
@@ -162,7 +162,7 @@
 	const MON_SEAKING       ; 9e
 	const MON_PORYGON2      ; 9f
 	const MON_NAMEIL        ; a0 LICKILICKY (evolved LICKITUNG)
-	const MON_HAGANEIL      ; a1
+	const MON_STEELIX       ; a1
 	const MON_KINGDRA       ; a2
 	const MON_PONYTA        ; a3
 	const MON_RAPIDASH      ; a4
@@ -182,10 +182,10 @@
 	const MON_CHARMELEON    ; b2
 	const MON_WARTORTLE     ; b3
 	const MON_CHARIZARD     ; b4
-	const MON_NYULA         ; b5 SNEASEL
-	const MON_HOUOU         ; b6 HO_OH
-	const MON_TOGEPY        ; b7 TOGEPI
-	const MON_BULU          ; b8 SNUBBULL
+	const MON_SNEASEL       ; b5
+	const MON_HO_OH         ; b6
+	const MON_TOGEPI        ; b7
+	const MON_SNUBBULL      ; b8
 	const MON_ODDISH        ; b9
 	const MON_GLOOM         ; ba
 	const MON_VILEPLUME     ; bb
@@ -198,14 +198,14 @@
 	const MON_HONOGUMA      ; c2
 	const MON_VOLBEAR       ; c3
 	const MON_DYNABEAR      ; c4
-	const MON_KURUSU        ; c5
+	const MON_CRUISE        ; c5
 	const MON_AQUA          ; c6
 	const MON_AQUARIA       ; c7
-	const MON_HOHO          ; c8 HOOTHOOT
+	const MON_HOOTHOOT      ; c8
 	const MON_BOBO          ; c9 NOCTOWL
 	const MON_PACHIMEE      ; ca MAREEP
-	const MON_MOKOKO        ; cb FLAAFY
-	const MON_DENRYU        ; cc AMPHAROS
+	const MON_FLAAFFY       ; cb
+	const MON_AMPHAROS      ; cc
 	const MON_MIKON         ; cd (baby VULPIX)
 	const MON_MONJA         ; ce (baby TANGELA)
 	const MON_JARANJA       ; cf TANGROWTH (evolved TANGELA)
@@ -213,17 +213,17 @@
 	const MON_PUKU          ; d1 QWILFISH
 	const MON_SHIBIREFUGU   ; d2 (evolved QWILFISH)
 	const MON_PICHU         ; d3
-	const MON_PY            ; d4 CLEFFA
-	const MON_PUPURIN       ; d5 IGGLYBUFF
+	const MON_CLEFFA        ; d4
+	const MON_IGGLYBUFF     ; d5
 	const MON_MIZUUO        ; d6 QUAGSIRE
-	const MON_NATY          ; d7 NATU
-	const MON_NATIO         ; d8 XATU
+	const MON_NATU          ; d7
+	const MON_XATU          ; d8
 	const MON_GYOPIN        ; d9 (baby GOLDEEN)
-	const MON_MARIL         ; da MARILL
+	const MON_MARILL        ; da
 	const MON_MANBO1        ; db
 	const MON_IKARI         ; dc
-	const MON_GROTESS       ; dd
-	const MON_EKSING        ; de CROBAT
+	const MON_GROTESQUE       ; dd
+	const MON_X_ING         ; de CROBAT
 	const MON_PARA          ; df (baby PARAS)
 	const MON_KOKUMO        ; e0 SPINARAK
 	const MON_TWOHEAD       ; e1 ARIADOS
@@ -234,51 +234,22 @@
 	const MON_PAON          ; e6 PHANPHY
 	const MON_DONPHAN       ; e7
 	const MON_TWINZ         ; e8 (baby GIRAFARIG)
-	const MON_KIRINRIKI     ; e9 GIRAFARIG
+	const MON_GIRAFARIG     ; e9
 	const MON_PAINTER       ; ea SMEARGLE
 	const MON_KOUNYA        ; eb (baby MEOWTH)
 	const MON_RINRIN        ; ec
 	const MON_BERURUN       ; ed
-	const MON_NYOROTONO     ; ee POLITOED
-	const MON_YADOKING      ; ef SLOWKING
-	const MON_ANNON         ; f0 UNOWN
-	const MON_REDIBA        ; f1 LEDYBA
+	const MON_POLITOED      ; ee
+	const MON_SLOWKING      ; ef
+	const MON_UNOWN         ; f0
+	const MON_LEDYBA        ; f1
 	const MON_MITSUBOSHI    ; f2 LEDIAN
 	const MON_PUCHICORN     ; f3 (baby PONYTA)
-	const MON_EIFIE         ; f4 ESPEON
-	const MON_BLACKY        ; f5 UMBREON
+	const MON_ESPEON        ; f4
+	const MON_UMBREON       ; f5
 	const MON_TURBAN        ; f6
 	const MON_BETBABY       ; f7 (baby GRIMER)
-	const MON_TEPPOUO       ; f8 REMORAID
-	const MON_OKUTANK       ; f9 OCTILLERY
-	const MON_GONGU         ; fa TYROGUE
+	const MON_REMORAID      ; f8
+	const MON_OCTILLERY     ; f9
+	const MON_GONG          ; fa TYROGUE

-; Unown forms
-	const_def 1
-	const UNOWN_A ;  1
-	const UNOWN_B ;  2
-	const UNOWN_C ;  3
-	const UNOWN_D ;  4
-	const UNOWN_E ;  5
-	const UNOWN_F ;  6
-	const UNOWN_G ;  7
-	const UNOWN_H ;  8
-	const UNOWN_I ;  9
-	const UNOWN_J ; 10
-	const UNOWN_K ; 11
-	const UNOWN_L ; 12
-	const UNOWN_M ; 13
-	const UNOWN_N ; 14
-	const UNOWN_O ; 15
-	const UNOWN_P ; 16
-	const UNOWN_Q ; 17
-	const UNOWN_R ; 18
-	const UNOWN_S ; 19
-	const UNOWN_T ; 20
-	const UNOWN_U ; 21
-	const UNOWN_V ; 22
-	const UNOWN_W ; 23
-	const UNOWN_X ; 24
-	const UNOWN_Y ; 25
-	const UNOWN_Z ; 26
-DEF NUM_UNOWN EQU const_value - 1 ; 26
--- a/constants/sprite_anim_constants.asm
+++ b/constants/sprite_anim_constants.asm
@@ -46,7 +46,7 @@ DEF NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
 	const SPRITE_ANIM_DICT_BULBASAUR_ICON   ; 16
 	const SPRITE_ANIM_DICT_CHARMANDER_ICON  ; 17
 	const SPRITE_ANIM_DICT_WEEDLE_ICON      ; 18
-	const SPRITE_ANIM_DICT_ANNON_ICON       ; 19
+	const SPRITE_ANIM_DICT_UNOWN_ICON       ; 19
 	const SPRITE_ANIM_DICT_GEODUDE_ICON     ; 1a
 	const SPRITE_ANIM_DICT_MACHOP_ICON      ; 1b
 	const SPRITE_ANIM_DICT_EGG_ICON         ; 1c
@@ -97,7 +97,7 @@ DEF NUM_SPRITEANIMDICT_ENTRIES EQU 10
 	const SPRITE_ANIM_OBJ_BULBASAUR_ICON          ; 16
 	const SPRITE_ANIM_OBJ_CHARMANDER_ICON         ; 17
 	const SPRITE_ANIM_OBJ_WEEDLE_ICON             ; 18
-	const SPRITE_ANIM_OBJ_ANNON_ICON              ; 19
+	const SPRITE_ANIM_OBJ_UNOWN_ICON              ; 19
 	const SPRITE_ANIM_OBJ_GEODUDE_ICON            ; 1a
 	const SPRITE_ANIM_OBJ_MACHOP_ICON             ; 1b
 	const SPRITE_ANIM_OBJ_EGG_ICON                ; 1c
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@@ -190,14 +190,14 @@ INCLUDE "data/pokemon/base_stats/hanaryu.asm"
 INCLUDE "data/pokemon/base_stats/honoguma.asm"
 INCLUDE "data/pokemon/base_stats/volbear.asm"
 INCLUDE "data/pokemon/base_stats/dynabear.asm"
-INCLUDE "data/pokemon/base_stats/kurusu.asm"
+INCLUDE "data/pokemon/base_stats/cruise.asm"
 INCLUDE "data/pokemon/base_stats/aqua.asm"
 INCLUDE "data/pokemon/base_stats/aquaria.asm"
-INCLUDE "data/pokemon/base_stats/hoho.asm"
+INCLUDE "data/pokemon/base_stats/hoothoot.asm"
 INCLUDE "data/pokemon/base_stats/bobo.asm"
 INCLUDE "data/pokemon/base_stats/pachimee.asm"
-INCLUDE "data/pokemon/base_stats/mokoko.asm"
-INCLUDE "data/pokemon/base_stats/denryu.asm"
+INCLUDE "data/pokemon/base_stats/flaaffy.asm"
+INCLUDE "data/pokemon/base_stats/ampharos.asm"
 INCLUDE "data/pokemon/base_stats/mikon.asm"
 INCLUDE "data/pokemon/base_stats/monja.asm"
 INCLUDE "data/pokemon/base_stats/jaranra.asm"
@@ -205,17 +205,17 @@ INCLUDE "data/pokemon/base_stats/haneei.asm"
 INCLUDE "data/pokemon/base_stats/puku.asm"
 INCLUDE "data/pokemon/base_stats/shibirefugu.asm"
 INCLUDE "data/pokemon/base_stats/pichu.asm"
-INCLUDE "data/pokemon/base_stats/py.asm"
-INCLUDE "data/pokemon/base_stats/pupurin.asm"
+INCLUDE "data/pokemon/base_stats/cleffa.asm"
+INCLUDE "data/pokemon/base_stats/igglybuff.asm"
 INCLUDE "data/pokemon/base_stats/mizuuo.asm"
-INCLUDE "data/pokemon/base_stats/naty.asm"
-INCLUDE "data/pokemon/base_stats/natio.asm"
+INCLUDE "data/pokemon/base_stats/natu.asm"
+INCLUDE "data/pokemon/base_stats/xatu.asm"
 INCLUDE "data/pokemon/base_stats/gyopin.asm"
-INCLUDE "data/pokemon/base_stats/maril.asm"
+INCLUDE "data/pokemon/base_stats/marill.asm"
 INCLUDE "data/pokemon/base_stats/manbo1.asm"
 INCLUDE "data/pokemon/base_stats/ikari.asm"
-INCLUDE "data/pokemon/base_stats/grotess.asm"
-INCLUDE "data/pokemon/base_stats/eksing.asm"
+INCLUDE "data/pokemon/base_stats/grotesque.asm"
+INCLUDE "data/pokemon/base_stats/x_ing.asm"
 INCLUDE "data/pokemon/base_stats/para.asm"
 INCLUDE "data/pokemon/base_stats/kokumo.asm"
 INCLUDE "data/pokemon/base_stats/twohead.asm"
@@ -226,25 +226,25 @@ INCLUDE "data/pokemon/base_stats/sunny.asm"
 INCLUDE "data/pokemon/base_stats/paon.asm"
 INCLUDE "data/pokemon/base_stats/donphan.asm"
 INCLUDE "data/pokemon/base_stats/twinz.asm"
-INCLUDE "data/pokemon/base_stats/kirinriki.asm"
+INCLUDE "data/pokemon/base_stats/girafarig.asm"
 INCLUDE "data/pokemon/base_stats/painter.asm"
 INCLUDE "data/pokemon/base_stats/kounya.asm"
 INCLUDE "data/pokemon/base_stats/rinrin.asm"
 INCLUDE "data/pokemon/base_stats/berurun.asm"
-INCLUDE "data/pokemon/base_stats/nyorotono.asm"
-INCLUDE "data/pokemon/base_stats/yadoking.asm"
-INCLUDE "data/pokemon/base_stats/annon.asm"
-INCLUDE "data/pokemon/base_stats/rediba.asm"
+INCLUDE "data/pokemon/base_stats/politoed.asm"
+INCLUDE "data/pokemon/base_stats/slowking.asm"
+INCLUDE "data/pokemon/base_stats/unown.asm"
+INCLUDE "data/pokemon/base_stats/ledyba.asm"
 INCLUDE "data/pokemon/base_stats/mitsuboshi.asm"
 INCLUDE "data/pokemon/base_stats/puchicorn.asm"
-INCLUDE "data/pokemon/base_stats/eifie.asm"
-INCLUDE "data/pokemon/base_stats/blacky.asm"
+INCLUDE "data/pokemon/base_stats/espeon.asm"
+INCLUDE "data/pokemon/base_stats/umbreon.asm"
 INCLUDE "data/pokemon/base_stats/turban.asm"
 INCLUDE "data/pokemon/base_stats/betbaby.asm"
-INCLUDE "data/pokemon/base_stats/teppouo.asm"
-INCLUDE "data/pokemon/base_stats/okutank.asm"
-INCLUDE "data/pokemon/base_stats/gongu.asm"
-INCLUDE "data/pokemon/base_stats/kapoerer.asm"
+INCLUDE "data/pokemon/base_stats/remoraid.asm"
+INCLUDE "data/pokemon/base_stats/octillery.asm"
+INCLUDE "data/pokemon/base_stats/gong.asm"
+INCLUDE "data/pokemon/base_stats/hitmontop.asm"
 INCLUDE "data/pokemon/base_stats/pudie.asm"
 INCLUDE "data/pokemon/base_stats/haneko.asm"
 INCLUDE "data/pokemon/base_stats/poponeko.asm"
@@ -252,8 +252,8 @@ INCLUDE "data/pokemon/base_stats/wataneko.asm"
 INCLUDE "data/pokemon/base_stats/baririna.asm"
 INCLUDE "data/pokemon/base_stats/lip.asm"
 INCLUDE "data/pokemon/base_stats/elebaby.asm"
-INCLUDE "data/pokemon/base_stats/booby.asm"
-INCLUDE "data/pokemon/base_stats/kireihana.asm"
+INCLUDE "data/pokemon/base_stats/magby.asm"
+INCLUDE "data/pokemon/base_stats/bellossom.asm"
 INCLUDE "data/pokemon/base_stats/tsubomitto.asm"
 INCLUDE "data/pokemon/base_stats/miltank.asm"
 INCLUDE "data/pokemon/base_stats/bombseeker.asm"
@@ -263,24 +263,24 @@ INCLUDE "data/pokemon/base_stats/raitora.asm"
 INCLUDE "data/pokemon/base_stats/madame.asm"
 INCLUDE "data/pokemon/base_stats/norowara.asm"
 INCLUDE "data/pokemon/base_stats/kyonpan.asm"
-INCLUDE "data/pokemon/base_stats/yamikarasu.asm"
-INCLUDE "data/pokemon/base_stats/happi.asm"
+INCLUDE "data/pokemon/base_stats/murkrow.asm"
+INCLUDE "data/pokemon/base_stats/happy.asm"
 INCLUDE "data/pokemon/base_stats/scissors.asm"
-INCLUDE "data/pokemon/base_stats/purakkusu.asm"
+INCLUDE "data/pokemon/base_stats/plucks.asm"
 INCLUDE "data/pokemon/base_stats/devil.asm"
-INCLUDE "data/pokemon/base_stats/helgaa.asm"
+INCLUDE "data/pokemon/base_stats/houndoom.asm"
 INCLUDE "data/pokemon/base_stats/wolfman.asm"
 INCLUDE "data/pokemon/base_stats/warwolf.asm"
 INCLUDE "data/pokemon/base_stats/porygon2.asm"
 INCLUDE "data/pokemon/base_stats/nameil.asm"
-INCLUDE "data/pokemon/base_stats/haganeil.asm"
+INCLUDE "data/pokemon/base_stats/steelix.asm"
 INCLUDE "data/pokemon/base_stats/kingdra.asm"
 INCLUDE "data/pokemon/base_stats/rai.asm"
 INCLUDE "data/pokemon/base_stats/en.asm"
 INCLUDE "data/pokemon/base_stats/sui.asm"
-INCLUDE "data/pokemon/base_stats/nyula.asm"
-INCLUDE "data/pokemon/base_stats/houou.asm"
-INCLUDE "data/pokemon/base_stats/togepy.asm"
-INCLUDE "data/pokemon/base_stats/bulu.asm"
+INCLUDE "data/pokemon/base_stats/sneasel.asm"
+INCLUDE "data/pokemon/base_stats/ho_oh.asm"
+INCLUDE "data/pokemon/base_stats/togepi.asm"
+INCLUDE "data/pokemon/base_stats/snubbull.asm"
 INCLUDE "data/pokemon/base_stats/tail.asm"
 INCLUDE "data/pokemon/base_stats/leafy.asm"
--- a/data/pokemon/base_stats/ampharos.asm
+++ b/data/pokemon/base_stats/ampharos.asm
@@ -1,4 +1,4 @@
-	db DEX_DENRYU ; 165
+	db DEX_AMPHAROS ; 165

 	db  55,  45,  45,  50,  70,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 7, 7 ; sprite dimensions
-	dw DenryuPicFront, DenryuPicBack ; sprites
+	dw AmpharosPicFront, AmpharosPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/bellossom.asm
+++ b/data/pokemon/base_stats/bellossom.asm
@@ -1,4 +1,4 @@
-	db DEX_KIREIHANA ; 221
+	db DEX_BELLOSSOM ; 221

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 7, 7 ; sprite dimensions
-	dw KireihanaPicFront, KireihanaPicBack ; sprites
+	dw BellossomPicFront, BellossomPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/cleffa.asm
+++ b/data/pokemon/base_stats/cleffa.asm
@@ -1,4 +1,4 @@
-	db DEX_PY ; 173
+	db DEX_CLEFFA ; 173

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw PyPicFront, PyPicBack ; sprites
+	dw CleffaPicFront, CleffaPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/cruise.asm
+++ b/data/pokemon/base_stats/cruise.asm
@@ -1,4 +1,4 @@
-	db DEX_KURUSU ; 158
+	db DEX_CRUISE ; 158

 	db  45,  50,  50,  45,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw KurusuPicFront, KurusuPicBack ; sprites
+	dw CruisePicFront, CruisePicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/espeon.asm
+++ b/data/pokemon/base_stats/espeon.asm
@@ -1,4 +1,4 @@
-	db DEX_EIFIE ; 205
+	db DEX_ESPEON ; 205

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 6, 6 ; sprite dimensions
-	dw EifiePicFront, EifiePicBack ; sprites
+	dw EspeonPicFront, EspeonPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/flaaffy.asm
+++ b/data/pokemon/base_stats/flaaffy.asm
@@ -1,4 +1,4 @@
-	db DEX_MOKOKO ; 164
+	db DEX_FLAAFFY ; 164

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 6, 6 ; sprite dimensions
-	dw MokokoPicFront, MokokoPicBack ; sprites
+	dw FlaaffyPicFront, FlaaffyPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/girafarig.asm
+++ b/data/pokemon/base_stats/girafarig.asm
@@ -1,4 +1,4 @@
-	db DEX_KIRINRIKI ; 194
+	db DEX_GIRAFARIG ; 194

 	db  70,  50,  50,  45,  45,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -14,7 +14,7 @@ endc
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 7, 7 ; sprite dimensions
-	dw KirinrikiPicFront, KirinrikiPicBack ; sprites
+	dw GirafarigPicFront, GirafarigPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/gongu.asm
+++ b/data/pokemon/base_stats/gongu.asm
@@ -1,4 +1,4 @@
-	db DEX_GONGU ; 211
+	db DEX_GONG ; 211

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw GonguPicFront, GonguPicBack ; sprites
+	dw GongPicFront, GongPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/grotesque.asm
+++ b/data/pokemon/base_stats/grotesque.asm
@@ -1,4 +1,4 @@
-	db DEX_GROTESS ; 182
+	db DEX_GROTESQUE ; 182

 	db  60,  65,  60,  30,  80,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 6, 6 ; sprite dimensions
-	dw GrotessPicFront, GrotessPicBack ; sprites
+	dw GrotesquePicFront, GrotesquePicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/happy.asm
+++ b/data/pokemon/base_stats/happy.asm
@@ -1,4 +1,4 @@
-	db DEX_HAPPI ; 232
+	db DEX_HAPPY ; 232

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 7, 7 ; sprite dimensions
-	dw HappiPicFront, HappiPicBack ; sprites
+	dw HappyPicFront, HappyPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/hitmontop.asm
+++ b/data/pokemon/base_stats/hitmontop.asm
@@ -1,4 +1,4 @@
-	db DEX_KAPOERER ; 212
+	db DEX_HITMONTOP ; 212

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 7, 7 ; sprite dimensions
-	dw KapoererPicFront, KapoererPicBack ; sprites
+	dw HitmontopPicFront, HitmontopPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/ho_oh.asm
+++ b/data/pokemon/base_stats/ho_oh.asm
@@ -1,4 +1,4 @@
-	db DEX_HOUOU ; 247
+	db DEX_HO_OH ; 247

 	db 100, 100, 100, 100, 100,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 7, 7 ; sprite dimensions
-	dw HououPicFront, HououPicBack ; sprites
+	dw HoOhPicFront, HoOhPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/hoothoot.asm
+++ b/data/pokemon/base_stats/hoothoot.asm
@@ -1,4 +1,4 @@
-	db DEX_HOHO ; 161
+	db DEX_HOOTHOOT ; 161

 	db  65,  55,  40,  65,  55,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw HohoPicFront, HohoPicBack ; sprites
+	dw HoothootPicFront, HoothootPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/houndoom.asm
+++ b/data/pokemon/base_stats/houndoom.asm
@@ -1,4 +1,4 @@
-	db DEX_HELGAA ; 236
+	db DEX_HOUNDOOM ; 236

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 7, 7 ; sprite dimensions
-	dw HelgaaPicFront, HelgaaPicBack ; sprites
+	dw HoundoomPicFront, HoundoomPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/igglybuff.asm
+++ b/data/pokemon/base_stats/igglybuff.asm
@@ -1,4 +1,4 @@
-	db DEX_PUPURIN ; 174
+	db DEX_IGGLYBUFF ; 174

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw PupurinPicFront, PupurinPicBack ; sprites
+	dw IgglybuffPicFront, IgglybuffPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/ledyba.asm
+++ b/data/pokemon/base_stats/ledyba.asm
@@ -1,4 +1,4 @@
-	db DEX_REDIBA ; 202
+	db DEX_LEDYBA ; 202

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 6, 6 ; sprite dimensions
-	dw RedibaPicFront, RedibaPicBack ; sprites
+	dw LedybaPicFront, LedybaPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/magby.asm
+++ b/data/pokemon/base_stats/magby.asm
@@ -1,4 +1,4 @@
-	db DEX_BOOBY ; 220
+	db DEX_MAGBY ; 220

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 6, 6 ; sprite dimensions
-	dw BoobyPicFront, BoobyPicBack ; sprites
+	dw MagbyPicFront, MagbyPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/marill.asm
+++ b/data/pokemon/base_stats/marill.asm
@@ -1,4 +1,4 @@
-	db DEX_MARIL ; 179
+	db DEX_MARILL ; 179

 	db  45,  50,  55,  40,  55,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw MarilPicFront, MarilPicBack ; sprites
+	dw MarillPicFront, MarillPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/yamikarasu.asm
+++ b/data/pokemon/base_stats/yamikarasu.asm
@@ -1,4 +1,4 @@
-	db DEX_YAMIKARASU ; 231
+	db DEX_MURKROW ; 231

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 6, 6 ; sprite dimensions
-	dw YamikarasuPicFront, YamikarasuPicBack ; sprites
+	dw MurkrowPicFront, MurkrowPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/natu.asm
+++ b/data/pokemon/base_stats/natu.asm
@@ -1,4 +1,4 @@
-	db DEX_NATY ; 176
+	db DEX_NATU ; 176

 	db  45,  50,  50,  60,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw NatyPicFront, NatyPicBack ; sprites
+	dw NatuPicFront, NatuPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/octillery.asm
+++ b/data/pokemon/base_stats/octillery.asm
@@ -1,4 +1,4 @@
-	db DEX_OKUTANK ; 210
+	db DEX_OCTILLERY ; 210

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 6, 6 ; sprite dimensions
-	dw OkutankPicFront, OkutankPicBack ; sprites
+	dw OctilleryPicFront, OctilleryPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/purakkusu.asm
+++ b/data/pokemon/base_stats/purakkusu.asm
@@ -1,4 +1,4 @@
-	db DEX_PURAKKUSU ; 234
+	db DEX_PLUCKS ; 234

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 7, 7 ; sprite dimensions
-	dw PurakkusuPicFront, PurakkusuPicBack ; sprites
+	dw PlucksPicFront, PlucksPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/nyorotono.asm
+++ b/data/pokemon/base_stats/nyorotono.asm
@@ -1,4 +1,4 @@
-	db DEX_NYOROTONO ; 199
+	db DEX_POLITOED ; 199

 	db  90,  85,  95,  70,  70,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 7, 7 ; sprite dimensions
-	dw NyorotonoPicFront, NyorotonoPicBack ; sprites
+	dw PolitoedPicFront, PolitoedPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/remoraid.asm
+++ b/data/pokemon/base_stats/remoraid.asm
@@ -1,4 +1,4 @@
-	db DEX_TEPPOUO ; 209
+	db DEX_REMORAID ; 209

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw TeppouoPicFront, TeppouoPicBack ; sprites
+	dw RemoraidPicFront, RemoraidPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/slowking.asm
+++ b/data/pokemon/base_stats/slowking.asm
@@ -1,4 +1,4 @@
-	db DEX_YADOKING ; 200
+	db DEX_SLOWKING ; 200

 	db  95,  75, 110,  30,  80,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 7, 7 ; sprite dimensions
-	dw YadokingPicFront, YadokingPicBack ; sprites
+	dw SlowkingPicFront, SlowkingPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/sneasel.asm
+++ b/data/pokemon/base_stats/sneasel.asm
@@ -1,4 +1,4 @@
-	db DEX_NYULA ; 246
+	db DEX_SNEASEL ; 246

 	db  45,  65,  50,  85,  40,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw NyulaPicFront, NyulaPicBack ; sprites
+	dw SneaselPicFront, SneaselPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/snubbull.asm
+++ b/data/pokemon/base_stats/snubbull.asm
@@ -1,4 +1,4 @@
-	db DEX_BULU ; 249
+	db DEX_SNUBBULL ; 249

 	db  65,  70,  60,  50,  70,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_FEMALE ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 6, 6 ; sprite dimensions
-	dw BuluPicFront, BuluPicBack ; sprites
+	dw SnubbullPicFront, SnubbullPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/haganeil.asm
+++ b/data/pokemon/base_stats/haganeil.asm
@@ -1,4 +1,4 @@
-	db DEX_HAGANEIL ; 241
+	db DEX_STEELIX ; 241

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 7, 7 ; sprite dimensions
-	dw HaganeilPicFront, HaganeilPicBack ; sprites
+	dw SteelixPicFront, SteelixPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/togepi.asm
+++ b/data/pokemon/base_stats/togepi.asm
@@ -1,4 +1,4 @@
-	db DEX_TOGEPY ; 248
+	db DEX_TOGEPI ; 248

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw TogepyPicFront, TogepyPicBack ; sprites
+	dw TogepiPicFront, TogepiPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/umbreon.asm
+++ b/data/pokemon/base_stats/umbreon.asm
@@ -1,4 +1,4 @@
-	db DEX_BLACKY ; 206
+	db DEX_UMBREON ; 206

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 6, 6 ; sprite dimensions
-	dw BlackyPicFront, BlackyPicBack ; sprites
+	dw UmbreonPicFront, UmbreonPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/unown.asm
+++ b/data/pokemon/base_stats/unown.asm
@@ -1,4 +1,4 @@
-	db DEX_ANNON ; 201
+	db DEX_UNOWN ; 201

 	db  50,  50,  50,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw AnnonPicPtrsFront, AnnonPicPtrsBack ; sprites
+	dw UnownPicPtrsFront, UnownPicPtrsBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/eksing.asm
+++ b/data/pokemon/base_stats/eksing.asm
@@ -1,4 +1,4 @@
-	db DEX_EKSING ; 183
+	db DEX_X_ING ; 183

 	db  60,  65,  50,  85,  45,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 7, 7 ; sprite dimensions
-	dw EksingPicFront, EksingPicBack ; sprites
+	dw XIngPicFront, XIngPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/base_stats/natio.asm
+++ b/data/pokemon/base_stats/natio.asm
@@ -1,4 +1,4 @@
-	db DEX_NATIO ; 177
+	db DEX_XATU ; 177

 	db  55,  50,  50,  80,  70,  50
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 6, 6 ; sprite dimensions
-	dw NatioPicFront, NatioPicBack ; sprites
+	dw XatuPicFront, XatuPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate

 	; tm/hm learnset
--- a/data/pokemon/cries.asm
+++ b/data/pokemon/cries.asm
@@ -34,7 +34,7 @@ PokemonCries::
 	mon_cry CRY_13,    0,  256 ; MON_BLASTOISE
 	mon_cry CRY_14,    0,  256 ; MON_PINSIR
 	mon_cry CRY_12,    0,  256 ; MON_TANGELA
-	mon_cry CRY_00,    0,    0 ; MON_KAPOERER
+	mon_cry CRY_00,    0,    0 ; MON_HITMONTOP
 	mon_cry CRY_00,    0,    0 ; MON_PUDIE
 	mon_cry CRY_1F,   32,  192 ; MON_GROWLITHE
 	mon_cry CRY_17,  255,  320 ; MON_ONIX
@@ -71,8 +71,8 @@ PokemonCries::
 	mon_cry CRY_1A,   68,  192 ; MON_VENONAT
 	mon_cry CRY_0F,   60,  320 ; MON_DRAGONITE
 	mon_cry CRY_00,  128,   16 ; MON_ELEBABY
-	mon_cry CRY_00,    0,    0 ; MON_BOOBY
-	mon_cry CRY_1D,  224,    0 ; MON_KIREIHANA
+	mon_cry CRY_00,    0,    0 ; MON_MAGBY
+	mon_cry CRY_1D,  224,    0 ; MON_BELLOSSOM
 	mon_cry CRY_0B,  187,  129 ; MON_DODUO
 	mon_cry CRY_0E,  255,  383 ; MON_POLIWAG
 	mon_cry CRY_0D,  255,  383 ; MON_JYNX
@@ -125,12 +125,12 @@ PokemonCries::
 	mon_cry CRY_1A,   41,  256 ; MON_VENOMOTH
 	mon_cry CRY_0C,   35,  383 ; MON_DEWGONG
 	mon_cry CRY_00,    0,    0 ; MON_KYONPAN
-	mon_cry CRY_00,    0,    0 ; MON_YAMIKARASU
+	mon_cry CRY_00,    0,    0 ; MON_MURKROW
 	mon_cry CRY_16,  128,  160 ; MON_CATERPIE
 	mon_cry CRY_1C,  204,  129 ; MON_METAPOD
 	mon_cry CRY_16,  119,  192 ; MON_BUTTERFREE
 	mon_cry CRY_1F,    8,  320 ; MON_MACHAMP
-	mon_cry CRY_11,   32,   16 ; MON_HAPPI
+	mon_cry CRY_11,   32,   16 ; MON_HAPPY
 	mon_cry CRY_21,  255,  192 ; MON_GOLDUCK
 	mon_cry CRY_0D,  238,  192 ; MON_HYPNO
 	mon_cry CRY_1D,  250,  256 ; MON_GOLBAT
@@ -138,12 +138,12 @@ PokemonCries::
 	mon_cry CRY_05,   85,  129 ; MON_SNORLAX
 	mon_cry CRY_17,  128,  128 ; MON_MAGIKARP
 	mon_cry CRY_00,    0,    0 ; MON_SCISSORS
-	mon_cry CRY_00,    0,    0 ; MON_PURAKKUSU
+	mon_cry CRY_00,    0,    0 ; MON_PLUCKS
 	mon_cry CRY_07,  239,  383 ; MON_MUK
 	mon_cry CRY_0F,   64,    0 ; MON_DEVIL
 	mon_cry CRY_20,  238,  352 ; MON_KINGLER
 	mon_cry CRY_18,  111,  352 ; MON_CLOYSTER
-	mon_cry CRY_00,    0,    0 ; MON_HELGAA
+	mon_cry CRY_00,    0,    0 ; MON_HOUNDOOM
 	mon_cry CRY_06,  168,  272 ; MON_ELECTRODE
 	mon_cry CRY_19,  170,  160 ; MON_CLEFABLE
 	mon_cry CRY_12,  255,  383 ; MON_WEEZING
@@ -164,7 +164,7 @@ PokemonCries::
 	mon_cry CRY_16,   16,  383 ; MON_SEAKING
 	mon_cry CRY_00,    0,    0 ; MON_PORYGON2
 	mon_cry CRY_00,    0,    0 ; MON_NAMEIL
-	mon_cry CRY_00,    0,    0 ; MON_HAGANEIL
+	mon_cry CRY_00,    0,    0 ; MON_STEELIX
 	mon_cry CRY_00,    0,    0 ; MON_KINGDRA
 	mon_cry CRY_25,    0,  256 ; MON_PONYTA
 	mon_cry CRY_25,   32,  320 ; MON_RAPIDASH
@@ -184,10 +184,10 @@ PokemonCries::
 	mon_cry CRY_04,   32,  192 ; MON_CHARMELEON
 	mon_cry CRY_1D,   32,  192 ; MON_WARTORTLE
 	mon_cry CRY_04,    0,  256 ; MON_CHARIZARD
-	mon_cry CRY_1D,    0,    0 ; MON_NYULA
-	mon_cry CRY_00,    0,    0 ; MON_HOUOU
-	mon_cry CRY_00,    0,    0 ; MON_TOGEPY
-	mon_cry CRY_00,    0,    0 ; MON_BULU
+	mon_cry CRY_1D,    0,    0 ; MON_SNEASEL
+	mon_cry CRY_00,    0,    0 ; MON_HO_OH
+	mon_cry CRY_00,    0,    0 ; MON_TOGEPI
+	mon_cry CRY_00,    0,    0 ; MON_SNUBBULL
 	mon_cry CRY_08,  221,  129 ; MON_ODDISH
 	mon_cry CRY_08,  170,  192 ; MON_GLOOM
 	mon_cry CRY_23,   34,  383 ; MON_VILEPLUME
@@ -200,14 +200,14 @@ PokemonCries::
 	mon_cry CRY_00,    0,  256 ; MON_HONOGUMA
 	mon_cry CRY_00,    0,  256 ; MON_VOLBEAR
 	mon_cry CRY_00,    0,  256 ; MON_DYNABEAR
-	mon_cry CRY_00,    0,  256 ; MON_KURUSU
+	mon_cry CRY_00,    0,  256 ; MON_CRUISE
 	mon_cry CRY_00,    0,  256 ; MON_AQUA
 	mon_cry CRY_00,    0,  256 ; MON_AQUARIA
-	mon_cry CRY_00,    0,  256 ; MON_HOHO
+	mon_cry CRY_00,    0,  256 ; MON_HOOTHOOT
 	mon_cry CRY_00,    0,  256 ; MON_BOBO
 	mon_cry CRY_00,    0,  256 ; MON_PACHIMEE
-	mon_cry CRY_00,    0,  256 ; MON_MOKOKO
-	mon_cry CRY_00,    0,  256 ; MON_DENRYU
+	mon_cry CRY_00,    0,  256 ; MON_FLAAFFY
+	mon_cry CRY_00,    0,  256 ; MON_AMPHAROS
 	mon_cry CRY_00,    0,  256 ; MON_MIKON
 	mon_cry CRY_00,    0,  256 ; MON_MONJA
 	mon_cry CRY_00,    0,  256 ; MON_JARANJA
@@ -215,17 +215,17 @@ PokemonCries::
 	mon_cry CRY_00,    0,  256 ; MON_PUKU
 	mon_cry CRY_00,    0,  256 ; MON_SHIBIREFUGU
 	mon_cry CRY_00,    0,  256 ; MON_PICHU
-	mon_cry CRY_00,    0,  256 ; MON_PY
-	mon_cry CRY_00,    0,  256 ; MON_PUPURIN
+	mon_cry CRY_00,    0,  256 ; MON_CLEFFA
+	mon_cry CRY_00,    0,  256 ; MON_IGGLYBUFF
 	mon_cry CRY_00,    0,  256 ; MON_MIZUUO
-	mon_cry CRY_00,    0,  256 ; MON_NATY
-	mon_cry CRY_00,    0,  256 ; MON_NATIO
+	mon_cry CRY_00,    0,  256 ; MON_NATU
+	mon_cry CRY_00,    0,  256 ; MON_XATU
 	mon_cry CRY_00,    0,  256 ; MON_GYOPIN
-	mon_cry CRY_00,    0,  256 ; MON_MARIL
+	mon_cry CRY_00,    0,  256 ; MON_MARILL
 	mon_cry CRY_00,    0,  256 ; MON_MANBO1
 	mon_cry CRY_00,    0,  256 ; MON_IKARI
-	mon_cry CRY_00,    0,  256 ; MON_GROTESS
-	mon_cry CRY_00,    0,  256 ; MON_EKSING
+	mon_cry CRY_00,    0,  256 ; MON_GROTESQUE
+	mon_cry CRY_00,    0,  256 ; MON_X_ING
 	mon_cry CRY_00,    0,  256 ; MON_PARA
 	mon_cry CRY_00,    0,  256 ; MON_KOKUMO
 	mon_cry CRY_00,    0,  256 ; MON_TWOHEAD
@@ -236,24 +236,24 @@ PokemonCries::
 	mon_cry CRY_00,    0,  256 ; MON_PAON
 	mon_cry CRY_00,    0,  256 ; MON_DONPHAN
 	mon_cry CRY_00,    0,  256 ; MON_TWINZ
-	mon_cry CRY_00,    0,  256 ; MON_KIRINRIKI
+	mon_cry CRY_00,    0,  256 ; MON_GIRAFARIG
 	mon_cry CRY_00,    0,  256 ; MON_PAINTER
 	mon_cry CRY_00,    0,  256 ; MON_KOUNYA
 	mon_cry CRY_00,    0,  256 ; MON_RINRIN
 	mon_cry CRY_00,    0,  256 ; MON_BERURUN
-	mon_cry CRY_00,    0,  256 ; MON_NYOROTONO
-	mon_cry CRY_00,    0,  256 ; MON_YADOKING
-	mon_cry CRY_00,    0,  256 ; MON_ANNON
-	mon_cry CRY_00,    0,  256 ; MON_REDIBA
+	mon_cry CRY_00,    0,  256 ; MON_POLITOED
+	mon_cry CRY_00,    0,  256 ; MON_SLOWKING
+	mon_cry CRY_00,    0,  256 ; MON_UNOWN
+	mon_cry CRY_00,    0,  256 ; MON_LEDYBA
 	mon_cry CRY_00,    0,  256 ; MON_MITSUBOSHI
 	mon_cry CRY_00,    0,  256 ; MON_PUCHICORN
-	mon_cry CRY_00,    0,  256 ; MON_EIFIE
-	mon_cry CRY_00,    0,  256 ; MON_BLACKY
+	mon_cry CRY_00,    0,  256 ; MON_ESPEON
+	mon_cry CRY_00,    0,  256 ; MON_UMBREON
 	mon_cry CRY_00,    0,  256 ; MON_TURBAN
 	mon_cry CRY_00,    0,  256 ; MON_BETBABY
-	mon_cry CRY_00,    0,  256 ; MON_TEPPOUO
-	mon_cry CRY_00,    0,  256 ; MON_OKUTANK
-	mon_cry CRY_00,    0,  256 ; MON_GONGU
+	mon_cry CRY_00,    0,  256 ; MON_REMORAID
+	mon_cry CRY_00,    0,  256 ; MON_OCTILLERY
+	mon_cry CRY_00,    0,  256 ; MON_GONG
 	mon_cry CRY_00,    0,  256 ; fb
 	mon_cry CRY_00,    0,  256 ; fc
 	mon_cry CRY_00,    0,  256 ; fd
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@@ -956,14 +956,14 @@ PokedexEntryPointers2::
 	dw HonogumaDexEntry
 	dw VolbearDexEntry
 	dw DynabearDexEntry
-	dw KurusuDexEntry
+	dw CruiseDexEntry
 	dw AquaDexEntry
 	dw AquariaDexEntry
-	dw HohoDexEntry
+	dw HoothootDexEntry
 	dw BoboDexEntry
 	dw PachimeeDexEntry
-	dw MokokoDexEntry
-	dw DenryuDexEntry
+	dw FlaaffyDexEntry
+	dw AmpharosDexEntry
 	dw MikonDexEntry
 	dw MonjaDexEntry
 	dw JaranraDexEntry
@@ -971,17 +971,17 @@ PokedexEntryPointers2::
 	dw PukuDexEntry
 	dw ShibirefuguDexEntry
 	dw PichuDexEntry
-	dw PyDexEntry
-	dw PupurinDexEntry
+	dw CleffaDexEntry
+	dw IgglybuffDexEntry
 	dw MizuuoDexEntry
-	dw NatyDexEntry
-	dw NatioDexEntry
+	dw NatuDexEntry
+	dw XatuDexEntry
 	dw GyopinDexEntry
-	dw MarilDexEntry
+	dw MarillDexEntry
 	dw Manbo1DexEntry
 	dw IkariDexEntry
-	dw GrotessDexEntry
-	dw EksingDexEntry
+	dw GrotesqueDexEntry
+	dw XIngDexEntry
 	dw ParaDexEntry
 	dw KokumoDexEntry
 	dw TwoheadDexEntry
@@ -992,25 +992,25 @@ PokedexEntryPointers2::
 	dw PaonDexEntry
 	dw DonphanDexEntry
 	dw TwinzDexEntry
-	dw KirinrikiDexEntry
+	dw GirafarigDexEntry
 	dw PainterDexEntry
 	dw KounyaDexEntry
 	dw RinrinDexEntry
 	dw BerurunDexEntry
-	dw NyorotonoDexEntry
-	dw YadokingDexEntry
-	dw AnnonDexEntry
-	dw RedibaDexEntry
+	dw PolitoedDexEntry
+	dw SlowkingDexEntry
+	dw UnownDexEntry
+	dw LedybaDexEntry
 	dw MitsuboshiDexEntry
 	dw PuchicornDexEntry
-	dw EifieDexEntry
-	dw BlackyDexEntry
+	dw EspeonDexEntry
+	dw UmbreonDexEntry
 	dw TurbanDexEntry
 	dw BetbabyDexEntry
-	dw TeppouoDexEntry
-	dw OkutankDexEntry
-	dw GonguDexEntry
-	dw KapoererDexEntry
+	dw RemoraidDexEntry
+	dw OctilleryDexEntry
+	dw GongDexEntry
+	dw HitmontopDexEntry
 	dw PudieDexEntry
 	dw HanekoDexEntry
 	dw PoponekoDexEntry
@@ -1018,8 +1018,8 @@ PokedexEntryPointers2::
 	dw BaririnaDexEntry
 	dw LipDexEntry
 	dw NorowaraDexEntry ; should be ElebabyDexEntry
-	dw BoobyDexEntry
-	dw KireihanaDexEntry
+	dw MagbyDexEntry
+	dw BellossomDexEntry
 	dw TsubomittoDexEntry
 	dw MiltankDexEntry
 	dw BombseekerDexEntry
@@ -1029,25 +1029,25 @@ PokedexEntryPointers2::
 	dw MadameDexEntry
 	dw NorowaraDexEntry
 	dw KyonpanDexEntry
-	dw YamikarasuDexEntry
-	dw HappiDexEntry
+	dw MurkrowDexEntry
+	dw HappyDexEntry
 	dw ScissorsDexEntry
-	dw PurakkusuDexEntry
+	dw PlucksDexEntry
 	dw DevilDexEntry
-	dw HelgaaDexEntry
+	dw HoundoomDexEntry
 	dw WolfmanDexEntry
 	dw WarwolfDexEntry
 	dw Porygon2DexEntry
 	dw NameilDexEntry
-	dw HaganeilDexEntry
+	dw SteelixDexEntry
 	dw KingdraDexEntry
 	dw RaiDexEntry
 	dw EnDexEntry
 	dw SuiDexEntry
-	dw NyulaDexEntry
-	dw HououDexEntry
-	dw TogepyDexEntry
-	dw BuluDexEntry
+	dw SneaselDexEntry
+	dw HoOhDexEntry
+	dw TogepiDexEntry
+	dw SnubbullDexEntry
 	dw TailDexEntry
 	dw LeafyDexEntry

@@ -1509,7 +1509,7 @@ DynabearDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-KurusuDexEntry:
+CruiseDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -1530,7 +1530,7 @@ AquariaDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-HohoDexEntry:
+HoothootDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -1551,14 +1551,14 @@ PachimeeDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-MokokoDexEntry:
+FlaaffyDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-DenryuDexEntry:
+AmpharosDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -1614,14 +1614,14 @@ PichuDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-PyDexEntry:
+CleffaDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-PupurinDexEntry:
+IgglybuffDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -1635,14 +1635,14 @@ MizuuoDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-NatyDexEntry:
+NatuDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-NatioDexEntry:
+XatuDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -1656,7 +1656,7 @@ GyopinDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-MarilDexEntry:
+MarillDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -1677,14 +1677,14 @@ IkariDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-GrotessDexEntry:
+GrotesqueDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-EksingDexEntry:
+XIngDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -1761,7 +1761,7 @@ TwinzDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-KirinrikiDexEntry:
+GirafarigDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -1796,28 +1796,28 @@ BerurunDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-NyorotonoDexEntry:
+PolitoedDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-YadokingDexEntry:
+SlowkingDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-AnnonDexEntry:
+UnownDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-RedibaDexEntry:
+LedybaDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -1838,14 +1838,14 @@ PuchicornDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-EifieDexEntry:
+EspeonDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-BlackyDexEntry:
+UmbreonDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -1866,28 +1866,28 @@ BetbabyDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-TeppouoDexEntry:
+RemoraidDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-OkutankDexEntry:
+OctilleryDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-GonguDexEntry:
+GongDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-KapoererDexEntry:
+HitmontopDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -1943,14 +1943,14 @@ ElebabyDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-BoobyDexEntry:
+MagbyDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-KireihanaDexEntry:
+BellossomDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -2020,14 +2020,14 @@ KyonpanDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-YamikarasuDexEntry:
+MurkrowDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-HappiDexEntry:
+HappyDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -2041,7 +2041,7 @@ ScissorsDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-PurakkusuDexEntry:
+PlucksDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -2055,7 +2055,7 @@ DevilDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-HelgaaDexEntry:
+HoundoomDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -2090,7 +2090,7 @@ NameilDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-HaganeilDexEntry:
+SteelixDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
@@ -2125,28 +2125,28 @@ SuiDexEntry:
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-NyulaDexEntry:
+SneaselDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-HououDexEntry:
+HoOhDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-TogepyDexEntry:
+TogepiDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
 	db   "はっけんされた　ばかりの　ポケモン"
 	next "げんざい　ちょうさちゅう。@"

-BuluDexEntry:
+SnubbullDexEntry:
 	db "？？？@"
 	db 0
 	dw 0
--- a/data/pokemon/dex_order_alpha.asm
+++ b/data/pokemon/dex_order_alpha.asm
@@ -7,7 +7,7 @@ AlphabeticalPokedexOrder:
 	db DEX_AQUARIA
 	db DEX_SEAKING
 	db DEX_ANIMON
-	db DEX_ANNON
+	db DEX_UNOWN
 	db DEX_EEVEE
 	db DEX_IKARI
 	db DEX_GEODUDE
@@ -16,13 +16,13 @@ AlphabeticalPokedexOrder:
 	db DEX_WEEPINBELL
 	db DEX_VICTREEBEL
 	db DEX_WOLFMAN
-	db DEX_EIFIE
-	db DEX_EKSING
+	db DEX_ESPEON
+	db DEX_X_ING
 	db DEX_HITMONCHAN
 	db DEX_ELECTABUZZ
 	db DEX_ELEBABY
 	db DEX_EN
-	db DEX_OKUTANK
+	db DEX_OCTILLERY
 	db DEX_PRIMEAPE
 	db DEX_SPEAROW
 	db DEX_FEAROW
@@ -35,7 +35,7 @@ AlphabeticalPokedexOrder:
 	db DEX_SNORLAX
 	db DEX_KABUTO
 	db DEX_KABUTOPS
-	db DEX_KAPOERER
+	db DEX_HITMONTOP
 	db DEX_WARTORTLE
 	db DEX_BLASTOISE
 	db DEX_FARFETCHD
@@ -49,14 +49,14 @@ AlphabeticalPokedexOrder:
 	db DEX_NINETALES
 	db DEX_GYOPIN
 	db DEX_KYONPAN
-	db DEX_KIRINRIKI
-	db DEX_KIREIHANA
+	db DEX_GIRAFARIG
+	db DEX_BELLOSSOM
 	db DEX_KINGDRA
 	db DEX_KINGLER
 	db DEX_GLOOM
 	db DEX_KRABBY
-	db DEX_KURUSU
-	db DEX_GROTESS
+	db DEX_CRUISE
+	db DEX_GROTESQUE
 	db DEX_ABRA
 	db DEX_GENGAR
 	db DEX_TAUROS
@@ -75,7 +75,7 @@ AlphabeticalPokedexOrder:
 	db DEX_GOLBAT
 	db DEX_GOLEM
 	db DEX_GRAVELER
-	db DEX_GONGU
+	db DEX_GONG
 	db DEX_VENONAT
 	db DEX_RHYDON
 	db DEX_RHYHORN
@@ -110,14 +110,14 @@ AlphabeticalPokedexOrder:
 	db DEX_TSUBOMITTO
 	db DEX_DIGLETT
 	db DEX_TAIL
-	db DEX_TEPPOUO
+	db DEX_REMORAID
 	db DEX_DEVIL
-	db DEX_DENRYU
+	db DEX_AMPHAROS
 	db DEX_DODUO
 	db DEX_DODRIO
 	db DEX_KOFFING
 	db DEX_TENTACRUEL
-	db DEX_TOGEPY
+	db DEX_TOGEPI
 	db DEX_GOLDEEN
 	db DEX_METAPOD
 	db DEX_DONPHAN
@@ -131,22 +131,22 @@ AlphabeticalPokedexOrder:
 	db DEX_NIDORINA
 	db DEX_NIDORINO
 	db DEX_MEOWTH
-	db DEX_NYULA
+	db DEX_SNEASEL
 	db DEX_POLIWHIRL
-	db DEX_NYOROTONO
+	db DEX_POLITOED
 	db DEX_POLIWRATH
 	db DEX_POLIWAG
-	db DEX_NATY
-	db DEX_NATIO
+	db DEX_NATU
+	db DEX_XATU
 	db DEX_NOROWARA
 	db DEX_SEEL
 	db DEX_PAON
-	db DEX_HAGANEIL
+	db DEX_STEELIX
 	db DEX_DRAGONAIR
 	db DEX_BUTTERFREE
 	db DEX_PACHIMEE
 	db DEX_HAPPA
-	db DEX_HAPPI
+	db DEX_HAPPY
 	db DEX_HANAMOGURA
 	db DEX_HANARYU
 	db DEX_HANEEI
@@ -157,7 +157,7 @@ AlphabeticalPokedexOrder:
 	db DEX_MRMIME
 	db DEX_BARIRINA
 	db DEX_CLOYSTER
-	db DEX_PY
+	db DEX_CLEFFA
 	db DEX_WEEDLE
 	db DEX_PIKACHU
 	db DEX_CLEFABLE
@@ -181,23 +181,23 @@ AlphabeticalPokedexOrder:
 	db DEX_PUCHICORN
 	db DEX_PUDIE
 	db DEX_AERODACTYL
-	db DEX_BOOBY
-	db DEX_PUPURIN
-	db DEX_BLACKY
-	db DEX_PURAKKUSU
+	db DEX_MAGBY
+	db DEX_IGGLYBUFF
+	db DEX_UMBREON
+	db DEX_PLUCKS
 	db DEX_ARTICUNO
 	db DEX_JIGGLYPUFF
-	db DEX_BULU
+	db DEX_SNUBBULL
 	db DEX_PAINTER
 	db DEX_GRIMER
 	db DEX_MUK
 	db DEX_BETBABY
-	db DEX_HELGAA
+	db DEX_HOUNDOOM
 	db DEX_PERSIAN
 	db DEX_BERURUN
 	db DEX_LICKITUNG
-	db DEX_HOUOU
-	db DEX_HOHO
+	db DEX_HO_OH
+	db DEX_HOOTHOOT
 	db DEX_BOBO
 	db DEX_PIDGEY
 	db DEX_PONYTA
@@ -210,7 +210,7 @@ AlphabeticalPokedexOrder:
 	db DEX_MADAME
 	db DEX_BELLSPROUT
 	db DEX_WEEZING
-	db DEX_MARIL
+	db DEX_MARILL
 	db DEX_ELECTRODE
 	db DEX_MANKEY
 	db DEX_MANBO1
@@ -223,14 +223,14 @@ AlphabeticalPokedexOrder:
 	db DEX_MILTANK
 	db DEX_DITTO
 	db DEX_TENTACOOL
-	db DEX_MOKOKO
+	db DEX_FLAAFFY
 	db DEX_VENOMOTH
 	db DEX_MONJA
 	db DEX_TANGELA
-	db DEX_YADOKING
+	db DEX_SLOWKING
 	db DEX_SLOWBRO
 	db DEX_SLOWPOKE
-	db DEX_YAMIKARASU
+	db DEX_MURKROW
 	db DEX_KADABRA
 	db DEX_YOROIDORI
 	db DEX_RAI
@@ -247,7 +247,7 @@ AlphabeticalPokedexOrder:
 	db DEX_RINRIN
 	db DEX_JYNX
 	db DEX_MAGNETON
-	db DEX_REDIBA
+	db DEX_LEDYBA
 	db DEX_VULPIX
 	db DEX_WARWOLF
 	db DEX_WATANEKO
--- a/data/pokemon/evos_attacks.asm
+++ b/data/pokemon/evos_attacks.asm
@@ -535,7 +535,7 @@ ZubatEvosAttacks:
 	db 0 ; no more level-up moves

 GolbatEvosAttacks:
-	db EVOLVE_LEVEL, 44, DEX_EKSING
+	db EVOLVE_LEVEL, 44, DEX_X_ING
 	db 0 ; no more evolutions
 	db  1, MOVE_LEECH_LIFE
 	db  8, MOVE_SUPERSONIC
@@ -562,7 +562,7 @@ OddishEvosAttacks:

 GloomEvosAttacks:
 	db EVOLVE_STONE, 1, ITEM_LEAF_STONE, DEX_VILEPLUME
-	db EVOLVE_STONE, 1, ITEM_POISON_STONE, DEX_KIREIHANA
+	db EVOLVE_STONE, 1, ITEM_POISON_STONE, DEX_BELLOSSOM
 	db 0 ; no more evolutions
 	db  1, MOVE_ABSORB
 	db  6, MOVE_STUN_SPORE
@@ -783,7 +783,7 @@ PoliwagEvosAttacks:

 PoliwhirlEvosAttacks:
 	db EVOLVE_STONE, 1, ITEM_WATER_STONE, DEX_POLIWRATH
-	db EVOLVE_STONE, 1, ITEM_HEART_STONE, DEX_NYOROTONO
+	db EVOLVE_STONE, 1, ITEM_HEART_STONE, DEX_POLITOED
 	db 0 ; no more evolutions
 	db  1, MOVE_BUBBLE
 	db  8, MOVE_HYPNOSIS
@@ -1032,7 +1032,7 @@ SlowpokeEvosAttacks:
 	db 0 ; no more level-up moves

 SlowbroEvosAttacks:
-	db EVOLVE_ITEM, 1, ITEM_KINGS_ROCK, DEX_YADOKING
+	db EVOLVE_ITEM, 1, ITEM_KINGS_ROCK, DEX_SLOWKING
 	db 0 ; no more evolutions
 	db  1, MOVE_CONFUSION
 	db  9, MOVE_DISABLE
@@ -1240,7 +1240,7 @@ GengarEvosAttacks:
 	db 0 ; no more level-up moves

 OnixEvosAttacks:
-	db EVOLVE_LEVEL, 38, DEX_HAGANEIL
+	db EVOLVE_LEVEL, 38, DEX_STEELIX
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  5, MOVE_HARDEN
@@ -1485,7 +1485,7 @@ RhydonEvosAttacks:
 	db 0 ; no more level-up moves

 ChanseyEvosAttacks:
-	db EVOLVE_LEVEL, 45, DEX_HAPPI
+	db EVOLVE_LEVEL, 45, DEX_HAPPY
 	db 0 ; no more evolutions
 	db  1, MOVE_POUND
 	db  5, MOVE_TAIL_WHIP
@@ -1678,7 +1678,7 @@ MagmarEvosAttacks:
 	db 0 ; no more level-up moves

 PinsirEvosAttacks:
-	db EVOLVE_LEVEL, 42, DEX_PURAKKUSU
+	db EVOLVE_LEVEL, 42, DEX_PLUCKS
 	db 0 ; no more evolutions
 	db  1, MOVE_VICEGRIP
 	db  6, MOVE_FOCUS_ENERGY
@@ -1747,8 +1747,8 @@ EeveeEvosAttacks:
 	db EVOLVE_STONE, 1, ITEM_WATER_STONE, DEX_VAPOREON
 	db EVOLVE_STONE, 1, ITEM_THUNDERSTONE, DEX_JOLTEON
 	db EVOLVE_STONE, 1, ITEM_FIRE_STONE, DEX_FLAREON
-	db EVOLVE_STONE, 1, ITEM_HEART_STONE, DEX_EIFIE
-	db EVOLVE_STONE, 1, ITEM_POISON_STONE, DEX_BLACKY
+	db EVOLVE_STONE, 1, ITEM_HEART_STONE, DEX_ESPEON
+	db EVOLVE_STONE, 1, ITEM_POISON_STONE, DEX_UMBREON
 	db EVOLVE_STONE, 1, ITEM_LEAF_STONE, DEX_LEAFY
 	; db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
@@ -2089,7 +2089,7 @@ DynabearEvosAttacks:
 	db 71, MOVE_FLAMETHROWER
 	db 0 ; no more level-up moves

-KurusuEvosAttacks:
+CruiseEvosAttacks:
 	; db EVOLVE_LEVEL, 16, DEX_AQUA
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
@@ -2130,7 +2130,7 @@ AquariaEvosAttacks:
 	db 69, MOVE_HYDRO_PUMP
 	db 0 ; no more level-up moves

-HohoEvosAttacks:
+HoothootEvosAttacks:
 	; db EVOLVE_LEVEL, 20, DEX_BOBO
 	db 0 ; no more evolutions
 	db  1, MOVE_GROWL
@@ -2158,7 +2158,7 @@ BoboEvosAttacks:
 	db 0 ; no more level-up moves

 PachimeeEvosAttacks:
-	db EVOLVE_LEVEL, 16, DEX_MOKOKO
+	db EVOLVE_LEVEL, 16, DEX_FLAAFFY
 	db 0 ; no more evolutions
 	db  1, MOVE_THUNDERSHOCK
 	db  3, MOVE_GROWL
@@ -2171,8 +2171,8 @@ PachimeeEvosAttacks:
 	db 45, MOVE_THUNDERBOLT
 	db 0 ; no more level-up moves

-MokokoEvosAttacks:
-	db EVOLVE_LEVEL, 32, DEX_DENRYU
+FlaaffyEvosAttacks:
+	db EVOLVE_LEVEL, 32, DEX_AMPHAROS
 	db 0 ; no more evolutions
 	db  1, MOVE_THUNDERSHOCK
 	db  4, MOVE_GROWL
@@ -2185,7 +2185,7 @@ MokokoEvosAttacks:
 	db 53, MOVE_THUNDERBOLT
 	db 0 ; no more level-up moves

-DenryuEvosAttacks:
+AmpharosEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_THUNDERSHOCK
 	db  5, MOVE_GROWL
@@ -2292,7 +2292,7 @@ PichuEvosAttacks:
 	db 45, MOVE_THUNDER
 	db 0 ; no more level-up moves

-PyEvosAttacks:
+CleffaEvosAttacks:
 	db EVOLVE_LEVEL, 12, DEX_CLEFAIRY
 	db 0 ; no more evolutions
 	db  1, MOVE_CHARM
@@ -2307,7 +2307,7 @@ PyEvosAttacks:
 	db 46, MOVE_MOONLIGHT
 	db 0 ; no more level-up moves

-PupurinEvosAttacks:
+IgglybuffEvosAttacks:
 	db EVOLVE_LEVEL, 12, DEX_JIGGLYPUFF
 	db 0 ; no more evolutions
 	db  1, MOVE_CHARM
@@ -2336,8 +2336,8 @@ MizuuoEvosAttacks:
 	db 49, MOVE_SLAM
 	db 0 ; no more level-up moves

-NatyEvosAttacks:
-	db EVOLVE_STONE, 1, ITEM_HEART_STONE, DEX_NATIO
+NatuEvosAttacks:
+	db EVOLVE_STONE, 1, ITEM_HEART_STONE, DEX_XATU
 	db 0 ; no more evolutions
 	db  1, MOVE_PECK
 	db  6, MOVE_CONFUSION
@@ -2350,7 +2350,7 @@ NatyEvosAttacks:
 	db 48, MOVE_DRILL_PECK
 	db 0 ; no more level-up moves

-NatioEvosAttacks:
+XatuEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_PECK
 	db  1, MOVE_STALKER
@@ -2372,7 +2372,7 @@ GyopinEvosAttacks:
 	db 45, MOVE_AGILITY
 	db 0 ; no more level-up moves

-MarilEvosAttacks:
+MarillEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_POUND
 	db  6, MOVE_TAIL_WHIP
@@ -2396,7 +2396,7 @@ Manbo1EvosAttacks:
 	db 0 ; no more level-up moves

 IkariEvosAttacks:
-	db EVOLVE_LEVEL, 38, DEX_GROTESS
+	db EVOLVE_LEVEL, 38, DEX_GROTESQUE
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  6, MOVE_LEER
@@ -2410,7 +2410,7 @@ IkariEvosAttacks:
 	db 54, MOVE_HYDRO_PUMP
 	db 0 ; no more level-up moves

-GrotessEvosAttacks:
+GrotesqueEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  7, MOVE_LEER
@@ -2424,7 +2424,7 @@ GrotessEvosAttacks:
 	db 63, MOVE_HYDRO_PUMP
 	db 0 ; no more level-up moves

-EksingEvosAttacks:
+XIngEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_LEECH_LIFE
 	db  9, MOVE_SUPERSONIC
@@ -2549,14 +2549,14 @@ DonphanEvosAttacks:
 	db 0 ; no more level-up moves

 TwinzEvosAttacks:
-	db EVOLVE_LEVEL, 29, DEX_KIRINRIKI
+	db EVOLVE_LEVEL, 29, DEX_GIRAFARIG
 	db 0 ; no more evolutions
 	db  1, MOVE_DOUBLE_KICK
 	db  6, MOVE_GROWL
 	db 11, MOVE_SAND_ATTACK
 	db 0 ; no more level-up moves

-KirinrikiEvosAttacks:
+GirafarigEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_DOUBLE_KICK
 	db  6, MOVE_GROWL
@@ -2623,14 +2623,14 @@ BerurunEvosAttacks:
 	db 61, MOVE_ATTRACT
 	db 0 ; no more level-up moves

-NyorotonoEvosAttacks:
+PolitoedEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_HYPNOSIS
 	db  1, MOVE_WATER_GUN
 	db  1, MOVE_DOUBLESLAP
 	db 0 ; no more level-up moves

-YadokingEvosAttacks:
+SlowkingEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_CONFUSION
 	db  9, MOVE_DISABLE
@@ -2643,12 +2643,12 @@ YadokingEvosAttacks:
 	db 64, MOVE_PSYCHIC
 	db 0 ; no more level-up moves

-AnnonEvosAttacks:
+UnownEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_PSYWAVE
 	db 0 ; no more level-up moves

-RedibaEvosAttacks:
+LedybaEvosAttacks:
 	; db EVOLVE_LEVEL, 18, DEX_MITSUBOSHI
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
@@ -2682,7 +2682,7 @@ PuchicornEvosAttacks:
 	db 56, MOVE_TAKE_DOWN
 	db 0 ; no more level-up moves

-EifieEvosAttacks:
+EspeonEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  7, MOVE_SAND_ATTACK
@@ -2696,7 +2696,7 @@ EifieEvosAttacks:
 	db 63, MOVE_PSYCHIC
 	db 0 ; no more level-up moves

-BlackyEvosAttacks:
+UmbreonEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  7, MOVE_SAND_ATTACK
@@ -2733,8 +2733,8 @@ BetbabyEvosAttacks:
 	db 56, MOVE_SLUDGE_BOMB
 	db 0 ; no more level-up moves

-TeppouoEvosAttacks:
-	db EVOLVE_LEVEL, 34, DEX_OKUTANK
+RemoraidEvosAttacks:
+	db EVOLVE_LEVEL, 34, DEX_OCTILLERY
 	db 0 ; no more evolutions
 	db  1, MOVE_WATER_GUN
 	db 10, MOVE_FOCUS_ENERGY
@@ -2745,7 +2745,7 @@ TeppouoEvosAttacks:
 	db 70, MOVE_ZAP_CANNON
 	db 0 ; no more level-up moves

-OkutankEvosAttacks:
+OctilleryEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_WATER_GUN
 	db 10, MOVE_FOCUS_ENERGY
@@ -2756,15 +2756,15 @@ OkutankEvosAttacks:
 	db 70, MOVE_ZAP_CANNON
 	db 0 ; no more level-up moves

-GonguEvosAttacks:
+GongEvosAttacks:
 	db EVOLVE_LEVEL, 15, DEX_HITMONLEE
 	db EVOLVE_LEVEL, 15, DEX_HITMONCHAN
-	db EVOLVE_LEVEL, 15, DEX_KAPOERER
+	db EVOLVE_LEVEL, 15, DEX_HITMONTOP
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db 0 ; no more level-up moves

-KapoererEvosAttacks:
+HitmontopEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  7, MOVE_LEER
@@ -2878,7 +2878,7 @@ ElebabyEvosAttacks:
 	db 48, MOVE_THUNDER
 	db 0 ; no more level-up moves

-BoobyEvosAttacks:
+MagbyEvosAttacks:
 	db EVOLVE_LEVEL, 15, DEX_MAGMAR
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
@@ -2892,7 +2892,7 @@ BoobyEvosAttacks:
 	db 48, MOVE_FLAMETHROWER
 	db 0 ; no more level-up moves

-KireihanaEvosAttacks:
+BellossomEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_ABSORB
 	db  1, MOVE_STUN_SPORE
@@ -3013,7 +3013,7 @@ KyonpanEvosAttacks:
 	db 100, MOVE_CONFUSE_RAY
 	db 0 ; no more level-up moves

-YamikarasuEvosAttacks:
+MurkrowEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_PECK
 	db  6, MOVE_SAND_ATTACK
@@ -3026,7 +3026,7 @@ YamikarasuEvosAttacks:
 	db 69, MOVE_PERISH_SONG
 	db 0 ; no more level-up moves

-HappiEvosAttacks:
+HappyEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_POUND
 	db  6, MOVE_TAIL_WHIP
@@ -3054,7 +3054,7 @@ ScissorsEvosAttacks:
 	db 73, MOVE_AGILITY
 	db 0 ; no more level-up moves

-PurakkusuEvosAttacks:
+PlucksEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_VICEGRIP
 	db  7, MOVE_FOCUS_ENERGY
@@ -3068,7 +3068,7 @@ PurakkusuEvosAttacks:
 	db 0 ; no more level-up moves

 DevilEvosAttacks:
-	db EVOLVE_LEVEL, 35, DEX_HELGAA
+	db EVOLVE_LEVEL, 35, DEX_HOUNDOOM
 	db 0 ; no more evolutions
 	db  1, MOVE_EMBER
 	db  7, MOVE_LEER
@@ -3081,7 +3081,7 @@ DevilEvosAttacks:
 	db 56, MOVE_FLAMETHROWER
 	db 0 ; no more level-up moves

-HelgaaEvosAttacks:
+HoundoomEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_EMBER
 	db  8, MOVE_LEER
@@ -3147,7 +3147,7 @@ NameilEvosAttacks:
 	db 77, MOVE_SCREECH
 	db 0 ; no more level-up moves

-HaganeilEvosAttacks:
+SteelixEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  6, MOVE_HARDEN
@@ -3214,7 +3214,7 @@ SuiEvosAttacks:
 	db 85, MOVE_HYDRO_PUMP
 	db 0 ; no more level-up moves

-NyulaEvosAttacks:
+SneaselEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
 	db  6, MOVE_TAIL_WHIP
@@ -3227,7 +3227,7 @@ NyulaEvosAttacks:
 	db 48, MOVE_SLASH
 	db 0 ; no more level-up moves

-HououEvosAttacks:
+HoOhEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_WING_ATTACK
 	db  9, MOVE_LEER
@@ -3242,7 +3242,7 @@ HououEvosAttacks:
 	db 93, MOVE_SKY_ATTACK
 	db 0 ; no more level-up moves

-TogepyEvosAttacks:
+TogepiEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_PECK
 	db  8, MOVE_WITHDRAW
@@ -3254,7 +3254,7 @@ TogepyEvosAttacks:
 	db 50, MOVE_SKULL_BASH
 	db 0 ; no more level-up moves

-BuluEvosAttacks:
+SnubbullEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  6, MOVE_TAIL_WHIP
--- a/data/pokemon/evos_attacks_pointers.asm
+++ b/data/pokemon/evos_attacks_pointers.asm
@@ -158,14 +158,14 @@ EvosAttacksPointers::
 	dw HonogumaEvosAttacks
 	dw VolbearEvosAttacks
 	dw DynabearEvosAttacks
-	dw KurusuEvosAttacks
+	dw CruiseEvosAttacks
 	dw AquaEvosAttacks
 	dw AquariaEvosAttacks
-	dw HohoEvosAttacks
+	dw HoothootEvosAttacks
 	dw BoboEvosAttacks
 	dw PachimeeEvosAttacks
-	dw MokokoEvosAttacks
-	dw DenryuEvosAttacks
+	dw FlaaffyEvosAttacks
+	dw AmpharosEvosAttacks
 	dw MikonEvosAttacks
 	dw MonjaEvosAttacks
 	dw JaranraEvosAttacks
@@ -173,17 +173,17 @@ EvosAttacksPointers::
 	dw PukuEvosAttacks
 	dw ShibirefuguEvosAttacks
 	dw PichuEvosAttacks
-	dw PyEvosAttacks
-	dw PupurinEvosAttacks
+	dw CleffaEvosAttacks
+	dw IgglybuffEvosAttacks
 	dw MizuuoEvosAttacks
-	dw NatyEvosAttacks
-	dw NatioEvosAttacks
+	dw NatuEvosAttacks
+	dw XatuEvosAttacks
 	dw GyopinEvosAttacks
-	dw MarilEvosAttacks
+	dw MarillEvosAttacks
 	dw Manbo1EvosAttacks
 	dw IkariEvosAttacks
-	dw GrotessEvosAttacks
-	dw EksingEvosAttacks
+	dw GrotesqueEvosAttacks
+	dw XIngEvosAttacks
 	dw ParaEvosAttacks
 	dw KokumoEvosAttacks
 	dw TwoheadEvosAttacks
@@ -194,25 +194,25 @@ EvosAttacksPointers::
 	dw PaonEvosAttacks
 	dw DonphanEvosAttacks
 	dw TwinzEvosAttacks
-	dw KirinrikiEvosAttacks
+	dw GirafarigEvosAttacks
 	dw PainterEvosAttacks
 	dw KounyaEvosAttacks
 	dw RinrinEvosAttacks
 	dw BerurunEvosAttacks
-	dw NyorotonoEvosAttacks
-	dw YadokingEvosAttacks
-	dw AnnonEvosAttacks
-	dw RedibaEvosAttacks
+	dw PolitoedEvosAttacks
+	dw SlowkingEvosAttacks
+	dw UnownEvosAttacks
+	dw LedybaEvosAttacks
 	dw MitsuboshiEvosAttacks
 	dw PuchicornEvosAttacks
-	dw EifieEvosAttacks
-	dw BlackyEvosAttacks
+	dw EspeonEvosAttacks
+	dw UmbreonEvosAttacks
 	dw TurbanEvosAttacks
 	dw BetbabyEvosAttacks
-	dw TeppouoEvosAttacks
-	dw OkutankEvosAttacks
-	dw GonguEvosAttacks
-	dw KapoererEvosAttacks
+	dw RemoraidEvosAttacks
+	dw OctilleryEvosAttacks
+	dw GongEvosAttacks
+	dw HitmontopEvosAttacks
 	dw PudieEvosAttacks
 	dw HanekoEvosAttacks
 	dw PoponekoEvosAttacks
@@ -220,8 +220,8 @@ EvosAttacksPointers::
 	dw BaririnaEvosAttacks
 	dw LipEvosAttacks
 	dw ElebabyEvosAttacks
-	dw BoobyEvosAttacks
-	dw KireihanaEvosAttacks
+	dw MagbyEvosAttacks
+	dw BellossomEvosAttacks
 	dw TsubomittoEvosAttacks
 	dw MiltankEvosAttacks
 	dw BombseekerEvosAttacks
@@ -231,24 +231,24 @@ EvosAttacksPointers::
 	dw MadameEvosAttacks
 	dw NorowaraEvosAttacks
 	dw KyonpanEvosAttacks
-	dw YamikarasuEvosAttacks
-	dw HappiEvosAttacks
+	dw MurkrowEvosAttacks
+	dw HappyEvosAttacks
 	dw ScissorsEvosAttacks
-	dw PurakkusuEvosAttacks
+	dw PlucksEvosAttacks
 	dw DevilEvosAttacks
-	dw HelgaaEvosAttacks
+	dw HoundoomEvosAttacks
 	dw WolfmanEvosAttacks
 	dw WarwolfEvosAttacks
 	dw Porygon2EvosAttacks
 	dw NameilEvosAttacks
-	dw HaganeilEvosAttacks
+	dw SteelixEvosAttacks
 	dw KingdraEvosAttacks
 	dw RaiEvosAttacks
 	dw EnEvosAttacks
 	dw SuiEvosAttacks
-	dw NyulaEvosAttacks
-	dw HououEvosAttacks
-	dw TogepyEvosAttacks
-	dw BuluEvosAttacks
+	dw SneaselEvosAttacks
+	dw HoOhEvosAttacks
+	dw TogepiEvosAttacks
+	dw SnubbullEvosAttacks
 	dw TailEvosAttacks
 	dw LeafyEvosAttacks
--- a/data/pokemon/gen1_order.asm
+++ b/data/pokemon/gen1_order.asm
@@ -35,7 +35,7 @@ Pokered_MonIndices::
 	db DEX_BLASTOISE   ; 1c
 	db DEX_PINSIR      ; 1d
 	db DEX_TANGELA     ; 1e
-	db DEX_KAPOERER    ; 1f
+	db DEX_HITMONTOP   ; 1f
 	db DEX_PUDIE       ; 20
 	db DEX_GROWLITHE   ; 21
 	db DEX_ONIX        ; 22
@@ -72,8 +72,8 @@ Pokered_MonIndices::
 	db DEX_VENONAT     ; 41
 	db DEX_DRAGONITE   ; 42
 	db DEX_ELEBABY     ; 43
-	db DEX_BOOBY       ; 44
-	db DEX_KIREIHANA   ; 45
+	db DEX_MAGBY       ; 44
+	db DEX_BELLOSSOM   ; 45
 	db DEX_DODUO       ; 46
 	db DEX_POLIWAG     ; 47
 	db DEX_JYNX        ; 48
@@ -126,12 +126,12 @@ Pokered_MonIndices::
 	db DEX_VENOMOTH    ; 77
 	db DEX_DEWGONG     ; 78
 	db DEX_KYONPAN     ; 79
-	db DEX_YAMIKARASU  ; 7a
+	db DEX_MURKROW     ; 7a
 	db DEX_CATERPIE    ; 7b
 	db DEX_METAPOD     ; 7c
 	db DEX_BUTTERFREE  ; 7d
 	db DEX_MACHAMP     ; 7e
-	db DEX_HAPPI       ; 7f
+	db DEX_HAPPY       ; 7f
 	db DEX_GOLDUCK     ; 80
 	db DEX_HYPNO       ; 81
 	db DEX_GOLBAT      ; 82
@@ -139,12 +139,12 @@ Pokered_MonIndices::
 	db DEX_SNORLAX     ; 84
 	db DEX_MAGIKARP    ; 85
 	db DEX_SCISSORS    ; 86
-	db DEX_PURAKKUSU   ; 87
+	db DEX_PLUCKS      ; 87
 	db DEX_MUK         ; 88
 	db DEX_DEVIL       ; 89
 	db DEX_KINGLER     ; 8a
 	db DEX_CLOYSTER    ; 8b
-	db DEX_HELGAA      ; 8c
+	db DEX_HOUNDOOM    ; 8c
 	db DEX_ELECTRODE   ; 8d
 	db DEX_CLEFABLE    ; 8e
 	db DEX_WEEZING     ; 8f
@@ -165,7 +165,7 @@ Pokered_MonIndices::
 	db DEX_SEAKING     ; 9e
 	db DEX_PORYGON2    ; 9f
 	db DEX_NAMEIL      ; a0
-	db DEX_HAGANEIL    ; a1
+	db DEX_STEELIX     ; a1
 	db DEX_KINGDRA     ; a2
 	db DEX_PONYTA      ; a3
 	db DEX_RAPIDASH    ; a4
@@ -185,10 +185,10 @@ Pokered_MonIndices::
 	db DEX_CHARMELEON  ; b2
 	db DEX_WARTORTLE   ; b3
 	db DEX_CHARIZARD   ; b4
-	db DEX_NYULA       ; b5
-	db DEX_HOUOU       ; b6
-	db DEX_TOGEPY      ; b7
-	db DEX_BULU        ; b8
+	db DEX_SNEASEL     ; b5
+	db DEX_HO_OH       ; b6
+	db DEX_TOGEPI      ; b7
+	db DEX_SNUBBULL    ; b8
 	db DEX_ODDISH      ; b9
 	db DEX_GLOOM       ; ba
 	db DEX_VILEPLUME   ; bb
@@ -201,14 +201,14 @@ Pokered_MonIndices::
 	db DEX_HONOGUMA    ; c2
 	db DEX_VOLBEAR     ; c3
 	db DEX_DYNABEAR    ; c4
-	db DEX_KURUSU      ; c5
+	db DEX_CRUISE      ; c5
 	db DEX_AQUA        ; c6
 	db DEX_AQUARIA     ; c7
-	db DEX_HOHO        ; c8
+	db DEX_HOOTHOOT    ; c8
 	db DEX_BOBO        ; c9
 	db DEX_PACHIMEE    ; ca
-	db DEX_MOKOKO      ; cb
-	db DEX_DENRYU      ; cc
+	db DEX_FLAAFFY     ; cb
+	db DEX_AMPHAROS    ; cc
 	db DEX_MIKON       ; cd
 	db DEX_MONJA       ; ce
 	db DEX_JARANRA     ; cf
@@ -216,17 +216,17 @@ Pokered_MonIndices::
 	db DEX_PUKU        ; d1
 	db DEX_SHIBIREFUGU ; d2
 	db DEX_PICHU       ; d3
-	db DEX_PY          ; d4
-	db DEX_PUPURIN     ; d5
+	db DEX_CLEFFA      ; d4
+	db DEX_IGGLYBUFF   ; d5
 	db DEX_MIZUUO      ; d6
-	db DEX_NATY        ; d7
-	db DEX_NATIO       ; d8
+	db DEX_NATU        ; d7
+	db DEX_XATU        ; d8
 	db DEX_GYOPIN      ; d9
-	db DEX_MARIL       ; da
+	db DEX_MARILL      ; da
 	db DEX_MANBO1      ; db
 	db DEX_IKARI       ; dc
-	db DEX_GROTESS     ; dd
-	db DEX_EKSING      ; de
+	db DEX_GROTESQUE   ; dd
+	db DEX_X_ING       ; de
 	db DEX_PARA        ; df
 	db DEX_KOKUMO      ; e0
 	db DEX_TWOHEAD     ; e1
@@ -237,23 +237,23 @@ Pokered_MonIndices::
 	db DEX_PAON        ; e6
 	db DEX_DONPHAN     ; e7
 	db DEX_TWINZ       ; e8
-	db DEX_KIRINRIKI   ; e9
+	db DEX_GIRAFARIG   ; e9
 	db DEX_PAINTER     ; ea
 	db DEX_KOUNYA      ; eb
 	db DEX_RINRIN      ; ec
 	db DEX_BERURUN     ; ed
-	db DEX_NYOROTONO   ; ee
-	db DEX_YADOKING    ; ef
-	db DEX_ANNON       ; f0
-	db DEX_REDIBA      ; f1
+	db DEX_POLITOED    ; ee
+	db DEX_SLOWKING    ; ef
+	db DEX_UNOWN       ; f0
+	db DEX_LEDYBA      ; f1
 	db DEX_MITSUBOSHI  ; f2
 	db DEX_PUCHICORN   ; f3
-	db DEX_EIFIE       ; f4
-	db DEX_BLACKY      ; f5
+	db DEX_ESPEON      ; f4
+	db DEX_UMBREON     ; f5
 	db DEX_TURBAN      ; f6
 	db DEX_BETBABY     ; f7
-	db DEX_TEPPOUO     ; f8
-	db DEX_OKUTANK     ; f9
-	db DEX_GONGU       ; fa
-	db DEX_REDIBA      ; fb
-	db DEX_REDIBA      ; fc
+	db DEX_REMORAID    ; f8
+	db DEX_OCTILLERY   ; f9
+	db DEX_GONG        ; fa
+	db DEX_LEDYBA      ; fb
+	db DEX_LEDYBA      ; fc
--- a/data/pokemon/menu_icons.asm
+++ b/data/pokemon/menu_icons.asm
@@ -158,14 +158,14 @@ MonMenuIcons::
 	db ICON_RHYDON     ; 9b HONOGUMA
 	db ICON_RHYDON     ; 9c VOLBEAR
 	db ICON_RHYDON     ; 9d DYNABEAR
-	db ICON_LAPRAS     ; 9e KURUSU
+	db ICON_LAPRAS     ; 9e CRUISE
 	db ICON_LAPRAS     ; 9f AQUA
 	db ICON_LAPRAS     ; a0 AQUARIA
-	db ICON_PIDGEY     ; a1 HOHO
+	db ICON_PIDGEY     ; a1 HOOTHOOT
 	db ICON_PIDGEY     ; a2 BOBO
 	db ICON_LOKON      ; a3 PACHIMEE
-	db ICON_LOKON      ; a4 MOKOKO
-	db ICON_RHYDON     ; a5 DENRYU
+	db ICON_LOKON      ; a4 FLAAFFY
+	db ICON_RHYDON     ; a5 AMPHAROS
 	db ICON_LOKON      ; a6 MIKON
 	db ICON_ODDISH     ; a7 MONJA
 	db ICON_ODDISH     ; a8 JARANRA
@@ -174,16 +174,16 @@ MonMenuIcons::
 	db ICON_MAGIKARP   ; ab SHIBIREFUGU
 	db ICON_PIKACHU    ; ac PICHU
 	db ICON_CLEFAIRY   ; ad PY
-	db ICON_JIGGLYPUFF ; ae PUPURIN
+	db ICON_JIGGLYPUFF ; ae IGGLYBUFF
 	db ICON_RHYDON     ; af MIZUUO
-	db ICON_PIDGEY     ; b0 NATY
-	db ICON_PIDGEY     ; b1 NATIO
+	db ICON_PIDGEY     ; b0 NATU
+	db ICON_PIDGEY     ; b1 XATU
 	db ICON_MAGIKARP   ; b2 GYOPIN
-	db ICON_JIGGLYPUFF ; b3 MARIL
+	db ICON_JIGGLYPUFF ; b3 MARILL
 	db ICON_MAGIKARP   ; b4 MANBO1
 	db ICON_MAGIKARP   ; b5 IKARI
-	db ICON_MAGIKARP   ; b6 GROTESS
-	db ICON_ZUBAT      ; b7 EKSING
+	db ICON_MAGIKARP   ; b6 GROTESQUE
+	db ICON_ZUBAT      ; b7 X_ING
 	db ICON_MUSHI      ; b8 PARA
 	db ICON_MUSHI      ; b9 KOKUMO
 	db ICON_MUSHI      ; ba TWOHEAD
@@ -194,25 +194,25 @@ MonMenuIcons::
 	db ICON_TAUROS     ; bf PAON
 	db ICON_TAUROS     ; c0 DONPHAN
 	db ICON_GENGAR     ; c1 TWINZ
-	db ICON_LOKON      ; c2 KIRINRIKI
+	db ICON_LOKON      ; c2 GIRAFARIG
 	db ICON_MRMIME     ; c3 PAINTER
 	db ICON_LOKON      ; c4 KOUNYA
 	db ICON_LOKON      ; c5 RINRIN
 	db ICON_LOKON      ; c6 BERURUN
-	db ICON_POLIWAG    ; c7 NYOROTONO
-	db ICON_RHYDON     ; c8 YADOKING
-	db ICON_ANNON      ; c9 ANNON
-	db ICON_MUSHI      ; ca REDIBA
+	db ICON_POLIWAG    ; c7 POLITOED
+	db ICON_RHYDON     ; c8 SLOWKING
+	db ICON_UNOWN      ; c9 UNOWN
+	db ICON_MUSHI      ; ca LEDYBA
 	db ICON_MUSHI      ; cb MITSUBOSHI
 	db ICON_TAUROS     ; cc PUCHICORN
-	db ICON_LOKON      ; cd EIFIE
-	db ICON_LOKON      ; ce BLACKY
+	db ICON_LOKON      ; cd ESPEON
+	db ICON_LOKON      ; ce UMBREON
 	db ICON_LOKON      ; cf TURBAN
 	db ICON_DITTO      ; d0 BETBABY
-	db ICON_MAGIKARP   ; d1 TEPPOUO
-	db ICON_MAGIKARP   ; d2 OKUTANK
-	db ICON_MACHOP     ; d3 GONGU
-	db ICON_MACHOP     ; d4 KAPOERER
+	db ICON_MAGIKARP   ; d1 REMORAID
+	db ICON_MAGIKARP   ; d2 OCTILLERY
+	db ICON_MACHOP     ; d3 GONG
+	db ICON_MACHOP     ; d4 HITMONTOP
 	db ICON_LOKON      ; d5 PUDIE
 	db ICON_ODDISH     ; d6 HANEKO
 	db ICON_ODDISH     ; d7 POPONEKO
@@ -220,8 +220,8 @@ MonMenuIcons::
 	db ICON_MRMIME     ; d9 BARIRINA
 	db ICON_MRMIME     ; da LIP
 	db ICON_MRMIME     ; db ELEBABY
-	db ICON_MRMIME     ; dc BOOBY
-	db ICON_ODDISH     ; dd KIREIHANA
+	db ICON_MRMIME     ; dc MAGBY
+	db ICON_ODDISH     ; dd BELLOSSOM
 	db ICON_ODDISH     ; de TSUBOMITTO
 	db ICON_TAUROS     ; df MILTANK
 	db ICON_LAPRAS     ; e0 BOMBSEEKER
@@ -231,24 +231,24 @@ MonMenuIcons::
 	db ICON_PIDGEY     ; e4 MADAME
 	db ICON_GENGAR     ; e5 NOROWARA
 	db ICON_GENGAR     ; e6 KYONPAN
-	db ICON_PIDGEY     ; e7 YAMIKARASU
-	db ICON_RHYDON     ; e8 HAPPI
+	db ICON_PIDGEY     ; e7 MURKROW
+	db ICON_RHYDON     ; e8 HAPPY
 	db ICON_MUSHI      ; e9 SCISSORS
-	db ICON_MUSHI      ; ea PURAKKUSU
+	db ICON_MUSHI      ; ea PLUCKS
 	db ICON_LOKON      ; eb DEVIL
-	db ICON_LOKON      ; ec HELGAA
+	db ICON_LOKON      ; ec HOUNDOOM
 	db ICON_RHYDON     ; ed WOLFMAN
 	db ICON_RHYDON     ; ee WARWOLF
 	db ICON_VOLTORB    ; ef PORYGON2
 	db ICON_RHYDON     ; f0 NAMEIL
-	db ICON_ONIX       ; f1 HAGANEIL
+	db ICON_ONIX       ; f1 STEELIX
 	db ICON_LAPRAS     ; f2 KINGDRA
 	db ICON_LOKON      ; f3 RAI
 	db ICON_LOKON      ; f4 EN
 	db ICON_LOKON      ; f5 SUI
-	db ICON_LOKON      ; f6 NYULA
-	db ICON_PIDGEY     ; f7 HOUOU
-	db ICON_CLEFAIRY   ; f8 TOGEPY
-	db ICON_CLEFAIRY   ; f9 BULU
+	db ICON_LOKON      ; f6 SNEASEL
+	db ICON_PIDGEY     ; f7 HO_OH
+	db ICON_CLEFAIRY   ; f8 TOGEPI
+	db ICON_CLEFAIRY   ; f9 SNUBBULL
 	db ICON_LOKON      ; fa TAIL
 	db ICON_LOKON      ; fb LEAFY
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@@ -156,14 +156,14 @@ PokemonNames::
 	db "ホノオグマ" ; HONOGUMA
 	db "ボルベアー" ; VOLBEAR
 	db "ダイナベア" ; DYNABEAR
-	db "クルス@@" ; KURUSU
+	db "クルス@@" ; CRUISE
 	db "アクア@@" ; AQUA
 	db "アクエリア" ; AQUARIA
-	db "ホーホー@" ; HOHO
+	db "ホーホー@" ; HOOTHOOT
 	db "ボーボー@" ; BOBO
 	db "パチメエ@" ; PACHIMEE
-	db "モココ@@" ; MOKOKO
-	db "デンリュウ" ; DENRYU
+	db "モココ@@" ; FLAAFFY
+	db "デンリュウ" ; AMPHAROS
 	db "ミコン@@" ; MIKON
 	db "モンジャ@" ; MONJA
 	db "ジャランラ" ; JARANRA
@@ -172,16 +172,16 @@ PokemonNames::
 	db "シビレフグ" ; SHIBIREFUGU
 	db "ピチュー@" ; PICHU
 	db "ピィ@@@" ; PY
-	db "ププリン@" ; PUPURIN
+	db "ププリン@" ; IGGLYBUFF
 	db "ミズウオ@" ; MIZUUO
-	db "ネイティ@" ; NATY
-	db "ネイティオ" ; NATIO
+	db "ネイティ@" ; NATU
+	db "ネイティオ" ; XATU
 	db "ギョピン@" ; GYOPIN
-	db "マリル@@" ; MARIL
+	db "マリル@@" ; MARILL
 	db "マンボー１" ; MANBO1
 	db "イカリ@@" ; IKARI
-	db "グロテス@" ; GROTESS
-	db "エクシング" ; EKSING
+	db "グロテス@" ; GROTESQUE
+	db "エクシング" ; X_ING
 	db "パラ@@@" ; PARA
 	db "コクモ@@" ; KOKUMO
 	db "ツーヘッド" ; TWOHEAD
@@ -192,25 +192,25 @@ PokemonNames::
 	db "パオン@@" ; PAON
 	db "ドンファン" ; DONPHAN
 	db "ツインズ@" ; TWINZ
-	db "キリンリキ" ; KIRINRIKI
+	db "キリンリキ" ; GIRAFARIG
 	db "ペインター" ; PAINTER
 	db "コーニャ@" ; KOUNYA
 	db "リンリン@" ; RINRIN
 	db "ベルルン@" ; BERURUN
-	db "ニョロトノ" ; NYOROTONO
-	db "ヤドキング" ; YADOKING
-	db "アンノーン" ; ANNON
-	db "レディバ@" ; REDIBA
+	db "ニョロトノ" ; POLITOED
+	db "ヤドキング" ; SLOWKING
+	db "アンノーン" ; UNOWN
+	db "レディバ@" ; LEDYBA
 	db "ミツボシ@" ; MITSUBOSHI
 	db "プチコーン" ; PUCHICORN
-	db "エーフィ@" ; EIFIE
-	db "ブラッキー" ; BLACKY
+	db "エーフィ@" ; ESPEON
+	db "ブラッキー" ; UMBREON
 	db "ターバン@" ; TURBAN
 	db "ベトベビー" ; BETBABY
-	db "テッポウオ" ; TEPPOUO
-	db "オクタン@" ; OKUTANK
-	db "ゴング@@" ; GONGU
-	db "カポエラー" ; KAPOERER
+	db "テッポウオ" ; REMORAID
+	db "オクタン@" ; OCTILLERY
+	db "ゴング@@" ; GONG
+	db "カポエラー" ; HITMONTOP
 	db "プディ@@" ; PUDIE
 	db "ハネコ@@" ; HANEKO
 	db "ポポネコ@" ; POPONEKO
@@ -218,8 +218,8 @@ PokemonNames::
 	db "バリリーナ" ; BARIRINA
 	db "リップ@@" ; LIP
 	db "エレベビー" ; ELEBABY
-	db "ブビィ@@" ; BOOBY
-	db "キレイハナ" ; KIREIHANA
+	db "ブビィ@@" ; MAGBY
+	db "キレイハナ" ; BELLOSSOM
 	db "ツボミット" ; TSUBOMITTO
 	db "ミルタンク" ; MILTANK
 	db "ボムシカー" ; BOMBSEEKER
@@ -229,24 +229,24 @@ PokemonNames::
 	db "マダーム@" ; MADAME
 	db "ノロワラ@" ; NOROWARA
 	db "キョンパン" ; KYONPAN
-	db "ヤミカラス" ; YAMIKARASU
-	db "ハッピー@" ; HAPPI
+	db "ヤミカラス" ; MURKROW
+	db "ハッピー@" ; HAPPY
 	db "シザース@" ; SCISSORS
-	db "プラックス" ; PURAKKUSU
+	db "プラックス" ; PLUCKS
 	db "デビル@@" ; DEVIL
-	db "ヘルガー@" ; HELGAA
+	db "ヘルガー@" ; HOUNDOOM
 	db "ウルフマン" ; WOLFMAN
 	db "ワーウルフ" ; WARWOLF
 	db "ポリゴン２" ; PORYGON2
 	db "ナメール@" ; NAMEIL
-	db "ハガネール" ; HAGANEIL
+	db "ハガネール" ; STEELIX
 	db "キングドラ" ; KINGDRA
 	db "ライ@@@" ; RAI
 	db "エン@@@" ; EN
 	db "スイ@@@" ; SUI
-	db "ニューラ@" ; NYULA
-	db "ホウオウ@" ; HOUOU
-	db "トゲピー@" ; TOGEPY
-	db "ブルー@@" ; BULU
+	db "ニューラ@" ; SNEASEL
+	db "ホウオウ@" ; HO_OH
+	db "トゲピー@" ; TOGEPI
+	db "ブルー@@" ; SNUBBULL
 	db "テイル@@" ; TAIL
 	db "リーフィ@" ; LEAFY
--- a/data/pokemon/palettes.asm
+++ b/data/pokemon/palettes.asm
@@ -157,14 +157,14 @@ PokemonPalettes::
 	db PAL_REDMON    ; HONOGUMA
 	db PAL_REDMON    ; VOLBEAR
 	db PAL_REDMON    ; DYNABEAR
-	db PAL_CYANMON   ; KURUSU
+	db PAL_CYANMON   ; CRUISE
 	db PAL_CYANMON   ; AQUA
 	db PAL_CYANMON   ; AQUARIA
-	db PAL_BROWNMON  ; HOHO
+	db PAL_BROWNMON  ; HOOTHOOT
 	db PAL_BROWNMON  ; BOBO
 	db PAL_PINKMON   ; PACHIMEE
-	db PAL_PINKMON   ; MOKOKO
-	db PAL_YELLOWMON ; DENRYU
+	db PAL_PINKMON   ; FLAAFFY
+	db PAL_YELLOWMON ; AMPHAROS
 	db PAL_REDMON    ; MIKON
 	db PAL_GREENMON  ; MONJA
 	db PAL_GREENMON  ; JARANRA
@@ -173,16 +173,16 @@ PokemonPalettes::
 	db PAL_BLUEMON   ; SHIBIREFUGU
 	db PAL_YELLOWMON ; PICHU
 	db PAL_PINKMON   ; PY
-	db PAL_PINKMON   ; PUPURIN
+	db PAL_PINKMON   ; IGGLYBUFF
 	db PAL_CYANMON   ; MIZUUO
-	db PAL_BROWNMON  ; NATY
-	db PAL_BROWNMON  ; NATIO
+	db PAL_BROWNMON  ; NATU
+	db PAL_BROWNMON  ; XATU
 	db PAL_REDMON    ; GYOPIN
-	db PAL_PINKMON   ; MARIL
+	db PAL_PINKMON   ; MARILL
 	db PAL_CYANMON   ; MANBO1
 	db PAL_CYANMON   ; IKARI
-	db PAL_BLUEMON   ; GROTESS
-	db PAL_PURPLEMON ; EKSING
+	db PAL_BLUEMON   ; GROTESQUE
+	db PAL_PURPLEMON ; X_ING
 	db PAL_REDMON    ; PARA
 	db PAL_PURPLEMON ; KOKUMO
 	db PAL_PURPLEMON ; TWOHEAD
@@ -193,25 +193,25 @@ PokemonPalettes::
 	db PAL_CYANMON   ; PAON
 	db PAL_BROWNMON  ; DONPHAN
 	db PAL_PURPLEMON ; TWINZ
-	db PAL_YELLOWMON ; KIRINRIKI
+	db PAL_YELLOWMON ; GIRAFARIG
 	db PAL_BROWNMON  ; PAINTER
 	db PAL_YELLOWMON ; KOUNYA
 	db PAL_BROWNMON  ; RINRIN
 	db PAL_BROWNMON  ; BERURUN
-	db PAL_GREENMON  ; NYOROTONO
-	db PAL_PINKMON   ; YADOKING
-	db PAL_MEWMON    ; ANNON
-	db PAL_GREENMON  ; REDIBA
+	db PAL_GREENMON  ; POLITOED
+	db PAL_PINKMON   ; SLOWKING
+	db PAL_MEWMON    ; UNOWN
+	db PAL_GREENMON  ; LEDYBA
 	db PAL_REDMON    ; MITSUBOSHI
 	db PAL_REDMON    ; PUCHICORN
-	db PAL_YELLOWMON ; EIFIE
-	db PAL_GRAYMON   ; BLACKY
+	db PAL_YELLOWMON ; ESPEON
+	db PAL_GRAYMON   ; UMBREON
 	db PAL_GRAYMON   ; TURBAN
 	db PAL_GRAYMON   ; BETBABY
-	db PAL_BLUEMON   ; TEPPOUO
-	db PAL_REDMON    ; OKUTANK
-	db PAL_BROWNMON  ; GONGU
-	db PAL_BROWNMON  ; KAPOERER
+	db PAL_BLUEMON   ; REMORAID
+	db PAL_REDMON    ; OCTILLERY
+	db PAL_BROWNMON  ; GONG
+	db PAL_BROWNMON  ; HITMONTOP
 	db PAL_BROWNMON  ; PUDIE
 	db PAL_GREENMON  ; HANEKO
 	db PAL_YELLOWMON ; POPONEKO
@@ -219,8 +219,8 @@ PokemonPalettes::
 	db PAL_PINKMON   ; BARIRINA
 	db PAL_MEWMON    ; LIP
 	db PAL_YELLOWMON ; ELEBABY
-	db PAL_REDMON    ; BOOBY
-	db PAL_PURPLEMON ; KIREIHANA
+	db PAL_REDMON    ; MAGBY
+	db PAL_PURPLEMON ; BELLOSSOM
 	db PAL_GREENMON  ; TSUBOMITTO
 	db PAL_BROWNMON  ; MILTANK
 	db PAL_REDMON    ; BOMBSEEKER
@@ -230,25 +230,25 @@ PokemonPalettes::
 	db PAL_BROWNMON  ; MADAME
 	db PAL_BROWNMON  ; NOROWARA
 	db PAL_PURPLEMON ; KYONPAN
-	db PAL_BLUEMON   ; YAMIKARASU
-	db PAL_PINKMON   ; HAPPI
+	db PAL_BLUEMON   ; MURKROW
+	db PAL_PINKMON   ; HAPPY
 	db PAL_GREENMON  ; SCISSORS
-	db PAL_BROWNMON  ; PURAKKUSU
+	db PAL_BROWNMON  ; PLUCKS
 	db PAL_REDMON    ; DEVIL
-	db PAL_REDMON    ; HELGAA
+	db PAL_REDMON    ; HOUNDOOM
 	db PAL_BROWNMON  ; WOLFMAN
 	db PAL_BROWNMON  ; WARWOLF
 	db PAL_GRAYMON   ; PORYGON2
 	db PAL_PINKMON   ; NAMEIL
-	db PAL_GRAYMON   ; HAGANEIL
+	db PAL_GRAYMON   ; STEELIX
 	db PAL_BLUEMON   ; KINGDRA
 	db PAL_YELLOWMON ; RAI
 	db PAL_REDMON    ; EN
 	db PAL_CYANMON   ; SUI
-	db PAL_BROWNMON  ; NYULA
-	db PAL_REDMON    ; HOUOU
-	db PAL_YELLOWMON ; TOGEPY
-	db PAL_BROWNMON  ; BULU
+	db PAL_BROWNMON  ; SNEASEL
+	db PAL_REDMON    ; HO_OH
+	db PAL_YELLOWMON ; TOGEPI
+	db PAL_BROWNMON  ; SNUBBULL
 	db PAL_BROWNMON  ; TAIL
 	db PAL_GREENMON  ; LEAFY
 	db PAL_MEWMON    ; FC
--- a/data/sprite_anims/gfx.asm
+++ b/data/sprite_anims/gfx.asm
@@ -33,7 +33,7 @@ SpriteAnimGFX:
 	sprite_anim_obj_gfx   8, BANK(BulbasaurIcon),  BulbasaurIcon  ; SPRITE_ANIM_DICT_BULBASAUR_ICON
 	sprite_anim_obj_gfx   8, BANK(CharmanderIcon), CharmanderIcon ; SPRITE_ANIM_DICT_CHARMANDER_ICON
 	sprite_anim_obj_gfx   8, BANK(WeedleIcon),     WeedleIcon     ; SPRITE_ANIM_DICT_WEEDLE_ICON
-	sprite_anim_obj_gfx   8, BANK(AnnonIcon),      AnnonIcon      ; SPRITE_ANIM_DICT_ANNON_ICON
+	sprite_anim_obj_gfx   8, BANK(UnownIcon),      UnownIcon      ; SPRITE_ANIM_DICT_UNOWN_ICON
 	sprite_anim_obj_gfx   8, BANK(GeodudeIcon),    GeodudeIcon    ; SPRITE_ANIM_DICT_GEODUDE_ICON
 	sprite_anim_obj_gfx   8, BANK(MachopIcon),     MachopIcon     ; SPRITE_ANIM_DICT_MACHOP_ICON
 	sprite_anim_obj_gfx   8, BANK(EggIcon),        EggIcon        ; SPRITE_ANIM_DICT_EGG_ICON
--- a/data/sprite_anims/objects.asm
+++ b/data/sprite_anims/objects.asm
@@ -51,8 +51,8 @@ SpriteAnimObjects:
 	db SPRITE_ANIM_FRAMESET_PARTY_MON,                 SPRITE_ANIM_FUNC_PARTY_MON,                 SPRITE_ANIM_DICT_CHARMANDER_ICON
 ; SPRITE_ANIM_OBJ_WEEDLE_ICON
 	db SPRITE_ANIM_FRAMESET_PARTY_MON,                 SPRITE_ANIM_FUNC_PARTY_MON,                 SPRITE_ANIM_DICT_WEEDLE_ICON
-; SPRITE_ANIM_OBJ_ANNON_ICON
-	db SPRITE_ANIM_FRAMESET_PARTY_MON,                 SPRITE_ANIM_FUNC_PARTY_MON,                 SPRITE_ANIM_DICT_ANNON_ICON
+; SPRITE_ANIM_OBJ_UNOWN_ICON
+	db SPRITE_ANIM_FRAMESET_PARTY_MON,                 SPRITE_ANIM_FUNC_PARTY_MON,                 SPRITE_ANIM_DICT_UNOWN_ICON
 ; SPRITE_ANIM_OBJ_GEODUDE_ICON
 	db SPRITE_ANIM_FRAMESET_PARTY_MON,                 SPRITE_ANIM_FUNC_PARTY_MON,                 SPRITE_ANIM_DICT_GEODUDE_ICON
 ; SPRITE_ANIM_OBJ_MACHOP_ICON
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -33,13 +33,13 @@ if DEF(_GOLD)

 	; BUG_CATCHER_BOY_SOUSUKE
 	db "そうすけ@", TRAINERTYPE_ITEM_MOVES
-	db  9, DEX_REDIBA, ITEM_NONE, MOVE_SCRATCH, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE
+	db  9, DEX_LEDYBA, ITEM_NONE, MOVE_SCRATCH, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE
 	db -1 ; end
 endc
 if DEF(_SILVER)
 	; BUG_CATCHER_BOY_KENJI
 	db "けんじ@", TRAINERTYPE_ITEM_MOVES
-	db  9, DEX_REDIBA, ITEM_NONE, MOVE_SCRATCH, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE
+	db  9, DEX_LEDYBA, ITEM_NONE, MOVE_SCRATCH, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE
 	db -1 ; end

 	; BUG_CATCHER_BOY_KEN
@@ -176,7 +176,7 @@ GamaGroup::
 	db 37, MON_GROWLITHE, MON_VULPIX, 0

 RivalGroup::
-	db  5, DEX_KURUSU, 0
+	db  5, DEX_CRUISE, 0
 	db  5, DEX_HAPPA, 0
 	db  5, DEX_HONOGUMA, 0
 ; Leftover Hiker data from Red/Blue
@@ -387,7 +387,7 @@ FledglingGroup::
 	db 38, MON_MACHOKE, MON_MACHOP, MON_MACHOKE, 0
 	db 43, MON_MACHOKE, MON_MACHOP, MON_MACHOKE, 0
 ; Unused Green(?) data
-	db 50, DEX_TEPPOUO, DEX_LIP, DEX_KIREIHANA, DEX_BULBASAUR, DEX_CHARMANDER, DEX_SQUIRTLE, 0
+	db 50, DEX_REMORAID, DEX_LIP, DEX_BELLOSSOM, DEX_BULBASAUR, DEX_CHARMANDER, DEX_SQUIRTLE, 0
 ; Leftover Green data from Red/Blue
 	db 5, MON_BULBASAUR, 0
 	db 5, MON_CHARMANDER, 0
@@ -471,7 +471,7 @@ PokeManiacGroup::

 RocketMGroup::
 ; Unused
-	db 13, DEX_KOTORA, DEX_GONGU, DEX_KIREIHANA, 0
+	db 13, DEX_KOTORA, DEX_GONG, DEX_BELLOSSOM, 0
 ; Leftover Cooltrainer♂ data from Red/Blue
 	db 39, MON_NIDORINO, MON_NIDOKING, 0
 	db 43, MON_EXEGGUTOR, MON_CLOYSTER, MON_ARCANINE, 0
@@ -518,7 +518,7 @@ SwimmerFGroup::
 	db -1, 37, MON_KOFFING, 39, MON_MUK, 37, MON_KOFFING, 43, MON_WEEZING, 0

 SwimmerMGroup::
-	db 10, DEX_BARIRINA, DEX_KIRINRIKI, DEX_PUCHICORN, 0
+	db 10, DEX_BARIRINA, DEX_GIRAFARIG, DEX_PUCHICORN, 0

 SailorGroup::
 ; Leftover Sabrina data from Red/Blue
@@ -595,10 +595,10 @@ BurglarGroup::
 	db -1, 58, MON_GYARADOS, 56, MON_DRAGONAIR, 56, MON_DRAGONAIR, 60, MON_AERODACTYL, 62, MON_DRAGONITE, 0

 JugglerGroup::
-	db  6, DEX_MARIL, DEX_GYOPIN, 0
+	db  6, DEX_MARILL, DEX_GYOPIN, 0

 BlackbeltGroup::
-	db  6, DEX_PY, DEX_GYOPIN, 0
+	db  6, DEX_CLEFFA, DEX_GYOPIN, 0

 PsychicGroup::
 KungFuMasterGroup::
@@ -617,13 +617,13 @@ SchoolboyGroup::
 if DEF(_GOLD)
 	; SCHOOLBOY_TETSUYA
 	db "てつや@", TRAINERTYPE_ITEM_MOVES
-	db  9, DEX_YADOKING, ITEM_NONE, MOVE_DISABLE, MOVE_CONFUSION, MOVE_NONE, MOVE_NONE
+	db  9, DEX_SLOWKING, ITEM_NONE, MOVE_DISABLE, MOVE_CONFUSION, MOVE_NONE, MOVE_NONE
 	db -1 ; end
 endc
 if DEF(_SILVER)
 	; SCHOOLBOY_TETSUYA
 	db "てつや@", TRAINERTYPE_ITEM
-	db  8, DEX_YADOKING, ITEM_NONE
+	db  8, DEX_SLOWKING, ITEM_NONE
 	db -1 ; end
 endc

@@ -631,13 +631,13 @@ FirebreatherGroup::
 if DEF(_GOLD)
 	; FIREBREATHER_AKITO
 	db "あきと@", TRAINERTYPE_ITEM_MOVES
-	db 10, DEX_BOOBY, ITEM_NONE, MOVE_SCRATCH, MOVE_SMOG, MOVE_NONE, MOVE_NONE
+	db 10, DEX_MAGBY, ITEM_NONE, MOVE_SCRATCH, MOVE_SMOG, MOVE_NONE, MOVE_NONE
 	db -1 ; end
 endc
 if DEF(_SILVER)
 	; FIREBREATHER_AKITO
 	db "あきと@", TRAINERTYPE_ITEM
-	db  8, DEX_BOOBY, ITEM_NONE
+	db  8, DEX_MAGBY, ITEM_NONE
 	db -1 ; end
 endc

--- a/data/wild/maps/QuietHills.asm
+++ b/data/wild/maps/QuietHills.asm
@@ -1,8 +1,8 @@
 	map_id QUIET_HILLS
 	db 8 percent, 8 percent, 8 percent ; encounter rates: morn/day/nite
 	; morn only
-	db 7, DEX_REDIBA
-	db 7, DEX_REDIBA
+	db 7, DEX_LEDYBA
+	db 7, DEX_LEDYBA
 	db 5, DEX_METAPOD
 	; morn/day
 	db 5, DEX_PIKACHU
@@ -16,11 +16,11 @@ if DEF(_GOLD)
 	db 6, DEX_HANEKO
 endc
 if DEF(_SILVER)
-	db 6, DEX_MARIL
+	db 6, DEX_MARILL
 endc
 	db 5, DEX_CATERPIE
 	; day/nite
-	db 8, DEX_REDIBA
+	db 8, DEX_LEDYBA
 	db 4, DEX_METAPOD
 	; nite only
 	db 6, DEX_RATTATA
@@ -28,8 +28,8 @@ if DEF(_GOLD)
 	db 6, DEX_CATERPIE
 endc
 if DEF(_SILVER)
-	db 5, DEX_HOHO
+	db 5, DEX_HOOTHOOT
 endc
-	db 6, DEX_REDIBA
+	db 6, DEX_LEDYBA
 	db 5, DEX_METAPOD
 	db 5, DEX_PIKACHU
--- a/data/wild/maps/Route1.asm
+++ b/data/wild/maps/Route1.asm
@@ -17,13 +17,13 @@ endc
 	db 5, DEX_PIDGEY
 	db 4, DEX_RATTATA
 	; morn/day/nite
-	db 6, DEX_KIRINRIKI
-	db 4, DEX_KIRINRIKI
+	db 6, DEX_GIRAFARIG
+	db 4, DEX_GIRAFARIG
 if DEF(_GOLD)
 	db 4, DEX_HANEKO
 endc
 if DEF(_SILVER)
-	db 4, DEX_MARIL
+	db 4, DEX_MARILL
 endc
 	db 4, DEX_PIDGEY
 	; day/nite
@@ -37,7 +37,7 @@ if DEF(_GOLD)
 	db 8, DEX_RATTATA
 endc
 if DEF(_SILVER)
-	db 5, DEX_HOHO
-	db 3, DEX_HOHO
+	db 5, DEX_HOOTHOOT
+	db 3, DEX_HOOTHOOT
 endc
 	db 5, DEX_PIKACHU
--- a/data/wild/maps/Route12.asm
+++ b/data/wild/maps/Route12.asm
@@ -21,5 +21,5 @@
 	db 18, DEX_DODUO
 	db 19, DEX_DODUO
 	db 20, DEX_DODUO
-	db 21, DEX_BULU
-	db 21, DEX_BULU
+	db 21, DEX_SNUBBULL
+	db 21, DEX_SNUBBULL
--- a/data/wild/maps/Route13.asm
+++ b/data/wild/maps/Route13.asm
@@ -21,5 +21,5 @@
 	db 22, DEX_DODUO
 	db 23, DEX_DODUO
 	db 24, DEX_DODUO
-	db 25, DEX_BULU
-	db 25, DEX_BULU
+	db 25, DEX_SNUBBULL
+	db 25, DEX_SNUBBULL
--- a/data/wild/maps/Route14.asm
+++ b/data/wild/maps/Route14.asm
@@ -16,10 +16,10 @@
 	db 21, DEX_MIKON
 	; day/nite
 	db 22, DEX_HANEKO
-	db 23, DEX_HOHO
+	db 23, DEX_HOOTHOOT
 	; nite only
-	db 24, DEX_HOHO
-	db 25, DEX_HOHO
-	db 26, DEX_HOHO
-	db 27, DEX_BULU
-	db 27, DEX_BULU
+	db 24, DEX_HOOTHOOT
+	db 25, DEX_HOOTHOOT
+	db 26, DEX_HOOTHOOT
+	db 27, DEX_SNUBBULL
+	db 27, DEX_SNUBBULL
--- a/data/wild/maps/Route15.asm
+++ b/data/wild/maps/Route15.asm
@@ -16,9 +16,9 @@
 	db 25, DEX_VULPIX
 	; day/nite
 	db 23, DEX_HANEKO
-	db 24, DEX_HOHO
+	db 24, DEX_HOOTHOOT
 	; nite only
-	db 25, DEX_HOHO
+	db 25, DEX_HOOTHOOT
 	db 26, DEX_DROWZEE
 	db 27, DEX_DROWZEE
 	db 28, DEX_HYPNO
--- a/data/wild/maps/Route17.asm
+++ b/data/wild/maps/Route17.asm
@@ -16,9 +16,9 @@
 	db 30, DEX_VULPIX
 	; day/nite
 	db 28, DEX_HANEKO
-	db 29, DEX_HOHO
+	db 29, DEX_HOOTHOOT
 	; nite only
-	db 31, DEX_HOHO
+	db 31, DEX_HOOTHOOT
 	db 32, DEX_DROWZEE
 	db 33, DEX_DROWZEE
 	db 34, DEX_HYPNO
--- a/data/wild/maps/Route18.asm
+++ b/data/wild/maps/Route18.asm
@@ -1,9 +1,9 @@
 	map_id ROUTE_18
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn only
-	db 28, DEX_REDIBA
+	db 28, DEX_LEDYBA
 	db 28, DEX_MANKEY
-	db 27, DEX_REDIBA
+	db 27, DEX_LEDYBA
 	; morn/day
 	db 28, DEX_MANKEY
 	db 31, DEX_MANKEY
@@ -15,7 +15,7 @@
 	db 30, DEX_WOLFMAN
 	db 31, DEX_WOLFMAN
 	; day/nite
-	db 29, DEX_REDIBA
+	db 29, DEX_LEDYBA
 	db 30, DEX_WOLFMAN
 	; nite only
 	db 33, DEX_WOLFMAN
--- a/data/wild/maps/Route19.asm
+++ b/data/wild/maps/Route19.asm
@@ -1,13 +1,13 @@
 	map_id ROUTE_19
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn only
-	db 29, DEX_REDIBA
+	db 29, DEX_LEDYBA
 	db 29, DEX_MILTANK
-	db 28, DEX_REDIBA
+	db 28, DEX_LEDYBA
 	; morn/day
 	db 29, DEX_MILTANK
 	db 32, DEX_MANKEY
-	db 29, DEX_REDIBA
+	db 29, DEX_LEDYBA
 	db 30, DEX_MANKEY
 	; morn/day/nite
 	db 31, DEX_PRIMEAPE
@@ -15,7 +15,7 @@
 	db 31, DEX_POLIWHIRL
 	db 32, DEX_POLIWAG
 	; day/nite
-	db 30, DEX_REDIBA
+	db 30, DEX_LEDYBA
 	db 31, DEX_WOLFMAN
 	; nite only
 	db 34, DEX_WOLFMAN
--- a/data/wild/maps/Route2.asm
+++ b/data/wild/maps/Route2.asm
@@ -23,7 +23,7 @@ if DEF(_GOLD)
 	db 8, DEX_HANEKO
 endc
 if DEF(_SILVER)
-	db 8, DEX_MARIL
+	db 8, DEX_MARILL
 endc
 	db 4, DEX_PIDGEY
 	; day/nite
@@ -35,7 +35,7 @@ if DEF(_GOLD)
 	db 6, DEX_RATTATA
 endc
 if DEF(_SILVER)
-	db 6, DEX_HOHO
+	db 6, DEX_HOOTHOOT
 endc
 	db 7, DEX_EKANS
 	db 8, DEX_RATTATA
--- a/data/wild/maps/Route20.asm
+++ b/data/wild/maps/Route20.asm
@@ -7,7 +7,7 @@
 	; morn/day
 	db 32, DEX_MILTANK
 	db 35, DEX_PRIMEAPE
-	db 32, DEX_REDIBA
+	db 32, DEX_LEDYBA
 	db 33, DEX_MANKEY
 	; morn/day/nite
 	db 34, DEX_PRIMEAPE
@@ -15,7 +15,7 @@
 	db 34, DEX_POLIWHIRL
 	db 35, DEX_POLIWHIRL
 	; day/nite
-	db 33, DEX_REDIBA
+	db 33, DEX_LEDYBA
 	db 34, DEX_WOLFMAN
 	; nite only
 	db 37, DEX_WOLFMAN
--- a/data/wild/maps/Route23.asm
+++ b/data/wild/maps/Route23.asm
@@ -18,8 +18,8 @@
 	db 28, DEX_ODDISH
 	db 30, DEX_RATICATE
 	; nite only
-	db 32, DEX_HOHO
+	db 32, DEX_HOOTHOOT
 	db 33, DEX_EKANS
-	db 34, DEX_HOHO
+	db 34, DEX_HOOTHOOT
 	db 35, DEX_ARBOK
-	db 35, DEX_HOHO
+	db 35, DEX_HOOTHOOT
--- a/data/wild/maps/Route3.asm
+++ b/data/wild/maps/Route3.asm
@@ -18,8 +18,8 @@
 	db 8, DEX_CATERPIE
 	db 9, DEX_RATTATA
 	; nite only
-	db 10, DEX_HOHO
+	db 10, DEX_HOOTHOOT
 	db 11, DEX_ODDISH
-	db 12, DEX_HOHO
+	db 12, DEX_HOOTHOOT
 	db 11, DEX_ODDISH
 	db 13, DEX_ODDISH
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2198,7 +2198,7 @@ EnemySendOutFirstMon:

 ; Play scanline fade animation for Hoothoot
 	ld b, 2
-	cp DEX_HOHO
+	cp DEX_HOOTHOOT
 	jr z, .apply_animation

 ; Play normal send out animation for everyone else
@@ -2634,7 +2634,7 @@ SendOutPlayerMon:

 ; Play scanline fade animation for Hoothoot
 	ld b, 2
-	cp DEX_HOHO
+	cp DEX_HOOTHOOT
 	jr z, .apply_animation

 ; Play send out animation for everyone else
--- a/engine/debug/monster_debug_menu.asm
+++ b/engine/debug/monster_debug_menu.asm
@@ -349,7 +349,7 @@ MonsterTest_GetPic:
 	ret
 .is_a_pokemon
 	ld a, [wUnownDex] ; BUG: wUnownDex isn't set beforehand so an invalid Unown ($00) is displayed instead.
-	ld [wAnnonID], a
+	ld [wUnownID], a

 	ld a, [wTempSpecies]
 	ld [wCurPartySpecies], a
--- a/engine/games/picross_minigame.asm
+++ b/engine/games/picross_minigame.asm
@@ -1891,7 +1891,7 @@ ENDM
 PicrossSprites:
 	picross_pattern PATTERN_NORMAL, DiglettIcon
 	picross_pattern PATTERN_NORMAL, GengarIcon
-	picross_pattern PATTERN_NORMAL, AnnonIcon
+	picross_pattern PATTERN_NORMAL, UnownIcon
 	picross_pattern PATTERN_NORMAL, SnorlaxIcon
 	picross_pattern PATTERN_TILESET, BANK(Pokecenter_GFX), Pokecenter_GFX + $20 tiles
 	picross_pattern PATTERN_NORMAL, PoliwrathSpriteGFX
--- a/engine/gfx/get_unown_letter.asm
+++ b/engine/gfx/get_unown_letter.asm
@@ -45,5 +45,5 @@ GetUnownLetter::
 ; Increment to get 1-26
 	ldh a, [hQuotient + 3]
 	inc a
-	ld [wAnnonID], a
+	ld [wUnownID], a
 	ret
--- a/engine/movie/oak_speech.asm
+++ b/engine/movie/oak_speech.asm
@@ -25,7 +25,7 @@ GameStart:: ; unreferenced
 	call PrintText
 	call GBFadeOutToWhite
 	call ClearTileMap
-	ld a, DEX_YADOKING
+	ld a, DEX_SLOWKING
 	ld [wCurSpecies], a
 	ld [wCurPartySpecies], a
 	call GetBaseData
@@ -35,7 +35,7 @@ GameStart:: ; unreferenced
 	call MovePicLeft
 	ld hl, OakSpeech2
 	call PrintText
-	ld a, DEX_YADOKING
+	ld a, DEX_SLOWKING
 	call PlayCry
 	ld hl, OakSpeech3
 	call PrintText
--- a/engine/pokedex/pokedex.asm
+++ b/engine/pokedex/pokedex.asm
@@ -430,13 +430,13 @@ Pokedex_List:

 Pokedex_InitAButtonMenu:
 	ld a, [wTempSpecies]
-	cp DEX_ANNON
-	jr nz, .not_annon
+	cp DEX_UNOWN
+	jr nz, .not_unown

 	ld a, A_BUTTON_MENU_UNOWN
 	jr .DisplayButtons

-.not_annon
+.not_unown
 	ld a, A_BUTTON_MENU_NO_UNOWN
 .DisplayButtons
 	call ShowPokedexMenu
@@ -497,7 +497,7 @@ Pokedex_AButtonMenu:
 .UnownMode:
 	call Pokedex_GetSelectedMon
 	ld a, [wTempSpecies]
-	cp DEX_ANNON
+	cp DEX_UNOWN
 	ret nz

 	call Pokedex_UnownMode
@@ -573,7 +573,7 @@ Pokedex_AButtonMenu:

 .ReturnButtons:
 	ld a, [wTempSpecies]
-	cp DEX_ANNON
+	cp DEX_UNOWN
 	jr nz, .unown
 	ld a, A_BUTTON_MENU_UNOWN
 	jr .show_pokedex_menu
@@ -1362,7 +1362,7 @@ Pokedex_DexEntryScreen:
 .loop
 	call WaitForAutoBgMapTransfer
 	ld a, [wUnownDex]
-	ld [wAnnonID], a
+	ld [wUnownID], a
 	ld hl, wTileMap
 	lb bc, SCREEN_HEIGHT, SCREEN_WIDTH
 	call Pokedex_PlaceBorder
--- a/engine/pokedex/pokedex_2.asm
+++ b/engine/pokedex/pokedex_2.asm
@@ -679,14 +679,14 @@ GetDexUnownCount:
 	call ByteFill
 	ld hl, wUnownDex
 	ld bc, NUM_UNOWN
-.annon_loop:
+.unown_loop:
 	ld a, [hli]
 	and a
-	jr z, .no_annon
+	jr z, .no_unown
 	inc b
-.no_annon
+.no_unown
 	dec c
-	jr nz, .annon_loop
+	jr nz, .unown_loop

 	ld a, b
 	ld [wDexUnownCount], a
@@ -737,8 +737,8 @@ dw .Init, .Update, .ShowUnownLetter
 	ld hl, wUnownDex
 	add hl, de
 	ld a, [hl]
-	ld [wAnnonID], a
-	ld a, DEX_ANNON
+	ld [wUnownID], a
+	ld a, DEX_UNOWN
 	ld [wCurPartySpecies], a
 	ld [wCurSpecies], a
 	call GetBaseData
--- a/garbage/garbage.asm
+++ b/garbage/garbage.asm
@@ -1624,9 +1624,9 @@ Unreferenced_Corrupt_SilentHillLabBackUnusedScript:
 	Unreferenced_Corrupt_Gold_SilentHillLabBackStarterData:
 		db DEX_HONOGUMA
 		dw @ - $229
-		db DEX_KURUSU
+		db DEX_CRUISE

-		db DEX_KURUSU
+		db DEX_CRUISE
 		dw @ - $203
 		db DEX_HAPPA

@@ -1827,9 +1827,9 @@ Unreferenced_Corrupt_SilentHillLabBackFunc4:
 Unreferenced_Corrupt_SilentHillLabBackStarterData:
 	db DEX_HONOGUMA
 	dw @ - $229
-	db DEX_KURUSU
+	db DEX_CRUISE

-	db DEX_KURUSU
+	db DEX_CRUISE
 	dw @ - $203
 	db DEX_HAPPA

@@ -1910,9 +1910,9 @@ Unreferenced_Corrupt2_SilentHillLabBackFunc4:
 Unreferenced_Corrupt2_SilentHillLabBackStarterData:
 	db DEX_HONOGUMA
 	dw @ - $229
-	db DEX_KURUSU
+	db DEX_CRUISE

-	db DEX_KURUSU
+	db DEX_CRUISE
 	dw @ - $203
 	db DEX_HAPPA

--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -87,8 +87,8 @@ INCBIN "gfx/hud/hud.2bpp"
 BoldAlphabetGFX:
 INCBIN "gfx/font/alphabet.1bpp"

-AnnonAlphabetGFX:
-INCBIN "gfx/font/annon_alphabet.1bpp"
+UnownAlphabetGFX:
+INCBIN "gfx/font/unown_alphabet.1bpp"

 EmptyTile1bppGFX:
 INCBIN "gfx/font/empty_tile.1bpp"
--- a/gfx/font/unown_alphabet.png
+++ b/gfx/font/unown_alphabet.png
--- a/gfx/icons/unown.png
+++ b/gfx/icons/unown.png
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -387,22 +387,22 @@ VolbearPicFront::     INCBIN "gfx/pokemon/volbear/front.pic"
 VolbearPicBack::      INCBIN "gfx/pokemon/volbear/back.pic"
 DynabearPicFront::    INCBIN "gfx/pokemon/dynabear/front.pic"
 DynabearPicBack::     INCBIN "gfx/pokemon/dynabear/back.pic"
-KurusuPicFront::      INCBIN "gfx/pokemon/kurusu/front.pic"
-KurusuPicBack::       INCBIN "gfx/pokemon/kurusu/back.pic"
+CruisePicFront::      INCBIN "gfx/pokemon/cruise/front.pic"
+CruisePicBack::       INCBIN "gfx/pokemon/cruise/back.pic"
 AquaPicFront::        INCBIN "gfx/pokemon/aqua/front.pic"
 AquaPicBack::         INCBIN "gfx/pokemon/aqua/back.pic"
 AquariaPicFront::     INCBIN "gfx/pokemon/aquaria/front.pic"
 AquariaPicBack::      INCBIN "gfx/pokemon/aquaria/back.pic"
-HohoPicFront::        INCBIN "gfx/pokemon/hoho/front.pic"
-HohoPicBack::         INCBIN "gfx/pokemon/hoho/back.pic"
+HoothootPicFront::    INCBIN "gfx/pokemon/hoothoot/front.pic"
+HoothootPicBack::     INCBIN "gfx/pokemon/hoothoot/back.pic"
 BoboPicFront::        INCBIN "gfx/pokemon/bobo/front.pic"
 BoboPicBack::         INCBIN "gfx/pokemon/bobo/back.pic"
 PachimeePicFront::    INCBIN "gfx/pokemon/pachimee/front.pic"
 PachimeePicBack::     INCBIN "gfx/pokemon/pachimee/back.pic"
-MokokoPicFront::      INCBIN "gfx/pokemon/mokoko/front.pic"
-MokokoPicBack::       INCBIN "gfx/pokemon/mokoko/back.pic"
-DenryuPicFront::      INCBIN "gfx/pokemon/denryu/front.pic"
-DenryuPicBack::       INCBIN "gfx/pokemon/denryu/back.pic"
+FlaaffyPicFront::     INCBIN "gfx/pokemon/flaaffy/front.pic"
+FlaaffyPicBack::      INCBIN "gfx/pokemon/flaaffy/back.pic"
+AmpharosPicFront::    INCBIN "gfx/pokemon/ampharos/front.pic"
+AmpharosPicBack::     INCBIN "gfx/pokemon/ampharos/back.pic"
 MikonPicFront::       INCBIN "gfx/pokemon/mikon/front.pic"
 MikonPicBack::        INCBIN "gfx/pokemon/mikon/back.pic"
 MonjaPicFront::       INCBIN "gfx/pokemon/monja/front.pic"
@@ -421,28 +421,28 @@ ShibirefuguPicFront:: INCBIN "gfx/pokemon/shibirefugu/front.pic"
 ShibirefuguPicBack::  INCBIN "gfx/pokemon/shibirefugu/back.pic"
 PichuPicFront::       INCBIN "gfx/pokemon/pichu/front.pic"
 PichuPicBack::        INCBIN "gfx/pokemon/pichu/back.pic"
-PyPicFront::          INCBIN "gfx/pokemon/py/front.pic"
-PyPicBack::           INCBIN "gfx/pokemon/py/back.pic"
-PupurinPicFront::     INCBIN "gfx/pokemon/pupurin/front.pic"
-PupurinPicBack::      INCBIN "gfx/pokemon/pupurin/back.pic"
+CleffaPicFront::      INCBIN "gfx/pokemon/cleffa/front.pic"
+CleffaPicBack::       INCBIN "gfx/pokemon/cleffa/back.pic"
+IgglybuffPicFront::   INCBIN "gfx/pokemon/igglybuff/front.pic"
+IgglybuffPicBack::    INCBIN "gfx/pokemon/igglybuff/back.pic"
 MizuuoPicFront::      INCBIN "gfx/pokemon/mizuuo/front.pic"
 MizuuoPicBack::       INCBIN "gfx/pokemon/mizuuo/back.pic"
-NatyPicFront::        INCBIN "gfx/pokemon/naty/front.pic"
-NatyPicBack::         INCBIN "gfx/pokemon/naty/back.pic"
-NatioPicFront::       INCBIN "gfx/pokemon/natio/front.pic"
-NatioPicBack::        INCBIN "gfx/pokemon/natio/back.pic"
+NatuPicFront::        INCBIN "gfx/pokemon/natu/front.pic"
+NatuPicBack::         INCBIN "gfx/pokemon/natu/back.pic"
+XatuPicFront::        INCBIN "gfx/pokemon/xatu/front.pic"
+XatuPicBack::         INCBIN "gfx/pokemon/xatu/back.pic"
 GyopinPicFront::      INCBIN "gfx/pokemon/gyopin/front.pic"
 GyopinPicBack::       INCBIN "gfx/pokemon/gyopin/back.pic"
-MarilPicFront::       INCBIN "gfx/pokemon/maril/front.pic"
-MarilPicBack::        INCBIN "gfx/pokemon/maril/back.pic"
+MarillPicFront::      INCBIN "gfx/pokemon/marill/front.pic"
+MarillPicBack::       INCBIN "gfx/pokemon/marill/back.pic"
 Manbo1PicFront::      INCBIN "gfx/pokemon/manbo1/front.pic"
 Manbo1PicBack::       INCBIN "gfx/pokemon/manbo1/back.pic"
 IkariPicFront::       INCBIN "gfx/pokemon/ikari/front.pic"
 IkariPicBack::        INCBIN "gfx/pokemon/ikari/back.pic"
-GrotessPicFront::     INCBIN "gfx/pokemon/grotess/front.pic"
-GrotessPicBack::      INCBIN "gfx/pokemon/grotess/back.pic"
-EksingPicFront::      INCBIN "gfx/pokemon/eksing/front.pic"
-EksingPicBack::       INCBIN "gfx/pokemon/eksing/back.pic"
+GrotesquePicFront::   INCBIN "gfx/pokemon/grotesque/front.pic"
+GrotesquePicBack::    INCBIN "gfx/pokemon/grotesque/back.pic"
+XIngPicFront::        INCBIN "gfx/pokemon/x_ing/front.pic"
+XIngPicBack::         INCBIN "gfx/pokemon/x_ing/back.pic"
 ParaPicFront::        INCBIN "gfx/pokemon/para/front.pic"
 ParaPicBack::         INCBIN "gfx/pokemon/para/back.pic"
 KokumoPicFront::      INCBIN "gfx/pokemon/kokumo/front.pic"
@@ -463,8 +463,8 @@ DonphanPicFront::     INCBIN "gfx/pokemon/donphan/front.pic"
 DonphanPicBack::      INCBIN "gfx/pokemon/donphan/back.pic"
 TwinzPicFront::       INCBIN "gfx/pokemon/twinz/front.pic"
 TwinzPicBack::        INCBIN "gfx/pokemon/twinz/back.pic"
-KirinrikiPicFront::   INCBIN "gfx/pokemon/kirinriki/front.pic"
-KirinrikiPicBack::    INCBIN "gfx/pokemon/kirinriki/back.pic"
+GirafarigPicFront::   INCBIN "gfx/pokemon/girafarig/front.pic"
+GirafarigPicBack::    INCBIN "gfx/pokemon/girafarig/back.pic"
 PainterPicFront::     INCBIN "gfx/pokemon/painter/front.pic"
 PainterPicBack::      INCBIN "gfx/pokemon/painter/back.pic"
 KounyaPicFront::      INCBIN "gfx/pokemon/kounya/front.pic"
@@ -477,32 +477,32 @@ RinrinPicFront::      INCBIN "gfx/pokemon/rinrin/front.pic"
 RinrinPicBack::       INCBIN "gfx/pokemon/rinrin/back.pic"
 BerurunPicFront::     INCBIN "gfx/pokemon/berurun/front.pic"
 BerurunPicBack::      INCBIN "gfx/pokemon/berurun/back.pic"
-NyorotonoPicFront::   INCBIN "gfx/pokemon/nyorotono/front.pic"
-NyorotonoPicBack::    INCBIN "gfx/pokemon/nyorotono/back.pic"
-YadokingPicFront::    INCBIN "gfx/pokemon/yadoking/front.pic"
-YadokingPicBack::     INCBIN "gfx/pokemon/yadoking/back.pic"
-RedibaPicFront::      INCBIN "gfx/pokemon/rediba/front.pic"
-RedibaPicBack::       INCBIN "gfx/pokemon/rediba/back.pic"
+PolitoedPicFront::    INCBIN "gfx/pokemon/politoed/front.pic"
+PolitoedPicBack::     INCBIN "gfx/pokemon/politoed/back.pic"
+SlowkingPicFront::    INCBIN "gfx/pokemon/slowking/front.pic"
+SlowkingPicBack::     INCBIN "gfx/pokemon/slowking/back.pic"
+LedybaPicFront::      INCBIN "gfx/pokemon/ledyba/front.pic"
+LedybaPicBack::       INCBIN "gfx/pokemon/ledyba/back.pic"
 MitsuboshiPicFront::  INCBIN "gfx/pokemon/mitsuboshi/front.pic"
 MitsuboshiPicBack::   INCBIN "gfx/pokemon/mitsuboshi/back.pic"
 PuchicornPicFront::   INCBIN "gfx/pokemon/puchicorn/front.pic"
 PuchicornPicBack::    INCBIN "gfx/pokemon/puchicorn/back.pic"
-EifiePicFront::       INCBIN "gfx/pokemon/eifie/front.pic"
-EifiePicBack::        INCBIN "gfx/pokemon/eifie/back.pic"
-BlackyPicFront::      INCBIN "gfx/pokemon/blacky/front.pic"
-BlackyPicBack::       INCBIN "gfx/pokemon/blacky/back.pic"
+EspeonPicFront::      INCBIN "gfx/pokemon/espeon/front.pic"
+EspeonPicBack::       INCBIN "gfx/pokemon/espeon/back.pic"
+UmbreonPicFront::     INCBIN "gfx/pokemon/umbreon/front.pic"
+UmbreonPicBack::      INCBIN "gfx/pokemon/umbreon/back.pic"
 TurbanPicFront::      INCBIN "gfx/pokemon/turban/front.pic"
 TurbanPicBack::       INCBIN "gfx/pokemon/turban/back.pic"
 BetbabyPicFront::     INCBIN "gfx/pokemon/betbaby/front.pic"
 BetbabyPicBack::      INCBIN "gfx/pokemon/betbaby/back.pic"
-TeppouoPicFront::     INCBIN "gfx/pokemon/teppouo/front.pic"
-TeppouoPicBack::      INCBIN "gfx/pokemon/teppouo/back.pic"
-OkutankPicFront::     INCBIN "gfx/pokemon/okutank/front.pic"
-OkutankPicBack::      INCBIN "gfx/pokemon/okutank/back.pic"
-GonguPicFront::       INCBIN "gfx/pokemon/gongu/front.pic"
-GonguPicBack::        INCBIN "gfx/pokemon/gongu/back.pic"
-KapoererPicFront::    INCBIN "gfx/pokemon/kapoerer/front.pic"
-KapoererPicBack::     INCBIN "gfx/pokemon/kapoerer/back.pic"
+RemoraidPicFront::    INCBIN "gfx/pokemon/remoraid/front.pic"
+RemoraidPicBack::     INCBIN "gfx/pokemon/remoraid/back.pic"
+OctilleryPicFront::   INCBIN "gfx/pokemon/octillery/front.pic"
+OctilleryPicBack::    INCBIN "gfx/pokemon/octillery/back.pic"
+GongPicFront::        INCBIN "gfx/pokemon/gong/front.pic"
+GongPicBack::         INCBIN "gfx/pokemon/gong/back.pic"
+HitmontopPicFront::   INCBIN "gfx/pokemon/hitmontop/front.pic"
+HitmontopPicBack::    INCBIN "gfx/pokemon/hitmontop/back.pic"
 PudiePicFront::       INCBIN "gfx/pokemon/pudie/front.pic"
 PudiePicBack::        INCBIN "gfx/pokemon/pudie/back.pic"
 HanekoPicFront::      INCBIN "gfx/pokemon/haneko/front.pic"
@@ -517,10 +517,10 @@ LipPicFront::         INCBIN "gfx/pokemon/lip/front.pic"
 LipPicBack::          INCBIN "gfx/pokemon/lip/back.pic"
 ElebabyPicFront::     INCBIN "gfx/pokemon/elebaby/front.pic"
 ElebabyPicBack::      INCBIN "gfx/pokemon/elebaby/back.pic"
-BoobyPicFront::       INCBIN "gfx/pokemon/booby/front.pic"
-BoobyPicBack::        INCBIN "gfx/pokemon/booby/back.pic"
-KireihanaPicFront::   INCBIN "gfx/pokemon/kireihana/front.pic"
-KireihanaPicBack::    INCBIN "gfx/pokemon/kireihana/back.pic"
+MagbyPicFront::       INCBIN "gfx/pokemon/magby/front.pic"
+MagbyPicBack::        INCBIN "gfx/pokemon/magby/back.pic"
+BellossomPicFront::   INCBIN "gfx/pokemon/bellossom/front.pic"
+BellossomPicBack::    INCBIN "gfx/pokemon/bellossom/back.pic"
 TsubomittoPicFront::  INCBIN "gfx/pokemon/tsubomitto/front.pic"
 TsubomittoPicBack::   INCBIN "gfx/pokemon/tsubomitto/back.pic"
 MiltankPicFront::     INCBIN "gfx/pokemon/miltank/front.pic"
@@ -543,18 +543,18 @@ NorowaraPicFront::    INCBIN "gfx/pokemon/norowara/front.pic"
 NorowaraPicBack::     INCBIN "gfx/pokemon/norowara/back.pic"
 KyonpanPicFront::     INCBIN "gfx/pokemon/kyonpan/front.pic"
 KyonpanPicBack::      INCBIN "gfx/pokemon/kyonpan/back.pic"
-YamikarasuPicFront::  INCBIN "gfx/pokemon/yamikarasu/front.pic"
-YamikarasuPicBack::   INCBIN "gfx/pokemon/yamikarasu/back.pic"
-HappiPicFront::       INCBIN "gfx/pokemon/happi/front.pic"
-HappiPicBack::        INCBIN "gfx/pokemon/happi/back.pic"
+MurkrowPicFront::     INCBIN "gfx/pokemon/murkrow/front.pic"
+MurkrowPicBack::      INCBIN "gfx/pokemon/murkrow/back.pic"
+HappyPicFront::       INCBIN "gfx/pokemon/happy/front.pic"
+HappyPicBack::        INCBIN "gfx/pokemon/happy/back.pic"
 ScissorsPicFront::    INCBIN "gfx/pokemon/scissors/front.pic"
 ScissorsPicBack::     INCBIN "gfx/pokemon/scissors/back.pic"
-PurakkusuPicFront::   INCBIN "gfx/pokemon/purakkusu/front.pic"
-PurakkusuPicBack::    INCBIN "gfx/pokemon/purakkusu/back.pic"
+PlucksPicFront::      INCBIN "gfx/pokemon/plucks/front.pic"
+PlucksPicBack::       INCBIN "gfx/pokemon/plucks/back.pic"
 DevilPicFront::       INCBIN "gfx/pokemon/devil/front.pic"
 DevilPicBack::        INCBIN "gfx/pokemon/devil/back.pic"
-HelgaaPicFront::      INCBIN "gfx/pokemon/helgaa/front.pic"
-HelgaaPicBack::       INCBIN "gfx/pokemon/helgaa/back.pic"
+HoundoomPicFront::    INCBIN "gfx/pokemon/houndoom/front.pic"
+HoundoomPicBack::     INCBIN "gfx/pokemon/houndoom/back.pic"
 WolfmanPicFront::     INCBIN "gfx/pokemon/wolfman/front.pic"
 WolfmanPicBack::      INCBIN "gfx/pokemon/wolfman/back.pic"
 WarwolfPicFront::     INCBIN "gfx/pokemon/warwolf/front.pic"
@@ -563,8 +563,8 @@ Porygon2PicFront::    INCBIN "gfx/pokemon/porygon2/front.pic"
 Porygon2PicBack::     INCBIN "gfx/pokemon/porygon2/back.pic"
 NameilPicFront::      INCBIN "gfx/pokemon/nameil/front.pic"
 NameilPicBack::       INCBIN "gfx/pokemon/nameil/back.pic"
-HaganeilPicFront::    INCBIN "gfx/pokemon/haganeil/front.pic"
-HaganeilPicBack::     INCBIN "gfx/pokemon/haganeil/back.pic"
+SteelixPicFront::     INCBIN "gfx/pokemon/steelix/front.pic"
+SteelixPicBack::      INCBIN "gfx/pokemon/steelix/back.pic"
 KingdraPicFront::     INCBIN "gfx/pokemon/kingdra/front.pic"
 KingdraPicBack::      INCBIN "gfx/pokemon/kingdra/back.pic"
 RaiPicFront::         INCBIN "gfx/pokemon/rai/front.pic"
@@ -574,81 +574,81 @@ EnPicFront::          INCBIN "gfx/pokemon/en/front.pic"
 EnPicBack::           INCBIN "gfx/pokemon/en/back.pic"
 SuiPicFront::         INCBIN "gfx/pokemon/sui/front.pic"
 SuiPicBack::          INCBIN "gfx/pokemon/sui/back.pic"
-NyulaPicFront::       INCBIN "gfx/pokemon/nyula/front.pic"
-NyulaPicBack::        INCBIN "gfx/pokemon/nyula/back.pic"
+SneaselPicFront::     INCBIN "gfx/pokemon/sneasel/front.pic"
+SneaselPicBack::      INCBIN "gfx/pokemon/sneasel/back.pic"


 SECTION "Pics 11", ROMX

-HououPicFront::       INCBIN "gfx/pokemon/houou/front.pic"
-HououPicBack::        INCBIN "gfx/pokemon/houou/back.pic"
-TogepyPicFront::      INCBIN "gfx/pokemon/togepy/front.pic"
-TogepyPicBack::       INCBIN "gfx/pokemon/togepy/back.pic"
-BuluPicFront::        INCBIN "gfx/pokemon/bulu/front.pic"
-BuluPicBack::         INCBIN "gfx/pokemon/bulu/back.pic"
+HoOhPicFront::        INCBIN "gfx/pokemon/ho_oh/front.pic"
+HoOhPicBack::         INCBIN "gfx/pokemon/ho_oh/back.pic"
+TogepiPicFront::      INCBIN "gfx/pokemon/togepi/front.pic"
+TogepiPicBack::       INCBIN "gfx/pokemon/togepi/back.pic"
+SnubbullPicFront::    INCBIN "gfx/pokemon/snubbull/front.pic"
+SnubbullPicBack::     INCBIN "gfx/pokemon/snubbull/back.pic"
 TailPicFront::        INCBIN "gfx/pokemon/tail/front.pic"
 TailPicBack::         INCBIN "gfx/pokemon/tail/back.pic"
 LeafyPicFront::       INCBIN "gfx/pokemon/leafy/front.pic"
 LeafyPicBack::        INCBIN "gfx/pokemon/leafy/back.pic"


-SECTION "Annon Pic Ptrs and Pics", ROMX
+SECTION "Unown Pic Ptrs and Pics", ROMX

-INCLUDE "gfx/pokemon/annon_pic_ptrs.asm"
+INCLUDE "gfx/pokemon/unown_pic_ptrs.asm"

-AnnonPics::
-AnnonAPicFront::      INCBIN "gfx/pokemon/annon_a/front.pic"
-AnnonAPicBack::       INCBIN "gfx/pokemon/annon_a/back.pic"
-AnnonBPicFront::      INCBIN "gfx/pokemon/annon_b/front.pic"
-AnnonBPicBack::       INCBIN "gfx/pokemon/annon_b/back.pic"
-AnnonCPicFront::      INCBIN "gfx/pokemon/annon_c/front.pic"
-AnnonCPicBack::       INCBIN "gfx/pokemon/annon_c/back.pic"
-AnnonDPicFront::      INCBIN "gfx/pokemon/annon_d/front.pic"
-AnnonDPicBack::       INCBIN "gfx/pokemon/annon_d/back.pic"
-AnnonEPicFront::      INCBIN "gfx/pokemon/annon_e/front.pic"
-AnnonEPicBack::       INCBIN "gfx/pokemon/annon_e/back.pic"
-AnnonFPicFront::      INCBIN "gfx/pokemon/annon_f/front.pic"
-AnnonFPicBack::       INCBIN "gfx/pokemon/annon_f/back.pic"
-AnnonGPicFront::      INCBIN "gfx/pokemon/annon_g/front.pic"
-AnnonGPicBack::       INCBIN "gfx/pokemon/annon_g/back.pic"
-AnnonHPicFront::      INCBIN "gfx/pokemon/annon_h/front.pic"
-AnnonHPicBack::       INCBIN "gfx/pokemon/annon_h/back.pic"
-AnnonIPicFront::      INCBIN "gfx/pokemon/annon_i/front.pic"
-AnnonIPicBack::       INCBIN "gfx/pokemon/annon_i/back.pic"
-AnnonJPicFront::      INCBIN "gfx/pokemon/annon_j/front.pic"
-AnnonJPicBack::       INCBIN "gfx/pokemon/annon_j/back.pic"
-AnnonKPicFront::      INCBIN "gfx/pokemon/annon_k/front.pic"
-AnnonKPicBack::       INCBIN "gfx/pokemon/annon_k/back.pic"
-AnnonLPicFront::      INCBIN "gfx/pokemon/annon_l/front.pic"
-AnnonLPicBack::       INCBIN "gfx/pokemon/annon_l/back.pic"
-AnnonMPicFront::      INCBIN "gfx/pokemon/annon_m/front.pic"
-AnnonMPicBack::       INCBIN "gfx/pokemon/annon_m/back.pic"
-AnnonNPicFront::      INCBIN "gfx/pokemon/annon_n/front.pic"
-AnnonNPicBack::       INCBIN "gfx/pokemon/annon_n/back.pic"
-AnnonOPicFront::      INCBIN "gfx/pokemon/annon_o/front.pic"
-AnnonOPicBack::       INCBIN "gfx/pokemon/annon_o/back.pic"
-AnnonPPicFront::      INCBIN "gfx/pokemon/annon_p/front.pic"
-AnnonPPicBack::       INCBIN "gfx/pokemon/annon_p/back.pic"
-AnnonQPicFront::      INCBIN "gfx/pokemon/annon_q/front.pic"
-AnnonQPicBack::       INCBIN "gfx/pokemon/annon_q/back.pic"
-AnnonRPicFront::      INCBIN "gfx/pokemon/annon_r/front.pic"
-AnnonRPicBack::       INCBIN "gfx/pokemon/annon_r/back.pic"
-AnnonSPicFront::      INCBIN "gfx/pokemon/annon_s/front.pic"
-AnnonSPicBack::       INCBIN "gfx/pokemon/annon_s/back.pic"
-AnnonTPicFront::      INCBIN "gfx/pokemon/annon_t/front.pic"
-AnnonTPicBack::       INCBIN "gfx/pokemon/annon_t/back.pic"
-AnnonUPicFront::      INCBIN "gfx/pokemon/annon_u/front.pic"
-AnnonUPicBack::       INCBIN "gfx/pokemon/annon_u/back.pic"
-AnnonVPicFront::      INCBIN "gfx/pokemon/annon_v/front.pic"
-AnnonVPicBack::       INCBIN "gfx/pokemon/annon_v/back.pic"
-AnnonWPicFront::      INCBIN "gfx/pokemon/annon_w/front.pic"
-AnnonWPicBack::       INCBIN "gfx/pokemon/annon_w/back.pic"
-AnnonXPicFront::      INCBIN "gfx/pokemon/annon_x/front.pic"
-AnnonXPicBack::       INCBIN "gfx/pokemon/annon_x/back.pic"
-AnnonYPicFront::      INCBIN "gfx/pokemon/annon_y/front.pic"
-AnnonYPicBack::       INCBIN "gfx/pokemon/annon_y/back.pic"
-AnnonZPicFront::      INCBIN "gfx/pokemon/annon_z/front.pic"
-AnnonZPicBack::       INCBIN "gfx/pokemon/annon_z/back.pic"
+UnownPics::
+UnownAPicFront::      INCBIN "gfx/pokemon/unown_a/front.pic"
+UnownAPicBack::       INCBIN "gfx/pokemon/unown_a/back.pic"
+UnownBPicFront::      INCBIN "gfx/pokemon/unown_b/front.pic"
+UnownBPicBack::       INCBIN "gfx/pokemon/unown_b/back.pic"
+UnownCPicFront::      INCBIN "gfx/pokemon/unown_c/front.pic"
+UnownCPicBack::       INCBIN "gfx/pokemon/unown_c/back.pic"
+UnownDPicFront::      INCBIN "gfx/pokemon/unown_d/front.pic"
+UnownDPicBack::       INCBIN "gfx/pokemon/unown_d/back.pic"
+UnownEPicFront::      INCBIN "gfx/pokemon/unown_e/front.pic"
+UnownEPicBack::       INCBIN "gfx/pokemon/unown_e/back.pic"
+UnownFPicFront::      INCBIN "gfx/pokemon/unown_f/front.pic"
+UnownFPicBack::       INCBIN "gfx/pokemon/unown_f/back.pic"
+UnownGPicFront::      INCBIN "gfx/pokemon/unown_g/front.pic"
+UnownGPicBack::       INCBIN "gfx/pokemon/unown_g/back.pic"
+UnownHPicFront::      INCBIN "gfx/pokemon/unown_h/front.pic"
+UnownHPicBack::       INCBIN "gfx/pokemon/unown_h/back.pic"
+UnownIPicFront::      INCBIN "gfx/pokemon/unown_i/front.pic"
+UnownIPicBack::       INCBIN "gfx/pokemon/unown_i/back.pic"
+UnownJPicFront::      INCBIN "gfx/pokemon/unown_j/front.pic"
+UnownJPicBack::       INCBIN "gfx/pokemon/unown_j/back.pic"
+UnownKPicFront::      INCBIN "gfx/pokemon/unown_k/front.pic"
+UnownKPicBack::       INCBIN "gfx/pokemon/unown_k/back.pic"
+UnownLPicFront::      INCBIN "gfx/pokemon/unown_l/front.pic"
+UnownLPicBack::       INCBIN "gfx/pokemon/unown_l/back.pic"
+UnownMPicFront::      INCBIN "gfx/pokemon/unown_m/front.pic"
+UnownMPicBack::       INCBIN "gfx/pokemon/unown_m/back.pic"
+UnownNPicFront::      INCBIN "gfx/pokemon/unown_n/front.pic"
+UnownNPicBack::       INCBIN "gfx/pokemon/unown_n/back.pic"
+UnownOPicFront::      INCBIN "gfx/pokemon/unown_o/front.pic"
+UnownOPicBack::       INCBIN "gfx/pokemon/unown_o/back.pic"
+UnownPPicFront::      INCBIN "gfx/pokemon/unown_p/front.pic"
+UnownPPicBack::       INCBIN "gfx/pokemon/unown_p/back.pic"
+UnownQPicFront::      INCBIN "gfx/pokemon/unown_q/front.pic"
+UnownQPicBack::       INCBIN "gfx/pokemon/unown_q/back.pic"
+UnownRPicFront::      INCBIN "gfx/pokemon/unown_r/front.pic"
+UnownRPicBack::       INCBIN "gfx/pokemon/unown_r/back.pic"
+UnownSPicFront::      INCBIN "gfx/pokemon/unown_s/front.pic"
+UnownSPicBack::       INCBIN "gfx/pokemon/unown_s/back.pic"
+UnownTPicFront::      INCBIN "gfx/pokemon/unown_t/front.pic"
+UnownTPicBack::       INCBIN "gfx/pokemon/unown_t/back.pic"
+UnownUPicFront::      INCBIN "gfx/pokemon/unown_u/front.pic"
+UnownUPicBack::       INCBIN "gfx/pokemon/unown_u/back.pic"
+UnownVPicFront::      INCBIN "gfx/pokemon/unown_v/front.pic"
+UnownVPicBack::       INCBIN "gfx/pokemon/unown_v/back.pic"
+UnownWPicFront::      INCBIN "gfx/pokemon/unown_w/front.pic"
+UnownWPicBack::       INCBIN "gfx/pokemon/unown_w/back.pic"
+UnownXPicFront::      INCBIN "gfx/pokemon/unown_x/front.pic"
+UnownXPicBack::       INCBIN "gfx/pokemon/unown_x/back.pic"
+UnownYPicFront::      INCBIN "gfx/pokemon/unown_y/front.pic"
+UnownYPicBack::       INCBIN "gfx/pokemon/unown_y/back.pic"
+UnownZPicFront::      INCBIN "gfx/pokemon/unown_z/front.pic"
+UnownZPicBack::       INCBIN "gfx/pokemon/unown_z/back.pic"


 SECTION "Egg Pic", ROMX
--- a/gfx/pokemon/ampharos/back.png
+++ b/gfx/pokemon/ampharos/back.png
--- a/gfx/pokemon/ampharos/front.png
+++ b/gfx/pokemon/ampharos/front.png
--- a/gfx/pokemon/annon_pic_ptrs.asm
+++ b/gfx/pokemon/annon_pic_ptrs.asm
@@ -1,55 +0,0 @@
-AnnonPicPtrs::
-AnnonPicPtrsFront::
-	dw AnnonAPicFront
-AnnonPicPtrsBack::
-	dw AnnonAPicBack
-	dw AnnonBPicFront
-	dw AnnonBPicBack
-	dw AnnonCPicFront
-	dw AnnonCPicBack
-	dw AnnonDPicFront
-	dw AnnonDPicBack
-	dw AnnonEPicFront
-	dw AnnonEPicBack
-	dw AnnonFPicFront
-	dw AnnonFPicBack
-	dw AnnonGPicFront
-	dw AnnonGPicBack
-	dw AnnonHPicFront
-	dw AnnonHPicBack
-	dw AnnonIPicFront
-	dw AnnonIPicBack
-	dw AnnonJPicFront
-	dw AnnonJPicBack
-	dw AnnonKPicFront
-	dw AnnonKPicBack
-	dw AnnonLPicFront
-	dw AnnonLPicBack
-	dw AnnonMPicFront
-	dw AnnonMPicBack
-	dw AnnonNPicFront
-	dw AnnonNPicBack
-	dw AnnonOPicFront
-	dw AnnonOPicBack
-	dw AnnonPPicFront
-	dw AnnonPPicBack
-	dw AnnonQPicFront
-	dw AnnonQPicBack
-	dw AnnonRPicFront
-	dw AnnonRPicBack
-	dw AnnonSPicFront
-	dw AnnonSPicBack
-	dw AnnonTPicFront
-	dw AnnonTPicBack
-	dw AnnonUPicFront
-	dw AnnonUPicBack
-	dw AnnonVPicFront
-	dw AnnonVPicBack
-	dw AnnonWPicFront
-	dw AnnonWPicBack
-	dw AnnonXPicFront
-	dw AnnonXPicBack
-	dw AnnonYPicFront
-	dw AnnonYPicBack
-	dw AnnonZPicFront
-	dw AnnonYPicBack ; typo in original list, should be AnnonZPicBack
--- a/gfx/pokemon/bellossom/back.png
+++ b/gfx/pokemon/bellossom/back.png
--- a/gfx/pokemon/bellossom/front.png
+++ b/gfx/pokemon/bellossom/front.png
--- a/gfx/pokemon/cleffa/back.png
+++ b/gfx/pokemon/cleffa/back.png
--- a/gfx/pokemon/cleffa/front.png
+++ b/gfx/pokemon/cleffa/front.png
--- a/gfx/pokemon/cruise/back.png
+++ b/gfx/pokemon/cruise/back.png
--- a/gfx/pokemon/cruise/front.png
+++ b/gfx/pokemon/cruise/front.png
--- a/gfx/pokemon/espeon/back.png
+++ b/gfx/pokemon/espeon/back.png
--- a/gfx/pokemon/espeon/front.png
+++ b/gfx/pokemon/espeon/front.png
--- a/gfx/pokemon/flaaffy/back.png
+++ b/gfx/pokemon/flaaffy/back.png
--- a/gfx/pokemon/flaaffy/front.png
+++ b/gfx/pokemon/flaaffy/front.png
--- a/gfx/pokemon/girafarig/back.png
+++ b/gfx/pokemon/girafarig/back.png
--- a/gfx/pokemon/girafarig/front.png
+++ b/gfx/pokemon/girafarig/front.png
--- a/gfx/pokemon/gongu/back.png
+++ b/gfx/pokemon/gongu/back.png
--- a/gfx/pokemon/gongu/front.png
+++ b/gfx/pokemon/gongu/front.png
--- a/gfx/pokemon/grotesque/back.png
+++ b/gfx/pokemon/grotesque/back.png
--- a/gfx/pokemon/grotesque/front.png
+++ b/gfx/pokemon/grotesque/front.png
--- a/gfx/pokemon/happy/back.png
+++ b/gfx/pokemon/happy/back.png
--- a/gfx/pokemon/happy/front.png
+++ b/gfx/pokemon/happy/front.png
--- a/gfx/pokemon/hitmontop/back.png
+++ b/gfx/pokemon/hitmontop/back.png
--- a/gfx/pokemon/hitmontop/front.png
+++ b/gfx/pokemon/hitmontop/front.png
--- a/gfx/pokemon/ho_oh/back.png
+++ b/gfx/pokemon/ho_oh/back.png
--- a/gfx/pokemon/ho_oh/front.png
+++ b/gfx/pokemon/ho_oh/front.png
--- a/Show More
+++ b/Show More