447 files changed, 3087 insertions, 3087 deletions

diff --git a/constants/icon_constants.asm b/constants/icon_constants.asm
index ca999c9..cb82df9 100644
--- a/constants/icon_constants.asm
+++ b/constants/icon_constants.asm
@@ -1,35 +1,35 @@
 ; icon ids
 	const_def
-	const ICON_NONE        ; 00
-	const ICON_NYOROMO     ; 01
-	const ICON_PURIN       ; 02
-	const ICON_DIGDA       ; 03
-	const ICON_PIKACHU     ; 04
-	const ICON_HITODEMAN   ; 05
-	const ICON_KOIKING     ; 06
-	const ICON_POPPO       ; 07
-	const ICON_SIDON       ; 08
-	const ICON_PIPPI       ; 09
-	const ICON_NAZONOKUSA  ; 0a
-	const ICON_MUSHI       ; 0b
-	const ICON_GANGAR      ; 0c
-	const ICON_LAPLACE     ; 0d
-	const ICON_BARRIERD    ; 0e
-	const ICON_LOKON       ; 0f
-	const ICON_KENTAUROS   ; 10
-	const ICON_SHELLDER    ; 11
-	const ICON_METAMON     ; 12
-	const ICON_IWARK       ; 13
-	const ICON_BIRIRIDAMA  ; 14
-	const ICON_ZENIGAME    ; 15
-	const ICON_FUSHIGIDANE ; 16
-	const ICON_HITOKAGE    ; 17
-	const ICON_BEEDLE      ; 18
-	const ICON_ANNON       ; 19
-	const ICON_ISITSUBUTE  ; 1a
-	const ICON_WANRIKY     ; 1b
-	const ICON_EGG         ; 1c
-	const ICON_MENOKURAGE  ; 1d
-	const ICON_BUTTERFREE  ; 1e
-	const ICON_ZUBAT       ; 1f
-	const ICON_KABIGON     ; 20
+	const ICON_NONE
+	const ICON_POLIWAG
+	const ICON_JIGGLYPUFF
+	const ICON_DIGLETT
+	const ICON_PIKACHU
+	const ICON_STARYU
+	const ICON_MAGIKARP
+	const ICON_PIDGEY
+	const ICON_RHYDON
+	const ICON_CLEFAIRY
+	const ICON_ODDISH
+	const ICON_MUSHI
+	const ICON_GENGAR
+	const ICON_LAPRAS
+	const ICON_MRMIME
+	const ICON_LOKON
+	const ICON_TAUROS
+	const ICON_SHELLDER
+	const ICON_DITTO
+	const ICON_ONIX
+	const ICON_VOLTORB
+	const ICON_SQUIRTLE
+	const ICON_BULBASAUR
+	const ICON_CHARMANDER
+	const ICON_WEEDLE
+	const ICON_ANNON
+	const ICON_GEODUDE
+	const ICON_MACHOP
+	const ICON_EGG
+	const ICON_TENTACOOL
+	const ICON_BUTTERFREE
+	const ICON_ZUBAT
+	const ICON_SNORLAX
diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm
index e9d6d79..e3a72ad 100755
--- a/constants/palette_constants.asm
+++ b/constants/palette_constants.asm
@@ -44,10 +44,10 @@
 	const PAL_INTRO_WATER ; 2a
 	const PAL_INTRO_LAPRAS ; 2b
 	const PAL_INTRO_FOREST ; 2c
-	const PAL_INTRO_PURIN_PIKACHU ; 2d
-	const PAL_INTRO_KAMEX ; 2e
-	const PAL_INTRO_FUSHIGIBANA ; 2f
-	const PAL_INTRO_LIZARDON ; 30
+	const PAL_INTRO_JIGGLYPUFF_PIKACHU ; 2d
+	const PAL_INTRO_BLASTOISE ; 2e
+	const PAL_INTRO_VENUSAUR ; 2f
+	const PAL_INTRO_CHARIZARD ; 30
 	const PAL_SLOTS_1 ; 31
 	const PAL_SLOTS_2 ; 32
 	const PAL_SLOTS_3 ; 33
diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm
index b3c5e00..c9f1f43 100644
--- a/constants/pokedex_constants.asm
+++ b/constants/pokedex_constants.asm
@@ -1,288 +1,288 @@
 ; Pokédex numbers
 	const_def
-	const DEX_NONE        ; 00
-	const DEX_FUSHIGIDANE ; 01 BULBASAUR
-	const DEX_FUSHIGISOU  ; 02 IVYSAUR
-	const DEX_FUSHIGIBANA ; 03 VENUSAUR
-	const DEX_HITOKAGE    ; 04 CHARMANDER
-	const DEX_LIZARDO     ; 05 CHARMELEON
-	const DEX_LIZARDON    ; 06 CHARIZARD
-	const DEX_ZENIGAME    ; 07 SQUIRTLE
-	const DEX_KAMEIL      ; 08 WARTORTLE
-	const DEX_KAMEX       ; 09 BLASTOISE
-	const DEX_CATERPIE    ; 0a CATERPIE
-	const DEX_TRANSEL     ; 0b METAPOD
-	const DEX_BUTTERFREE  ; 0c BUTTERFREE
-	const DEX_BEEDLE      ; 0d WEEDLE
-	const DEX_COCOON      ; 0e KAKUNA
-	const DEX_SPEAR       ; 0f BEEDRILL
-	const DEX_POPPO       ; 10 PIDGEY
-	const DEX_PIGEON      ; 11 PIDGEOTTO
-	const DEX_PIGEOT      ; 12 PIDGEOT
-	const DEX_KORATTA     ; 13 RATTATA
-	const DEX_RATTA       ; 14 RATICATE
-	const DEX_ONISUZUME   ; 15 SPEAROW
-	const DEX_ONIDRILL    ; 16 FEAROW
-	const DEX_ARBO        ; 17 EKANS
-	const DEX_ARBOK       ; 18 ARBOK
-	const DEX_PIKACHU     ; 19 PIKACHU
-	const DEX_RAICHU      ; 1a RAICHU
-	const DEX_SAND        ; 1b SANDSHREW
-	const DEX_SANDPAN     ; 1c SANDSLASH
-	const DEX_NIDORAN_F   ; 1d NIDORAN_F
-	const DEX_NIDORINA    ; 1e NIDORINA
-	const DEX_NIDOQUEEN   ; 1f NIDOQUEEN
-	const DEX_NIDORAN_M   ; 20 NIDORAN_M
-	const DEX_NIDORINO    ; 21 NIDORINO
-	const DEX_NIDOKING    ; 22 NIDOKING
-	const DEX_PIPPI       ; 23 CLEFAIRY
-	const DEX_PIXY        ; 24 CLEFABLE
-	const DEX_ROKON       ; 25 VULPIX
-	const DEX_KYUKON      ; 26 NINETALES
-	const DEX_PURIN       ; 27 JIGGLYPUFF
-	const DEX_PUKURIN     ; 28 WIGGLYTUFF
-	const DEX_ZUBAT       ; 29 ZUBAT
-	const DEX_GOLBAT      ; 2a GOLBAT
-	const DEX_NAZONOKUSA  ; 2b ODDISH
-	const DEX_KUSAIHANA   ; 2c GLOOM
-	const DEX_RUFFRESIA   ; 2d VILEPLUME
-	const DEX_PARAS       ; 2e PARAS
-	const DEX_PARASECT    ; 2f PARASECT
-	const DEX_KONGPANG    ; 30 VENONAT
-	const DEX_MORPHON     ; 31 VENOMOTH
-	const DEX_DIGDA       ; 32 DIGLETT
-	const DEX_DUGTRIO     ; 33 DUGTRIO
-	const DEX_NYARTH      ; 34 MEOWTH
-	const DEX_PERSIAN     ; 35 PERSIAN
-	const DEX_KODUCK      ; 36 PSYDUCK
-	const DEX_GOLDUCK     ; 37 GOLDUCK
-	const DEX_MANKEY      ; 38 MANKEY
-	const DEX_OKORIZARU   ; 39 PRIMEAPE
-	const DEX_GARDIE      ; 3a GROWLITHE
-	const DEX_WINDIE      ; 3b ARCANINE
-	const DEX_NYOROMO     ; 3c POLIWAG
-	const DEX_NYOROZO     ; 3d POLIWHIRL
-	const DEX_NYOROBON    ; 3e POLIWRATH
-	const DEX_CASEY       ; 3f ABRA
-	const DEX_YUNGERER    ; 40 KADABRA
-	const DEX_FOODIN      ; 41 ALAKAZAM
-	const DEX_WANRIKY     ; 42 MACHOP
-	const DEX_GORIKY      ; 43 MACHOKE
-	const DEX_KAIRIKY     ; 44 MACHAMP
-	const DEX_MADATSUBOMI ; 45 BELLSPROUT
-	const DEX_UTSUDON     ; 46 WEEPINBELL
-	const DEX_UTSUBOT     ; 47 VICTREEBEL
-	const DEX_MENOKURAGE  ; 48 TENTACOOL
-	const DEX_DOKUKURAGE  ; 49 TENTACRUEL
-	const DEX_ISITSUBUTE  ; 4a GEODUDE
-	const DEX_GOLONE      ; 4b GRAVELER
-	const DEX_GOLONYA     ; 4c GOLEM
-	const DEX_PONYTA      ; 4d PONYTA
-	const DEX_GALLOP      ; 4e RAPIDASH
-	const DEX_YADON       ; 4f SLOWPOKE
-	const DEX_YADORAN     ; 50 SLOWBRO
-	const DEX_COIL        ; 51 MAGNEMITE
-	const DEX_RARECOIL    ; 52 MAGNETON
-	const DEX_KAMONEGI    ; 53 FARFETCH_D
-	const DEX_DODO        ; 54 DODUO
-	const DEX_DODORIO     ; 55 DODRIO
-	const DEX_PAWOU       ; 56 SEEL
-	const DEX_JUGON       ; 57 DEWGONG
-	const DEX_BETBETER    ; 58 GRIMER
-	const DEX_BETBETON    ; 59 MUK
-	const DEX_SHELLDER    ; 5a SHELLDER
-	const DEX_PARSHEN     ; 5b CLOYSTER
-	const DEX_GHOS        ; 5c GASTLY
-	const DEX_GHOST       ; 5d HAUNTER
-	const DEX_GANGAR      ; 5e GENGAR
-	const DEX_IWARK       ; 5f ONIX
-	const DEX_SLEEPE      ; 60 DROWZEE
-	const DEX_SLEEPER     ; 61 HYPNO
-	const DEX_CRAB        ; 62 KRABBY
-	const DEX_KINGLER     ; 63 KINGLER
-	const DEX_BIRIRIDAMA  ; 64 VOLTORB
-	const DEX_MARUMINE    ; 65 ELECTRODE
-	const DEX_TAMATAMA    ; 66 EXEGGCUTE
-	const DEX_NASSY       ; 67 EXEGGUTOR
-	const DEX_KARAKARA    ; 68 CUBONE
-	const DEX_GARAGARA    ; 69 MAROWAK
-	const DEX_SAWAMULAR   ; 6a HITMONLEE
-	const DEX_EBIWALAR    ; 6b HITMONCHAN
-	const DEX_BERORINGA   ; 6c LICKITUNG
-	const DEX_DOGARS      ; 6d KOFFING
-	const DEX_MATADOGAS   ; 6e WEEZING
-	const DEX_SIHORN      ; 6f RHYHORN
-	const DEX_SIDON       ; 70 RHYDON
-	const DEX_LUCKY       ; 71 CHANSEY
-	const DEX_MONJARA     ; 72 TANGELA
-	const DEX_GARURA      ; 73 KANGASKHAN
-	const DEX_TATTU       ; 74 HORSEA
-	const DEX_SEADRA      ; 75 SEADRA
-	const DEX_TOSAKINTO   ; 76 GOLDEEN
-	const DEX_AZUMAO      ; 77 SEAKING
-	const DEX_HITODEMAN   ; 78 STARYU
-	const DEX_STARMIE     ; 79 STARMIE
-	const DEX_BARRIERD    ; 7a MR__MIME
-	const DEX_STRIKE      ; 7b SCYTHER
-	const DEX_ROUGELA     ; 7c JYNX
-	const DEX_ELEBOO      ; 7d ELECTABUZZ
-	const DEX_BOOBER      ; 7e MAGMAR
-	const DEX_KAILIOS     ; 7f PINSIR
-	const DEX_KENTAUROS   ; 80 TAUROS
-	const DEX_KOIKING     ; 81 MAGIKARP
-	const DEX_GYARADOS    ; 82 GYARADOS
-	const DEX_LAPLACE     ; 83 LAPRAS
-	const DEX_METAMON     ; 84 DITTO
-	const DEX_EIEVUI      ; 85 EEVEE
-	const DEX_SHOWERS     ; 86 VAPOREON
-	const DEX_THUNDERS    ; 87 JOLTEON
-	const DEX_BOOSTER     ; 88 FLAREON
-	const DEX_PORYGON     ; 89 PORYGON
-	const DEX_OMNITE      ; 8a OMANYTE
-	const DEX_OMSTAR      ; 8b OMASTAR
-	const DEX_KABUTO      ; 8c KABUTO
-	const DEX_KABUTOPS    ; 8d KABUTOPS
-	const DEX_PTERA       ; 8e AERODACTYL
-	const DEX_KABIGON     ; 8f SNORLAX
-	const DEX_FREEZER     ; 90 ARTICUNO
-	const DEX_THUNDER     ; 91 ZAPDOS
-	const DEX_FIRE        ; 92 MOLTRES
-	const DEX_MINIRYU     ; 93 DRATINI
-	const DEX_HAKURYU     ; 94 DRAGONAIR
-	const DEX_KAIRYU      ; 95 DRAGONITE
-	const DEX_MEWTWO      ; 96 MEWTWO
-	const DEX_MEW         ; 97 MEW
-	const DEX_HAPPA       ; 98 CHIKORITA
-	const DEX_HANAMOGURA  ; 99 BAYLEEF
-	const DEX_HANARYU     ; 9a MEGANIUM
-	const DEX_HONOGUMA    ; 9b
-	const DEX_VOLBEAR     ; 9c
-	const DEX_DYNABEAR    ; 9d
-	const DEX_KURUSU      ; 9e
-	const DEX_AQUA        ; 9f
-	const DEX_AQUARIA     ; a0
-	const DEX_HOHO        ; a1 HOOTHOOT
-	const DEX_BOBO        ; a2 NOCTOWL
-	const DEX_PACHIMEE    ; a3 MAREEP
-	const DEX_MOKOKO      ; a4 FLAAFFY
-	const DEX_DENRYU      ; a5 AMPHAROS
-	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_MIZUUO      ; af QUAGSIRE
-	const DEX_NATY        ; b0 NATU
-	const DEX_NATIO       ; b1 XATU
-	const DEX_GYOPIN      ; b2 (baby GOLDEEN)
-	const DEX_MARIL       ; b3 MARILL
-	const DEX_MANBO1      ; b4
-	const DEX_IKARI       ; b5
-	const DEX_GROTESS     ; b6
-	const DEX_EKSING      ; b7 CROBAT
-	const DEX_PARA        ; b8 (baby PARAS)
-	const DEX_KOKUMO      ; b9 SPINARAK
-	const DEX_TWOHEAD     ; ba ARIADOS
-	const DEX_YOROIDORI   ; bb SKARMORY
-	const DEX_ANIMON      ; bc (evolved DITTO)
-	const DEX_HINAZU      ; bd (baby DODUO)
-	const DEX_SUNNY       ; be SUNFLORA
-	const DEX_PAON        ; bf PHANPY
-	const DEX_DONPHAN     ; c0 DONPHAN
-	const DEX_TWINZ       ; c1 (baby GIRAFARIG)
-	const DEX_KIRINRIKI   ; c2 GIRAFARIG
-	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_MITSUBOSHI  ; cb LEDIAN
-	const DEX_PUCHICORN   ; cc (baby PONYTA)
-	const DEX_EIFIE       ; cd ESPEON
-	const DEX_BLACKY      ; ce UMBREON
-	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_PUDIE       ; d5 (baby GROWLITHE)
-	const DEX_HANEKO      ; d6 HOPPIP
-	const DEX_POPONEKO    ; d7 SKIPLOOM
-	const DEX_WATANEKO    ; d8 JUMPLUFF
-	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_TSUBOMITTO  ; de (evolved WEEPINBELL)
-	const DEX_MILTANK     ; df MILTANK
-	const DEX_BOMBSEEKER  ; e0
-	const DEX_GIFT        ; e1 DELIBIRD
-	const DEX_KOTORA      ; e2
-	const DEX_RAITORA     ; e3
-	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_SCISSORS    ; e9 SCIZOR
-	const DEX_PURAKKUSU   ; ea (evolved PINSIR)
-	const DEX_DEVIL       ; eb HOUNDOUR
-	const DEX_HELGAA      ; ec HOUNDOOM
-	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_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_TAIL        ; fa AIPOM
-	const DEX_LEAFY       ; fb LEAFEON (evolved EEVEE)
+	const DEX_NONE          ; 00
+	const DEX_BULBASAUR     ; 01
+	const DEX_IVYSAUR       ; 02
+	const DEX_VENUSAUR      ; 03
+	const DEX_CHARMANDER    ; 04
+	const DEX_CHARMELEON    ; 05
+	const DEX_CHARIZARD     ; 06
+	const DEX_SQUIRTLE      ; 07
+	const DEX_WARTORTLE     ; 08
+	const DEX_BLASTOISE     ; 09
+	const DEX_CATERPIE      ; 0a
+	const DEX_METAPOD       ; 0b
+	const DEX_BUTTERFREE    ; 0c
+	const DEX_WEEDLE        ; 0d
+	const DEX_KAKUNA        ; 0e
+	const DEX_BEEDRILL      ; 0f
+	const DEX_PIDGEY        ; 10
+	const DEX_PIDGEOTTO     ; 11
+	const DEX_PIDGEOT       ; 12
+	const DEX_RATTATA       ; 13
+	const DEX_RATICATE      ; 14
+	const DEX_SPEAROW       ; 15
+	const DEX_FEAROW        ; 16
+	const DEX_EKANS         ; 17
+	const DEX_ARBOK         ; 18
+	const DEX_PIKACHU       ; 19
+	const DEX_RAICHU        ; 1a
+	const DEX_SANDSHREW     ; 1b
+	const DEX_SANDSLASH     ; 1c
+	const DEX_NIDORAN_F     ; 1d
+	const DEX_NIDORINA      ; 1e
+	const DEX_NIDOQUEEN     ; 1f
+	const DEX_NIDORAN_M     ; 20
+	const DEX_NIDORINO      ; 21
+	const DEX_NIDOKING      ; 22
+	const DEX_CLEFAIRY      ; 23
+	const DEX_CLEFABLE      ; 24
+	const DEX_VULPIX        ; 25
+	const DEX_NINETALES     ; 26
+	const DEX_JIGGLYPUFF    ; 27
+	const DEX_WIGGLYTUFF    ; 28
+	const DEX_ZUBAT         ; 29
+	const DEX_GOLBAT        ; 2a
+	const DEX_ODDISH        ; 2b
+	const DEX_GLOOM         ; 2c
+	const DEX_VILEPLUME     ; 2d
+	const DEX_PARAS         ; 2e
+	const DEX_PARASECT      ; 2f
+	const DEX_VENONAT       ; 30
+	const DEX_VENOMOTH      ; 31
+	const DEX_DIGLETT       ; 32
+	const DEX_DUGTRIO       ; 33
+	const DEX_MEOWTH        ; 34
+	const DEX_PERSIAN       ; 35
+	const DEX_PSYDUCK       ; 36
+	const DEX_GOLDUCK       ; 37
+	const DEX_MANKEY        ; 38
+	const DEX_PRIMEAPE      ; 39
+	const DEX_GROWLITHE     ; 3a
+	const DEX_ARCANINE      ; 3b
+	const DEX_POLIWAG       ; 3c
+	const DEX_POLIWHIRL     ; 3d
+	const DEX_POLIWRATH     ; 3e
+	const DEX_ABRA          ; 3f
+	const DEX_KADABRA       ; 40
+	const DEX_ALAKAZAM      ; 41
+	const DEX_MACHOP        ; 42
+	const DEX_MACHOKE       ; 43
+	const DEX_MACHAMP       ; 44
+	const DEX_BELLSPROUT    ; 45
+	const DEX_WEEPINBELL    ; 46
+	const DEX_VICTREEBEL    ; 47
+	const DEX_TENTACOOL     ; 48
+	const DEX_TENTACRUEL    ; 49
+	const DEX_GEODUDE       ; 4a
+	const DEX_GRAVELER      ; 4b
+	const DEX_GOLEM         ; 4c
+	const DEX_PONYTA        ; 4d
+	const DEX_RAPIDASH      ; 4e
+	const DEX_SLOWPOKE      ; 4f
+	const DEX_SLOWBRO       ; 50
+	const DEX_MAGNEMITE     ; 51
+	const DEX_MAGNETON      ; 52
+	const DEX_FARFETCHD     ; 53
+	const DEX_DODUO         ; 54
+	const DEX_DODRIO        ; 55
+	const DEX_SEEL          ; 56
+	const DEX_DEWGONG       ; 57
+	const DEX_GRIMER        ; 58
+	const DEX_MUK           ; 59
+	const DEX_SHELLDER      ; 5a
+	const DEX_CLOYSTER      ; 5b
+	const DEX_GASTLY        ; 5c
+	const DEX_HAUNTER       ; 5d
+	const DEX_GENGAR        ; 5e
+	const DEX_ONIX          ; 5f
+	const DEX_DROWZEE       ; 60
+	const DEX_HYPNO         ; 61
+	const DEX_KRABBY        ; 62
+	const DEX_KINGLER       ; 63
+	const DEX_VOLTORB       ; 64
+	const DEX_ELECTRODE     ; 65
+	const DEX_EXEGGCUTE     ; 66
+	const DEX_EXEGGUTOR     ; 67
+	const DEX_CUBONE        ; 68
+	const DEX_MAROWAK       ; 69
+	const DEX_HITMONLEE     ; 6a
+	const DEX_HITMONCHAN    ; 6b
+	const DEX_LICKITUNG     ; 6c
+	const DEX_KOFFING       ; 6d
+	const DEX_WEEZING       ; 6e
+	const DEX_RHYHORN       ; 6f
+	const DEX_RHYDON        ; 70
+	const DEX_CHANSEY       ; 71
+	const DEX_TANGELA       ; 72
+	const DEX_KANGASKHAN    ; 73
+	const DEX_HORSEA        ; 74
+	const DEX_SEADRA        ; 75
+	const DEX_GOLDEEN       ; 76
+	const DEX_SEAKING       ; 77
+	const DEX_STARYU        ; 78
+	const DEX_STARMIE       ; 79
+	const DEX_MRMIME        ; 7a
+	const DEX_SCYTHER       ; 7b
+	const DEX_JYNX          ; 7c
+	const DEX_ELECTABUZZ    ; 7d
+	const DEX_MAGMAR        ; 7e
+	const DEX_PINSIR        ; 7f
+	const DEX_TAUROS        ; 80
+	const DEX_MAGIKARP      ; 81
+	const DEX_GYARADOS      ; 82
+	const DEX_LAPRAS        ; 83
+	const DEX_DITTO         ; 84
+	const DEX_EEVEE         ; 85
+	const DEX_VAPOREON      ; 86
+	const DEX_JOLTEON       ; 87
+	const DEX_FLAREON       ; 88
+	const DEX_PORYGON       ; 89
+	const DEX_OMANYTE       ; 8a
+	const DEX_OMASTAR       ; 8b
+	const DEX_KABUTO        ; 8c
+	const DEX_KABUTOPS      ; 8d
+	const DEX_AERODACTYL    ; 8e
+	const DEX_SNORLAX       ; 8f
+	const DEX_ARTICUNO      ; 90
+	const DEX_ZAPDOS        ; 91
+	const DEX_MOLTRES       ; 92
+	const DEX_DRATINI       ; 93
+	const DEX_DRAGONAIR     ; 94
+	const DEX_DRAGONITE     ; 95
+	const DEX_MEWTWO        ; 96
+	const DEX_MEW           ; 97
+	const DEX_HAPPA         ; 98 CHIKORITA
+	const DEX_HANAMOGURA    ; 99 BAYLEEF
+	const DEX_HANARYU       ; 9a MEGANIUM
+	const DEX_HONOGUMA      ; 9b
+	const DEX_VOLBEAR       ; 9c
+	const DEX_DYNABEAR      ; 9d
+	const DEX_KURUSU        ; 9e
+	const DEX_AQUA          ; 9f
+	const DEX_AQUARIA       ; a0
+	const DEX_HOHO          ; a1 HOOTHOOT
+	const DEX_BOBO          ; a2 NOCTOWL
+	const DEX_PACHIMEE      ; a3 MAREEP
+	const DEX_MOKOKO        ; a4 FLAAFFY
+	const DEX_DENRYU        ; a5 AMPHAROS
+	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_MIZUUO        ; af QUAGSIRE
+	const DEX_NATY          ; b0 NATU
+	const DEX_NATIO         ; b1 XATU
+	const DEX_GYOPIN        ; b2 (baby GOLDEEN)
+	const DEX_MARIL         ; b3 MARILL
+	const DEX_MANBO1        ; b4
+	const DEX_IKARI         ; b5
+	const DEX_GROTESS       ; b6
+	const DEX_EKSING        ; b7 CROBAT
+	const DEX_PARA          ; b8 (baby PARAS)
+	const DEX_KOKUMO        ; b9 SPINARAK
+	const DEX_TWOHEAD       ; ba ARIADOS
+	const DEX_YOROIDORI     ; bb SKARMORY
+	const DEX_ANIMON        ; bc (evolved DITTO)
+	const DEX_HINAZU        ; bd (baby DODUO)
+	const DEX_SUNNY         ; be SUNFLORA
+	const DEX_PAON          ; bf PHANPY
+	const DEX_DONPHAN       ; c0 DONPHAN
+	const DEX_TWINZ         ; c1 (baby GIRAFARIG)
+	const DEX_KIRINRIKI     ; c2 GIRAFARIG
+	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_MITSUBOSHI    ; cb LEDIAN
+	const DEX_PUCHICORN     ; cc (baby PONYTA)
+	const DEX_EIFIE         ; cd ESPEON
+	const DEX_BLACKY        ; ce UMBREON
+	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_PUDIE         ; d5 (baby GROWLITHE)
+	const DEX_HANEKO        ; d6 HOPPIP
+	const DEX_POPONEKO      ; d7 SKIPLOOM
+	const DEX_WATANEKO      ; d8 JUMPLUFF
+	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_TSUBOMITTO    ; de (evolved WEEPINBELL)
+	const DEX_MILTANK       ; df MILTANK
+	const DEX_BOMBSEEKER    ; e0
+	const DEX_GIFT          ; e1 DELIBIRD
+	const DEX_KOTORA        ; e2
+	const DEX_RAITORA       ; e3
+	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_SCISSORS      ; e9 SCIZOR
+	const DEX_PURAKKUSU     ; ea (evolved PINSIR)
+	const DEX_DEVIL         ; eb HOUNDOUR
+	const DEX_HELGAA        ; ec HOUNDOOM
+	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_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_TAIL          ; fa AIPOM
+	const DEX_LEAFY         ; fb LEAFEON (evolved EEVEE)
 NUM_POKEMON EQU const_value - 1
-	const DEX_FC          ; fc
-	const DEX_EGG         ; fd EGG
-	const DEX_FE          ; fe
+	const DEX_FC            ; fc
+	const DEX_EGG           ; fd EGG
+	const DEX_FE            ; fe
 
-; Annon forms
+  ;  Annon 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
+	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
 NUM_ANNON EQU const_value - 1 ; 26
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 24c4bf9..bb303e9 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -1,194 +1,194 @@
-; old RBY index numbers
-; used primarily for cries
+ ;  old RBY index numbers
+ ;  used primarily for cries
 	const_def
-	const MON_NONE        ; 00
-	const MON_SIDON       ; 01 RHYDON
-	const MON_GARURA      ; 02 KANGASKHAN
-	const MON_NIDORAN_M   ; 03 NIDORAN_M
-	const MON_PIPPI       ; 04 CLEFAIRY
-	const MON_ONISUZUME   ; 05 SPEAROW
-	const MON_BIRIRIDAMA  ; 06 VOLTORB
-	const MON_NIDOKING    ; 07 NIDOKING
-	const MON_YADORAN     ; 08 SLOWBRO
-	const MON_FUSHIGISOU  ; 09 IVYSAUR
-	const MON_NASSY       ; 0a EXEGGUTOR
-	const MON_BERORINGA   ; 0b LICKITUNG
-	const MON_TAMATAMA    ; 0c EXEGGCUTE
-	const MON_BETBETER    ; 0d GRIMER
-	const MON_GANGAR      ; 0e GENGAR
-	const MON_NIDORAN_F   ; 0f NIDORAN_F
-	const MON_NIDOQUEEN   ; 10 NIDOQUEEN
-	const MON_KARAKARA    ; 11 CUBONE
-	const MON_SIHORN      ; 12 RHYHORN
-	const MON_LAPLACE     ; 13 LAPRAS
-	const MON_WINDIE      ; 14 ARCANINE
-	const MON_MEW         ; 15 MEW
-	const MON_GYARADOS    ; 16 GYARADOS
-	const MON_SHELLDER    ; 17 SHELLDER
-	const MON_MENOKURAGE  ; 18 TENTACOOL
-	const MON_GHOS        ; 19 GASTLY
-	const MON_STRIKE      ; 1a SCYTHER
-	const MON_HITODEMAN   ; 1b STARYU
-	const MON_KAMEX       ; 1c BLASTOISE
-	const MON_KAILIOS     ; 1d PINSIR
-	const MON_MONJARA     ; 1e TANGELA
-	const MON_KAPOERER    ; 1f HITMONTOP
-	const MON_PUDIE       ; 20 (baby GROWLITHE)
-	const MON_GARDIE      ; 21 GROWLITHE
-	const MON_IWARK       ; 22 ONIX
-	const MON_ONIDRILL    ; 23 FEAROW
-	const MON_POPPO       ; 24 PIDGEY
-	const MON_YADON       ; 25 SLOWPOKE
-	const MON_YUNGERER    ; 26 KADABRA
-	const MON_GOLONE      ; 27 GRAVELER
-	const MON_LUCKY       ; 28 CHANSEY
-	const MON_GORIKY      ; 29 MACHOKE
-	const MON_BARRIERD    ; 2a MR__MIME
-	const MON_SAWAMULAR   ; 2b HITMONLEE
-	const MON_EBIWALAR    ; 2c HITMONCHAN
-	const MON_ARBOK       ; 2d ARBOK
-	const MON_PARASECT    ; 2e PARASECT
-	const MON_KODUCK      ; 2f PSYDUCK
-	const MON_SLEEPE      ; 30 DROWZEE
-	const MON_GOLONYA     ; 31 GOLEM
-	const MON_HANEKO      ; 32 HOPPIP
-	const MON_BOOBER      ; 33 MAGMAR
-	const MON_TAIL        ; 34 AIPOM
-	const MON_ELEBOO      ; 35 ELECTABUZZ
-	const MON_RARECOIL    ; 36 MAGNETON
-	const MON_DOGARS      ; 37 KOFFING
-	const MON_POPONEKO    ; 38 SKIPLOOM
-	const MON_MANKEY      ; 39 MANKEY
-	const MON_PAWOU       ; 3a SEEL
-	const MON_DIGDA       ; 3b DIGLETT
-	const MON_KENTAUROS   ; 3c TAUROS
-	const MON_WATANEKO    ; 3d JUMPLUFF
-	const MON_BARIRINA    ; 3e MIME_JR (baby MR__MIME)
-	const MON_LIP         ; 3f SMOOCHUM
-	const MON_KAMONEGI    ; 40 FARFETCH_D
-	const MON_KONGPANG    ; 41 VENONAT
-	const MON_KAIRYU      ; 42 DRAGONITE
-	const MON_ELEBABY     ; 43 ELEKID
-	const MON_BOOBY       ; 44 MAGBY
-	const MON_KIREIHANA   ; 45 BELLOSSOM
-	const MON_DODO        ; 46 DODUO
-	const MON_NYOROMO     ; 47 POLIWAG
-	const MON_ROUGELA     ; 48 JYNX
-	const MON_FIRE        ; 49 MOLTRES
-	const MON_FREEZER     ; 4a ARTICUNO
-	const MON_THUNDER     ; 4b ZAPDOS
-	const MON_METAMON     ; 4c DITTO
-	const MON_NYARTH      ; 4d MEOWTH
-	const MON_CRAB        ; 4e KRABBY
-	const MON_TSUBOMITTO  ; 4f (evolved WEEPINBELL)
-	const MON_MILTANK     ; 50 MILTANK
-	const MON_BOMBSEEKER  ; 51 (MISSINGNO)
-	const MON_ROKON       ; 52 VULPIX
-	const MON_KYUKON      ; 53 NINETALES
-	const MON_PIKACHU     ; 54 PIKACHU
-	const MON_RAICHU      ; 55 RAICHU
-	const MON_GIFT        ; 56 DELIBIRD
-	const MON_KOTORA      ; 57 (MISSINGNO)
-	const MON_MINIRYU     ; 58 DRATINI
-	const MON_HAKURYU     ; 59 DRAGONAIR
-	const MON_KABUTO      ; 5a KABUTO
-	const MON_KABUTOPS    ; 5b KABUTOPS
-	const MON_TATTU       ; 5c HORSEA
-	const MON_SEADRA      ; 5d SEADRA
-	const MON_RAITORA     ; 5e (MISSINGNO)
-	const MON_MADAME      ; 5f (evolved FARFETCH_D)
-	const MON_SAND        ; 60 SANDSHREW
-	const MON_SANDPAN     ; 61 SANDSLASH
-	const MON_OMNITE      ; 62 OMANYTE
-	const MON_OMSTAR      ; 63 OMASTAR
-	const MON_PURIN       ; 64 JIGGLYPUFF
-	const MON_PUKURIN     ; 65 WIGGLYTUFF
-	const MON_EIEVUI      ; 66 EEVEE
-	const MON_BOOSTER     ; 67 FLAREON
-	const MON_THUNDERS    ; 68 JOLTEON
-	const MON_SHOWERS     ; 69 VAPOREON
-	const MON_WANRIKY     ; 6a MACHOP
-	const MON_ZUBAT       ; 6b ZUBAT
-	const MON_ARBO        ; 6c EKANS
-	const MON_PARAS       ; 6d PARAS
-	const MON_NYOROZO     ; 6e POLIWHIRL
-	const MON_NYOROBON    ; 6f POLIWRATH
-	const MON_BEEDLE      ; 70 WEEDLE
-	const MON_COCOON      ; 71 KAKUNA
-	const MON_SPEAR       ; 72 BEEDRILL
-	const MON_NOROWARA    ; 73 (MISSINGNO)
-	const MON_DODORIO     ; 74 DODRIO
-	const MON_OKORIZARU   ; 75 PRIMEAPE
-	const MON_DUGTRIO     ; 76 DUGTRIO
-	const MON_MORPHON     ; 77 VENOMOTH
-	const MON_JUGON       ; 78 DEWGONG
-	const MON_KYONPAN     ; 79 (MISSINGNO)
-	const MON_YAMIKARASU  ; 7a MURKROW
-	const MON_CATERPIE    ; 7b CATERPIE
-	const MON_TRANSEL     ; 7c METAPOD
-	const MON_BUTTERFREE  ; 7d BUTTERFREE
-	const MON_KAIRIKY     ; 7e MACHAMP
-	const MON_HAPPI       ; 7f BLISSEY
-	const MON_GOLDUCK     ; 80 GOLDUCK
-	const MON_SLEEPER     ; 81 HYPNO
-	const MON_GOLBAT      ; 82 GOLBAT
-	const MON_MEWTWO      ; 83 MEWTWO
-	const MON_KABIGON     ; 84 SNORLAX
-	const MON_KOIKING     ; 85 MAGIKARP
-	const MON_SCISSORS    ; 86 SCIZOR
-	const MON_PURAKKUSU   ; 87 (evolved PINSIR)
-	const MON_BETBETON    ; 88 MUK
-	const MON_DEVIL       ; 89 HOUNDOUR
-	const MON_KINGLER     ; 8a KINGLER
-	const MON_PARSHEN     ; 8b CLOYSTER
-	const MON_HELGAA      ; 8c HOUNDOOM
-	const MON_MARUMINE    ; 8d ELECTRODE
-	const MON_PIXY        ; 8e CLEFABLE
-	const MON_MATADOGAS   ; 8f WEEZING
-	const MON_PERSIAN     ; 90 PERSIAN
-	const MON_GARAGARA    ; 91 MAROWAK
-	const MON_WOLFMAN     ; 92 (MISSINGNO)
-	const MON_GHOST       ; 93 HAUNTER
-	const MON_CASEY       ; 94 ABRA
-	const MON_FOODIN      ; 95 ALAKAZAM
-	const MON_PIGEON      ; 96 PIDGEOTTO
-	const MON_PIGEOT      ; 97 PIDGEOT
-	const MON_STARMIE     ; 98 STARMIE
-	const MON_FUSHIGIDANE ; 99 BULBASAUR
-	const MON_FUSHIGIBANA ; 9a VENUSAUR
-	const MON_DOKUKURAGE  ; 9b TENTACRUEL
-	const MON_WARWOLF     ; 9c (MISSINGNO)
-	const MON_TOSAKINTO   ; 9d GOLDEEN
-	const MON_AZUMAO      ; 9e SEAKING
-	const MON_PORYGON2    ; 9f PORYGON2
-	const MON_NAMEIL      ; a0 LICKILICKY (evolved LICKITUNG)
-	const MON_HAGANEIL    ; a1 STEELIX
-	const MON_KINGDRA     ; a2 KINGDRA
-	const MON_PONYTA      ; a3 PONYTA
-	const MON_GALLOP      ; a4 RAPIDASH
-	const MON_KORATTA     ; a5 RATTATA
-	const MON_RATTA       ; a6 RATICATE
-	const MON_NIDORINO    ; a7 NIDORINO
-	const MON_NIDORINA    ; a8 NIDORINA
-	const MON_ISITSUBUTE  ; a9 GEODUDE
-	const MON_PORYGON     ; aa PORYGON
-	const MON_PTERA       ; ab AERODACTYL
-	const MON_RAI         ; ac RAIKOU
-	const MON_COIL        ; ad MAGNEMITE
-	const MON_EN          ; ae ENTEI
-	const MON_SUI         ; af SUICUNE
-	const MON_HITOKAGE    ; b0 CHARMANDER
-	const MON_ZENIGAME    ; b1 SQUIRTLE
-	const MON_LIZARDO     ; b2 CHARMELEON
-	const MON_KAMEIL      ; b3 WARTORTLE
-	const MON_LIZARDON    ; b4 CHARIZARD
-	const MON_NYULA       ; b5 SNEASEL
-	const MON_HOUOU       ; b6 HO_OH
-	const MON_TOGEPY      ; b7 TOGEPI
-	const MON_BULU        ; b8 SNUBBULL
-	const MON_NAZONOKUSA  ; b9 ODDISH
-	const MON_KUSAIHANA   ; ba GLOOM
-	const MON_RUFFRESIA   ; bb VILEPLUME
-	const MON_MADATSUBOMI ; bc BELLSPROUT
-	const MON_UTSUDON     ; bd WEEPINBELL
-	const MON_UTSUBOT     ; be VICTREEBEL
+	const MON_NONE          ; 00
+	const MON_RHYDON        ; 01
+	const MON_KANGASKHAN    ; 02
+	const MON_NIDORAN_M     ; 03
+	const MON_CLEFAIRY      ; 04
+	const MON_SPEAROW       ; 05
+	const MON_VOLTORB       ; 06
+	const MON_NIDOKING      ; 07
+	const MON_SLOWBRO       ; 08
+	const MON_IVYSAUR       ; 09
+	const MON_EXEGGUTOR     ; 0a
+	const MON_LICKITUNG     ; 0b
+	const MON_EXEGGCUTE     ; 0c
+	const MON_GRIMER        ; 0d
+	const MON_GENGAR        ; 0e
+	const MON_NIDORAN_F     ; 0f
+	const MON_NIDOQUEEN     ; 10
+	const MON_CUBONE        ; 11
+	const MON_RHYHORN       ; 12
+	const MON_LAPRAS        ; 13
+	const MON_ARCANINE      ; 14
+	const MON_MEW           ; 15
+	const MON_GYARADOS      ; 16
+	const MON_SHELLDER      ; 17
+	const MON_TENTACOOL     ; 18
+	const MON_GASTLY        ; 19
+	const MON_SCYTHER       ; 1a
+	const MON_STARYU        ; 1b
+	const MON_BLASTOISE     ; 1c
+	const MON_PINSIR        ; 1d
+	const MON_TANGELA       ; 1e
+	const MON_KAPOERER      ; 1f HITMONTOP
+	const MON_PUDIE         ; 20 (baby GROWLITHE)
+	const MON_GROWLITHE     ; 21
+	const MON_ONIX          ; 22
+	const MON_FEAROW        ; 23
+	const MON_PIDGEY        ; 24
+	const MON_SLOWPOKE      ; 25
+	const MON_KADABRA       ; 26
+	const MON_GRAVELER      ; 27
+	const MON_CHANSEY       ; 28
+	const MON_MACHOKE       ; 29
+	const MON_MRMIME        ; 2a
+	const MON_HITMONLEE     ; 2b
+	const MON_HITMONCHAN    ; 2c
+	const MON_ARBOK         ; 2d
+	const MON_PARASECT      ; 2e
+	const MON_PSYDUCK       ; 2f
+	const MON_DROWZEE       ; 30
+	const MON_GOLEM         ; 31
+	const MON_HANEKO        ; 32 HOPPIP
+	const MON_MAGMAR        ; 33
+	const MON_TAIL          ; 34 AIPOM
+	const MON_ELECTABUZZ    ; 35
+	const MON_MAGNETON      ; 36
+	const MON_KOFFING       ; 37
+	const MON_POPONEKO      ; 38 SKIPLOOM
+	const MON_MANKEY        ; 39
+	const MON_SEEL          ; 3a
+	const MON_DIGLETT       ; 3b
+	const MON_TAUROS        ; 3c
+	const MON_WATANEKO      ; 3d JUMPLUFF
+	const MON_BARIRINA      ; 3e MIME_JR
+	const MON_LIP           ; 3f SMOOCHUM
+	const MON_FARFETCHD     ; 40
+	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_DODUO         ; 46
+	const MON_POLIWAG       ; 47
+	const MON_JYNX          ; 48
+	const MON_MOLTRES       ; 49
+	const MON_ARTICUNO      ; 4a
+	const MON_ZAPDOS        ; 4b
+	const MON_DITTO         ; 4c
+	const MON_MEOWTH        ; 4d
+	const MON_KRABBY        ; 4e
+	const MON_TSUBOMITTO    ; 4f (evolved WEEPINBELL)
+	const MON_MILTANK       ; 50 MILTANK
+	const MON_BOMBSEEKER    ; 51 (MISSINGNO)
+	const MON_VULPIX        ; 52
+	const MON_NINETALES     ; 53
+	const MON_PIKACHU       ; 54
+	const MON_RAICHU        ; 55
+	const MON_GIFT          ; 56 DELIBIRD
+	const MON_KOTORA        ; 57 (MISSINGNO)
+	const MON_DRATINI       ; 58
+	const MON_DRAGONAIR     ; 59
+	const MON_KABUTO        ; 5a
+	const MON_KABUTOPS      ; 5b
+	const MON_HORSEA        ; 5c
+	const MON_SEADRA        ; 5d
+	const MON_RAITORA       ; 5e (MISSINGNO)
+	const MON_MADAME        ; 5f (evolved FARFETCH_D)
+	const MON_SANDSHREW     ; 60
+	const MON_SANDSLASH     ; 61
+	const MON_OMANYTE       ; 62
+	const MON_OMASTAR       ; 63
+	const MON_JIGGLYPUFF    ; 64
+	const MON_WIGGLYTUFF    ; 65
+	const MON_EEVEE         ; 66
+	const MON_FLAREON       ; 67
+	const MON_JOLTEON       ; 68
+	const MON_VAPOREON      ; 69
+	const MON_MACHOP        ; 6a
+	const MON_ZUBAT         ; 6b
+	const MON_EKANS         ; 6c
+	const MON_PARAS         ; 6d
+	const MON_POLIWHIRL     ; 6e
+	const MON_POLIWRATH     ; 6f
+	const MON_WEEDLE        ; 70
+	const MON_KAKUNA        ; 71
+	const MON_BEEDRILL      ; 72
+	const MON_NOROWARA      ; 73 (MISSINGNO)
+	const MON_DODRIO        ; 74
+	const MON_PRIMEAPE      ; 75
+	const MON_DUGTRIO       ; 76
+	const MON_VENOMOTH      ; 77
+	const MON_DEWGONG       ; 78
+	const MON_KYONPAN       ; 79 (MISSINGNO)
+	const MON_YAMIKARASU    ; 7a MURKROW
+	const MON_CATERPIE      ; 7b
+	const MON_METAPOD       ; 7c
+	const MON_BUTTERFREE    ; 7d
+	const MON_MACHAMP       ; 7e
+	const MON_HAPPI         ; 7f BLISSEY
+	const MON_GOLDUCK       ; 80
+	const MON_HYPNO         ; 81
+	const MON_GOLBAT        ; 82
+	const MON_MEWTWO        ; 83
+	const MON_SNORLAX       ; 84
+	const MON_MAGIKARP      ; 85
+	const MON_SCISSORS      ; 86 SCIZOR
+	const MON_PURAKKUSU     ; 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_ELECTRODE     ; 8d
+	const MON_CLEFABLE      ; 8e
+	const MON_WEEZING       ; 8f
+	const MON_PERSIAN       ; 90
+	const MON_MAROWAK       ; 91
+	const MON_WOLFMAN       ; 92 (MISSINGNO)
+	const MON_HAUNTER       ; 93
+	const MON_ABRA          ; 94
+	const MON_ALAKAZAM      ; 95
+	const MON_PIDGEOTTO     ; 96
+	const MON_PIDGEOT       ; 97
+	const MON_STARMIE       ; 98
+	const MON_BULBASAUR     ; 99
+	const MON_VENUSAUR      ; 9a
+	const MON_TENTACRUEL    ; 9b
+	const MON_WARWOLF       ; 9c (MISSINGNO)
+	const MON_GOLDEEN       ; 9d
+	const MON_SEAKING       ; 9e
+	const MON_PORYGON2      ; 9f
+	const MON_NAMEIL        ; a0 LICKILICKY (evolved LICKITUNG)
+	const MON_HAGANEIL      ; a1
+	const MON_KINGDRA       ; a2
+	const MON_PONYTA        ; a3
+	const MON_RAPIDASH      ; a4
+	const MON_RATTATA       ; a5
+	const MON_RATICATE      ; a6
+	const MON_NIDORINO      ; a7
+	const MON_NIDORINA      ; a8
+	const MON_GEODUDE       ; a9
+	const MON_PORYGON       ; aa
+	const MON_AERODACTYL    ; ab
+	const MON_RAI           ; ac RAIKOU
+	const MON_MAGNEMITE     ; ad
+	const MON_EN            ; ae ENTEI
+	const MON_SUI           ; af SUICUNE
+	const MON_CHARMANDER    ; b0
+	const MON_SQUIRTLE      ; b1
+	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_ODDISH        ; b9
+	const MON_GLOOM         ; ba
+	const MON_VILEPLUME     ; bb
+	const MON_BELLSPROUT    ; bc
+	const MON_WEEPINBELL    ; bd
+	const MON_VICTREEBEL    ; be
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index 12f5e3a..4c14691 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -76,14 +76,14 @@
 	const SPRITE_SAILOR                ; 4a
 	const SPRITE_HELMET                ; 4b
 	const SPRITE_BURGLAR               ; 4c
-	const SPRITE_SIDON                 ; 4d RHYDON
-	const SPRITE_PIPPI                 ; 4e CLEFAIRY
-	const SPRITE_POPPO                 ; 4f PIDGEY
-	const SPRITE_LIZARDON              ; 50 CHARIZARD
-	const SPRITE_KABIGON               ; 51 SNORLAX
-	const SPRITE_PAWOU                 ; 52 SEEL
-	const SPRITE_NYOROBON              ; 53 POLIWRATH
-	const SPRITE_LAPLACE               ; 54 LAPRAS
+	const SPRITE_RHYDON                ; 4d RHYDON
+	const SPRITE_CLEFAIRY              ; 4e CLEFAIRY
+	const SPRITE_PIDGEY                ; 4f PIDGEY
+	const SPRITE_CHARIZARD             ; 50 CHARIZARD
+	const SPRITE_SNORLAX               ; 51 SNORLAX
+	const SPRITE_SEEL                  ; 52 SEEL
+	const SPRITE_POLIWRATH             ; 53 POLIWRATH
+	const SPRITE_LAPRAS                ; 54 LAPRAS
 	const SPRITE_POKE_BALL             ; 55
 	const SPRITE_POKEDEX               ; 56
 	const SPRITE_PAPER                 ; 57
diff --git a/data/maps/objects/Fonto.asm b/data/maps/objects/Fonto.asm
index 09fcf84..69c1cd2 100644
--- a/data/maps/objects/Fonto.asm
+++ b/data/maps/objects/Fonto.asm
@@ -26,7 +26,7 @@ Fonto_MapEvents::
 
 	def_object_events
 	object_event  2,  4, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  5, SPRITE_SIDON, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_RHYDON, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  5, 14, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 16,  8, SPRITE_TWIN, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
diff --git a/data/maps/objects/FontoRocketHouse.asm b/data/maps/objects/FontoRocketHouse.asm
index d7db86f..1f45e0d 100644
--- a/data/maps/objects/FontoRocketHouse.asm
+++ b/data/maps/objects/FontoRocketHouse.asm
@@ -17,7 +17,7 @@ FontoRocketHouse_MapEvents::
 	object_event  5,  4, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10,  2, SPRITE_ROCKET_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14,  2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 12,  2, SPRITE_POPPO, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 12,  2, SPRITE_PIDGEY, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 FontoRocketHouse_Blocks::
 INCBIN "maps/FontoRocketHouse.blk"
diff --git a/data/maps/objects/Haiteku.asm b/data/maps/objects/Haiteku.asm
index dbae101..7195303 100644
--- a/data/maps/objects/Haiteku.asm
+++ b/data/maps/objects/Haiteku.asm
@@ -31,7 +31,7 @@ Haiteku_MapEvents::
 
 	def_object_events
 	object_event 22, 15, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 23, 14, SPRITE_PIPPI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 23, 14, SPRITE_CLEFAIRY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 23, 24, SPRITE_SAILOR, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 26, 10, SPRITE_SAILOR, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 14, SPRITE_GENTLEMAN, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
diff --git a/data/maps/objects/KantoCeladonMart5F.asm b/data/maps/objects/KantoCeladonMart5F.asm
index 01ddf4d..fd7d46f 100644
--- a/data/maps/objects/KantoCeladonMart5F.asm
+++ b/data/maps/objects/KantoCeladonMart5F.asm
@@ -15,8 +15,8 @@ KantoCeladonMart5F_MapEvents::
 
 	def_object_events
 	object_event 14,  5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  8,  3, SPRITE_SIDON, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  5, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  8,  3, SPRITE_RHYDON, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  5, SPRITE_PIDGEY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoCeladonMart5F_Blocks::
 INCBIN "maps/KantoCeladonMart5F.blk"
diff --git a/data/maps/objects/KantoGamefreakHQ1.asm b/data/maps/objects/KantoGamefreakHQ1.asm
index 055b82b..070561b 100644
--- a/data/maps/objects/KantoGamefreakHQ1.asm
+++ b/data/maps/objects/KantoGamefreakHQ1.asm
@@ -18,9 +18,9 @@ KantoGamefreakHQ1_MapEvents::
 
 	def_object_events
 	object_event  1,  5, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  4,  5, SPRITE_SIDON, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  0,  8, SPRITE_PIPPI, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  7, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  4,  5, SPRITE_RHYDON, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  0,  8, SPRITE_CLEFAIRY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  7, SPRITE_PIDGEY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 KantoGamefreakHQ1_Blocks::
 INCBIN "maps/KantoGamefreakHQ1.blk"
diff --git a/data/maps/objects/PlayerHouse2F.asm b/data/maps/objects/PlayerHouse2F.asm
index 0c2a394..84c9ffb 100644
--- a/data/maps/objects/PlayerHouse2F.asm
+++ b/data/maps/objects/PlayerHouse2F.asm
@@ -19,7 +19,7 @@ PlayerHouse2F_MapEvents::
 
 	def_object_events
 	object_event  8,  1, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6,  1, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  1, SPRITE_CLEFAIRY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 PlayerHouse2F_Blocks::
 INCBIN "maps/PlayerHouse2F.blk"
diff --git a/data/maps/objects/SilentHillPokecenter.asm b/data/maps/objects/SilentHillPokecenter.asm
index 97b21d6..63608fd 100644
--- a/data/maps/objects/SilentHillPokecenter.asm
+++ b/data/maps/objects/SilentHillPokecenter.asm
@@ -19,7 +19,7 @@ SilentHillPokecenter_MapEvents::
 	object_event 14,  6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  3,  4, SPRITE_24, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  9,  1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 10,  1, SPRITE_SIDON, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 10,  1, SPRITE_RHYDON, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 SilentHillPokecenter_Blocks::
 INCBIN "maps/SilentHillPokecenter.blk"
diff --git a/data/maps/objects/South.asm b/data/maps/objects/South.asm
index 0c57e06..18e7f6e 100644
--- a/data/maps/objects/South.asm
+++ b/data/maps/objects/South.asm
@@ -30,7 +30,7 @@ South_MapEvents::
 
 	def_object_events
 	object_event 25, 21, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 24, 21, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 24, 21, SPRITE_CLEFAIRY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 22, 16, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 30, 11, SPRITE_FISHING_GURU, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
diff --git a/data/maps/objects/Stand.asm b/data/maps/objects/Stand.asm
index 899a41c..477e781 100644
--- a/data/maps/objects/Stand.asm
+++ b/data/maps/objects/Stand.asm
@@ -38,11 +38,11 @@ Stand_MapEvents::
 	object_event 14, 17, SPRITE_TWIN, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 28, 19, SPRITE_ROCKER, FACE_RIGHT, 0, 3, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 30, 31, SPRITE_TEACHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 21,  8, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 13,  6, SPRITE_PIPPI, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6,  6, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 14, 15, SPRITE_POPPO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6, 21, SPRITE_SIDON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 21,  8, SPRITE_RHYDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 13,  6, SPRITE_CLEFAIRY, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  6, SPRITE_RHYDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 14, 15, SPRITE_PIDGEY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6, 21, SPRITE_RHYDON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 Stand_Blocks::
 INCBIN "maps/Stand.blk"
diff --git a/data/maps/objects/West.asm b/data/maps/objects/West.asm
index 8f65773..a8036ac 100644
--- a/data/maps/objects/West.asm
+++ b/data/maps/objects/West.asm
@@ -37,7 +37,7 @@ West_MapEvents::
 	object_event 12,  7, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 26, 10, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 30, 14, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 29, 14, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 29, 14, SPRITE_CLEFAIRY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 22, 19, SPRITE_COOLTRAINER_F, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 18, 13, SPRITE_36, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
diff --git a/data/maps/objects/WestHouse1.asm b/data/maps/objects/WestHouse1.asm
index 80eb8e2..306a9b8 100644
--- a/data/maps/objects/WestHouse1.asm
+++ b/data/maps/objects/WestHouse1.asm
@@ -20,7 +20,7 @@ WestHouse1_MapEvents::
 	def_object_events
 	object_event  7,  3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  1,  6, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  1,  4, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  4, SPRITE_PIDGEY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 WestHouse1_Blocks::
 INCBIN "maps/WestHouse1.blk"
diff --git a/data/maps/objects/WestMart5F.asm b/data/maps/objects/WestMart5F.asm
index bc84abd..fa955ce 100644
--- a/data/maps/objects/WestMart5F.asm
+++ b/data/maps/objects/WestMart5F.asm
@@ -19,7 +19,7 @@ WestMart5F_MapEvents::
 	def_object_events
 	object_event  8,  5, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 13,  5, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event 13,  4, SPRITE_NYOROBON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event 13,  4, SPRITE_POLIWRATH, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 WestMart5F_Blocks::
 INCBIN "maps/WestMart5F.blk"
diff --git a/data/maps/objects/WestMart6F.asm b/data/maps/objects/WestMart6F.asm
index 6a6af8b..8c44311 100644
--- a/data/maps/objects/WestMart6F.asm
+++ b/data/maps/objects/WestMart6F.asm
@@ -19,8 +19,8 @@ WestMart6F_MapEvents::
 
 	def_object_events
 	object_event 12,  3, SPRITE_OFFICER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  6,  4, SPRITE_SIDON, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  3,  6, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  6,  4, SPRITE_RHYDON, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  3,  6, SPRITE_PIDGEY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
 WestMart6F_Blocks::
 INCBIN "maps/WestMart6F.blk"
diff --git a/data/maps/objects/WestRadioTower5F.asm b/data/maps/objects/WestRadioTower5F.asm
index 3409300..d1a6294 100644
--- a/data/maps/objects/WestRadioTower5F.asm
+++ b/data/maps/objects/WestRadioTower5F.asm
@@ -18,8 +18,8 @@ WestRadioTower5F_MapEvents::
 	def_object_events
 	object_event  6,  6, SPRITE_SCIENTIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  5,  2, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  2,  6, SPRITE_PIPPI, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
-	object_event  1,  5, SPRITE_PIPPI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  2,  6, SPRITE_CLEFAIRY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+	object_event  1,  5, SPRITE_CLEFAIRY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  3,  7, SPRITE_SAKAKI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  4,  2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event  2,  4, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
index c28f1c7..d87386a 100644
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@@ -36,156 +36,156 @@ endr
 ENDM
 
 BaseData::
-INCLUDE "data/pokemon/base_stats/fushigidane.inc"
+INCLUDE "data/pokemon/base_stats/bulbasaur.inc"
 .FirstEntryEnd::
-INCLUDE "data/pokemon/base_stats/fushigisou.inc"
-INCLUDE "data/pokemon/base_stats/fushigibana.inc"
-INCLUDE "data/pokemon/base_stats/hitokage.inc"
-INCLUDE "data/pokemon/base_stats/lizardo.inc"
-INCLUDE "data/pokemon/base_stats/lizardon.inc"
-INCLUDE "data/pokemon/base_stats/zenigame.inc"
-INCLUDE "data/pokemon/base_stats/kameil.inc"
-INCLUDE "data/pokemon/base_stats/kamex.inc"
+INCLUDE "data/pokemon/base_stats/ivysaur.inc"
+INCLUDE "data/pokemon/base_stats/venusaur.inc"
+INCLUDE "data/pokemon/base_stats/charmander.inc"
+INCLUDE "data/pokemon/base_stats/charmeleon.inc"
+INCLUDE "data/pokemon/base_stats/charizard.inc"
+INCLUDE "data/pokemon/base_stats/squirtle.inc"
+INCLUDE "data/pokemon/base_stats/wartortle.inc"
+INCLUDE "data/pokemon/base_stats/blastoise.inc"
 INCLUDE "data/pokemon/base_stats/caterpie.inc"
-INCLUDE "data/pokemon/base_stats/transel.inc"
+INCLUDE "data/pokemon/base_stats/metapod.inc"
 INCLUDE "data/pokemon/base_stats/butterfree.inc"
-INCLUDE "data/pokemon/base_stats/beedle.inc"
-INCLUDE "data/pokemon/base_stats/cocoon.inc"
-INCLUDE "data/pokemon/base_stats/spear.inc"
-INCLUDE "data/pokemon/base_stats/poppo.inc"
-INCLUDE "data/pokemon/base_stats/pigeon.inc"
-INCLUDE "data/pokemon/base_stats/pigeot.inc"
-INCLUDE "data/pokemon/base_stats/koratta.inc"
-INCLUDE "data/pokemon/base_stats/ratta.inc"
-INCLUDE "data/pokemon/base_stats/onisuzume.inc"
-INCLUDE "data/pokemon/base_stats/onidrill.inc"
-INCLUDE "data/pokemon/base_stats/arbo.inc"
+INCLUDE "data/pokemon/base_stats/weedle.inc"
+INCLUDE "data/pokemon/base_stats/kakuna.inc"
+INCLUDE "data/pokemon/base_stats/beedrill.inc"
+INCLUDE "data/pokemon/base_stats/pidgey.inc"
+INCLUDE "data/pokemon/base_stats/pidgeotto.inc"
+INCLUDE "data/pokemon/base_stats/pidgeot.inc"
+INCLUDE "data/pokemon/base_stats/rattata.inc"
+INCLUDE "data/pokemon/base_stats/raticate.inc"
+INCLUDE "data/pokemon/base_stats/spearow.inc"
+INCLUDE "data/pokemon/base_stats/fearow.inc"
+INCLUDE "data/pokemon/base_stats/ekans.inc"
 INCLUDE "data/pokemon/base_stats/arbok.inc"
 INCLUDE "data/pokemon/base_stats/pikachu.inc"
 INCLUDE "data/pokemon/base_stats/raichu.inc"
-INCLUDE "data/pokemon/base_stats/sand.inc"
-INCLUDE "data/pokemon/base_stats/sandpan.inc"
+INCLUDE "data/pokemon/base_stats/sandshrew.inc"
+INCLUDE "data/pokemon/base_stats/sandslash.inc"
 INCLUDE "data/pokemon/base_stats/nidoran_f.inc"
 INCLUDE "data/pokemon/base_stats/nidorina.inc"
 INCLUDE "data/pokemon/base_stats/nidoqueen.inc"
 INCLUDE "data/pokemon/base_stats/nidoran_m.inc"
 INCLUDE "data/pokemon/base_stats/nidorino.inc"
 INCLUDE "data/pokemon/base_stats/nidoking.inc"
-INCLUDE "data/pokemon/base_stats/pippi.inc"
-INCLUDE "data/pokemon/base_stats/pixy.inc"
-INCLUDE "data/pokemon/base_stats/rokon.inc"
-INCLUDE "data/pokemon/base_stats/kyukon.inc"
-INCLUDE "data/pokemon/base_stats/purin.inc"
-INCLUDE "data/pokemon/base_stats/pukurin.inc"
+INCLUDE "data/pokemon/base_stats/clefairy.inc"
+INCLUDE "data/pokemon/base_stats/clefable.inc"
+INCLUDE "data/pokemon/base_stats/vulpix.inc"
+INCLUDE "data/pokemon/base_stats/ninetales.inc"
+INCLUDE "data/pokemon/base_stats/jigglypuff.inc"
+INCLUDE "data/pokemon/base_stats/wigglytuff.inc"
 INCLUDE "data/pokemon/base_stats/zubat.inc"
 INCLUDE "data/pokemon/base_stats/golbat.inc"
-INCLUDE "data/pokemon/base_stats/nazonokusa.inc"
-INCLUDE "data/pokemon/base_stats/kusaihana.inc"
-INCLUDE "data/pokemon/base_stats/ruffresia.inc"
+INCLUDE "data/pokemon/base_stats/oddish.inc"
+INCLUDE "data/pokemon/base_stats/gloom.inc"
+INCLUDE "data/pokemon/base_stats/vileplume.inc"
 INCLUDE "data/pokemon/base_stats/paras.inc"
 INCLUDE "data/pokemon/base_stats/parasect.inc"
-INCLUDE "data/pokemon/base_stats/kongpang.inc"
-INCLUDE "data/pokemon/base_stats/morphon.inc"
-INCLUDE "data/pokemon/base_stats/digda.inc"
+INCLUDE "data/pokemon/base_stats/venonat.inc"
+INCLUDE "data/pokemon/base_stats/venomoth.inc"
+INCLUDE "data/pokemon/base_stats/diglett.inc"
 INCLUDE "data/pokemon/base_stats/dugtrio.inc"
-INCLUDE "data/pokemon/base_stats/nyarth.inc"
+INCLUDE "data/pokemon/base_stats/meowth.inc"
 INCLUDE "data/pokemon/base_stats/persian.inc"
-INCLUDE "data/pokemon/base_stats/koduck.inc"
+INCLUDE "data/pokemon/base_stats/psyduck.inc"
 INCLUDE "data/pokemon/base_stats/golduck.inc"
 INCLUDE "data/pokemon/base_stats/mankey.inc"
-INCLUDE "data/pokemon/base_stats/okorizaru.inc"
-INCLUDE "data/pokemon/base_stats/gardie.inc"
-INCLUDE "data/pokemon/base_stats/windie.inc"
-INCLUDE "data/pokemon/base_stats/nyoromo.inc"
-INCLUDE "data/pokemon/base_stats/nyorozo.inc"
-INCLUDE "data/pokemon/base_stats/nyorobon.inc"
-INCLUDE "data/pokemon/base_stats/casey.inc"
-INCLUDE "data/pokemon/base_stats/yungerer.inc"
-INCLUDE "data/pokemon/base_stats/foodin.inc"
-INCLUDE "data/pokemon/base_stats/wanriky.inc"
-INCLUDE "data/pokemon/base_stats/goriky.inc"
-INCLUDE "data/pokemon/base_stats/kairiky.inc"
-INCLUDE "data/pokemon/base_stats/madatsubomi.inc"
-INCLUDE "data/pokemon/base_stats/utsudon.inc"
-INCLUDE "data/pokemon/base_stats/utsubot.inc"
-INCLUDE "data/pokemon/base_stats/menokurage.inc"
-INCLUDE "data/pokemon/base_stats/dokukurage.inc"
-INCLUDE "data/pokemon/base_stats/isitsubute.inc"
-INCLUDE "data/pokemon/base_stats/golone.inc"
-INCLUDE "data/pokemon/base_stats/golonya.inc"
+INCLUDE "data/pokemon/base_stats/primeape.inc"
+INCLUDE "data/pokemon/base_stats/growlithe.inc"
+INCLUDE "data/pokemon/base_stats/arcanine.inc"
+INCLUDE "data/pokemon/base_stats/poliwag.inc"
+INCLUDE "data/pokemon/base_stats/poliwhirl.inc"
+INCLUDE "data/pokemon/base_stats/poliwrath.inc"
+INCLUDE "data/pokemon/base_stats/abra.inc"
+INCLUDE "data/pokemon/base_stats/kadabra.inc"
+INCLUDE "data/pokemon/base_stats/alakazam.inc"
+INCLUDE "data/pokemon/base_stats/machop.inc"
+INCLUDE "data/pokemon/base_stats/machoke.inc"
+INCLUDE "data/pokemon/base_stats/machamp.inc"
+INCLUDE "data/pokemon/base_stats/bellsprout.inc"
+INCLUDE "data/pokemon/base_stats/weepinbell.inc"
+INCLUDE "data/pokemon/base_stats/victreebel.inc"
+INCLUDE "data/pokemon/base_stats/tentacool.inc"
+INCLUDE "data/pokemon/base_stats/tentacruel.inc"
+INCLUDE "data/pokemon/base_stats/geodude.inc"
+INCLUDE "data/pokemon/base_stats/graveler.inc"
+INCLUDE "data/pokemon/base_stats/golem.inc"
 INCLUDE "data/pokemon/base_stats/ponyta.inc"
-INCLUDE "data/pokemon/base_stats/gallop.inc"
-INCLUDE "data/pokemon/base_stats/yadon.inc"
-INCLUDE "data/pokemon/base_stats/yadoran.inc"
-INCLUDE "data/pokemon/base_stats/coil.inc"
-INCLUDE "data/pokemon/base_stats/rarecoil.inc"
-INCLUDE "data/pokemon/base_stats/kamonegi.inc"
-INCLUDE "data/pokemon/base_stats/dodo.inc"
-INCLUDE "data/pokemon/base_stats/dodorio.inc"
-INCLUDE "data/pokemon/base_stats/pawou.inc"
-INCLUDE "data/pokemon/base_stats/jugon.inc"
-INCLUDE "data/pokemon/base_stats/betbeter.inc"
-INCLUDE "data/pokemon/base_stats/betbeton.inc"
+INCLUDE "data/pokemon/base_stats/rapidash.inc"
+INCLUDE "data/pokemon/base_stats/slowpoke.inc"
+INCLUDE "data/pokemon/base_stats/slowbro.inc"
+INCLUDE "data/pokemon/base_stats/magnemite.inc"
+INCLUDE "data/pokemon/base_stats/magneton.inc"
+INCLUDE "data/pokemon/base_stats/farfetchd.inc"
+INCLUDE "data/pokemon/base_stats/doduo.inc"
+INCLUDE "data/pokemon/base_stats/dodrio.inc"
+INCLUDE "data/pokemon/base_stats/seel.inc"
+INCLUDE "data/pokemon/base_stats/dewgong.inc"
+INCLUDE "data/pokemon/base_stats/grimer.inc"
+INCLUDE "data/pokemon/base_stats/muk.inc"
 INCLUDE "data/pokemon/base_stats/shellder.inc"
-INCLUDE "data/pokemon/base_stats/parshen.inc"
-INCLUDE "data/pokemon/base_stats/ghos.inc"
-INCLUDE "data/pokemon/base_stats/ghost.inc"
-INCLUDE "data/pokemon/base_stats/gangar.inc"
-INCLUDE "data/pokemon/base_stats/iwark.inc"
-INCLUDE "data/pokemon/base_stats/sleepe.inc"
-INCLUDE "data/pokemon/base_stats/sleeper.inc"
-INCLUDE "data/pokemon/base_stats/crab.inc"
+INCLUDE "data/pokemon/base_stats/cloyster.inc"
+INCLUDE "data/pokemon/base_stats/gastly.inc"
+INCLUDE "data/pokemon/base_stats/haunter.inc"
+INCLUDE "data/pokemon/base_stats/gengar.inc"
+INCLUDE "data/pokemon/base_stats/onix.inc"
+INCLUDE "data/pokemon/base_stats/drowzee.inc"
+INCLUDE "data/pokemon/base_stats/hypno.inc"
+INCLUDE "data/pokemon/base_stats/krabby.inc"
 INCLUDE "data/pokemon/base_stats/kingler.inc"
-INCLUDE "data/pokemon/base_stats/biriridama.inc"
-INCLUDE "data/pokemon/base_stats/marumine.inc"
-INCLUDE "data/pokemon/base_stats/tamatama.inc"
-INCLUDE "data/pokemon/base_stats/nassy.inc"
-INCLUDE "data/pokemon/base_stats/karakara.inc"
-INCLUDE "data/pokemon/base_stats/garagara.inc"
-INCLUDE "data/pokemon/base_stats/sawamular.inc"
-INCLUDE "data/pokemon/base_stats/ebiwalar.inc"
-INCLUDE "data/pokemon/base_stats/beroringa.inc"
-INCLUDE "data/pokemon/base_stats/dogars.inc"
-INCLUDE "data/pokemon/base_stats/matadogas.inc"
-INCLUDE "data/pokemon/base_stats/sihorn.inc"
-INCLUDE "data/pokemon/base_stats/sidon.inc"
-INCLUDE "data/pokemon/base_stats/lucky.inc"
-INCLUDE "data/pokemon/base_stats/monjara.inc"
-INCLUDE "data/pokemon/base_stats/garura.inc"
-INCLUDE "data/pokemon/base_stats/tattu.inc"
+INCLUDE "data/pokemon/base_stats/voltorb.inc"
+INCLUDE "data/pokemon/base_stats/electrode.inc"
+INCLUDE "data/pokemon/base_stats/exeggcute.inc"
+INCLUDE "data/pokemon/base_stats/exeggutor.inc"
+INCLUDE "data/pokemon/base_stats/cubone.inc"
+INCLUDE "data/pokemon/base_stats/marowak.inc"
+INCLUDE "data/pokemon/base_stats/hitmonlee.inc"
+INCLUDE "data/pokemon/base_stats/hitmonchan.inc"
+INCLUDE "data/pokemon/base_stats/lickitung.inc"
+INCLUDE "data/pokemon/base_stats/koffing.inc"
+INCLUDE "data/pokemon/base_stats/weezing.inc"
+INCLUDE "data/pokemon/base_stats/rhyhorn.inc"
+INCLUDE "data/pokemon/base_stats/rhydon.inc"
+INCLUDE "data/pokemon/base_stats/chansey.inc"
+INCLUDE "data/pokemon/base_stats/tangela.inc"
+INCLUDE "data/pokemon/base_stats/kangaskhan.inc"
+INCLUDE "data/pokemon/base_stats/horsea.inc"
 INCLUDE "data/pokemon/base_stats/seadra.inc"
-INCLUDE "data/pokemon/base_stats/tosakinto.inc"
-INCLUDE "data/pokemon/base_stats/azumao.inc"
-INCLUDE "data/pokemon/base_stats/hitodeman.inc"
+INCLUDE "data/pokemon/base_stats/goldeen.inc"
+INCLUDE "data/pokemon/base_stats/seaking.inc"
+INCLUDE "data/pokemon/base_stats/staryu.inc"
 INCLUDE "data/pokemon/base_stats/starmie.inc"
-INCLUDE "data/pokemon/base_stats/barrierd.inc"
-INCLUDE "data/pokemon/base_stats/strike.inc"
-INCLUDE "data/pokemon/base_stats/rougela.inc"
-INCLUDE "data/pokemon/base_stats/eleboo.inc"
-INCLUDE "data/pokemon/base_stats/boober.inc"
-INCLUDE "data/pokemon/base_stats/kailios.inc"
-INCLUDE "data/pokemon/base_stats/kentauros.inc"
-INCLUDE "data/pokemon/base_stats/koiking.inc"
+INCLUDE "data/pokemon/base_stats/mrmime.inc"
+INCLUDE "data/pokemon/base_stats/scyther.inc"
+INCLUDE "data/pokemon/base_stats/jynx.inc"
+INCLUDE "data/pokemon/base_stats/electabuzz.inc"
+INCLUDE "data/pokemon/base_stats/magmar.inc"
+INCLUDE "data/pokemon/base_stats/pinsir.inc"
+INCLUDE "data/pokemon/base_stats/tauros.inc"
+INCLUDE "data/pokemon/base_stats/magikarp.inc"
 INCLUDE "data/pokemon/base_stats/gyarados.inc"
-INCLUDE "data/pokemon/base_stats/laplace.inc"
-INCLUDE "data/pokemon/base_stats/metamon.inc"
-INCLUDE "data/pokemon/base_stats/eievui.inc"
-INCLUDE "data/pokemon/base_stats/showers.inc"
-INCLUDE "data/pokemon/base_stats/thunders.inc"
-INCLUDE "data/pokemon/base_stats/booster.inc"
+INCLUDE "data/pokemon/base_stats/lapras.inc"
+INCLUDE "data/pokemon/base_stats/ditto.inc"
+INCLUDE "data/pokemon/base_stats/eevee.inc"
+INCLUDE "data/pokemon/base_stats/vaporeon.inc"
+INCLUDE "data/pokemon/base_stats/jolteon.inc"
+INCLUDE "data/pokemon/base_stats/flareon.inc"
 INCLUDE "data/pokemon/base_stats/porygon.inc"
-INCLUDE "data/pokemon/base_stats/omnite.inc"
-INCLUDE "data/pokemon/base_stats/omstar.inc"
+INCLUDE "data/pokemon/base_stats/omanyte.inc"
+INCLUDE "data/pokemon/base_stats/omastar.inc"
 INCLUDE "data/pokemon/base_stats/kabuto.inc"
 INCLUDE "data/pokemon/base_stats/kabutops.inc"
-INCLUDE "data/pokemon/base_stats/ptera.inc"
-INCLUDE "data/pokemon/base_stats/kabigon.inc"
-INCLUDE "data/pokemon/base_stats/freezer.inc"
-INCLUDE "data/pokemon/base_stats/thunder.inc"
-INCLUDE "data/pokemon/base_stats/fire.inc"
-INCLUDE "data/pokemon/base_stats/miniryu.inc"
-INCLUDE "data/pokemon/base_stats/hakuryu.inc"
-INCLUDE "data/pokemon/base_stats/kairyu.inc"
+INCLUDE "data/pokemon/base_stats/aerodactyl.inc"
+INCLUDE "data/pokemon/base_stats/snorlax.inc"
+INCLUDE "data/pokemon/base_stats/articuno.inc"
+INCLUDE "data/pokemon/base_stats/zapdos.inc"
+INCLUDE "data/pokemon/base_stats/moltres.inc"
+INCLUDE "data/pokemon/base_stats/dratini.inc"
+INCLUDE "data/pokemon/base_stats/dragonair.inc"
+INCLUDE "data/pokemon/base_stats/dragonite.inc"
 INCLUDE "data/pokemon/base_stats/mewtwo.inc"
 INCLUDE "data/pokemon/base_stats/mew.inc"
 INCLUDE "data/pokemon/base_stats/happa.inc"
diff --git a/data/pokemon/base_stats/casey.inc b/data/pokemon/base_stats/abra.inc
index f3693c1..59a055c 100644
--- a/data/pokemon/base_stats/casey.inc
+++ b/data/pokemon/base_stats/abra.inc
@@ -1,4 +1,4 @@
-	db DEX_CASEY ; 063
+	db DEX_ABRA ; 063
 
 	db  25,  20,  15,  90, 105,  65
 	;   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 CaseyPicFront, CaseyPicBack ; sprites
+	dw AbraPicFront, AbraPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/ptera.inc b/data/pokemon/base_stats/aerodactyl.inc
index eb045de..52d0b10 100644
--- a/data/pokemon/base_stats/ptera.inc
+++ b/data/pokemon/base_stats/aerodactyl.inc
@@ -1,4 +1,4 @@
-	db DEX_PTERA ; 142
+	db DEX_AERODACTYL ; 142
 
 	db  80, 105,  65, 130,  60,  85
 	;   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 PteraPicFront, PteraPicBack ; sprites
+	dw AerodactylPicFront, AerodactylPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/foodin.inc b/data/pokemon/base_stats/alakazam.inc
index c2cf13b..5a055e4 100644
--- a/data/pokemon/base_stats/foodin.inc
+++ b/data/pokemon/base_stats/alakazam.inc
@@ -1,4 +1,4 @@
-	db DEX_FOODIN ; 065
+	db DEX_ALAKAZAM ; 065
 
 	db  55,  50,  45, 120, 135,  95
 	;   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 FoodinPicFront, FoodinPicBack ; sprites
+	dw AlakazamPicFront, AlakazamPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/windie.inc b/data/pokemon/base_stats/arcanine.inc
index 5b50e93..86e1f0c 100644
--- a/data/pokemon/base_stats/windie.inc
+++ b/data/pokemon/base_stats/arcanine.inc
@@ -1,4 +1,4 @@
-	db DEX_WINDIE ; 059
+	db DEX_ARCANINE ; 059
 
 	db  90, 110,  80,  95,  80, 100
 	;   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 WindiePicFront, WindiePicBack ; sprites
+	dw ArcaninePicFront, ArcaninePicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/freezer.inc b/data/pokemon/base_stats/articuno.inc
index bf66c3d..8f665ae 100644
--- a/data/pokemon/base_stats/freezer.inc
+++ b/data/pokemon/base_stats/articuno.inc
@@ -1,4 +1,4 @@
-	db DEX_FREEZER ; 144
+	db DEX_ARTICUNO ; 144
 
 	db  90,  85, 100,  85,  95, 125
 	;   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 FreezerPicFront, FreezerPicBack ; sprites
+	dw ArticunoPicFront, ArticunoPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/spear.inc b/data/pokemon/base_stats/beedrill.inc
index c4c0608..7f67853 100644
--- a/data/pokemon/base_stats/spear.inc
+++ b/data/pokemon/base_stats/beedrill.inc
@@ -1,4 +1,4 @@
-	db DEX_SPEAR ; 015
+	db DEX_BEEDRILL ; 015
 
 	db  65,  80,  40,  75,  45,  80
 	;   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 SpearPicFront, SpearPicBack ; sprites
+	dw BeedrillPicFront, BeedrillPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/madatsubomi.inc b/data/pokemon/base_stats/bellsprout.inc
index bb0804b..2e08749 100644
--- a/data/pokemon/base_stats/madatsubomi.inc
+++ b/data/pokemon/base_stats/bellsprout.inc
@@ -1,4 +1,4 @@
-	db DEX_MADATSUBOMI ; 069
+	db DEX_BELLSPROUT ; 069
 
 	db  50,  75,  35,  40,  55,  70
 	;   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 MadatsubomiPicFront, MadatsubomiPicBack ; sprites
+	dw BellsproutPicFront, BellsproutPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/kamex.inc b/data/pokemon/base_stats/blastoise.inc
index 8bd0b54..b88a2d1 100644
--- a/data/pokemon/base_stats/kamex.inc
+++ b/data/pokemon/base_stats/blastoise.inc
@@ -1,4 +1,4 @@
-	db DEX_KAMEX ; 009
+	db DEX_BLASTOISE ; 009
 
 	db  79,  83, 100,  78,  85, 100
 	;   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 KamexPicFront, KamexPicBack ; sprites
+	dw BlastoisePicFront, BlastoisePicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/fushigidane.inc b/data/pokemon/base_stats/bulbasaur.inc
index 64d466b..b647152 100644
--- a/data/pokemon/base_stats/fushigidane.inc
+++ b/data/pokemon/base_stats/bulbasaur.inc
@@ -1,4 +1,4 @@
-	db DEX_FUSHIGIDANE ; 001
+	db DEX_BULBASAUR ; 001
 
 	db  45,  49,  49,  45,  65,  65
 	;   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 FushigidanePicFront, FushigidanePicBack ; sprites
+	dw BulbasaurPicFront, BulbasaurPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/lucky.inc b/data/pokemon/base_stats/chansey.inc
index 49d6971..b5b9679 100644
--- a/data/pokemon/base_stats/lucky.inc
+++ b/data/pokemon/base_stats/chansey.inc
@@ -1,4 +1,4 @@
-	db DEX_LUCKY ; 113
+	db DEX_CHANSEY ; 113
 
 	db 250,   5,   5,  50,  35, 105
 	;   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 LuckyPicFront, LuckyPicBack ; sprites
+	dw ChanseyPicFront, ChanseyPicBack ; sprites
 	db GROWTH_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/lizardon.inc b/data/pokemon/base_stats/charizard.inc
index c4b419a..d205b7d 100644
--- a/data/pokemon/base_stats/lizardon.inc
+++ b/data/pokemon/base_stats/charizard.inc
@@ -1,4 +1,4 @@
-	db DEX_LIZARDON ; 006
+	db DEX_CHARIZARD ; 006
 
 	db  78,  84,  78, 100, 100,  85
 	;   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 LizardonPicFront, LizardonPicBack ; sprites
+	dw CharizardPicFront, CharizardPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/hitokage.inc b/data/pokemon/base_stats/charmander.inc
index edc3f5a..1145325 100644
--- a/data/pokemon/base_stats/hitokage.inc
+++ b/data/pokemon/base_stats/charmander.inc
@@ -1,4 +1,4 @@
-	db DEX_HITOKAGE ; 004
+	db DEX_CHARMANDER ; 004
 
 	db  39,  52,  43,  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 HitokagePicFront, HitokagePicBack ; sprites
+	dw CharmanderPicFront, CharmanderPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/lizardo.inc b/data/pokemon/base_stats/charmeleon.inc
index 3d66d18..b3ef5c4 100644
--- a/data/pokemon/base_stats/lizardo.inc
+++ b/data/pokemon/base_stats/charmeleon.inc
@@ -1,4 +1,4 @@
-	db DEX_LIZARDO ; 005
+	db DEX_CHARMELEON ; 005
 
 	db  58,  64,  58,  80,  75,  65
 	;   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 LizardoPicFront, LizardoPicBack ; sprites
+	dw CharmeleonPicFront, CharmeleonPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/pixy.inc b/data/pokemon/base_stats/clefable.inc
index 73623e9..dcd9659 100644
--- a/data/pokemon/base_stats/pixy.inc
+++ b/data/pokemon/base_stats/clefable.inc
@@ -1,4 +1,4 @@
-	db DEX_PIXY ; 036
+	db DEX_CLEFABLE ; 036
 
 	db  95,  70,  73,  60,  85,  95
 	;   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 PixyPicFront, PixyPicBack ; sprites
+	dw ClefablePicFront, ClefablePicBack ; sprites
 	db GROWTH_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/pippi.inc b/data/pokemon/base_stats/clefairy.inc
index 8cd8847..010d784 100644
--- a/data/pokemon/base_stats/pippi.inc
+++ b/data/pokemon/base_stats/clefairy.inc
@@ -1,4 +1,4 @@
-	db DEX_PIPPI ; 035
+	db DEX_CLEFAIRY ; 035
 
 	db  70,  45,  48,  35,  60,  65
 	;   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 PippiPicFront, PippiPicBack ; sprites
+	dw ClefairyPicFront, ClefairyPicBack ; sprites
 	db GROWTH_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/parshen.inc b/data/pokemon/base_stats/cloyster.inc
index f6512e7..2c34164 100644
--- a/data/pokemon/base_stats/parshen.inc
+++ b/data/pokemon/base_stats/cloyster.inc
@@ -1,4 +1,4 @@
-	db DEX_PARSHEN ; 091
+	db DEX_CLOYSTER ; 091
 
 	db  50,  95, 180,  70,  85,  70
 	;   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 ParshenPicFront, ParshenPicBack ; sprites
+	dw CloysterPicFront, CloysterPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/karakara.inc b/data/pokemon/base_stats/cubone.inc
index 21ffe32..fe7ef53 100644
--- a/data/pokemon/base_stats/karakara.inc
+++ b/data/pokemon/base_stats/cubone.inc
@@ -1,4 +1,4 @@
-	db DEX_KARAKARA ; 104
+	db DEX_CUBONE ; 104
 
 	db  50,  50,  95,  35,  40,  40
 	;   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 KarakaraPicFront, KarakaraPicBack ; sprites
+	dw CubonePicFront, CubonePicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/jugon.inc b/data/pokemon/base_stats/dewgong.inc
index 806012d..30dc1cd 100644
--- a/data/pokemon/base_stats/jugon.inc
+++ b/data/pokemon/base_stats/dewgong.inc
@@ -1,4 +1,4 @@
-	db DEX_JUGON ; 087
+	db DEX_DEWGONG ; 087
 
 	db  90,  70,  80,  70,  80,  95
 	;   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 JugonPicFront, JugonPicBack ; sprites
+	dw DewgongPicFront, DewgongPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/digda.inc b/data/pokemon/base_stats/diglett.inc
index c992723..b5a36b3 100644
--- a/data/pokemon/base_stats/digda.inc
+++ b/data/pokemon/base_stats/diglett.inc
@@ -1,4 +1,4 @@
-	db DEX_DIGDA ; 050
+	db DEX_DIGLETT ; 050
 
 	db  10,  55,  25,  95,  50,  45
 	;   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 DigdaPicFront, DigdaPicBack ; sprites
+	dw DiglettPicFront, DiglettPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/metamon.inc b/data/pokemon/base_stats/ditto.inc
index 23c5cb5..7232649 100644
--- a/data/pokemon/base_stats/metamon.inc
+++ b/data/pokemon/base_stats/ditto.inc
@@ -1,4 +1,4 @@
-	db DEX_METAMON ; 132
+	db DEX_DITTO ; 132
 
 	db  48,  48,  48,  48,  48,  48
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_UNKNOWN ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw MetamonPicFront, MetamonPicBack ; sprites
+	dw DittoPicFront, DittoPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/dodorio.inc b/data/pokemon/base_stats/dodrio.inc
index 83e0826..8e8fe89 100644
--- a/data/pokemon/base_stats/dodorio.inc
+++ b/data/pokemon/base_stats/dodrio.inc
@@ -1,4 +1,4 @@
-	db DEX_DODORIO ; 085
+	db DEX_DODRIO ; 085
 
 	db  60, 110,  70, 100,  60,  65
 	;   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 DodorioPicFront, DodorioPicBack ; sprites
+	dw DodrioPicFront, DodrioPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/dodo.inc b/data/pokemon/base_stats/doduo.inc
index 6387d8a..e7aaef6 100644
--- a/data/pokemon/base_stats/dodo.inc
+++ b/data/pokemon/base_stats/doduo.inc
@@ -1,4 +1,4 @@
-	db DEX_DODO ; 084
+	db DEX_DODUO ; 084
 
 	db  35,  85,  45,  75,  35,  35
 	;   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 DodoPicFront, DodoPicBack ; sprites
+	dw DoduoPicFront, DoduoPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/hakuryu.inc b/data/pokemon/base_stats/dragonair.inc
index 0f7a10d..f37817b 100644
--- a/data/pokemon/base_stats/hakuryu.inc
+++ b/data/pokemon/base_stats/dragonair.inc
@@ -1,4 +1,4 @@
-	db DEX_HAKURYU ; 148
+	db DEX_DRAGONAIR ; 148
 
 	db  61,  84,  65,  70,  70,  70
 	;   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 HakuryuPicFront, HakuryuPicBack ; sprites
+	dw DragonairPicFront, DragonairPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/kairyu.inc b/data/pokemon/base_stats/dragonite.inc
index ba150e6..cde1577 100644
--- a/data/pokemon/base_stats/kairyu.inc
+++ b/data/pokemon/base_stats/dragonite.inc
@@ -1,4 +1,4 @@
-	db DEX_KAIRYU ; 149
+	db DEX_DRAGONITE ; 149
 
 	db  91, 134,  95,  80, 100, 100
 	;   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 KairyuPicFront, KairyuPicBack ; sprites
+	dw DragonitePicFront, DragonitePicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/miniryu.inc b/data/pokemon/base_stats/dratini.inc
index c456822..b3657c8 100644
--- a/data/pokemon/base_stats/miniryu.inc
+++ b/data/pokemon/base_stats/dratini.inc
@@ -1,4 +1,4 @@
-	db DEX_MINIRYU ; 147
+	db DEX_DRATINI ; 147
 
 	db  41,  64,  45,  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 MiniryuPicFront, MiniryuPicBack ; sprites
+	dw DratiniPicFront, DratiniPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/sleepe.inc b/data/pokemon/base_stats/drowzee.inc
index ee24e07..133e791 100644
--- a/data/pokemon/base_stats/sleepe.inc
+++ b/data/pokemon/base_stats/drowzee.inc
@@ -1,4 +1,4 @@
-	db DEX_SLEEPE ; 096
+	db DEX_DROWZEE ; 096
 
 	db  60,  48,  45,  42,  45,  90
 	;   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 SleepePicFront, SleepePicBack ; sprites
+	dw DrowzeePicFront, DrowzeePicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/eievui.inc b/data/pokemon/base_stats/eevee.inc
index 4a29e77..d829acd 100644
--- a/data/pokemon/base_stats/eievui.inc
+++ b/data/pokemon/base_stats/eevee.inc
@@ -1,4 +1,4 @@
-	db DEX_EIEVUI ; 133
+	db DEX_EEVEE ; 133
 
 	db  55,  55,  50,  55,  45,  65
 	;   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 EievuiPicFront, EievuiPicBack ; sprites
+	dw EeveePicFront, EeveePicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/arbo.inc b/data/pokemon/base_stats/ekans.inc
index 00f967a..9513745 100644
--- a/data/pokemon/base_stats/arbo.inc
+++ b/data/pokemon/base_stats/ekans.inc
@@ -1,4 +1,4 @@
-	db DEX_ARBO ; 023
+	db DEX_EKANS ; 023
 
 	db  35,  60,  44,  55,  50,  40
 	;   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 ArboPicFront, ArboPicBack ; sprites
+	dw EkansPicFront, EkansPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/eleboo.inc b/data/pokemon/base_stats/electabuzz.inc
index 4416661..228ca9b 100644
--- a/data/pokemon/base_stats/eleboo.inc
+++ b/data/pokemon/base_stats/electabuzz.inc
@@ -1,4 +1,4 @@
-	db DEX_ELEBOO ; 125
+	db DEX_ELECTABUZZ ; 125
 
 	db  65,  83,  57, 105,  85,  75
 	;   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 ElebooPicFront, ElebooPicBack ; sprites
+	dw ElectabuzzPicFront, ElectabuzzPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/marumine.inc b/data/pokemon/base_stats/electrode.inc
index 15cc4ba..c5f963e 100644
--- a/data/pokemon/base_stats/marumine.inc
+++ b/data/pokemon/base_stats/electrode.inc
@@ -1,4 +1,4 @@
-	db DEX_MARUMINE ; 101
+	db DEX_ELECTRODE ; 101
 
 	db  60,  50,  70, 140,  80,  80
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_UNKNOWN ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw MaruminePicFront, MaruminePicBack ; sprites
+	dw ElectrodePicFront, ElectrodePicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/tamatama.inc b/data/pokemon/base_stats/exeggcute.inc
index 39387c5..3e352bf 100644
--- a/data/pokemon/base_stats/tamatama.inc
+++ b/data/pokemon/base_stats/exeggcute.inc
@@ -1,4 +1,4 @@
-	db DEX_TAMATAMA ; 102
+	db DEX_EXEGGCUTE ; 102
 
 	db  60,  40,  80,  40,  60,  55
 	;   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 TamatamaPicFront, TamatamaPicBack ; sprites
+	dw ExeggcutePicFront, ExeggcutePicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/nassy.inc b/data/pokemon/base_stats/exeggutor.inc
index a5ccb5d..ff06f60 100644
--- a/data/pokemon/base_stats/nassy.inc
+++ b/data/pokemon/base_stats/exeggutor.inc
@@ -1,4 +1,4 @@
-	db DEX_NASSY ; 103
+	db DEX_EXEGGUTOR ; 103
 
 	db  95,  95,  85,  55, 125,  75
 	;   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 NassyPicFront, NassyPicBack ; sprites
+	dw ExeggutorPicFront, ExeggutorPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/kamonegi.inc b/data/pokemon/base_stats/farfetchd.inc
index ff31528..d78d427 100644
--- a/data/pokemon/base_stats/kamonegi.inc
+++ b/data/pokemon/base_stats/farfetchd.inc
@@ -1,4 +1,4 @@
-	db DEX_KAMONEGI ; 083
+	db DEX_FARFETCHD ; 083
 
 	db  52,  65,  55,  60,  58,  58
 	;   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 KamonegiPicFront, KamonegiPicBack ; sprites
+	dw FarfetchdPicFront, FarfetchdPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/onidrill.inc b/data/pokemon/base_stats/fearow.inc
index 1ea2520..7d9b7e2 100644
--- a/data/pokemon/base_stats/onidrill.inc
+++ b/data/pokemon/base_stats/fearow.inc
@@ -1,4 +1,4 @@
-	db DEX_ONIDRILL ; 022
+	db DEX_FEAROW ; 022
 
 	db  65,  90,  65, 100,  61,  61
 	;   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 OnidrillPicFront, OnidrillPicBack ; sprites
+	dw FearowPicFront, FearowPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/booster.inc b/data/pokemon/base_stats/flareon.inc
index 697ddf4..66929f2 100644
--- a/data/pokemon/base_stats/booster.inc
+++ b/data/pokemon/base_stats/flareon.inc
@@ -1,4 +1,4 @@
-	db DEX_BOOSTER ; 136
+	db DEX_FLAREON ; 136
 
 	db  65, 130,  60,  65,  70, 110
 	;   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 BoosterPicFront, BoosterPicBack ; sprites
+	dw FlareonPicFront, FlareonPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/ghos.inc b/data/pokemon/base_stats/gastly.inc
index 1de9016..c304972 100644
--- a/data/pokemon/base_stats/ghos.inc
+++ b/data/pokemon/base_stats/gastly.inc
@@ -1,4 +1,4 @@
-	db DEX_GHOS ; 092
+	db DEX_GASTLY ; 092
 
 	db  30,  35,  30,  80, 100,  25
 	;   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 GhosPicFront, GhosPicBack ; sprites
+	dw GastlyPicFront, GastlyPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/gangar.inc b/data/pokemon/base_stats/gengar.inc
index b06c9d8..8636752 100644
--- a/data/pokemon/base_stats/gangar.inc
+++ b/data/pokemon/base_stats/gengar.inc
@@ -1,4 +1,4 @@
-	db DEX_GANGAR ; 094
+	db DEX_GENGAR ; 094
 
 	db  60,  65,  60, 110, 130,  75
 	;   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 GangarPicFront, GangarPicBack ; sprites
+	dw GengarPicFront, GengarPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/isitsubute.inc b/data/pokemon/base_stats/geodude.inc
index 5cfd771..7aa0baf 100644
--- a/data/pokemon/base_stats/isitsubute.inc
+++ b/data/pokemon/base_stats/geodude.inc
@@ -1,4 +1,4 @@
-	db DEX_ISITSUBUTE ; 074
+	db DEX_GEODUDE ; 074
 
 	db  40,  80, 100,  20,  30,  45
 	;   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 IsitsubutePicFront, IsitsubutePicBack ; sprites
+	dw GeodudePicFront, GeodudePicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/kusaihana.inc b/data/pokemon/base_stats/gloom.inc
index c78a629..adb99fb 100644
--- a/data/pokemon/base_stats/kusaihana.inc
+++ b/data/pokemon/base_stats/gloom.inc
@@ -1,4 +1,4 @@
-	db DEX_KUSAIHANA ; 044
+	db DEX_GLOOM ; 044
 
 	db  60,  65,  70,  40,  85,  80
 	;   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 KusaihanaPicFront, KusaihanaPicBack ; sprites
+	dw GloomPicFront, GloomPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/tosakinto.inc b/data/pokemon/base_stats/goldeen.inc
index bb3fd6e..13ab74c 100644
--- a/data/pokemon/base_stats/tosakinto.inc
+++ b/data/pokemon/base_stats/goldeen.inc
@@ -1,4 +1,4 @@
-	db DEX_TOSAKINTO ; 118
+	db DEX_GOLDEEN ; 118
 
 	db  45,  67,  60,  63,  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 TosakintoPicFront, TosakintoPicBack ; sprites
+	dw GoldeenPicFront, GoldeenPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/golonya.inc b/data/pokemon/base_stats/golem.inc
index 8ef1b24..8bdc895 100644
--- a/data/pokemon/base_stats/golonya.inc
+++ b/data/pokemon/base_stats/golem.inc
@@ -1,4 +1,4 @@
-	db DEX_GOLONYA ; 076
+	db DEX_GOLEM ; 076
 
 	db  80, 110, 130,  45,  55,  80
 	;   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 GolonyaPicFront, GolonyaPicBack ; sprites
+	dw GolemPicFront, GolemPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/golone.inc b/data/pokemon/base_stats/graveler.inc
index ec9bf3b..e5665e8 100644
--- a/data/pokemon/base_stats/golone.inc
+++ b/data/pokemon/base_stats/graveler.inc
@@ -1,4 +1,4 @@
-	db DEX_GOLONE ; 075
+	db DEX_GRAVELER ; 075
 
 	db  55,  95, 115,  35,  45,  65
 	;   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 GolonePicFront, GolonePicBack ; sprites
+	dw GravelerPicFront, GravelerPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/betbeter.inc b/data/pokemon/base_stats/grimer.inc
index 1813923..769ff05 100644
--- a/data/pokemon/base_stats/betbeter.inc
+++ b/data/pokemon/base_stats/grimer.inc
@@ -1,4 +1,4 @@
-	db DEX_BETBETER ; 088
+	db DEX_GRIMER ; 088
 
 	db  80,  80,  50,  25,  55,  40
 	;   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 BetbeterPicFront, BetbeterPicBack ; sprites
+	dw GrimerPicFront, GrimerPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/gardie.inc b/data/pokemon/base_stats/growlithe.inc
index fc68ecf..2243ee4 100644
--- a/data/pokemon/base_stats/gardie.inc
+++ b/data/pokemon/base_stats/growlithe.inc
@@ -1,4 +1,4 @@
-	db DEX_GARDIE ; 058
+	db DEX_GROWLITHE ; 058
 
 	db  55,  70,  45,  60,  50,  70
 	;   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 GardiePicFront, GardiePicBack ; sprites
+	dw GrowlithePicFront, GrowlithePicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/ghost.inc b/data/pokemon/base_stats/haunter.inc
index 97a258a..63395f7 100644
--- a/data/pokemon/base_stats/ghost.inc
+++ b/data/pokemon/base_stats/haunter.inc
@@ -1,4 +1,4 @@
-	db DEX_GHOST ; 093
+	db DEX_HAUNTER ; 093
 
 	db  45,  50,  45,  95, 115,  40
 	;   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 GhostPicFront, GhostPicBack ; sprites
+	dw HaunterPicFront, HaunterPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/ebiwalar.inc b/data/pokemon/base_stats/hitmonchan.inc
index 301ee47..26e111a 100644
--- a/data/pokemon/base_stats/ebiwalar.inc
+++ b/data/pokemon/base_stats/hitmonchan.inc
@@ -1,4 +1,4 @@
-	db DEX_EBIWALAR ; 107
+	db DEX_HITMONCHAN ; 107
 
 	db  50, 105,  79,  76,  35,  85
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_MALE ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 6, 6 ; sprite dimensions
-	dw EbiwalarPicFront, EbiwalarPicBack ; sprites
+	dw HitmonchanPicFront, HitmonchanPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/sawamular.inc b/data/pokemon/base_stats/hitmonlee.inc
index 9f31324..d609152 100644
--- a/data/pokemon/base_stats/sawamular.inc
+++ b/data/pokemon/base_stats/hitmonlee.inc
@@ -1,4 +1,4 @@
-	db DEX_SAWAMULAR ; 106
+	db DEX_HITMONLEE ; 106
 
 	db  50, 120,  53,  87,  35,  85
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_MALE ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 7, 7 ; sprite dimensions
-	dw SawamularPicFront, SawamularPicBack ; sprites
+	dw HitmonleePicFront, HitmonleePicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/tattu.inc b/data/pokemon/base_stats/horsea.inc
index 8a7a575..cd90825 100644
--- a/data/pokemon/base_stats/tattu.inc
+++ b/data/pokemon/base_stats/horsea.inc
@@ -1,4 +1,4 @@
-	db DEX_TATTU ; 116
+	db DEX_HORSEA ; 116
 
 	db  30,  40,  70,  60,  70,  45
 	;   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 TattuPicFront, TattuPicBack ; sprites
+	dw HorseaPicFront, HorseaPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/sleeper.inc b/data/pokemon/base_stats/hypno.inc
index 38db0fc..3562284 100644
--- a/data/pokemon/base_stats/sleeper.inc
+++ b/data/pokemon/base_stats/hypno.inc
@@ -1,4 +1,4 @@
-	db DEX_SLEEPER ; 097
+	db DEX_HYPNO ; 097
 
 	db  85,  73,  70,  67,  70, 115
 	;   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 SleeperPicFront, SleeperPicBack ; sprites
+	dw HypnoPicFront, HypnoPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/fushigisou.inc b/data/pokemon/base_stats/ivysaur.inc
index a4159bc..6f815d9 100644
--- a/data/pokemon/base_stats/fushigisou.inc
+++ b/data/pokemon/base_stats/ivysaur.inc
@@ -1,4 +1,4 @@
-	db DEX_FUSHIGISOU ; 002
+	db DEX_IVYSAUR ; 002
 
 	db  60,  62,  63,  60,  80,  80
 	;   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 FushigisouPicFront, FushigisouPicBack ; sprites
+	dw IvysaurPicFront, IvysaurPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/purin.inc b/data/pokemon/base_stats/jigglypuff.inc
index 4209523..6dcfa90 100644
--- a/data/pokemon/base_stats/purin.inc
+++ b/data/pokemon/base_stats/jigglypuff.inc
@@ -1,4 +1,4 @@
-	db DEX_PURIN ; 039
+	db DEX_JIGGLYPUFF ; 039
 
 	db 115,  45,  20,  20,  25,  40
 	;   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 PurinPicFront, PurinPicBack ; sprites
+	dw JigglypuffPicFront, JigglypuffPicBack ; sprites
 	db GROWTH_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/thunders.inc b/data/pokemon/base_stats/jolteon.inc
index 21326cf..31f3890 100644
--- a/data/pokemon/base_stats/thunders.inc
+++ b/data/pokemon/base_stats/jolteon.inc
@@ -1,4 +1,4 @@
-	db DEX_THUNDERS ; 135
+	db DEX_JOLTEON ; 135
 
 	db  65,  65,  60, 130,  70, 110
 	;   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 ThundersPicFront, ThundersPicBack ; sprites
+	dw JolteonPicFront, JolteonPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/rougela.inc b/data/pokemon/base_stats/jynx.inc
index e13e9df..a8d0eb8 100644
--- a/data/pokemon/base_stats/rougela.inc
+++ b/data/pokemon/base_stats/jynx.inc
@@ -1,4 +1,4 @@
-	db DEX_ROUGELA ; 124
+	db DEX_JYNX ; 124
 
 	db  65,  50,  35,  95,  95,  80
 	;   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 RougelaPicFront, RougelaPicBack ; sprites
+	dw JynxPicFront, JynxPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/yungerer.inc b/data/pokemon/base_stats/kadabra.inc
index d46ad12..e099c4e 100644
--- a/data/pokemon/base_stats/yungerer.inc
+++ b/data/pokemon/base_stats/kadabra.inc
@@ -1,4 +1,4 @@
-	db DEX_YUNGERER ; 064
+	db DEX_KADABRA ; 064
 
 	db  40,  35,  30, 105, 120,  75
 	;   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 YungererPicFront, YungererPicBack ; sprites
+	dw KadabraPicFront, KadabraPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/cocoon.inc b/data/pokemon/base_stats/kakuna.inc
index c7bddb8..a762b11 100644
--- a/data/pokemon/base_stats/cocoon.inc
+++ b/data/pokemon/base_stats/kakuna.inc
@@ -1,4 +1,4 @@
-	db DEX_COCOON ; 014
+	db DEX_KAKUNA ; 014
 
 	db  45,  25,  50,  35,  25,  25
 	;   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 CocoonPicFront, CocoonPicBack ; sprites
+	dw KakunaPicFront, KakunaPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/garura.inc b/data/pokemon/base_stats/kangaskhan.inc
index 17b1cb2..19069d9 100644
--- a/data/pokemon/base_stats/garura.inc
+++ b/data/pokemon/base_stats/kangaskhan.inc
@@ -1,4 +1,4 @@
-	db DEX_GARURA ; 115
+	db DEX_KANGASKHAN ; 115
 
 	db 105,  95,  80,  90,  40,  80
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_FEMALE ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 7, 7 ; sprite dimensions
-	dw GaruraPicFront, GaruraPicBack ; sprites
+	dw KangaskhanPicFront, KangaskhanPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/dogars.inc b/data/pokemon/base_stats/koffing.inc
index 81206cc..ffc1be7 100644
--- a/data/pokemon/base_stats/dogars.inc
+++ b/data/pokemon/base_stats/koffing.inc
@@ -1,4 +1,4 @@
-	db DEX_DOGARS ; 109
+	db DEX_KOFFING ; 109
 
 	db  40,  65,  95,  35,  60,  40
 	;   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 DogarsPicFront, DogarsPicBack ; sprites
+	dw KoffingPicFront, KoffingPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/crab.inc b/data/pokemon/base_stats/krabby.inc
index a41d27e..a1e78ed 100644
--- a/data/pokemon/base_stats/crab.inc
+++ b/data/pokemon/base_stats/krabby.inc
@@ -1,4 +1,4 @@
-	db DEX_CRAB ; 098
+	db DEX_KRABBY ; 098
 
 	db  30, 105,  90,  50,  35,  25
 	;   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 CrabPicFront, CrabPicBack ; sprites
+	dw KrabbyPicFront, KrabbyPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/laplace.inc b/data/pokemon/base_stats/lapras.inc
index 780f098..dcf0141 100644
--- a/data/pokemon/base_stats/laplace.inc
+++ b/data/pokemon/base_stats/lapras.inc
@@ -1,4 +1,4 @@
-	db DEX_LAPLACE ; 131
+	db DEX_LAPRAS ; 131
 
 	db 130,  85,  80,  60,  95, 105
 	;   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 LaplacePicFront, LaplacePicBack ; sprites
+	dw LaprasPicFront, LaprasPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/beroringa.inc b/data/pokemon/base_stats/lickitung.inc
index cbabe5c..1f61a92 100644
--- a/data/pokemon/base_stats/beroringa.inc
+++ b/data/pokemon/base_stats/lickitung.inc
@@ -1,4 +1,4 @@
-	db DEX_BERORINGA ; 108
+	db DEX_LICKITUNG ; 108
 
 	db  90,  55,  75,  30,  60,  90
 	;   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 BeroringaPicFront, BeroringaPicBack ; sprites
+	dw LickitungPicFront, LickitungPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/kairiky.inc b/data/pokemon/base_stats/machamp.inc
index db33e4c..691fc69 100644
--- a/data/pokemon/base_stats/kairiky.inc
+++ b/data/pokemon/base_stats/machamp.inc
@@ -1,4 +1,4 @@
-	db DEX_KAIRIKY ; 068
+	db DEX_MACHAMP ; 068
 
 	db  90, 130,  80,  55,  65,  80
 	;   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 KairikyPicFront, KairikyPicBack ; sprites
+	dw MachampPicFront, MachampPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/goriky.inc b/data/pokemon/base_stats/machoke.inc
index beb05d4..fc942ef 100644
--- a/data/pokemon/base_stats/goriky.inc
+++ b/data/pokemon/base_stats/machoke.inc
@@ -1,4 +1,4 @@
-	db DEX_GORIKY ; 067
+	db DEX_MACHOKE ; 067
 
 	db  80, 100,  70,  45,  50,  60
 	;   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 GorikyPicFront, GorikyPicBack ; sprites
+	dw MachokePicFront, MachokePicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/wanriky.inc b/data/pokemon/base_stats/machop.inc
index 684cb08..530c77f 100644
--- a/data/pokemon/base_stats/wanriky.inc
+++ b/data/pokemon/base_stats/machop.inc
@@ -1,4 +1,4 @@
-	db DEX_WANRIKY ; 066
+	db DEX_MACHOP ; 066
 
 	db  70,  80,  50,  35,  35,  40
 	;   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 WanrikyPicFront, WanrikyPicBack ; sprites
+	dw MachopPicFront, MachopPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/koiking.inc b/data/pokemon/base_stats/magikarp.inc
index 8cc9493..dbccb02 100644
--- a/data/pokemon/base_stats/koiking.inc
+++ b/data/pokemon/base_stats/magikarp.inc
@@ -1,4 +1,4 @@
-	db DEX_KOIKING ; 129
+	db DEX_MAGIKARP ; 129
 
 	db  20,  10,  55,  80,  15,  20
 	;   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 KoikingPicFront, KoikingPicBack ; sprites
+	dw MagikarpPicFront, MagikarpPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/boober.inc b/data/pokemon/base_stats/magmar.inc
index 760b634..4a417dc 100644
--- a/data/pokemon/base_stats/boober.inc
+++ b/data/pokemon/base_stats/magmar.inc
@@ -1,4 +1,4 @@
-	db DEX_BOOBER ; 126
+	db DEX_MAGMAR ; 126
 
 	db  65,  95,  57,  93,  85,  70
 	;   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 BooberPicFront, BooberPicBack ; sprites
+	dw MagmarPicFront, MagmarPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/coil.inc b/data/pokemon/base_stats/magnemite.inc
index 115397d..8dad6c9 100644
--- a/data/pokemon/base_stats/coil.inc
+++ b/data/pokemon/base_stats/magnemite.inc
@@ -1,4 +1,4 @@
-	db DEX_COIL ; 081
+	db DEX_MAGNEMITE ; 081
 
 	db  25,  35,  70,  45,  60,  95
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_UNKNOWN ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw CoilPicFront, CoilPicBack ; sprites
+	dw MagnemitePicFront, MagnemitePicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/rarecoil.inc b/data/pokemon/base_stats/magneton.inc
index 6a3f0a6..f789b65 100644
--- a/data/pokemon/base_stats/rarecoil.inc
+++ b/data/pokemon/base_stats/magneton.inc
@@ -1,4 +1,4 @@
-	db DEX_RARECOIL ; 082
+	db DEX_MAGNETON ; 082
 
 	db  50,  60,  95,  70,  75, 120
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_UNKNOWN ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 6, 6 ; sprite dimensions
-	dw RarecoilPicFront, RarecoilPicBack ; sprites
+	dw MagnetonPicFront, MagnetonPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/garagara.inc b/data/pokemon/base_stats/marowak.inc
index 94553a7..d8dab1d 100644
--- a/data/pokemon/base_stats/garagara.inc
+++ b/data/pokemon/base_stats/marowak.inc
@@ -1,4 +1,4 @@
-	db DEX_GARAGARA ; 105
+	db DEX_MAROWAK ; 105
 
 	db  60,  80, 110,  45,  50,  70
 	;   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 GaragaraPicFront, GaragaraPicBack ; sprites
+	dw MarowakPicFront, MarowakPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/nyarth.inc b/data/pokemon/base_stats/meowth.inc
index 3658319..1806a08 100644
--- a/data/pokemon/base_stats/nyarth.inc
+++ b/data/pokemon/base_stats/meowth.inc
@@ -1,4 +1,4 @@
-	db DEX_NYARTH ; 052
+	db DEX_MEOWTH ; 052
 
 	db  40,  45,  35,  90,  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 NyarthPicFront, NyarthPicBack ; sprites
+	dw MeowthPicFront, MeowthPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/transel.inc b/data/pokemon/base_stats/metapod.inc
index 84d4019..6aaa05e 100644
--- a/data/pokemon/base_stats/transel.inc
+++ b/data/pokemon/base_stats/metapod.inc
@@ -1,4 +1,4 @@
-	db DEX_TRANSEL ; 011
+	db DEX_METAPOD ; 011
 
 	db  50,  20,  55,  30,  25,  25
 	;   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 TranselPicFront, TranselPicBack ; sprites
+	dw MetapodPicFront, MetapodPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/fire.inc b/data/pokemon/base_stats/moltres.inc
index 0800618..e9e1cec 100644
--- a/data/pokemon/base_stats/fire.inc
+++ b/data/pokemon/base_stats/moltres.inc
@@ -1,4 +1,4 @@
-	db DEX_FIRE ; 146
+	db DEX_MOLTRES ; 146
 
 	db  90, 100,  90,  90, 125,  85
 	;   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 FirePicFront, FirePicBack ; sprites
+	dw MoltresPicFront, MoltresPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/barrierd.inc b/data/pokemon/base_stats/mrmime.inc
index e6a3645..859feab 100644
--- a/data/pokemon/base_stats/barrierd.inc
+++ b/data/pokemon/base_stats/mrmime.inc
@@ -1,4 +1,4 @@
-	db DEX_BARRIERD ; 122
+	db DEX_MRMIME ; 122
 
 	db  40,  45,  65,  90, 100, 120
 	;   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 BarrierdPicFront, BarrierdPicBack ; sprites
+	dw MrMimePicFront, MrMimePicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/betbeton.inc b/data/pokemon/base_stats/muk.inc
index c269960..319c5ee 100644
--- a/data/pokemon/base_stats/betbeton.inc
+++ b/data/pokemon/base_stats/muk.inc
@@ -1,4 +1,4 @@
-	db DEX_BETBETON ; 089
+	db DEX_MUK ; 089
 
 	db 105, 105,  75,  50,  80,  65
 	;   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 BetbetonPicFront, BetbetonPicBack ; sprites
+	dw MukPicFront, MukPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/kyukon.inc b/data/pokemon/base_stats/ninetales.inc
index 839923b..0f002c3 100644
--- a/data/pokemon/base_stats/kyukon.inc
+++ b/data/pokemon/base_stats/ninetales.inc
@@ -1,4 +1,4 @@
-	db DEX_KYUKON ; 038
+	db DEX_NINETALES ; 038
 
 	db  73,  76,  75, 100, 100,  80
 	;   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 KyukonPicFront, KyukonPicBack ; sprites
+	dw NinetalesPicFront, NinetalesPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/nazonokusa.inc b/data/pokemon/base_stats/oddish.inc
index 8acdf2c..be2da4b 100644
--- a/data/pokemon/base_stats/nazonokusa.inc
+++ b/data/pokemon/base_stats/oddish.inc
@@ -1,4 +1,4 @@
-	db DEX_NAZONOKUSA ; 043
+	db DEX_ODDISH ; 043
 
 	db  45,  50,  55,  30,  75,  70
 	;   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 NazonokusaPicFront, NazonokusaPicBack ; sprites
+	dw OddishPicFront, OddishPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/omnite.inc b/data/pokemon/base_stats/omanyte.inc
index 8d05cf5..7fc17ff 100644
--- a/data/pokemon/base_stats/omnite.inc
+++ b/data/pokemon/base_stats/omanyte.inc
@@ -1,4 +1,4 @@
-	db DEX_OMNITE ; 138
+	db DEX_OMANYTE ; 138
 
 	db  35,  40, 100,  35,  90,  55
 	;   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 OmnitePicFront, OmnitePicBack ; sprites
+	dw OmanytePicFront, OmanytePicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/omstar.inc b/data/pokemon/base_stats/omastar.inc
index 5ea8841..110f7f0 100644
--- a/data/pokemon/base_stats/omstar.inc
+++ b/data/pokemon/base_stats/omastar.inc
@@ -1,4 +1,4 @@
-	db DEX_OMSTAR ; 139
+	db DEX_OMASTAR ; 139
 
 	db  70,  60, 125,  55, 115,  70
 	;   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 OmstarPicFront, OmstarPicBack ; sprites
+	dw OmastarPicFront, OmastarPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/iwark.inc b/data/pokemon/base_stats/onix.inc
index c0b501f..57e2a37 100644
--- a/data/pokemon/base_stats/iwark.inc
+++ b/data/pokemon/base_stats/onix.inc
@@ -1,4 +1,4 @@
-	db DEX_IWARK ; 095
+	db DEX_ONIX ; 095
 
 	db  35,  45, 160,  70,  30,  60
 	;   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 IwarkPicFront, IwarkPicBack ; sprites
+	dw OnixPicFront, OnixPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/pigeot.inc b/data/pokemon/base_stats/pidgeot.inc
index f4ebc16..1dfa802 100644
--- a/data/pokemon/base_stats/pigeot.inc
+++ b/data/pokemon/base_stats/pidgeot.inc
@@ -1,4 +1,4 @@
-	db DEX_PIGEOT ; 018
+	db DEX_PIDGEOT ; 018
 
 	db  83,  80,  75,  91,  70,  70
 	;   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 PigeotPicFront, PigeotPicBack ; sprites
+	dw PidgeotPicFront, PidgeotPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/pigeon.inc b/data/pokemon/base_stats/pidgeotto.inc
index ef818db..32544e7 100644
--- a/data/pokemon/base_stats/pigeon.inc
+++ b/data/pokemon/base_stats/pidgeotto.inc
@@ -1,4 +1,4 @@
-	db DEX_PIGEON ; 017
+	db DEX_PIDGEOTTO ; 017
 
 	db  63,  60,  55,  71,  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 PigeonPicFront, PigeonPicBack ; sprites
+	dw PidgeottoPicFront, PidgeottoPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/poppo.inc b/data/pokemon/base_stats/pidgey.inc
index 110e52b..76c613c 100644
--- a/data/pokemon/base_stats/poppo.inc
+++ b/data/pokemon/base_stats/pidgey.inc
@@ -1,4 +1,4 @@
-	db DEX_POPPO ; 016
+	db DEX_PIDGEY ; 016
 
 	db  40,  45,  40,  56,  35,  35
 	;   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 PoppoPicFront, PoppoPicBack ; sprites
+	dw PidgeyPicFront, PidgeyPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/kailios.inc b/data/pokemon/base_stats/pinsir.inc
index 8f2fd25..15fb8ac 100644
--- a/data/pokemon/base_stats/kailios.inc
+++ b/data/pokemon/base_stats/pinsir.inc
@@ -1,4 +1,4 @@
-	db DEX_KAILIOS ; 127
+	db DEX_PINSIR ; 127
 
 	db  65, 125, 100,  85,  55,  75
 	;   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 KailiosPicFront, KailiosPicBack ; sprites
+	dw PinsirPicFront, PinsirPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/nyoromo.inc b/data/pokemon/base_stats/poliwag.inc
index 722d4e0..c71c47b 100644
--- a/data/pokemon/base_stats/nyoromo.inc
+++ b/data/pokemon/base_stats/poliwag.inc
@@ -1,4 +1,4 @@
-	db DEX_NYOROMO ; 060
+	db DEX_POLIWAG ; 060
 
 	db  40,  50,  40,  90,  40,  45
 	;   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 NyoromoPicFront, NyoromoPicBack ; sprites
+	dw PoliwagPicFront, PoliwagPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/nyorozo.inc b/data/pokemon/base_stats/poliwhirl.inc
index bed84b4..8ef9f43 100644
--- a/data/pokemon/base_stats/nyorozo.inc
+++ b/data/pokemon/base_stats/poliwhirl.inc
@@ -1,4 +1,4 @@
-	db DEX_NYOROZO ; 061
+	db DEX_POLIWHIRL ; 061
 
 	db  65,  65,  65,  90,  50,  65
 	;   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 NyorozoPicFront, NyorozoPicBack ; sprites
+	dw PoliwhirlPicFront, PoliwhirlPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/nyorobon.inc b/data/pokemon/base_stats/poliwrath.inc
index fd322b0..e15d1f8 100644
--- a/data/pokemon/base_stats/nyorobon.inc
+++ b/data/pokemon/base_stats/poliwrath.inc
@@ -1,4 +1,4 @@
-	db DEX_NYOROBON ; 062
+	db DEX_POLIWRATH ; 062
 
 	db  90,  85,  95,  70,  70,  95
 	;   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 NyorobonPicFront, NyorobonPicBack ; sprites
+	dw PoliwrathPicFront, PoliwrathPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/okorizaru.inc b/data/pokemon/base_stats/primeape.inc
index 385aa03..beed2b1 100644
--- a/data/pokemon/base_stats/okorizaru.inc
+++ b/data/pokemon/base_stats/primeape.inc
@@ -1,4 +1,4 @@
-	db DEX_OKORIZARU ; 057
+	db DEX_PRIMEAPE ; 057
 
 	db  65, 105,  60,  95,  60,  80
 	;   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 OkorizaruPicFront, OkorizaruPicBack ; sprites
+	dw PrimeapePicFront, PrimeapePicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/koduck.inc b/data/pokemon/base_stats/psyduck.inc
index 8c00e6f..9844045 100644
--- a/data/pokemon/base_stats/koduck.inc
+++ b/data/pokemon/base_stats/psyduck.inc
@@ -1,4 +1,4 @@
-	db DEX_KODUCK ; 054
+	db DEX_PSYDUCK ; 054
 
 	db  50,  52,  48,  55,  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 KoduckPicFront, KoduckPicBack ; sprites
+	dw PsyduckPicFront, PsyduckPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/gallop.inc b/data/pokemon/base_stats/rapidash.inc
index 9a280d2..9676508 100644
--- a/data/pokemon/base_stats/gallop.inc
+++ b/data/pokemon/base_stats/rapidash.inc
@@ -1,4 +1,4 @@
-	db DEX_GALLOP ; 078
+	db DEX_RAPIDASH ; 078
 
 	db  65, 100,  70, 105,  80,  75
 	;   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 GallopPicFront, GallopPicBack ; sprites
+	dw RapidashPicFront, RapidashPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/ratta.inc b/data/pokemon/base_stats/raticate.inc
index 212c6fd..b3037da 100644
--- a/data/pokemon/base_stats/ratta.inc
+++ b/data/pokemon/base_stats/raticate.inc
@@ -1,4 +1,4 @@
-	db DEX_RATTA ; 020
+	db DEX_RATICATE ; 020
 
 	db  55,  81,  60,  97,  50,  70
 	;   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 RattaPicFront, RattaPicBack ; sprites
+	dw RaticatePicFront, RaticatePicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/koratta.inc b/data/pokemon/base_stats/rattata.inc
index 4acbe91..742fdb3 100644
--- a/data/pokemon/base_stats/koratta.inc
+++ b/data/pokemon/base_stats/rattata.inc
@@ -1,4 +1,4 @@
-	db DEX_KORATTA ; 019
+	db DEX_RATTATA ; 019
 
 	db  30,  56,  35,  72,  25,  35
 	;   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 KorattaPicFront, KorattaPicBack ; sprites
+	dw RattataPicFront, RattataPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/sidon.inc b/data/pokemon/base_stats/rhydon.inc
index b761fd7..8829358 100644
--- a/data/pokemon/base_stats/sidon.inc
+++ b/data/pokemon/base_stats/rhydon.inc
@@ -1,4 +1,4 @@
-	db DEX_SIDON ; 112
+	db DEX_RHYDON ; 112
 
 	db 105, 130, 120,  40,  45,  70
 	;   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 SidonPicFront, SidonPicBack ; sprites
+	dw RhydonPicFront, RhydonPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/sihorn.inc b/data/pokemon/base_stats/rhyhorn.inc
index b7d9c9c..6f5cd75 100644
--- a/data/pokemon/base_stats/sihorn.inc
+++ b/data/pokemon/base_stats/rhyhorn.inc
@@ -1,4 +1,4 @@
-	db DEX_SIHORN ; 111
+	db DEX_RHYHORN ; 111
 
 	db  80,  85,  95,  25,  30,  55
 	;   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 SihornPicFront, SihornPicBack ; sprites
+	dw RhyhornPicFront, RhyhornPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/sand.inc b/data/pokemon/base_stats/sandshrew.inc
index c5196b2..beb8a74 100644
--- a/data/pokemon/base_stats/sand.inc
+++ b/data/pokemon/base_stats/sandshrew.inc
@@ -1,4 +1,4 @@
-	db DEX_SAND ; 027
+	db DEX_SANDSHREW ; 027
 
 	db  50,  75,  85,  40,  30,  40
 	;   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 SandPicFront, SandPicBack ; sprites
+	dw SandshrewPicFront, SandshrewPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/sandpan.inc b/data/pokemon/base_stats/sandslash.inc
index fa42d0f..3aa2905 100644
--- a/data/pokemon/base_stats/sandpan.inc
+++ b/data/pokemon/base_stats/sandslash.inc
@@ -1,4 +1,4 @@
-	db DEX_SANDPAN ; 028
+	db DEX_SANDSLASH ; 028
 
 	db  75, 100, 110,  65,  55,  75
 	;   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 SandpanPicFront, SandpanPicBack ; sprites
+	dw SandslashPicFront, SandslashPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/strike.inc b/data/pokemon/base_stats/scyther.inc
index 43879d1..ba4d9f4 100644
--- a/data/pokemon/base_stats/strike.inc
+++ b/data/pokemon/base_stats/scyther.inc
@@ -1,4 +1,4 @@
-	db DEX_STRIKE ; 123
+	db DEX_SCYTHER ; 123
 
 	db  70, 110,  80, 105,  55,  85
 	;   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 StrikePicFront, StrikePicBack ; sprites
+	dw ScytherPicFront, ScytherPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/azumao.inc b/data/pokemon/base_stats/seaking.inc
index 510743c..a8541ed 100644
--- a/data/pokemon/base_stats/azumao.inc
+++ b/data/pokemon/base_stats/seaking.inc
@@ -1,4 +1,4 @@
-	db DEX_AZUMAO ; 119
+	db DEX_SEAKING ; 119
 
 	db  80,  92,  65,  68,  65,  80
 	;   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 AzumaoPicFront, AzumaoPicBack ; sprites
+	dw SeakingPicFront, SeakingPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/pawou.inc b/data/pokemon/base_stats/seel.inc
index 5cd8340..ac507a0 100644
--- a/data/pokemon/base_stats/pawou.inc
+++ b/data/pokemon/base_stats/seel.inc
@@ -1,4 +1,4 @@
-	db DEX_PAWOU ; 086
+	db DEX_SEEL ; 086
 
 	db  65,  45,  55,  45,  55,  70
 	;   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 PawouPicFront, PawouPicBack ; sprites
+	dw SeelPicFront, SeelPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/yadoran.inc b/data/pokemon/base_stats/slowbro.inc
index 819f868..483efc1 100644
--- a/data/pokemon/base_stats/yadoran.inc
+++ b/data/pokemon/base_stats/slowbro.inc
@@ -1,4 +1,4 @@
-	db DEX_YADORAN ; 080
+	db DEX_SLOWBRO ; 080
 
 	db  95,  75, 110,  30,  80,  65
 	;   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 YadoranPicFront, YadoranPicBack ; sprites
+	dw SlowbroPicFront, SlowbroPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/yadon.inc b/data/pokemon/base_stats/slowpoke.inc
index daffa31..6683992 100644
--- a/data/pokemon/base_stats/yadon.inc
+++ b/data/pokemon/base_stats/slowpoke.inc
@@ -1,4 +1,4 @@
-	db DEX_YADON ; 079
+	db DEX_SLOWPOKE ; 079
 
 	db  90,  65,  65,  15,  40,  35
 	;   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 YadonPicFront, YadonPicBack ; sprites
+	dw SlowpokePicFront, SlowpokePicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/kabigon.inc b/data/pokemon/base_stats/snorlax.inc
index 50a5ac3..2e052a8 100644
--- a/data/pokemon/base_stats/kabigon.inc
+++ b/data/pokemon/base_stats/snorlax.inc
@@ -1,4 +1,4 @@
-	db DEX_KABIGON ; 143
+	db DEX_SNORLAX ; 143
 
 	db 160, 110,  65,  30,  65, 100
 	;   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 KabigonPicFront, KabigonPicBack ; sprites
+	dw SnorlaxPicFront, SnorlaxPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/onisuzume.inc b/data/pokemon/base_stats/spearow.inc
index b3704d0..abe4f20 100644
--- a/data/pokemon/base_stats/onisuzume.inc
+++ b/data/pokemon/base_stats/spearow.inc
@@ -1,4 +1,4 @@
-	db DEX_ONISUZUME ; 021
+	db DEX_SPEAROW ; 021
 
 	db  40,  60,  30,  70,  31,  31
 	;   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 OnisuzumePicFront, OnisuzumePicBack ; sprites
+	dw SpearowPicFront, SpearowPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/zenigame.inc b/data/pokemon/base_stats/squirtle.inc
index 9d363bf..e99064f 100644
--- a/data/pokemon/base_stats/zenigame.inc
+++ b/data/pokemon/base_stats/squirtle.inc
@@ -1,4 +1,4 @@
-	db DEX_ZENIGAME ; 007
+	db DEX_SQUIRTLE ; 007
 
 	db  44,  48,  65,  43,  50,  55
 	;   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 ZenigamePicFront, ZenigamePicBack ; sprites
+	dw SquirtlePicFront, SquirtlePicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/hitodeman.inc b/data/pokemon/base_stats/staryu.inc
index c7e2051..e684cc8 100644
--- a/data/pokemon/base_stats/hitodeman.inc
+++ b/data/pokemon/base_stats/staryu.inc
@@ -1,4 +1,4 @@
-	db DEX_HITODEMAN ; 120
+	db DEX_STARYU ; 120
 
 	db  30,  45,  55,  85,  70,  55
 	;   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 HitodemanPicFront, HitodemanPicBack ; sprites
+	dw StaryuPicFront, StaryuPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/monjara.inc b/data/pokemon/base_stats/tangela.inc
index b0bee78..4f6c967 100644
--- a/data/pokemon/base_stats/monjara.inc
+++ b/data/pokemon/base_stats/tangela.inc
@@ -1,4 +1,4 @@
-	db DEX_MONJARA ; 114
+	db DEX_TANGELA ; 114
 
 	db  65,  55, 115,  60,  55, 100
 	;   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 MonjaraPicFront, MonjaraPicBack ; sprites
+	dw TangelaPicFront, TangelaPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/kentauros.inc b/data/pokemon/base_stats/tauros.inc
index 26449db..063bd18 100644
--- a/data/pokemon/base_stats/kentauros.inc
+++ b/data/pokemon/base_stats/tauros.inc
@@ -1,4 +1,4 @@
-	db DEX_KENTAUROS ; 128
+	db DEX_TAUROS ; 128
 
 	db  75, 100,  95, 110,  55,  70
 	;   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 KentaurosPicFront, KentaurosPicBack ; sprites
+	dw TaurosPicFront, TaurosPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/menokurage.inc b/data/pokemon/base_stats/tentacool.inc
index 080a0b1..634b564 100644
--- a/data/pokemon/base_stats/menokurage.inc
+++ b/data/pokemon/base_stats/tentacool.inc
@@ -1,4 +1,4 @@
-	db DEX_MENOKURAGE ; 072
+	db DEX_TENTACOOL ; 072
 
 	db  40,  40,  35,  70,  60, 100
 	;   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 MenokuragePicFront, MenokuragePicBack ; sprites
+	dw TentacoolPicFront, TentacoolPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/dokukurage.inc b/data/pokemon/base_stats/tentacruel.inc
index 54e2c4f..2ca77f7 100644
--- a/data/pokemon/base_stats/dokukurage.inc
+++ b/data/pokemon/base_stats/tentacruel.inc
@@ -1,4 +1,4 @@
-	db DEX_DOKUKURAGE ; 073
+	db DEX_TENTACRUEL ; 073
 
 	db  80,  70,  65, 100,  80, 120
 	;   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 DokukuragePicFront, DokukuragePicBack ; sprites
+	dw TentacruelPicFront, TentacruelPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/showers.inc b/data/pokemon/base_stats/vaporeon.inc
index eb1ba76..1ada54e 100644
--- a/data/pokemon/base_stats/showers.inc
+++ b/data/pokemon/base_stats/vaporeon.inc
@@ -1,4 +1,4 @@
-	db DEX_SHOWERS ; 134
+	db DEX_VAPOREON ; 134
 
 	db 130,  65,  60,  65,  70, 110
 	;   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 ShowersPicFront, ShowersPicBack ; sprites
+	dw VaporeonPicFront, VaporeonPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/morphon.inc b/data/pokemon/base_stats/venomoth.inc
index d8d0937..c8503d7 100644
--- a/data/pokemon/base_stats/morphon.inc
+++ b/data/pokemon/base_stats/venomoth.inc
@@ -1,4 +1,4 @@
-	db DEX_MORPHON ; 049
+	db DEX_VENOMOTH ; 049
 
 	db  70,  65,  60,  90,  90, 100
 	;   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 MorphonPicFront, MorphonPicBack ; sprites
+	dw VenomothPicFront, VenomothPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/kongpang.inc b/data/pokemon/base_stats/venonat.inc
index 6abbf05..e014054 100644
--- a/data/pokemon/base_stats/kongpang.inc
+++ b/data/pokemon/base_stats/venonat.inc
@@ -1,4 +1,4 @@
-	db DEX_KONGPANG ; 048
+	db DEX_VENONAT ; 048
 
 	db  60,  55,  50,  45,  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 KongpangPicFront, KongpangPicBack ; sprites
+	dw VenonatPicFront, VenonatPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/fushigibana.inc b/data/pokemon/base_stats/venusaur.inc
index 17237dd..6171818 100644
--- a/data/pokemon/base_stats/fushigibana.inc
+++ b/data/pokemon/base_stats/venusaur.inc
@@ -1,4 +1,4 @@
-	db DEX_FUSHIGIBANA ; 003
+	db DEX_VENUSAUR ; 003
 
 	db  80,  82,  83,  80, 100, 100
 	;   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 FushigibanaPicFront, FushigibanaPicBack ; sprites
+	dw VenusaurPicFront, VenusaurPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/utsubot.inc b/data/pokemon/base_stats/victreebel.inc
index e6b2b07..0dadcf3 100644
--- a/data/pokemon/base_stats/utsubot.inc
+++ b/data/pokemon/base_stats/victreebel.inc
@@ -1,4 +1,4 @@
-	db DEX_UTSUBOT ; 071
+	db DEX_VICTREEBEL ; 071
 
 	db  80, 105,  65,  70,  65, 100
 	;   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 UtsubotPicFront, UtsubotPicBack ; sprites
+	dw VictreebelPicFront, VictreebelPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/ruffresia.inc b/data/pokemon/base_stats/vileplume.inc
index 497c287..9500d6d 100644
--- a/data/pokemon/base_stats/ruffresia.inc
+++ b/data/pokemon/base_stats/vileplume.inc
@@ -1,4 +1,4 @@
-	db DEX_RUFFRESIA ; 045
+	db DEX_VILEPLUME ; 045
 
 	db  75,  80,  85,  50, 100,  95
 	;   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 RuffresiaPicFront, RuffresiaPicBack ; sprites
+	dw VileplumePicFront, VileplumePicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/biriridama.inc b/data/pokemon/base_stats/voltorb.inc
index 1f4f5d5..fd8b0cd 100644
--- a/data/pokemon/base_stats/biriridama.inc
+++ b/data/pokemon/base_stats/voltorb.inc
@@ -1,4 +1,4 @@
-	db DEX_BIRIRIDAMA ; 100
+	db DEX_VOLTORB ; 100
 
 	db  40,  30,  50, 100,  55,  55
 	;   hp  atk  def  spd  sat  sdf
@@ -10,7 +10,7 @@
 	db GENDER_UNKNOWN ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw BiriridamaPicFront, BiriridamaPicBack ; sprites
+	dw VoltorbPicFront, VoltorbPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/rokon.inc b/data/pokemon/base_stats/vulpix.inc
index 2152b1e..8d23273 100644
--- a/data/pokemon/base_stats/rokon.inc
+++ b/data/pokemon/base_stats/vulpix.inc
@@ -1,4 +1,4 @@
-	db DEX_ROKON ; 037
+	db DEX_VULPIX ; 037
 
 	db  38,  41,  40,  65,  65,  45
 	;   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 RokonPicFront, RokonPicBack ; sprites
+	dw VulpixPicFront, VulpixPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/kameil.inc b/data/pokemon/base_stats/wartortle.inc
index adb792e..8e9aeb8 100644
--- a/data/pokemon/base_stats/kameil.inc
+++ b/data/pokemon/base_stats/wartortle.inc
@@ -1,4 +1,4 @@
-	db DEX_KAMEIL ; 008
+	db DEX_WARTORTLE ; 008
 
 	db  59,  63,  80,  58,  65,  75
 	;   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 KameilPicFront, KameilPicBack ; sprites
+	dw WartortlePicFront, WartortlePicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/beedle.inc b/data/pokemon/base_stats/weedle.inc
index 2efbce0..4865a5b 100644
--- a/data/pokemon/base_stats/beedle.inc
+++ b/data/pokemon/base_stats/weedle.inc
@@ -1,4 +1,4 @@
-	db DEX_BEEDLE ; 013
+	db DEX_WEEDLE ; 013
 
 	db  40,  35,  30,  50,  20,  20
 	;   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 BeedlePicFront, BeedlePicBack ; sprites
+	dw WeedlePicFront, WeedlePicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/utsudon.inc b/data/pokemon/base_stats/weepinbell.inc
index 1b134e6..dc297ea 100644
--- a/data/pokemon/base_stats/utsudon.inc
+++ b/data/pokemon/base_stats/weepinbell.inc
@@ -1,4 +1,4 @@
-	db DEX_UTSUDON ; 070
+	db DEX_WEEPINBELL ; 070
 
 	db  65,  90,  50,  55,  55,  85
 	;   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 UtsudonPicFront, UtsudonPicBack ; sprites
+	dw WeepinbellPicFront, WeepinbellPicBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/matadogas.inc b/data/pokemon/base_stats/weezing.inc
index ce15200..a3c3820 100644
--- a/data/pokemon/base_stats/matadogas.inc
+++ b/data/pokemon/base_stats/weezing.inc
@@ -1,4 +1,4 @@
-	db DEX_MATADOGAS ; 110
+	db DEX_WEEZING ; 110
 
 	db  65,  90, 120,  60,  85,  55
 	;   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 MatadogasPicFront, MatadogasPicBack ; sprites
+	dw WeezingPicFront, WeezingPicBack ; sprites
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/pukurin.inc b/data/pokemon/base_stats/wigglytuff.inc
index b61b46a..aff61e9 100644
--- a/data/pokemon/base_stats/pukurin.inc
+++ b/data/pokemon/base_stats/wigglytuff.inc
@@ -1,4 +1,4 @@
-	db DEX_PUKURIN ; 040
+	db DEX_WIGGLYTUFF ; 040
 
 	db 140,  70,  45,  45,  50,  80
 	;   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 PukurinPicFront, PukurinPicBack ; sprites
+	dw WigglytuffPicFront, WigglytuffPicBack ; sprites
 	db GROWTH_FAST ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/base_stats/thunder.inc b/data/pokemon/base_stats/zapdos.inc
index 01114b3..7b3dcb5 100644
--- a/data/pokemon/base_stats/thunder.inc
+++ b/data/pokemon/base_stats/zapdos.inc
@@ -1,4 +1,4 @@
-	db DEX_THUNDER ; 145
+	db DEX_ZAPDOS ; 145
 
 	db  90,  90,  85, 100, 125,  90
 	;   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 ThunderPicFront, ThunderPicBack ; sprites
+	dw ZapdosPicFront, ZapdosPicBack ; sprites
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm
index b748f09..0f2cd33 100644
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@@ -9,107 +9,107 @@ INCLUDE "constants.asm"
 SECTION "data/pokemon/dex_entries.asm", ROMX
 
 PokedexEntryPointers1::
-	dw FushigidaneDexEntry
-	dw FushigisouDexEntry
-	dw FushigibanaDexEntry
-	dw HitokageDexEntry
-	dw LizardoDexEntry
-	dw LizardonDexEntry
-	dw ZenigameDexEntry
-	dw KameilDexEntry
-	dw KamexDexEntry
+	dw BulbasaurDexEntry
+	dw IvysaurDexEntry
+	dw VenusaurDexEntry
+	dw CharmanderDexEntry
+	dw CharmeleonDexEntry
+	dw CharizardDexEntry
+	dw SquirtleDexEntry
+	dw WartortleDexEntry
+	dw BlastoiseDexEntry
 	dw CaterpieDexEntry
-	dw TranselDexEntry
+	dw MetapodDexEntry
 	dw ButterfreeDexEntry
-	dw BeedleDexEntry
-	dw CocoonDexEntry
-	dw SpearDexEntry
-	dw PoppoDexEntry
-	dw PigeonDexEntry
-	dw PigeotDexEntry
-	dw KorattaDexEntry
-	dw RattaDexEntry
-	dw OnisuzumeDexEntry
-	dw OnidrillDexEntry
-	dw ArboDexEntry
+	dw WeedleDexEntry
+	dw KakunaDexEntry
+	dw BeedrillDexEntry
+	dw PidgeyDexEntry
+	dw PidgeottoDexEntry
+	dw PidgeotDexEntry
+	dw RattataDexEntry
+	dw RaticateDexEntry
+	dw SpearowDexEntry
+	dw FearowDexEntry
+	dw EkansDexEntry
 	dw ArbokDexEntry
 	dw PikachuDexEntry
 	dw RaichuDexEntry
-	dw SandDexEntry
-	dw SandpanDexEntry
+	dw SandshrewDexEntry
+	dw SandslashDexEntry
 	dw NidoranFDexEntry
 	dw NidorinaDexEntry
 	dw NidoqueenDexEntry
 	dw NidoranMDexEntry
 	dw NidorinoDexEntry
 	dw NidokingDexEntry
-	dw PippiDexEntry
-	dw PixyDexEntry
-	dw RokonDexEntry
-	dw KyukonDexEntry
-	dw PurinDexEntry
-	dw PukurinDexEntry
+	dw ClefairyDexEntry
+	dw ClefableDexEntry
+	dw VulpixDexEntry
+	dw NinetalesDexEntry
+	dw JigglypuffDexEntry
+	dw WigglytuffDexEntry
 	dw ZubatDexEntry
 	dw GolbatDexEntry
-	dw NazonokusaDexEntry
-	dw KusaihanaDexEntry
-	dw RuffresiaDexEntry
+	dw OddishDexEntry
+	dw GloomDexEntry
+	dw VileplumeDexEntry
 	dw ParasDexEntry
 	dw ParasectDexEntry
-	dw KongpangDexEntry
-	dw MorphonDexEntry
-	dw DigdaDexEntry
+	dw VenonatDexEntry
+	dw VenomothDexEntry
+	dw DiglettDexEntry
 	dw DugtrioDexEntry
-	dw NyarthDexEntry
+	dw MeowthDexEntry
 	dw PersianDexEntry
-	dw KoduckDexEntry
+	dw PsyduckDexEntry
 	dw GolduckDexEntry
 	dw MankeyDexEntry
-	dw OkorizaruDexEntry
-	dw GardieDexEntry
-	dw WindieDexEntry
-	dw NyoromoDexEntry
-	dw NyorozoDexEntry
-	dw NyorobonDexEntry
-	dw CaseyDexEntry
-	dw YungererDexEntry
-	dw FoodinDexEntry
-	dw WanrikyDexEntry
-	dw GorikyDexEntry
-	dw KairikyDexEntry
-	dw MadatsubomiDexEntry
-	dw UtsudonDexEntry
-	dw UtsubotDexEntry
-	dw MenokurageDexEntry
-	dw DokukurageDexEntry
-	dw IsitsubuteDexEntry
-	dw GoloneDexEntry
-	dw GolonyaDexEntry
+	dw PrimeapeDexEntry
+	dw GrowlitheDexEntry
+	dw ArcanineDexEntry
+	dw PoliwagDexEntry
+	dw PoliwhirlDexEntry
+	dw PoliwrathDexEntry
+	dw AbraDexEntry
+	dw KadabraDexEntry
+	dw AlakazamDexEntry
+	dw MachopDexEntry
+	dw MachokeDexEntry
+	dw MachampDexEntry
+	dw BellsproutDexEntry
+	dw WeepinbellDexEntry
+	dw VictreebelDexEntry
+	dw TentacoolDexEntry
+	dw TentacruelDexEntry
+	dw GeodudeDexEntry
+	dw GravelerDexEntry
+	dw GolemDexEntry
 	dw PonytaDexEntry
-	dw GallopDexEntry
-	dw YadonDexEntry
-	dw YadoranDexEntry
-	dw CoilDexEntry
-	dw RarecoilDexEntry
-	dw KamonegiDexEntry
-	dw DodoDexEntry
-	dw DodorioDexEntry
-	dw PawouDexEntry
-	dw JugonDexEntry
-	dw BetbeterDexEntry
-	dw BetbetonDexEntry
+	dw RapidashDexEntry
+	dw SlowpokeDexEntry
+	dw SlowbroDexEntry
+	dw MagnemiteDexEntry
+	dw MagnetonDexEntry
+	dw FarfetchdDexEntry
+	dw DoduoDexEntry
+	dw DodrioDexEntry
+	dw SeelDexEntry
+	dw DewgongDexEntry
+	dw GrimerDexEntry
+	dw MukDexEntry
 	dw ShellderDexEntry
-	dw ParshenDexEntry
-	dw GhosDexEntry
-	dw GhostDexEntry
-	dw GangarDexEntry
-	dw IwarkDexEntry
-	dw SleepeDexEntry
-	dw SleeperDexEntry
-	dw CrabDexEntry
+	dw CloysterDexEntry
+	dw GastlyDexEntry
+	dw HaunterDexEntry
+	dw GengarDexEntry
+	dw OnixDexEntry
+	dw DrowzeeDexEntry
+	dw HypnoDexEntry
+	dw KrabbyDexEntry
 	dw KinglerDexEntry
 
-FushigidaneDexEntry:
+BulbasaurDexEntry:
 	db "たね@"
 	db 7
 	dw 69
@@ -117,7 +117,7 @@ FushigidaneDexEntry:
 	next "なにかの　タネが　うえてあり"
 	next "からだと　いっしょに　そだつ。@"
 
-FushigisouDexEntry:
+IvysaurDexEntry:
 	db "たね@"
 	db 10
 	dw 130
@@ -125,7 +125,7 @@ FushigisouDexEntry:
 	next "ようぶんを　きゅうしゅう　すると"
 	next "だんだん　そだってくる。@"
 
-FushigibanaDexEntry:
+VenusaurDexEntry:
 	db "たね@"
 	db 20
 	dw 1000
@@ -133,7 +133,7 @@ FushigibanaDexEntry:
 	next "ひなたをみつけると　まるで"
 	next "ひきよせられるように　いどうする。@"
 
-HitokageDexEntry:
+CharmanderDexEntry:
 	db "とかげ@"
 	db 6
 	dw 85
@@ -141,7 +141,7 @@ HitokageDexEntry:
 	next "しっぽの　ほのおは　こうふんすると"
 	next "おんどが　あがっていく。@"
 
-LizardoDexEntry:
+CharmeleonDexEntry:
 	db "かえん@"
 	db 11
 	dw 190
@@ -149,7 +149,7 @@ LizardoDexEntry:
 	next "まわりの　おんどが　どんどん"
 	next "あがって　あいてを　くるしめる。@"
 
-LizardonDexEntry:
+CharizardDexEntry:
 	db "かえん@"
 	db 17
 	dw 905
@@ -157,7 +157,7 @@ LizardonDexEntry:
 	next "こうねつの　ほのおを　はいて"
 	next "やまかじを　おこすことも　ある。@"
 
-ZenigameDexEntry:
+SquirtleDexEntry:
 	db "かめのこ@"
 	db 5
 	dw 90
@@ -165,7 +165,7 @@ ZenigameDexEntry:
 	next "かたい　こうらが　できる。くちから"
 	next "きょうりょくな　あわを　だす。@"
 
-KameilDexEntry:
+WartortleDexEntry:
 	db "かめ@"
 	db 10
 	dw 225
@@ -173,7 +173,7 @@ KameilDexEntry:
 	next "えものを　ねらう。はやく　およぐとき"
 	next "みみを　うごかして　バランスをとる。@"
 
-KamexDexEntry:
+BlastoiseDexEntry:
 	db "こうら@"
 	db 16
 	dw 855
@@ -189,7 +189,7 @@ CaterpieDexEntry:
 	next "だっぴして　せいちょうすると"
 	next "いとを　かけて　サナギに　かわる。@"
 
-TranselDexEntry:
+MetapodDexEntry:
 	db "さなぎ@"
 	db 7
 	dw 99
@@ -205,7 +205,7 @@ ButterfreeDexEntry:
 	next "まもられている。あめの　ひでも"
 	next "そらを　とぶことが　できる。@"
 
-BeedleDexEntry:
+WeedleDexEntry:
 	db "けむし@"
 	db 3
 	dw 32
@@ -213,7 +213,7 @@ BeedleDexEntry:
 	next "あたまに　するどい　ハりをもち"
 	next "さされると　どくに　おかされる。@"
 
-CocoonDexEntry:
+KakunaDexEntry:
 	db "さなぎ@"
 	db 6
 	dw 100
@@ -221,7 +221,7 @@ CocoonDexEntry:
 	next "カラのなかで　へんしんちゅう。"
 	next "ほとんど　うごけない。@"
 
-SpearDexEntry:
+BeedrillDexEntry:
 	db "どくばち@"
 	db 10
 	dw 295
@@ -229,7 +229,7 @@ SpearDexEntry:
 	next "もうスピードで　とびまわり"
 	next "おしりの　どくばりで　さしまくる。@"
 
-PoppoDexEntry:
+PidgeyDexEntry:
 	db "ことり@"
 	db 3
 	dw 18
@@ -237,7 +237,7 @@ PoppoDexEntry:
 	next "ちじょうに　おりてきたとき"
 	next "はばたいて　すなを　かけたりする。@"
 
-PigeonDexEntry:
+PidgeottoDexEntry:
 	db "とり@"
 	db 11
 	dw 300
@@ -245,7 +245,7 @@ PigeonDexEntry:
 	next "エサの　タマタマを　つかんで"
 	next "１００キロさきの　す　まで　はこぶ。@"
 
-PigeotDexEntry:
+PidgeotDexEntry:
 	db "とり@"
 	db 15
 	dw 395
@@ -253,7 +253,7 @@ PigeotDexEntry:
 	next "あいてを　いかくする。"
 	next "マッハ２で　そらを　とびまわる。@"
 
-KorattaDexEntry:
+RattataDexEntry:
 	db "ねずみ@"
 	db 3
 	dw 35
@@ -261,7 +261,7 @@ KorattaDexEntry:
 	next "ちいさいうえに　うごきが　すばやく"
 	next "いろんな　ところに　しゅつぼつする。@"
 
-RattaDexEntry:
+RaticateDexEntry:
 	db "ねずみ@"
 	db 7
 	dw 185
@@ -269,7 +269,7 @@ RattaDexEntry:
 	next "ちいさな　みずかきが　ついている。"
 	next "かわを　およいで　わたる。@"
 
-OnisuzumeDexEntry:
+SpearowDexEntry:
 	db "ことり@"
 	db 3
 	dw 20
@@ -277,7 +277,7 @@ OnisuzumeDexEntry:
 	next "はねが　みじかいために　いつも"
 	next "いそがしく　はばたいている。@"
 
-OnidrillDexEntry:
+FearowDexEntry:
 	db "くちばし@"
 	db 12
 	dw 380
@@ -285,7 +285,7 @@ OnidrillDexEntry:
 	next "とびつづけることが　できる。"
 	next "１かいも　おりなくても　へいきだ。@"
 
-ArboDexEntry:
+EkansDexEntry:
 	db "へび@"
 	db 20
 	dw 69
@@ -317,7 +317,7 @@ RaichuDexEntry:
 	next "たっする。シッポに　さわると"
 	next "インドぞうでも　きぜつする。@"
 
-SandDexEntry:
+SandshrewDexEntry:
 	db "ねずみ@"
 	db 6
 	dw 120
@@ -325,7 +325,7 @@ SandDexEntry:
 	next "ふかい　あなを　ほって　かくれる。"
 	next "えものを　ねらうときは　でてくる。@"
 
-SandpanDexEntry:
+SandslashDexEntry:
 	db "ねずみ@"
 	db 10
 	dw 295
@@ -381,7 +381,7 @@ NidokingDexEntry:
 	next "ながく　のびた　ツノが　とくちょう。"
 	next "ツノに　どくがあるので　ちゅうい。@"
 
-PippiDexEntry:
+ClefairyDexEntry:
 	db "ようせい@"
 	db 6
 	dw 75
@@ -389,7 +389,7 @@ PippiDexEntry:
 	next "ファンがいる。ただし　せいそくちが"
 	next "かぎられ　みつけるのが　たいへん。@"
 
-PixyDexEntry:
+ClefableDexEntry:
 	db "ようせい@"
 	db 13
 	dw 400
@@ -397,7 +397,7 @@ PixyDexEntry:
 	next "ところで　おとした　はりのおとを"
 	next "みごとに　ききわけられる。@"
 
-RokonDexEntry:
+VulpixDexEntry:
 	db "きつね@"
 	db 6
 	dw 99
@@ -405,7 +405,7 @@ RokonDexEntry:
 	next "うつくしい。せいちょうすると"
 	next "さらに　しっぽが　ふえる。@"
 
-KyukonDexEntry:
+NinetalesDexEntry:
 	db "きつね@"
 	db 11
 	dw 199
@@ -413,7 +413,7 @@ KyukonDexEntry:
 	next "９ほんの　ながい　しっぽを　もつ。"
 	next "１０００ねん　いきると　いわれる。@"
 
-PurinDexEntry:
+JigglypuffDexEntry:
 	db "ふうせん@"
 	db 5
 	dw 55
@@ -421,7 +421,7 @@ PurinDexEntry:
 	next "ねむけを　もよおす　ふしぎで"
 	next "きもちのいい　うたを　うたう。@"
 
-PukurinDexEntry:
+WigglytuffDexEntry:
 	db "ふうせん@"
 	db 10
 	dw 120
@@ -445,7 +445,7 @@ GolbatDexEntry:
 	next "いちどに　３００シーシーの"
 	next "ちを　すいとってしまう。@"
 
-NazonokusaDexEntry:
+OddishDexEntry:
 	db "ざっそう@"
 	db 5
 	dw 54
@@ -453,7 +453,7 @@ NazonokusaDexEntry:
 	next "あまり　うごかない。よるに　なると"
 	next "たねをまきながら　あるきまわる。@"
 
-KusaihanaDexEntry:
+GloomDexEntry:
 	db "ざっそう@"
 	db 8
 	dw 86
@@ -461,7 +461,7 @@ KusaihanaDexEntry:
 	next "くさい　においは　２キロさきまで"
 	next "とどき　きを　うしなわせる。@"
 
-RuffresiaDexEntry:
+VileplumeDexEntry:
 	db "フラワー@"
 	db 12
 	dw 186
@@ -485,7 +485,7 @@ ParasectDexEntry:
 	next "まきちらす。しかし　ちゅうごくでは"
 	next "このほうしを　かんぽうやくに　する。@"
 
-KongpangDexEntry:
+VenonatDexEntry:
 	db "こんちゅう@"
 	db 10
 	dw 300
@@ -493,7 +493,7 @@ KongpangDexEntry:
 	next "ほかのむしなどを　たべてるらしい。"
 	next "よるは　あかりのそばに　やってくる。@"
 
-MorphonDexEntry:
+VenomothDexEntry:
 	db "どくが@"
 	db 15
 	dw 125
@@ -501,7 +501,7 @@ MorphonDexEntry:
 	next "ヒラヒラと　はばたくたびに"
 	next "もうどくの　こなを　ばらまく。@"
 
-DigdaDexEntry:
+DiglettDexEntry:
 	db "もぐら@"
 	db 2
 	dw 8
@@ -517,7 +517,7 @@ DugtrioDexEntry:
 	next "ゆだんしている　ところを"
 	next "べつの　ばしょから　こうげきする。@"
 
-NyarthDexEntry:
+MeowthDexEntry:
 	db "ばけねこ@"
 	db 4
 	dw 42
@@ -533,7 +533,7 @@ PersianDexEntry:
 	next "まっすぐ　たてたら　よう　ちゅうい。"
 	next "とびかかって　かみつく　まえぶれだ。@"
 
-KoduckDexEntry:
+PsyduckDexEntry:
 	db "あひる@"
 	db 8
 	dw 196
@@ -557,7 +557,7 @@ MankeyDexEntry:
 	next "せいかく。おこって　あばれだすと"
 	next "てが　つけられなくなる。@"
 
-OkorizaruDexEntry:
+PrimeapeDexEntry:
 	db "ぶたざる@"
 	db 10
 	dw 320
@@ -565,7 +565,7 @@ OkorizaruDexEntry:
 	next "にげても　にげても　どこまでも"
 	next "おいかけてくる　せいかくだ。@"
 
-GardieDexEntry:
+GrowlitheDexEntry:
 	db "こいぬ@"
 	db 7
 	dw 190
@@ -573,7 +573,7 @@ GardieDexEntry:
 	next "なわばりを　もっており　ゆだんして"
 	next "ちかずくと　こうげきされる。@"
 
-WindieDexEntry:
+ArcanineDexEntry:
 	db "でんせつ@"
 	db 19
 	dw 1550
@@ -581,7 +581,7 @@ WindieDexEntry:
 	next "とりこにした　うつくしい　ポケモン。"
 	next "とぶように　かろやかに　はしる。@"
 
-NyoromoDexEntry:
+PoliwagDexEntry:
 	db "おたま@"
 	db 6
 	dw 124
@@ -589,7 +589,7 @@ NyoromoDexEntry:
 	next "おなかの　なかが　すけて"
 	next "うずまきじょうに　みえる。@"
 
-NyorozoDexEntry:
+PoliwhirlDexEntry:
 	db "おたま@"
 	db 10
 	dw 200
@@ -597,7 +597,7 @@ NyorozoDexEntry:
 	next "ちじょうでは　いつも　あせをかき"
 	next "からだを　ぬめぬめ　させている。@"
 
-NyorobonDexEntry:
+PoliwrathDexEntry:
 	db "おたま@"
 	db 13
 	dw 540
@@ -605,7 +605,7 @@ NyorobonDexEntry:
 	next "オりンピックの　せんしゅでも　"
 	next "ぐんぐんと　おいぬいていく。@"
 
-CaseyDexEntry:
+AbraDexEntry:
 	db "ねんりき@"
 	db 9
 	dw 195
@@ -613,7 +613,7 @@ CaseyDexEntry:
 	next "ねむってる　あいだでも　さまざまな"
 	next "ちょうのうりょくを　つかう。@"
 
-YungererDexEntry:
+KadabraDexEntry:
 	db "ねんりき@"
 	db 13
 	dw 565
@@ -621,7 +621,7 @@ YungererDexEntry:
 	next "でていて　そばに　ちかよるだけで"
 	next "あたまが　いたくなってくる。@"
 
-FoodinDexEntry:
+AlakazamDexEntry:
 	db "ねんりき@"
 	db 15
 	dw 480
@@ -629,7 +629,7 @@ FoodinDexEntry:
 	next "けいさんする　ずのうを　もつ。"
 	next "ちのうしすうは　だいたい５０００。@"
 
-WanrikyDexEntry:
+MachopDexEntry:
 	db "かいりき@"
 	db 8
 	dw 195
@@ -637,7 +637,7 @@ WanrikyDexEntry:
 	next "こどものようで　ありながら"
 	next "おとな　１００にんを　なげとばす。@"
 
-GorikyDexEntry:
+MachokeDexEntry:
 	db "かいりき@"
 	db 15
 	dw 705
@@ -645,7 +645,7 @@ GorikyDexEntry:
 	next "にくたい。すごくおもい　にもつを"
 	next "はこぶ　しごとなどを　てつだう。@"
 
-KairikyDexEntry:
+MachampDexEntry:
 	db "かいりき@"
 	db 16
 	dw 1300
@@ -653,7 +653,7 @@ KairikyDexEntry:
 	next "２びょうかんに　１０００ぱつの"
 	next "パンチを　くりだすことができる。@"
 
-MadatsubomiDexEntry:
+BellsproutDexEntry:
 	db "フラワー@"
 	db 7
 	dw 40
@@ -661,7 +661,7 @@ MadatsubomiDexEntry:
 	next "でんせつの　マンドラゴラの　いっしゅ"
 	next "ではないかと　ささやかれている。@"
 
-UtsudonDexEntry:
+WeepinbellDexEntry:
 	db "ハエとり@"
 	db 10
 	dw 64
@@ -669,7 +669,7 @@ UtsudonDexEntry:
 	next "あいてを　きりさく。くちからは"
 	next "なんでも　とかす　えきたいを　はく。@"
 
-UtsubotDexEntry:
+VictreebelDexEntry:
 	db "ハエとり@"
 	db 17
 	dw 155
@@ -677,7 +677,7 @@ UtsubotDexEntry:
 	next "きょうぼうな　しょくぶつ　ポケモン。"
 	next "ようかいえきで　なんでも　とかす。@"
 
-MenokurageDexEntry:
+TentacoolDexEntry:
 	db "くらげ@"
 	db 9
 	dw 455
@@ -685,7 +685,7 @@ MenokurageDexEntry:
 	next "めだまから　ふしぎな　ひかりの"
 	next "ビームを　はっしゃする。@"
 
-DokukurageDexEntry:
+TentacruelDexEntry:
 	db "くらげ@"
 	db 16
 	dw 550
@@ -693,7 +693,7 @@ DokukurageDexEntry:
 	next "うごく。さされると　どくに　おかされ"
 	next "するどい　いたみが　はしる。@"
 
-IsitsubuteDexEntry:
+GeodudeDexEntry:
 	db "がんせき@"
 	db 4
 	dw 20
@@ -701,7 +701,7 @@ IsitsubuteDexEntry:
 	next "いしころに　にていて　きがつかずに"
 	next "ふんだり　つまずいたり　してしまう。@"
 
-GoloneDexEntry:
+GravelerDexEntry:
 	db "がんせき@"
 	db 10
 	dw 1050
@@ -709,7 +709,7 @@ GoloneDexEntry:
 	next "ころがりながら　いどうするとき"
 	next "じゃまものは　おしつぶしていく。@"
 
-GolonyaDexEntry:
+GolemDexEntry:
 	db "メガトン@"
 	db 14
 	dw 3000
@@ -725,7 +725,7 @@ PonytaDexEntry:
 	next "ものすごい。１かいの　ジャンプで"
 	next "とうきょうタワーも　とびこえる。@"
 
-GallopDexEntry:
+RapidashDexEntry:
 	db "ひのうま@"
 	db 17
 	dw 950
@@ -733,7 +733,7 @@ GallopDexEntry:
 	next "メラメラ　もえながら　しんかんせんと"
 	next "おなじ　スピードで　かけぬける。@"
 
-YadonDexEntry:
+SlowpokeDexEntry:
 	db "まぬけ@"
 	db 12
 	dw 360
@@ -741,7 +741,7 @@ YadonDexEntry:
 	next "たたかれても　５びょう　たってから"
 	next "いたさを　かんじるほどだ。@"
 
-YadoranDexEntry:
+SlowbroDexEntry:
 	db "やどかり@"
 	db 16
 	dw 785
@@ -749,7 +749,7 @@ YadoranDexEntry:
 	next "とりにいったとき　シェルダーに"
 	next "しっぽをかまれ　ヤドランになった。@"
 
-CoilDexEntry:
+MagnemiteDexEntry:
 	db "じしゃく@"
 	db 3
 	dw 60
@@ -757,7 +757,7 @@ CoilDexEntry:
 	next "さゆうの　ユニットから"
 	next "でんじはなどを　ほうしゃする。@"
 
-RarecoilDexEntry:
+MagnetonDexEntry:
 	db "じしゃく@"
 	db 10
 	dw 600
@@ -765,7 +765,7 @@ RarecoilDexEntry:
 	next "きょうりょくな　じりょくせんと"
 	next "こうでんあつを　ほうしゃする。@"
 
-KamonegiDexEntry:
+FarfetchdDexEntry:
 	db "かるがも@"
 	db 8
 	dw 150
@@ -773,7 +773,7 @@ KamonegiDexEntry:
 	next "しょくぶつの　クキを　１ぽん"
 	next "いつも　もって　あるいている。@"
 
-DodoDexEntry:
+DoduoDexEntry:
 	db "ふたごどり@"
 	db 14
 	dw 392
@@ -781,7 +781,7 @@ DodoDexEntry:
 	next "はやく　きょだいな　あしあとを"
 	next "のこして　だいちを　かけぬける。@"
 
-DodorioDexEntry:
+DodrioDexEntry:
 	db "みつごどり@"
 	db 18
 	dw 852
@@ -789,7 +789,7 @@ DodorioDexEntry:
 	next "さくせんを　あやつる。ねるときも"
 	next "どれか　１つは　おきているという。@"
 
-PawouDexEntry:
+SeelDexEntry:
 	db "あしか@"
 	db 11
 	dw 900
@@ -797,7 +797,7 @@ PawouDexEntry:
 	next "ひふは　ぶあつくて　じょうぶ。"
 	next "れいか４０ど　でも　かつどうできる。@"
 
-JugonDexEntry:
+DewgongDexEntry:
 	db "あしか@"
 	db 17
 	dw 1200
@@ -805,7 +805,7 @@ JugonDexEntry:
 	next "おおわれている。さむさに　つよく"
 	next "むしろ　さむいほど　げんきになる。@"
 
-BetbeterDexEntry:
+GrimerDexEntry:
 	db "へドロ@"
 	db 9
 	dw 300
@@ -813,7 +813,7 @@ BetbeterDexEntry:
 	next "へドロが　べトべターにへんかした。"
 	next "きたないモノが　だいこうぶつ。@"
 
-BetbetonDexEntry:
+MukDexEntry:
 	db "へドロ@"
 	db 12
 	dw 300
@@ -829,7 +829,7 @@ ShellderDexEntry:
 	next "おおわれている。しかし　なかは"
 	next "とても　やわらかい。@"
 
-ParshenDexEntry:
+CloysterDexEntry:
 	db "２まいがい@"
 	db 15
 	dw 1325
@@ -837,7 +837,7 @@ ParshenDexEntry:
 	next "ナパームだんでも　こわせない。"
 	next "こうげきするときだけ　ひらく。@"
 
-GhosDexEntry:
+GastlyDexEntry:
 	db "ガスじょう@"
 	db 13
 	dw 1
@@ -845,7 +845,7 @@ GhosDexEntry:
 	next "ガスに　つつまれると"
 	next "インドぞうも　２びょうで　たおれる。@"
 
-GhostDexEntry:
+HaunterDexEntry:
 	db "ガスじょう@"
 	db 16
 	dw 1
@@ -853,7 +853,7 @@ GhostDexEntry:
 	next "みられているような　きがしたら"
 	next "そこに　ゴーストが　いるのだ。@"
 
-GangarDexEntry:
+GengarDexEntry:
 	db "シャドー@"
 	db 15
 	dw 405
@@ -861,7 +861,7 @@ GangarDexEntry:
 	next "いのちをうばいに　くらやみから"
 	next "あらわれることが　あるという。@"
 
-IwarkDexEntry:
+OnixDexEntry:
 	db "いわへび@"
 	db 88
 	dw 2100
@@ -869,7 +869,7 @@ IwarkDexEntry:
 	next "がんせきせいぶんが　へんかして"
 	next "くろい　ダイヤモンドのようになる。@"
 
-SleepeDexEntry:
+DrowzeeDexEntry:
 	db "さいみん@"
 	db 10
 	dw 324
@@ -877,7 +877,7 @@ SleepeDexEntry:
 	next "いきもの　バクの　しそん。"
 	next "さいみんじゅつが　とくいだ。@"
 
-SleeperDexEntry:
+HypnoDexEntry:
 	db "さいみん@"
 	db 16
 	dw 756
@@ -885,7 +885,7 @@ SleeperDexEntry:
 	next "こどもに　さいみんじゅつを　かけて"
 	next "どこかへ　つれさるじけんが　あった。@"
 
-CrabDexEntry:
+KrabbyDexEntry:
 	db "さわがに@"
 	db 4
 	dw 65
@@ -902,56 +902,56 @@ KinglerDexEntry:
 	next "おおきすぎて　うまく　うごかない。@"
 
 PokedexEntryPointers2::
-	dw BiriridamaDexEntry
-	dw MarumineDexEntry
-	dw TamatamaDexEntry
-	dw NassyDexEntry
-	dw KarakaraDexEntry
-	dw GaragaraDexEntry
-	dw SawamularDexEntry
-	dw EbiwalarDexEntry
-	dw BeroringaDexEntry
-	dw DogarsDexEntry
-	dw MatadogasDexEntry
-	dw SihornDexEntry
-	dw SidonDexEntry
-	dw LuckyDexEntry
-	dw MonjaraDexEntry
-	dw GaruraDexEntry
-	dw TattuDexEntry
+	dw VoltorbDexEntry
+	dw ElectrodeDexEntry
+	dw ExeggcuteDexEntry
+	dw ExeggutorDexEntry
+	dw CuboneDexEntry
+	dw MarowakDexEntry
+	dw HitmonleeDexEntry
+	dw HitmonchanDexEntry
+	dw LickitungDexEntry
+	dw KoffingDexEntry
+	dw WeezingDexEntry
+	dw RhyhornDexEntry
+	dw RhydonDexEntry
+	dw ChanseyDexEntry
+	dw TangelaDexEntry
+	dw KangaskhanDexEntry
+	dw HorseaDexEntry
 	dw SeadraDexEntry
-	dw TosakintoDexEntry
-	dw AzumaoDexEntry
-	dw HitodemanDexEntry
+	dw GoldeenDexEntry
+	dw SeakingDexEntry
+	dw StaryuDexEntry
 	dw StarmieDexEntry
-	dw BarrierdDexEntry
-	dw StrikeDexEntry
-	dw RougelaDexEntry
-	dw ElebooDexEntry
-	dw BooberDexEntry
-	dw KailiosDexEntry
-	dw KentaurosDexEntry
-	dw KoikingDexEntry
+	dw MrMimeDexEntry
+	dw ScytherDexEntry
+	dw JynxDexEntry
+	dw ElectabuzzDexEntry
+	dw MagmarDexEntry
+	dw PinsirDexEntry
+	dw TaurosDexEntry
+	dw MagikarpDexEntry
 	dw GyaradosDexEntry
-	dw LaplaceDexEntry
-	dw MetamonDexEntry
-	dw EievuiDexEntry
-	dw ShowersDexEntry
-	dw ThundersDexEntry
-	dw BoosterDexEntry
+	dw LaprasDexEntry
+	dw DittoDexEntry
+	dw EeveeDexEntry
+	dw VaporeonDexEntry
+	dw JolteonDexEntry
+	dw FlareonDexEntry
 	dw PorygonDexEntry
-	dw OmniteDexEntry
-	dw OmstarDexEntry
+	dw OmanyteDexEntry
+	dw OmastarDexEntry
 	dw KabutoDexEntry
 	dw KabutopsDexEntry
-	dw PteraDexEntry
-	dw KabigonDexEntry
-	dw FreezerDexEntry
-	dw ThunderDexEntry
-	dw FireDexEntry
-	dw MiniryuDexEntry
-	dw HakuryuDexEntry
-	dw KairyuDexEntry
+	dw AerodactylDexEntry
+	dw SnorlaxDexEntry
+	dw ArticunoDexEntry
+	dw ZapdosDexEntry
+	dw MoltresDexEntry
+	dw DratiniDexEntry
+	dw DragonairDexEntry
+	dw DragoniteDexEntry
 	dw MewtwoDexEntry
 	dw MewDexEntry
 	dw HappaDexEntry
@@ -1055,7 +1055,7 @@ PokedexEntryPointers2::
 	dw TailDexEntry
 	dw LeafyDexEntry
 
-BiriridamaDexEntry:
+VoltorbDexEntry:
 	db "ボール@"
 	db 5
 	dw 104
@@ -1063,7 +1063,7 @@ BiriridamaDexEntry:
 	next "モンスターボールと　まちがえて"
 	next "さわって　しびれるひとが　おおい。@"
 
-MarumineDexEntry:
+ElectrodeDexEntry:
 	db "ボール@"
 	db 12
 	dw 666
@@ -1071,7 +1071,7 @@ MarumineDexEntry:
 	next "ためこんでおり　ちょっとした"
 	next "しげきで　だいばくはつを　おこす。@"
 
-TamatamaDexEntry:
+ExeggcuteDexEntry:
 	db "たまご@"
 	db 4
 	dw 25
@@ -1079,7 +1079,7 @@ TamatamaDexEntry:
 	next "しょくぶつの　タネのような"
 	next "いきものだと　いうことが　わかった。@"
 
-NassyDexEntry:
+ExeggutorDexEntry:
 	db "やしのみ@"
 	db 20
 	dw 1200
@@ -1087,7 +1087,7 @@ NassyDexEntry:
 	next "みの　ひとつひとつに"
 	next "それぞれ　いしを　もっている。@"
 
-KarakaraDexEntry:
+CuboneDexEntry:
 	db "こどく@"
 	db 4
 	dw 65
@@ -1095,7 +1095,7 @@ KarakaraDexEntry:
 	next "あたまに　かぶっている。さびしいとき"
 	next "おおごえで　なくという。@"
 
-GaragaraDexEntry:
+MarowakDexEntry:
 	db "ほねずき@"
 	db 10
 	dw 450
@@ -1103,7 +1103,7 @@ GaragaraDexEntry:
 	next "よわかった。ホネを　つかうようになり"
 	next "せいかくが　きょうぼうか　した。@"
 
-SawamularDexEntry:
+HitmonleeDexEntry:
 	db "キック@"
 	db 15
 	dw 498
@@ -1111,7 +1111,7 @@ SawamularDexEntry:
 	next "あいてが　とおく　はなれていても"
 	next "かんたんに　けりあげてしまう。@"
 
-EbiwalarDexEntry:
+HitmonchanDexEntry:
 	db "パンチ@"
 	db 14
 	dw 502
@@ -1119,7 +1119,7 @@ EbiwalarDexEntry:
 	next "のりうつった。パンチのスピードは"
 	next "しんかんせんよりも　はやい。@"
 
-BeroringaDexEntry:
+LickitungDexEntry:
 	db "なめまわし@"
 	db 12
 	dw 655
@@ -1127,7 +1127,7 @@ BeroringaDexEntry:
 	next "エサをとったり　こうげきをしたりと"
 	next "まるで　てのように　うごくのだ。@"
 
-DogarsDexEntry:
+KoffingDexEntry:
 	db "どくガス@"
 	db 6
 	dw 10
@@ -1135,7 +1135,7 @@ DogarsDexEntry:
 	next "もうどくの　ガスが　つまっている。"
 	next "ちかくに　くるだけで　くさい。@"
 
-MatadogasDexEntry:
+WeezingDexEntry:
 	db "どくガス@"
 	db 12
 	dw 95
@@ -1143,7 +1143,7 @@ MatadogasDexEntry:
 	next "ふたごの　ちいさい　ドガースが"
 	next "れんけつしたまま　でることがある。@"
 
-SihornDexEntry:
+RhyhornDexEntry:
 	db "とげとげ@"
 	db 10
 	dw 1150
@@ -1151,7 +1151,7 @@ SihornDexEntry:
 	next "こうそうビルでも　たいあたりで"
 	next "コナゴナに　ふんさいしてしまう。@"
 
-SidonDexEntry:
+RhydonDexEntry:
 	db "ドりル@"
 	db 19
 	dw 1200
@@ -1159,7 +1159,7 @@ SidonDexEntry:
 	next "まもっている。２０００どの"
 	next "マグマの　なかでも　いきられる。@"
 
-LuckyDexEntry:
+ChanseyDexEntry:
 	db "たまご@"
 	db 11
 	dw 346
@@ -1167,7 +1167,7 @@ LuckyDexEntry:
 	next "つかまえた　ひとには　しあわせを"
 	next "もたらすと　いわれている。@"
 
-MonjaraDexEntry:
+TangelaDexEntry:
 	db "ツルじょう@"
 	db 10
 	dw 350
@@ -1175,7 +1175,7 @@ MonjaraDexEntry:
 	next "からみあい　しょうたいは　みえない。"
 	next "ちかずくものに　からみついてくる。@"
 
-GaruraDexEntry:
+KangaskhanDexEntry:
 	db "おやこ@"
 	db 22
 	dw 800
@@ -1183,7 +1183,7 @@ GaruraDexEntry:
 	next "ふくろから　ほとんど　でてこない。"
 	next "やく３ねんで　おやばなれする。@"
 
-TattuDexEntry:
+HorseaDexEntry:
 	db "ドラゴン@"
 	db 4
 	dw 80
@@ -1199,7 +1199,7 @@ SeadraDexEntry:
 	next "まえを　むいたまま　うしろへ"
 	next "およぐことも　できる　ポケモン。@"
 
-TosakintoDexEntry:
+GoldeenDexEntry:
 	db "きんぎょ@"
 	db 6
 	dw 150
@@ -1207,7 +1207,7 @@ TosakintoDexEntry:
 	next "はったつしており　すいちゅうを"
 	next "５ノットの　はやさで　およぐ。@"
 
-AzumaoDexEntry:
+SeakingDexEntry:
 	db "きんぎょ@"
 	db 13
 	dw 390
@@ -1215,7 +1215,7 @@ AzumaoDexEntry:
 	next "いわはだを　ツノで　くりぬき"
 	next "じぶんの　すを　つくっている。@"
 
-HitodemanDexEntry:
+StaryuDexEntry:
 	db "ほしがた@"
 	db 8
 	dw 345
@@ -1231,7 +1231,7 @@ StarmieDexEntry:
 	next "うちゅうせいぶつ　ではないかと"
 	next "じもとでは　うたがわれている。@"
 
-BarrierdDexEntry:
+MrMimeDexEntry:
 	db "バりアー@"
 	db 13
 	dw 545
@@ -1239,7 +1239,7 @@ BarrierdDexEntry:
 	next "パントマイムで　つくったカべが"
 	next "ほんとうに　あらわれるという。@"
 
-StrikeDexEntry:
+ScytherDexEntry:
 	db "かまきり@"
 	db 15
 	dw 560
@@ -1247,7 +1247,7 @@ StrikeDexEntry:
 	next "いきのねを　とめる。ごくまれに"
 	next "ハネをつかって　とぶことがある。@"
 
-RougelaDexEntry:
+JynxDexEntry:
 	db "ひとがた@"
 	db 14
 	dw 406
@@ -1255,7 +1255,7 @@ RougelaDexEntry:
 	next "ゆだんをすると　おもわず　つられて"
 	next "おどってしまうという。@"
 
-ElebooDexEntry:
+ElectabuzzDexEntry:
 	db "でんげき@"
 	db 11
 	dw 300
@@ -1263,7 +1263,7 @@ ElebooDexEntry:
 	next "おおきな　はつでんしょ　などに　"
 	next "しばしば　あらわれる。@"
 
-BooberDexEntry:
+MagmarDexEntry:
 	db "ひふき@"
 	db 13
 	dw 445
@@ -1271,7 +1271,7 @@ BooberDexEntry:
 	next "みつかった。くちから　ほのおをはく。"
 	next "たいおんは　１２００ど　もある。@"
 
-KailiosDexEntry:
+PinsirDexEntry:
 	db "くわがた@"
 	db 15
 	dw 550
@@ -1279,7 +1279,7 @@ KailiosDexEntry:
 	next "はさまれたら　ちぎれるまで"
 	next "はなさないという。@"
 
-KentaurosDexEntry:
+TaurosDexEntry:
 	db "あばれうし@"
 	db 14
 	dw 884
@@ -1287,7 +1287,7 @@ KentaurosDexEntry:
 	next "しっぽで　からだを　たたきながら"
 	next "まっすぐ　つっこんでくる。@"
 
-KoikingDexEntry:
+MagikarpDexEntry:
 	db "さかな@"
 	db 9
 	dw 100
@@ -1303,7 +1303,7 @@ GyaradosDexEntry:
 	next "くちからだす　はかいこうせんは"
 	next "すべてのものを　やきつくす。@"
 
-LaplaceDexEntry:
+LaprasDexEntry:
 	db "のりもの@"
 	db 25
 	dw 2200
@@ -1311,7 +1311,7 @@ LaplaceDexEntry:
 	next "ぜつめつ　すんぜんに　なっている。"
 	next "ひとをのせて　すすむ。@"
 
-MetamonDexEntry:
+DittoDexEntry:
 	db "へんしん@"
 	db 3
 	dw 40
@@ -1319,7 +1319,7 @@ MetamonDexEntry:
 	next "コピーして　あいて　そっくりに"
 	next "へんしんする　のうりょくがある。@"
 
-EievuiDexEntry:
+EeveeDexEntry:
 	db "しんか@"
 	db 3
 	dw 65
@@ -1327,7 +1327,7 @@ EievuiDexEntry:
 	next "いしからでる　ほうしゃせんによって"
 	next "からだが　とつぜんへんいを　おこす。@"
 
-ShowersDexEntry:
+VaporeonDexEntry:
 	db "あわはき@"
 	db 10
 	dw 290
@@ -1335,7 +1335,7 @@ ShowersDexEntry:
 	next "さかなのような　ひれが　のこっていて"
 	next "にんぎょと　まちがう　ひともいる。@"
 
-ThundersDexEntry:
+JolteonDexEntry:
 	db "かみなり@"
 	db 8
 	dw 245
@@ -1343,7 +1343,7 @@ ThundersDexEntry:
 	next "すいこんで　やく１００００ボルトの"
 	next "でんきを　はきだすことができる。@"
 
-BoosterDexEntry:
+FlareonDexEntry:
 	db "ほのお@"
 	db 9
 	dw 250
@@ -1359,7 +1359,7 @@ PorygonDexEntry:
 	next "ついに　じんこうの　ポケモンを"
 	next "つくることに　せいこうした。@"
 
-OmniteDexEntry:
+OmanyteDexEntry:
 	db "うずまき@"
 	db 4
 	dw 75
@@ -1367,7 +1367,7 @@ OmniteDexEntry:
 	next "かせきが　はっけんされ　そこから"
 	next "いきかえらせることが　できる。@"
 
-OmstarDexEntry:
+OmastarDexEntry:
 	db "うずまき@"
 	db 10
 	dw 350
@@ -1391,7 +1391,7 @@ KabutopsDexEntry:
 	next "するどい　カマで　えものを　とらえ"
 	next "たいえきを　すいとってしまう。@"
 
-PteraDexEntry:
+AerodactylDexEntry:
 	db "かせき@"
 	db 18
 	dw 590
@@ -1399,7 +1399,7 @@ PteraDexEntry:
 	next "いでんしから　ふっかつさせた。"
 	next "たかいこえで　なきながら　とぶ。@"
 
-KabigonDexEntry:
+SnorlaxDexEntry:
 	db "いねむり@"
 	db 21
 	dw 4600
@@ -1407,7 +1407,7 @@ KabigonDexEntry:
 	next "たべないと　きが　すまない。"
 	next "たべおわると　ねむってしまう。@"
 
-FreezerDexEntry:
+ArticunoDexEntry:
 	db "れいとう@"
 	db 17
 	dw 554
@@ -1415,7 +1415,7 @@ FreezerDexEntry:
 	next "めのまえに　あらわれるといわれる"
 	next "でんせつの　れいとうポケモン。@"
 
-ThunderDexEntry:
+ZapdosDexEntry:
 	db "でんげき@"
 	db 16
 	dw 526
@@ -1423,7 +1423,7 @@ ThunderDexEntry:
 	next "いなづまを　おとしながら　あらわれる"
 	next "でんせつの　とりポケモンである。@"
 
-FireDexEntry:
+MoltresDexEntry:
 	db "かえん@"
 	db 20
 	dw 600
@@ -1431,7 +1431,7 @@ FireDexEntry:
 	next "しられる。　はばたくたびに　はねが"
 	next "あかるく　もえあがり　うつくしい。@"
 
-MiniryuDexEntry:
+DratiniDexEntry:
 	db "ドラゴン@"
 	db 18
 	dw 33
@@ -1439,7 +1439,7 @@ MiniryuDexEntry:
 	next "よばれた。わずかだが　すいちゅうに"
 	next "すんでいることが　わかった。@"
 
-HakuryuDexEntry:
+DragonairDexEntry:
 	db "ドラゴン@"
 	db 40
 	dw 165
@@ -1447,7 +1447,7 @@ HakuryuDexEntry:
 	next "とぶとき　からだを　しなやかに"
 	next "くねらせて　とても　うつくしい。@"
 
-KairyuDexEntry:
+DragoniteDexEntry:
 	db "ドラゴン@"
 	db 22
 	dw 2100
diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm
index 75da11e..363316e 100644
--- a/data/pokemon/dex_order_alpha.asm
+++ b/data/pokemon/dex_order_alpha.asm
@@ -5,128 +5,128 @@ SECTION "data/pokemon/dex_order_alpha.asm", ROMX
 ; Every Pokémon sorted alphabetically by name (gojūon order).
 
 AlphabeticalPokedexOrder:
-	db DEX_ARBO
+	db DEX_EKANS
 	db DEX_ARBOK
 	db DEX_AQUA
 	db DEX_AQUARIA
-	db DEX_AZUMAO
+	db DEX_SEAKING
 	db DEX_ANIMON
 	db DEX_ANNON
-	db DEX_EIEVUI
+	db DEX_EEVEE
 	db DEX_IKARI
-	db DEX_ISITSUBUTE
-	db DEX_IWARK
-	db DEX_WINDIE
-	db DEX_UTSUDON
-	db DEX_UTSUBOT
+	db DEX_GEODUDE
+	db DEX_ONIX
+	db DEX_ARCANINE
+	db DEX_WEEPINBELL
+	db DEX_VICTREEBEL
 	db DEX_WOLFMAN
 	db DEX_EIFIE
 	db DEX_EKSING
-	db DEX_EBIWALAR
-	db DEX_ELEBOO
+	db DEX_HITMONCHAN
+	db DEX_ELECTABUZZ
 	db DEX_ELEBABY
 	db DEX_EN
 	db DEX_OKUTANK
-	db DEX_OKORIZARU
-	db DEX_ONISUZUME
-	db DEX_ONIDRILL
-	db DEX_OMSTAR
-	db DEX_OMNITE
-	db DEX_GARDIE
-	db DEX_KAIRIKY
-	db DEX_KAIRYU
-	db DEX_KAILIOS
-	db DEX_KABIGON
+	db DEX_PRIMEAPE
+	db DEX_SPEAROW
+	db DEX_FEAROW
+	db DEX_OMASTAR
+	db DEX_OMANYTE
+	db DEX_GROWLITHE
+	db DEX_MACHAMP
+	db DEX_DRAGONITE
+	db DEX_PINSIR
+	db DEX_SNORLAX
 	db DEX_KABUTO
 	db DEX_KABUTOPS
 	db DEX_KAPOERER
-	db DEX_KAMEIL
-	db DEX_KAMEX
-	db DEX_KAMONEGI
-	db DEX_KARAKARA
-	db DEX_GARAGARA
-	db DEX_GARURA
+	db DEX_WARTORTLE
+	db DEX_BLASTOISE
+	db DEX_FARFETCHD
+	db DEX_CUBONE
+	db DEX_MAROWAK
+	db DEX_KANGASKHAN
 	db DEX_GIFT
 	db DEX_CATERPIE
 	db DEX_GYARADOS
-	db DEX_GALLOP
-	db DEX_KYUKON
+	db DEX_RAPIDASH
+	db DEX_NINETALES
 	db DEX_GYOPIN
 	db DEX_KYONPAN
 	db DEX_KIRINRIKI
 	db DEX_KIREIHANA
 	db DEX_KINGDRA
 	db DEX_KINGLER
-	db DEX_KUSAIHANA
-	db DEX_CRAB
+	db DEX_GLOOM
+	db DEX_KRABBY
 	db DEX_KURUSU
 	db DEX_GROTESS
-	db DEX_CASEY
-	db DEX_GANGAR
-	db DEX_KENTAUROS
-	db DEX_KOIKING
-	db DEX_COIL
-	db DEX_GHOS
-	db DEX_GHOST
+	db DEX_ABRA
+	db DEX_GENGAR
+	db DEX_TAUROS
+	db DEX_MAGIKARP
+	db DEX_MAGNEMITE
+	db DEX_GASTLY
+	db DEX_HAUNTER
 	db DEX_KOUNYA
-	db DEX_GORIKY
-	db DEX_COCOON
+	db DEX_MACHOKE
+	db DEX_KAKUNA
 	db DEX_KOKUMO
-	db DEX_KODUCK
+	db DEX_PSYDUCK
 	db DEX_KOTORA
-	db DEX_KORATTA
+	db DEX_RATTATA
 	db DEX_GOLDUCK
 	db DEX_GOLBAT
-	db DEX_GOLONYA
-	db DEX_GOLONE
+	db DEX_GOLEM
+	db DEX_GRAVELER
 	db DEX_GONGU
-	db DEX_KONGPANG
-	db DEX_SIDON
-	db DEX_SIHORN
+	db DEX_VENONAT
+	db DEX_RHYDON
+	db DEX_RHYHORN
 	db DEX_SUNNY
-	db DEX_SAWAMULAR
-	db DEX_THUNDER
-	db DEX_THUNDERS
-	db DEX_SAND
-	db DEX_SANDPAN
+	db DEX_HITMONLEE
+	db DEX_ZAPDOS
+	db DEX_JOLTEON
+	db DEX_SANDSHREW
+	db DEX_SANDSLASH
 	db DEX_SEADRA
 	db DEX_SHELLDER
 	db DEX_SCISSORS
 	db DEX_SHIBIREFUGU
 	db DEX_JARANRA
-	db DEX_SHOWERS
-	db DEX_JUGON
+	db DEX_VAPOREON
+	db DEX_DEWGONG
 	db DEX_SUI
 	db DEX_STARMIE
-	db DEX_STRIKE
+	db DEX_SCYTHER
 	db DEX_ZUBAT
-	db DEX_SPEAR
-	db DEX_SLEEPER
-	db DEX_SLEEPE
-	db DEX_ZENIGAME
+	db DEX_BEEDRILL
+	db DEX_HYPNO
+	db DEX_DROWZEE
+	db DEX_SQUIRTLE
 	db DEX_TURBAN
 	db DEX_DYNABEAR
 	db DEX_DUGTRIO
-	db DEX_TATTU
-	db DEX_TAMATAMA
+	db DEX_HORSEA
+	db DEX_EXEGGCUTE
 	db DEX_TWINZ
 	db DEX_TWOHEAD
 	db DEX_TSUBOMITTO
-	db DEX_DIGDA
+	db DEX_DIGLETT
 	db DEX_TAIL
 	db DEX_TEPPOUO
 	db DEX_DEVIL
 	db DEX_DENRYU
-	db DEX_DODO
-	db DEX_DODORIO
-	db DEX_DOGARS
-	db DEX_DOKUKURAGE
+	db DEX_DODUO
+	db DEX_DODRIO
+	db DEX_KOFFING
+	db DEX_TENTACRUEL
 	db DEX_TOGEPY
-	db DEX_TOSAKINTO
-	db DEX_TRANSEL
+	db DEX_GOLDEEN
+	db DEX_METAPOD
 	db DEX_DONPHAN
-	db DEX_NAZONOKUSA
-	db DEX_NASSY
+	db DEX_ODDISH
+	db DEX_EXEGGUTOR
 	db DEX_NAMEIL
 	db DEX_NIDOKING
 	db DEX_NIDOQUEEN
@@ -134,19 +134,19 @@ AlphabeticalPokedexOrder:
 	db DEX_NIDORAN_F
 	db DEX_NIDORINA
 	db DEX_NIDORINO
-	db DEX_NYARTH
+	db DEX_MEOWTH
 	db DEX_NYULA
-	db DEX_NYOROZO
+	db DEX_POLIWHIRL
 	db DEX_NYOROTONO
-	db DEX_NYOROBON
-	db DEX_NYOROMO
+	db DEX_POLIWRATH
+	db DEX_POLIWAG
 	db DEX_NATY
 	db DEX_NATIO
 	db DEX_NOROWARA
-	db DEX_PAWOU
+	db DEX_SEEL
 	db DEX_PAON
 	db DEX_HAGANEIL
-	db DEX_HAKURYU
+	db DEX_DRAGONAIR
 	db DEX_BUTTERFREE
 	db DEX_PACHIMEE
 	db DEX_HAPPA
@@ -158,52 +158,52 @@ AlphabeticalPokedexOrder:
 	db DEX_PARA
 	db DEX_PARAS
 	db DEX_PARASECT
-	db DEX_BARRIERD
+	db DEX_MRMIME
 	db DEX_BARIRINA
-	db DEX_PARSHEN
+	db DEX_CLOYSTER
 	db DEX_PY
-	db DEX_BEEDLE
+	db DEX_WEEDLE
 	db DEX_PIKACHU
-	db DEX_PIXY
-	db DEX_PIGEOT
-	db DEX_PIGEON
+	db DEX_CLEFABLE
+	db DEX_PIDGEOT
+	db DEX_PIDGEOTTO
 	db DEX_PICHU
-	db DEX_PIPPI
-	db DEX_HITOKAGE
-	db DEX_HITODEMAN
+	db DEX_CLEFAIRY
+	db DEX_CHARMANDER
+	db DEX_STARYU
 	db DEX_HINAZU
-	db DEX_BIRIRIDAMA
-	db DEX_FIRE
-	db DEX_BOOSTER
-	db DEX_FOODIN
-	db DEX_BOOBER
+	db DEX_VOLTORB
+	db DEX_MOLTRES
+	db DEX_FLAREON
+	db DEX_ALAKAZAM
+	db DEX_MAGMAR
 	db DEX_PUKU
-	db DEX_PUKURIN
-	db DEX_FUSHIGISOU
-	db DEX_FUSHIGIDANE
-	db DEX_FUSHIGIBANA
+	db DEX_WIGGLYTUFF
+	db DEX_IVYSAUR
+	db DEX_BULBASAUR
+	db DEX_VENUSAUR
 	db DEX_PUCHICORN
 	db DEX_PUDIE
-	db DEX_PTERA
+	db DEX_AERODACTYL
 	db DEX_BOOBY
 	db DEX_PUPURIN
 	db DEX_BLACKY
 	db DEX_PURAKKUSU
-	db DEX_FREEZER
-	db DEX_PURIN
+	db DEX_ARTICUNO
+	db DEX_JIGGLYPUFF
 	db DEX_BULU
 	db DEX_PAINTER
-	db DEX_BETBETER
-	db DEX_BETBETON
+	db DEX_GRIMER
+	db DEX_MUK
 	db DEX_BETBABY
 	db DEX_HELGAA
 	db DEX_PERSIAN
 	db DEX_BERURUN
-	db DEX_BERORINGA
+	db DEX_LICKITUNG
 	db DEX_HOUOU
 	db DEX_HOHO
 	db DEX_BOBO
-	db DEX_POPPO
+	db DEX_PIDGEY
 	db DEX_PONYTA
 	db DEX_HONOGUMA
 	db DEX_POPONEKO
@@ -212,47 +212,47 @@ AlphabeticalPokedexOrder:
 	db DEX_PORYGON2
 	db DEX_VOLBEAR
 	db DEX_MADAME
-	db DEX_MADATSUBOMI
-	db DEX_MATADOGAS
+	db DEX_BELLSPROUT
+	db DEX_WEEZING
 	db DEX_MARIL
-	db DEX_MARUMINE
+	db DEX_ELECTRODE
 	db DEX_MANKEY
 	db DEX_MANBO1
 	db DEX_MIKON
 	db DEX_MIZUUO
 	db DEX_MITSUBOSHI
-	db DEX_MINIRYU
+	db DEX_DRATINI
 	db DEX_MEW
 	db DEX_MEWTWO
 	db DEX_MILTANK
-	db DEX_METAMON
-	db DEX_MENOKURAGE
+	db DEX_DITTO
+	db DEX_TENTACOOL
 	db DEX_MOKOKO
-	db DEX_MORPHON
+	db DEX_VENOMOTH
 	db DEX_MONJA
-	db DEX_MONJARA
+	db DEX_TANGELA
 	db DEX_YADOKING
-	db DEX_YADORAN
-	db DEX_YADON
+	db DEX_SLOWBRO
+	db DEX_SLOWPOKE
 	db DEX_YAMIKARASU
-	db DEX_YUNGERER
+	db DEX_KADABRA
 	db DEX_YOROIDORI
 	db DEX_RAI
 	db DEX_RAICHU
 	db DEX_RAITORA
-	db DEX_LUCKY
-	db DEX_RATTA
-	db DEX_LAPLACE
-	db DEX_RUFFRESIA
+	db DEX_CHANSEY
+	db DEX_RATICATE
+	db DEX_LAPRAS
+	db DEX_VILEPLUME
 	db DEX_LEAFY
-	db DEX_LIZARDO
-	db DEX_LIZARDON
+	db DEX_CHARMELEON
+	db DEX_CHARIZARD
 	db DEX_LIP
 	db DEX_RINRIN
-	db DEX_ROUGELA
-	db DEX_RARECOIL
+	db DEX_JYNX
+	db DEX_MAGNETON
 	db DEX_REDIBA
-	db DEX_ROKON
+	db DEX_VULPIX
 	db DEX_WARWOLF
 	db DEX_WATANEKO
-	db DEX_WANRIKY
+	db DEX_MACHOP
diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm
index 6bcc4c2..c0bea1b 100644
--- a/data/pokemon/evos_attacks.asm
+++ b/data/pokemon/evos_attacks.asm
@@ -6,7 +6,7 @@ SECTION "data/pokemon/evos_attacks.asm", ROMX
 ; and have been left in comments.
 
 ; Eevee's evolutions were not properly terminated by a 0,
-; so its data is corrupt. (See EievuiEvosAttacks.)
+; so its data is corrupt. (See EeveeEvosAttacks.)
 
 
 INCLUDE "data/pokemon/evos_attacks_pointers.inc"
@@ -25,8 +25,8 @@ EvosAttacks::
 ; - db 0 ; no more level-up moves
 
 
-FushigidaneEvosAttacks:
-	db EVOLVE_LEVEL, 16, DEX_FUSHIGISOU
+BulbasaurEvosAttacks:
+	db EVOLVE_LEVEL, 16, DEX_IVYSAUR
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  2, MOVE_GROWL
@@ -41,8 +41,8 @@ FushigidaneEvosAttacks:
 	db 56, MOVE_SOLARBEAM
 	db 0 ; no more level-up moves
 
-FushigisouEvosAttacks:
-	db EVOLVE_LEVEL, 32, DEX_FUSHIGIBANA
+IvysaurEvosAttacks:
+	db EVOLVE_LEVEL, 32, DEX_VENUSAUR
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  3, MOVE_GROWL
@@ -57,7 +57,7 @@ FushigisouEvosAttacks:
 	db 66, MOVE_SOLARBEAM
 	db 0 ; no more level-up moves
 
-FushigibanaEvosAttacks:
+VenusaurEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  4, MOVE_GROWL
@@ -72,8 +72,8 @@ FushigibanaEvosAttacks:
 	db 76, MOVE_SOLARBEAM
 	db 0 ; no more level-up moves
 
-HitokageEvosAttacks:
-	db EVOLVE_LEVEL, 16, DEX_LIZARDO
+CharmanderEvosAttacks:
+	db EVOLVE_LEVEL, 16, DEX_CHARMELEON
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
 	db  3, MOVE_GROWL
@@ -87,8 +87,8 @@ HitokageEvosAttacks:
 	db 55, MOVE_FLAMETHROWER
 	db 0 ; no more level-up moves
 
-LizardoEvosAttacks:
-	db EVOLVE_LEVEL, 36, DEX_LIZARDON
+CharmeleonEvosAttacks:
+	db EVOLVE_LEVEL, 36, DEX_CHARIZARD
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
 	db  4, MOVE_GROWL
@@ -102,7 +102,7 @@ LizardoEvosAttacks:
 	db 64, MOVE_FLAMETHROWER
 	db 0 ; no more level-up moves
 
-LizardonEvosAttacks:
+CharizardEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
 	db  5, MOVE_GROWL
@@ -117,8 +117,8 @@ LizardonEvosAttacks:
 	db 73, MOVE_FLAMETHROWER
 	db 0 ; no more level-up moves
 
-ZenigameEvosAttacks:
-	db EVOLVE_LEVEL, 16, DEX_KAMEIL
+SquirtleEvosAttacks:
+	db EVOLVE_LEVEL, 16, DEX_WARTORTLE
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  6, MOVE_TAIL_WHIP
@@ -134,8 +134,8 @@ ZenigameEvosAttacks:
 	db 51, MOVE_RAIN_DANCE
 	db 0 ; no more level-up moves
 
-KameilEvosAttacks:
-	db EVOLVE_LEVEL, 36, DEX_KAMEX
+WartortleEvosAttacks:
+	db EVOLVE_LEVEL, 36, DEX_BLASTOISE
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  7, MOVE_TAIL_WHIP
@@ -151,7 +151,7 @@ KameilEvosAttacks:
 	db 61, MOVE_RAIN_DANCE
 	db 0 ; no more level-up moves
 
-KamexEvosAttacks:
+BlastoiseEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  8, MOVE_TAIL_WHIP
@@ -168,13 +168,13 @@ KamexEvosAttacks:
 	db 0 ; no more level-up moves
 
 CaterpieEvosAttacks:
-	db EVOLVE_LEVEL, 7, DEX_TRANSEL
+	db EVOLVE_LEVEL, 7, DEX_METAPOD
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  1, MOVE_STRING_SHOT
 	db 0 ; no more level-up moves
 
-TranselEvosAttacks:
+MetapodEvosAttacks:
 	db EVOLVE_LEVEL, 10, DEX_BUTTERFREE
 	db 0 ; no more evolutions
 	db  1, MOVE_HARDEN
@@ -194,20 +194,20 @@ ButterfreeEvosAttacks:
 	db 40, MOVE_PSYBEAM
 	db 0 ; no more level-up moves
 
-BeedleEvosAttacks:
-	db EVOLVE_LEVEL, 7, DEX_COCOON
+WeedleEvosAttacks:
+	db EVOLVE_LEVEL, 7, DEX_KAKUNA
 	db 0 ; no more evolutions
 	db  1, MOVE_POISON_STING
 	db  1, MOVE_STRING_SHOT
 	db 0 ; no more level-up moves
 
-CocoonEvosAttacks:
-	db EVOLVE_LEVEL, 10, DEX_SPEAR
+KakunaEvosAttacks:
+	db EVOLVE_LEVEL, 10, DEX_BEEDRILL
 	db 0 ; no more evolutions
 	db  1, MOVE_HARDEN
 	db 0 ; no more level-up moves
 
-SpearEvosAttacks:
+BeedrillEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_POISON_STING
 	db  1, MOVE_STRING_SHOT
@@ -220,8 +220,8 @@ SpearEvosAttacks:
 	db 40, MOVE_PIN_MISSILE
 	db 0 ; no more level-up moves
 
-PoppoEvosAttacks:
-	; db EVOLVE_LEVEL, 18, DEX_PIGEON
+PidgeyEvosAttacks:
+	; db EVOLVE_LEVEL, 18, DEX_PIDGEOTTO
 	db 0 ; no more evolutions
 	db  1, MOVE_GUST
 	db  6, MOVE_SAND_ATTACK
@@ -233,8 +233,8 @@ PoppoEvosAttacks:
 	db 45, MOVE_MIRROR_MOVE
 	db 0 ; no more level-up moves
 
-PigeonEvosAttacks:
-	db EVOLVE_LEVEL, 36, DEX_PIGEOT
+PidgeottoEvosAttacks:
+	db EVOLVE_LEVEL, 36, DEX_PIDGEOT
 	db 0 ; no more evolutions
 	db  1, MOVE_GUST
 	db  7, MOVE_SAND_ATTACK
@@ -246,7 +246,7 @@ PigeonEvosAttacks:
 	db 52, MOVE_MIRROR_MOVE
 	db 0 ; no more level-up moves
 
-PigeotEvosAttacks:
+PidgeotEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_GUST
 	db  8, MOVE_SAND_ATTACK
@@ -258,8 +258,8 @@ PigeotEvosAttacks:
 	db 59, MOVE_MIRROR_MOVE
 	db 0 ; no more level-up moves
 
-KorattaEvosAttacks:
-	; db EVOLVE_LEVEL, 20, DEX_RATTA
+RattataEvosAttacks:
+	; db EVOLVE_LEVEL, 20, DEX_RATICATE
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  4, MOVE_TAIL_WHIP
@@ -271,7 +271,7 @@ KorattaEvosAttacks:
 	db 43, MOVE_HYPER_FANG
 	db 0 ; no more level-up moves
 
-RattaEvosAttacks:
+RaticateEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  5, MOVE_TAIL_WHIP
@@ -283,8 +283,8 @@ RattaEvosAttacks:
 	db 50, MOVE_HYPER_FANG
 	db 0 ; no more level-up moves
 
-OnisuzumeEvosAttacks:
-	db EVOLVE_LEVEL, 20, DEX_ONIDRILL
+SpearowEvosAttacks:
+	db EVOLVE_LEVEL, 20, DEX_FEAROW
 	db 0 ; no more evolutions
 	db  1, MOVE_PECK
 	db  5, MOVE_GROWL
@@ -297,7 +297,7 @@ OnisuzumeEvosAttacks:
 	db 61, MOVE_AGILITY
 	db 0 ; no more level-up moves
 
-OnidrillEvosAttacks:
+FearowEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_PECK
 	db  6, MOVE_GROWL
@@ -310,7 +310,7 @@ OnidrillEvosAttacks:
 	db 69, MOVE_AGILITY
 	db 0 ; no more level-up moves
 
-ArboEvosAttacks:
+EkansEvosAttacks:
 	; db EVOLVE_LEVEL, 22, DEX_ARBOK
 	db 0 ; no more evolutions
 	db  1, MOVE_WRAP
@@ -358,8 +358,8 @@ RaichuEvosAttacks:
 	db  1, MOVE_SWIFT
 	db 0 ; no more level-up moves
 
-SandEvosAttacks:
-	db EVOLVE_LEVEL, 22, DEX_SANDPAN
+SandshrewEvosAttacks:
+	db EVOLVE_LEVEL, 22, DEX_SANDSLASH
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
 	db  3, MOVE_DEFENSE_CURL
@@ -372,7 +372,7 @@ SandEvosAttacks:
 	db 45, MOVE_FOCUS_ENERGY
 	db 0 ; no more level-up moves
 
-SandpanEvosAttacks:
+SandslashEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
 	db  4, MOVE_DEFENSE_CURL
@@ -456,8 +456,8 @@ NidokingEvosAttacks:
 	db 46, MOVE_ATTRACT
 	db 0 ; no more level-up moves
 
-PippiEvosAttacks:
-	db EVOLVE_STONE, 1, ITEM_MOON_STONE, DEX_PIXY
+ClefairyEvosAttacks:
+	db EVOLVE_STONE, 1, ITEM_MOON_STONE, DEX_CLEFABLE
 	db 0 ; no more evolutions
 	db  1, MOVE_GROWL
 	db  4, MOVE_POUND
@@ -471,7 +471,7 @@ PippiEvosAttacks:
 	db 64, MOVE_MOONLIGHT
 	db 0 ; no more level-up moves
 
-PixyEvosAttacks:
+ClefableEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_SING
 	db  1, MOVE_DOUBLESLAP
@@ -479,8 +479,8 @@ PixyEvosAttacks:
 	db  1, MOVE_METRONOME
 	db 0 ; no more level-up moves
 
-RokonEvosAttacks:
-	db EVOLVE_STONE, 1, ITEM_FIRE_STONE, DEX_KYUKON
+VulpixEvosAttacks:
+	db EVOLVE_STONE, 1, ITEM_FIRE_STONE, DEX_NINETALES
 	db 0 ; no more evolutions
 	db  1, MOVE_TAIL_WHIP
 	db  6, MOVE_QUICK_ATTACK
@@ -493,7 +493,7 @@ RokonEvosAttacks:
 	db 53, MOVE_FLAMETHROWER
 	db 0 ; no more level-up moves
 
-KyukonEvosAttacks:
+NinetalesEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_QUICK_ATTACK
 	db  1, MOVE_FIRE_SPIN
@@ -501,8 +501,8 @@ KyukonEvosAttacks:
 	db  1, MOVE_DOUBLE_TEAM
 	db 0 ; no more level-up moves
 
-PurinEvosAttacks:
-	db EVOLVE_STONE, 1, ITEM_MOON_STONE, DEX_PUKURIN
+JigglypuffEvosAttacks:
+	db EVOLVE_STONE, 1, ITEM_MOON_STONE, DEX_WIGGLYTUFF
 	db 0 ; no more evolutions
 	db  1, MOVE_GROWL
 	db  6, MOVE_SING
@@ -517,7 +517,7 @@ PurinEvosAttacks:
 	db 60, MOVE_DOUBLE_EDGE
 	db 0 ; no more level-up moves
 
-PukurinEvosAttacks:
+WigglytuffEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_SING
 	db  1, MOVE_DEFENSE_CURL
@@ -551,8 +551,8 @@ GolbatEvosAttacks:
 	db 56, MOVE_CONFUSE_RAY
 	db 0 ; no more level-up moves
 
-NazonokusaEvosAttacks:
-	db EVOLVE_LEVEL, 21, DEX_KUSAIHANA
+OddishEvosAttacks:
+	db EVOLVE_LEVEL, 21, DEX_GLOOM
 	db 0 ; no more evolutions
 	db  1, MOVE_ABSORB
 	db  5, MOVE_STUN_SPORE
@@ -564,8 +564,8 @@ NazonokusaEvosAttacks:
 	db 36, MOVE_SOLARBEAM
 	db 0 ; no more level-up moves
 
-KusaihanaEvosAttacks:
-	db EVOLVE_STONE, 1, ITEM_LEAF_STONE, DEX_RUFFRESIA
+GloomEvosAttacks:
+	db EVOLVE_STONE, 1, ITEM_LEAF_STONE, DEX_VILEPLUME
 	db EVOLVE_STONE, 1, ITEM_POISON_STONE, DEX_KIREIHANA
 	db 0 ; no more evolutions
 	db  1, MOVE_ABSORB
@@ -578,7 +578,7 @@ KusaihanaEvosAttacks:
 	db 46, MOVE_SOLARBEAM
 	db 0 ; no more level-up moves
 
-RuffresiaEvosAttacks:
+VileplumeEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_ABSORB
 	db  1, MOVE_STUN_SPORE
@@ -611,8 +611,8 @@ ParasectEvosAttacks:
 	db 50, MOVE_SPORE
 	db 0 ; no more level-up moves
 
-KongpangEvosAttacks:
-	db EVOLVE_LEVEL, 31, DEX_MORPHON
+VenonatEvosAttacks:
+	db EVOLVE_LEVEL, 31, DEX_VENOMOTH
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  7, MOVE_DISABLE
@@ -625,7 +625,7 @@ KongpangEvosAttacks:
 	db 56, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
-MorphonEvosAttacks:
+VenomothEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  8, MOVE_DISABLE
@@ -638,7 +638,7 @@ MorphonEvosAttacks:
 	db 64, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
-DigdaEvosAttacks:
+DiglettEvosAttacks:
 	db EVOLVE_LEVEL, 26, DEX_DUGTRIO
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
@@ -665,7 +665,7 @@ DugtrioEvosAttacks:
 	db 61, MOVE_EARTHQUAKE
 	db 0 ; no more level-up moves
 
-NyarthEvosAttacks:
+MeowthEvosAttacks:
 	db EVOLVE_LEVEL, 28, DEX_PERSIAN
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
@@ -696,7 +696,7 @@ PersianEvosAttacks:
 	db 71, MOVE_COIN_HURL
 	db 0 ; no more level-up moves
 
-KoduckEvosAttacks:
+PsyduckEvosAttacks:
 	db EVOLVE_LEVEL, 33, DEX_GOLDUCK
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
@@ -722,7 +722,7 @@ GolduckEvosAttacks:
 	db 0 ; no more level-up moves
 
 MankeyEvosAttacks:
-	db EVOLVE_LEVEL, 28, DEX_OKORIZARU
+	db EVOLVE_LEVEL, 28, DEX_PRIMEAPE
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
 	db  7, MOVE_LEER
@@ -736,7 +736,7 @@ MankeyEvosAttacks:
 	db 55, MOVE_THRASH
 	db 0 ; no more level-up moves
 
-OkorizaruEvosAttacks:
+PrimeapeEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
 	db  8, MOVE_LEER
@@ -750,8 +750,8 @@ OkorizaruEvosAttacks:
 	db 64, MOVE_THRASH
 	db 0 ; no more level-up moves
 
-GardieEvosAttacks:
-	db EVOLVE_STONE, 1, ITEM_FIRE_STONE, DEX_WINDIE
+GrowlitheEvosAttacks:
+	db EVOLVE_STONE, 1, ITEM_FIRE_STONE, DEX_ARCANINE
 	db 0 ; no more evolutions
 	db  1, MOVE_EMBER
 	db  7, MOVE_ROAR
@@ -764,7 +764,7 @@ GardieEvosAttacks:
 	db 61, MOVE_FLAMETHROWER
 	db 0 ; no more level-up moves
 
-WindieEvosAttacks:
+ArcanineEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_QUICK_ATTACK
 	db  1, MOVE_BITE
@@ -772,8 +772,8 @@ WindieEvosAttacks:
 	db  1, MOVE_SACRED_FIRE
 	db 0 ; no more level-up moves
 
-NyoromoEvosAttacks:
-	db EVOLVE_LEVEL, 25, DEX_NYOROZO
+PoliwagEvosAttacks:
+	db EVOLVE_LEVEL, 25, DEX_POLIWHIRL
 	db 0 ; no more evolutions
 	db  1, MOVE_BUBBLE
 	db  6, MOVE_HYPNOSIS
@@ -785,8 +785,8 @@ NyoromoEvosAttacks:
 	db 45, MOVE_HYDRO_PUMP
 	db 0 ; no more level-up moves
 
-NyorozoEvosAttacks:
-	db EVOLVE_STONE, 1, ITEM_WATER_STONE, DEX_NYOROBON
+PoliwhirlEvosAttacks:
+	db EVOLVE_STONE, 1, ITEM_WATER_STONE, DEX_POLIWRATH
 	db EVOLVE_STONE, 1, ITEM_HEART_STONE, DEX_NYOROTONO
 	db 0 ; no more evolutions
 	db  1, MOVE_BUBBLE
@@ -799,7 +799,7 @@ NyorozoEvosAttacks:
 	db 59, MOVE_HYDRO_PUMP
 	db 0 ; no more level-up moves
 
-NyorobonEvosAttacks:
+PoliwrathEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_HYPNOSIS
 	db  1, MOVE_WATER_GUN
@@ -807,14 +807,14 @@ NyorobonEvosAttacks:
 	db 25, MOVE_LOW_KICK
 	db 0 ; no more level-up moves
 
-CaseyEvosAttacks:
-	db EVOLVE_LEVEL, 16, DEX_YUNGERER
+AbraEvosAttacks:
+	db EVOLVE_LEVEL, 16, DEX_KADABRA
 	db 0 ; no more evolutions
 	db  1, MOVE_TELEPORT
 	db 0 ; no more level-up moves
 
-YungererEvosAttacks:
-	db EVOLVE_TRADE, 1, DEX_FOODIN
+KadabraEvosAttacks:
+	db EVOLVE_TRADE, 1, DEX_ALAKAZAM
 	db 0 ; no more evolutions
 	db  1, MOVE_TELEPORT
 	db 16, MOVE_CONFUSION
@@ -828,7 +828,7 @@ YungererEvosAttacks:
 	db 46, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
-FoodinEvosAttacks:
+AlakazamEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TELEPORT
 	db 16, MOVE_CONFUSION
@@ -842,8 +842,8 @@ FoodinEvosAttacks:
 	db 46, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
-WanrikyEvosAttacks:
-	db EVOLVE_LEVEL, 28, DEX_GORIKY
+MachopEvosAttacks:
+	db EVOLVE_LEVEL, 28, DEX_MACHOKE
 	db 0 ; no more evolutions
 	db  1, MOVE_KARATE_CHOP
 	db  5, MOVE_LEER
@@ -856,8 +856,8 @@ WanrikyEvosAttacks:
 	db 45, MOVE_SUBMISSION
 	db 0 ; no more level-up moves
 
-GorikyEvosAttacks:
-	db EVOLVE_TRADE, 1, DEX_KAIRIKY
+MachokeEvosAttacks:
+	db EVOLVE_TRADE, 1, DEX_MACHAMP
 	db 0 ; no more evolutions
 	db  1, MOVE_KARATE_CHOP
 	db  7, MOVE_LEER
@@ -870,7 +870,7 @@ GorikyEvosAttacks:
 	db 61, MOVE_SUBMISSION
 	db 0 ; no more level-up moves
 
-KairikyEvosAttacks:
+MachampEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_KARATE_CHOP
 	db  7, MOVE_LEER
@@ -884,8 +884,8 @@ KairikyEvosAttacks:
 	db 61, MOVE_SUBMISSION
 	db 0 ; no more level-up moves
 
-MadatsubomiEvosAttacks:
-	db EVOLVE_LEVEL, 21, DEX_UTSUDON
+BellsproutEvosAttacks:
+	db EVOLVE_LEVEL, 21, DEX_WEEPINBELL
 	db 0 ; no more evolutions
 	db  1, MOVE_GROWTH
 	db  5, MOVE_VINE_WHIP
@@ -899,8 +899,8 @@ MadatsubomiEvosAttacks:
 	db 37, MOVE_SLAM
 	db 0 ; no more level-up moves
 
-UtsudonEvosAttacks:
-	db EVOLVE_STONE, 1, ITEM_LEAF_STONE, DEX_UTSUBOT
+WeepinbellEvosAttacks:
+	db EVOLVE_STONE, 1, ITEM_LEAF_STONE, DEX_VICTREEBEL
 	db EVOLVE_STONE, 1, ITEM_POISON_STONE, DEX_TSUBOMITTO
 	db 0 ; no more evolutions
 	db  1, MOVE_GROWTH
@@ -915,7 +915,7 @@ UtsudonEvosAttacks:
 	db 46, MOVE_SLAM
 	db 0 ; no more level-up moves
 
-UtsubotEvosAttacks:
+VictreebelEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_WRAP
 	db  1, MOVE_POISONPOWDER
@@ -923,8 +923,8 @@ UtsubotEvosAttacks:
 	db  1, MOVE_RAZOR_LEAF
 	db 0 ; no more level-up moves
 
-MenokurageEvosAttacks:
-	db EVOLVE_LEVEL, 30, DEX_DOKUKURAGE
+TentacoolEvosAttacks:
+	db EVOLVE_LEVEL, 30, DEX_TENTACRUEL
 	db 0 ; no more evolutions
 	db  1, MOVE_POISON_STING
 	db  3, MOVE_SUPERSONIC
@@ -938,7 +938,7 @@ MenokurageEvosAttacks:
 	db 55, MOVE_HYDRO_PUMP
 	db 0 ; no more level-up moves
 
-DokukurageEvosAttacks:
+TentacruelEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_POISON_STING
 	db  4, MOVE_SUPERSONIC
@@ -952,8 +952,8 @@ DokukurageEvosAttacks:
 	db 64, MOVE_HYDRO_PUMP
 	db 0 ; no more level-up moves
 
-IsitsubuteEvosAttacks:
-	db EVOLVE_LEVEL, 25, DEX_GOLONE
+GeodudeEvosAttacks:
+	db EVOLVE_LEVEL, 25, DEX_GRAVELER
 	db 0 ; no more evolutions
 	db  1, MOVE_DEFENSE_CURL
 	db  4, MOVE_TACKLE
@@ -967,8 +967,8 @@ IsitsubuteEvosAttacks:
 	db 44, MOVE_EXPLOSION
 	db 0 ; no more level-up moves
 
-GoloneEvosAttacks:
-	db EVOLVE_TRADE, 1, DEX_GOLONYA
+GravelerEvosAttacks:
+	db EVOLVE_TRADE, 1, DEX_GOLEM
 	db 0 ; no more evolutions
 	db  1, MOVE_DEFENSE_CURL
 	db  6, MOVE_TACKLE
@@ -982,7 +982,7 @@ GoloneEvosAttacks:
 	db 62, MOVE_EXPLOSION
 	db 0 ; no more level-up moves
 
-GolonyaEvosAttacks:
+GolemEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_DEFENSE_CURL
 	db  6, MOVE_TACKLE
@@ -997,7 +997,7 @@ GolonyaEvosAttacks:
 	db 0 ; no more level-up moves
 
 PonytaEvosAttacks:
-	db EVOLVE_LEVEL, 40, DEX_GALLOP
+	db EVOLVE_LEVEL, 40, DEX_RAPIDASH
 	db 0 ; no more evolutions
 	db  1, MOVE_TAIL_WHIP
 	db  8, MOVE_EMBER
@@ -1010,7 +1010,7 @@ PonytaEvosAttacks:
 	db 64, MOVE_TAKE_DOWN
 	db 0 ; no more level-up moves
 
-GallopEvosAttacks:
+RapidashEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TAIL_WHIP
 	db  9, MOVE_EMBER
@@ -1023,8 +1023,8 @@ GallopEvosAttacks:
 	db 72, MOVE_TAKE_DOWN
 	db 0 ; no more level-up moves
 
-YadonEvosAttacks:
-	db EVOLVE_LEVEL, 37, DEX_YADORAN
+SlowpokeEvosAttacks:
+	db EVOLVE_LEVEL, 37, DEX_SLOWBRO
 	db 0 ; no more evolutions
 	db  1, MOVE_CONFUSION
 	db  7, MOVE_DISABLE
@@ -1035,7 +1035,7 @@ YadonEvosAttacks:
 	db 52, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
-YadoranEvosAttacks:
+SlowbroEvosAttacks:
 	db EVOLVE_ITEM, 1, ITEM_KINGS_ROCK, DEX_YADOKING
 	db 0 ; no more evolutions
 	db  1, MOVE_CONFUSION
@@ -1048,8 +1048,8 @@ YadoranEvosAttacks:
 	db 64, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
-CoilEvosAttacks:
-	db EVOLVE_LEVEL, 30, DEX_RARECOIL
+MagnemiteEvosAttacks:
+	db EVOLVE_LEVEL, 30, DEX_MAGNETON
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  7, MOVE_THUNDER_WAVE
@@ -1062,7 +1062,7 @@ CoilEvosAttacks:
 	db 61, MOVE_ZAP_CANNON
 	db 0 ; no more level-up moves
 
-RarecoilEvosAttacks:
+MagnetonEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  8, MOVE_THUNDER_WAVE
@@ -1075,7 +1075,7 @@ RarecoilEvosAttacks:
 	db 69, MOVE_ZAP_CANNON
 	db 0 ; no more level-up moves
 
-KamonegiEvosAttacks:
+FarfetchdEvosAttacks:
 	db EVOLVE_LEVEL, 24, DEX_MADAME
 	db 0 ; no more evolutions
 	db  1, MOVE_PECK
@@ -1090,8 +1090,8 @@ KamonegiEvosAttacks:
 	db 46, MOVE_FURY_CUTTER
 	db 0 ; no more level-up moves
 
-DodoEvosAttacks:
-	db EVOLVE_LEVEL, 31, DEX_DODORIO
+DoduoEvosAttacks:
+	db EVOLVE_LEVEL, 31, DEX_DODRIO
 	db 0 ; no more evolutions
 	db  1, MOVE_GROWL
 	db  6, MOVE_PECK
@@ -1104,7 +1104,7 @@ DodoEvosAttacks:
 	db 53, MOVE_DRILL_PECK
 	db 0 ; no more level-up moves
 
-DodorioEvosAttacks:
+DodrioEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_GROWL
 	db  7, MOVE_PECK
@@ -1117,8 +1117,8 @@ DodorioEvosAttacks:
 	db 61, MOVE_DRILL_PECK
 	db 0 ; no more level-up moves
 
-PawouEvosAttacks:
-	db EVOLVE_LEVEL, 34, DEX_JUGON
+SeelEvosAttacks:
+	db EVOLVE_LEVEL, 34, DEX_DEWGONG
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  7, MOVE_GROWL
@@ -1132,7 +1132,7 @@ PawouEvosAttacks:
 	db 56, MOVE_ICE_BEAM
 	db 0 ; no more level-up moves
 
-JugonEvosAttacks:
+DewgongEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  8, MOVE_GROWL
@@ -1146,8 +1146,8 @@ JugonEvosAttacks:
 	db 64, MOVE_ICE_BEAM
 	db 0 ; no more level-up moves
 
-BetbeterEvosAttacks:
-	db EVOLVE_LEVEL, 38, DEX_BETBETON
+GrimerEvosAttacks:
+	db EVOLVE_LEVEL, 38, DEX_MUK
 	db 0 ; no more evolutions
 	db  1, MOVE_POUND
 	db  3, MOVE_POISON_GAS
@@ -1162,7 +1162,7 @@ BetbeterEvosAttacks:
 	db 66, MOVE_SLUDGE_BOMB
 	db 0 ; no more level-up moves
 
-BetbetonEvosAttacks:
+MukEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_POUND
 	db  4, MOVE_POISON_GAS
@@ -1178,7 +1178,7 @@ BetbetonEvosAttacks:
 	db 0 ; no more level-up moves
 
 ShellderEvosAttacks:
-	db EVOLVE_STONE, 1, ITEM_WATER_STONE, DEX_PARSHEN
+	db EVOLVE_STONE, 1, ITEM_WATER_STONE, DEX_CLOYSTER
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  8, MOVE_WITHDRAW
@@ -1191,7 +1191,7 @@ ShellderEvosAttacks:
 	db 57, MOVE_ICE_BEAM
 	db 0 ; no more level-up moves
 
-ParshenEvosAttacks:
+CloysterEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_WITHDRAW
 	db  1, MOVE_AURORA_BEAM
@@ -1199,8 +1199,8 @@ ParshenEvosAttacks:
 	db 57, MOVE_SPIKE_CANNON
 	db 0 ; no more level-up moves
 
-GhosEvosAttacks:
-	db EVOLVE_LEVEL, 25, DEX_GHOST
+GastlyEvosAttacks:
+	db EVOLVE_LEVEL, 25, DEX_HAUNTER
 	db 0 ; no more evolutions
 	db  1, MOVE_LICK
 	db  5, MOVE_POISON_GAS
@@ -1214,8 +1214,8 @@ GhosEvosAttacks:
 	db 45, MOVE_NIGHTMARE
 	db 0 ; no more level-up moves
 
-GhostEvosAttacks:
-	db EVOLVE_TRADE, 1, DEX_GANGAR
+HaunterEvosAttacks:
+	db EVOLVE_TRADE, 1, DEX_GENGAR
 	db 0 ; no more evolutions
 	db  1, MOVE_LICK
 	db  7, MOVE_POISON_GAS
@@ -1229,7 +1229,7 @@ GhostEvosAttacks:
 	db 63, MOVE_NIGHTMARE
 	db 0 ; no more level-up moves
 
-GangarEvosAttacks:
+GengarEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_LICK
 	db  7, MOVE_POISON_GAS
@@ -1243,7 +1243,7 @@ GangarEvosAttacks:
 	db 63, MOVE_NIGHTMARE
 	db 0 ; no more level-up moves
 
-IwarkEvosAttacks:
+OnixEvosAttacks:
 	db EVOLVE_LEVEL, 38, DEX_HAGANEIL
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
@@ -1258,8 +1258,8 @@ IwarkEvosAttacks:
 	db 53, MOVE_IRON_TAIL
 	db 0 ; no more level-up moves
 
-SleepeEvosAttacks:
-	db EVOLVE_LEVEL, 26, DEX_SLEEPER
+DrowzeeEvosAttacks:
+	db EVOLVE_LEVEL, 26, DEX_HYPNO
 	db 0 ; no more evolutions
 	db  1, MOVE_POUND
 	db  6, MOVE_HYPNOSIS
@@ -1273,7 +1273,7 @@ SleepeEvosAttacks:
 	db 46, MOVE_CONFUSE_RAY
 	db 0 ; no more level-up moves
 
-SleeperEvosAttacks:
+HypnoEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_POUND
 	db  7, MOVE_HYPNOSIS
@@ -1287,7 +1287,7 @@ SleeperEvosAttacks:
 	db 55, MOVE_CONFUSE_RAY
 	db 0 ; no more level-up moves
 
-CrabEvosAttacks:
+KrabbyEvosAttacks:
 	db EVOLVE_LEVEL, 28, DEX_KINGLER
 	db 0 ; no more evolutions
 	db  1, MOVE_BUBBLE
@@ -1316,8 +1316,8 @@ KinglerEvosAttacks:
 	db 64, MOVE_CRABHAMMER
 	db 0 ; no more level-up moves
 
-BiriridamaEvosAttacks:
-	db EVOLVE_LEVEL, 30, DEX_MARUMINE
+VoltorbEvosAttacks:
+	db EVOLVE_LEVEL, 30, DEX_ELECTRODE
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  9, MOVE_THUNDER_WAVE
@@ -1329,7 +1329,7 @@ BiriridamaEvosAttacks:
 	db 57, MOVE_EXPLOSION
 	db 0 ; no more level-up moves
 
-MarumineEvosAttacks:
+ElectrodeEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db 10, MOVE_THUNDER_WAVE
@@ -1341,8 +1341,8 @@ MarumineEvosAttacks:
 	db 64, MOVE_EXPLOSION
 	db 0 ; no more level-up moves
 
-TamatamaEvosAttacks:
-	db EVOLVE_STONE, 1, ITEM_LEAF_STONE, DEX_NASSY
+ExeggcuteEvosAttacks:
+	db EVOLVE_STONE, 1, ITEM_LEAF_STONE, DEX_EXEGGUTOR
 	db 0 ; no more evolutions
 	db  1, MOVE_BARRAGE
 	db  6, MOVE_HYPNOSIS
@@ -1356,7 +1356,7 @@ TamatamaEvosAttacks:
 	db 62, MOVE_SOLARBEAM
 	db 0 ; no more level-up moves
 
-NassyEvosAttacks:
+ExeggutorEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_BARRAGE
 	db  1, MOVE_CONFUSION
@@ -1365,8 +1365,8 @@ NassyEvosAttacks:
 	db 62, MOVE_STOMP
 	db 0 ; no more level-up moves
 
-KarakaraEvosAttacks:
-	db EVOLVE_LEVEL, 28, DEX_GARAGARA
+CuboneEvosAttacks:
+	db EVOLVE_LEVEL, 28, DEX_MAROWAK
 	db 0 ; no more evolutions
 	db  1, MOVE_BONE_CLUB
 	db  7, MOVE_GROWL
@@ -1379,7 +1379,7 @@ KarakaraEvosAttacks:
 	db 49, MOVE_BONE_LOCK
 	db 0 ; no more level-up moves
 
-GaragaraEvosAttacks:
+MarowakEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_BONE_CLUB
 	db  8, MOVE_GROWL
@@ -1392,7 +1392,7 @@ GaragaraEvosAttacks:
 	db 57, MOVE_BONE_LOCK
 	db 0 ; no more level-up moves
 
-SawamularEvosAttacks:
+HitmonleeEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  6, MOVE_ROLLING_KICK
@@ -1407,7 +1407,7 @@ SawamularEvosAttacks:
 	db 71, MOVE_REVERSAL
 	db 0 ; no more level-up moves
 
-EbiwalarEvosAttacks:
+HitmonchanEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  8, MOVE_MACH_PUNCH
@@ -1422,7 +1422,7 @@ EbiwalarEvosAttacks:
 	db 69, MOVE_DYNAMICPUNCH
 	db 0 ; no more level-up moves
 
-BeroringaEvosAttacks:
+LickitungEvosAttacks:
 	db EVOLVE_LEVEL, 32, DEX_NAMEIL
 	db 0 ; no more evolutions
 	db  1, MOVE_LICK
@@ -1436,8 +1436,8 @@ BeroringaEvosAttacks:
 	db 69, MOVE_SCREECH
 	db 0 ; no more level-up moves
 
-DogarsEvosAttacks:
-	db EVOLVE_LEVEL, 35, DEX_MATADOGAS
+KoffingEvosAttacks:
+	db EVOLVE_LEVEL, 35, DEX_WEEZING
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  8, MOVE_SMOG
@@ -1449,7 +1449,7 @@ DogarsEvosAttacks:
 	db 56, MOVE_EXPLOSION
 	db 0 ; no more level-up moves
 
-MatadogasEvosAttacks:
+WeezingEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  9, MOVE_SMOG
@@ -1461,8 +1461,8 @@ MatadogasEvosAttacks:
 	db 63, MOVE_EXPLOSION
 	db 0 ; no more level-up moves
 
-SihornEvosAttacks:
-	db EVOLVE_LEVEL, 42, DEX_SIDON
+RhyhornEvosAttacks:
+	db EVOLVE_LEVEL, 42, DEX_RHYDON
 	db 0 ; no more evolutions
 	db  1, MOVE_HORN_ATTACK
 	db  8, MOVE_STOMP
@@ -1475,7 +1475,7 @@ SihornEvosAttacks:
 	db 69, MOVE_TAKE_DOWN
 	db 0 ; no more level-up moves
 
-SidonEvosAttacks:
+RhydonEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_HORN_ATTACK
 	db  9, MOVE_STOMP
@@ -1488,7 +1488,7 @@ SidonEvosAttacks:
 	db 77, MOVE_TAKE_DOWN
 	db 0 ; no more level-up moves
 
-LuckyEvosAttacks:
+ChanseyEvosAttacks:
 	db EVOLVE_LEVEL, 45, DEX_HAPPI
 	db 0 ; no more evolutions
 	db  1, MOVE_POUND
@@ -1503,7 +1503,7 @@ LuckyEvosAttacks:
 	db 73, MOVE_PAIN_SPLIT
 	db 0 ; no more level-up moves
 
-MonjaraEvosAttacks:
+TangelaEvosAttacks:
 	db EVOLVE_LEVEL, 44, DEX_JARANRA
 	db 0 ; no more evolutions
 	db  1, MOVE_CONSTRICT
@@ -1518,7 +1518,7 @@ MonjaraEvosAttacks:
 	db 57, MOVE_SLAM
 	db 0 ; no more level-up moves
 
-GaruraEvosAttacks:
+KangaskhanEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_BITE
 	db  8, MOVE_TAIL_WHIP
@@ -1531,7 +1531,7 @@ GaruraEvosAttacks:
 	db 57, MOVE_COMET_PUNCH
 	db 0 ; no more level-up moves
 
-TattuEvosAttacks:
+HorseaEvosAttacks:
 	db EVOLVE_LEVEL, 32, DEX_SEADRA
 	db 0 ; no more evolutions
 	db  1, MOVE_BUBBLE
@@ -1560,8 +1560,8 @@ SeadraEvosAttacks:
 	db 65, MOVE_HYDRO_PUMP
 	db 0 ; no more level-up moves
 
-TosakintoEvosAttacks:
-	db EVOLVE_LEVEL, 33, DEX_AZUMAO
+GoldeenEvosAttacks:
+	db EVOLVE_LEVEL, 33, DEX_SEAKING
 	db 0 ; no more evolutions
 	db  1, MOVE_PECK
 	db  4, MOVE_TAIL_WHIP
@@ -1574,7 +1574,7 @@ TosakintoEvosAttacks:
 	db 53, MOVE_AGILITY
 	db 0 ; no more level-up moves
 
-AzumaoEvosAttacks:
+SeakingEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_PECK
 	db  5, MOVE_TAIL_WHIP
@@ -1587,7 +1587,7 @@ AzumaoEvosAttacks:
 	db 61, MOVE_AGILITY
 	db 0 ; no more level-up moves
 
-HitodemanEvosAttacks:
+StaryuEvosAttacks:
 	db EVOLVE_STONE, 1, ITEM_WATER_STONE, DEX_STARMIE
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
@@ -1611,7 +1611,7 @@ StarmieEvosAttacks:
 	db  1, MOVE_CONFUSE_RAY
 	db 0 ; no more level-up moves
 
-BarrierdEvosAttacks:
+MrMimeEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_CONFUSION
 	db  7, MOVE_BARRIER
@@ -1626,7 +1626,7 @@ BarrierdEvosAttacks:
 	db 56, MOVE_SUBSTITUTE
 	db 0 ; no more level-up moves
 
-StrikeEvosAttacks:
+ScytherEvosAttacks:
 	db EVOLVE_LEVEL, 41, DEX_SCISSORS
 	db 0 ; no more evolutions
 	db  1, MOVE_QUICK_ATTACK
@@ -1641,7 +1641,7 @@ StrikeEvosAttacks:
 	db 64, MOVE_AGILITY
 	db 0 ; no more level-up moves
 
-RougelaEvosAttacks:
+JynxEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_POUND
 	db  7, MOVE_SING
@@ -1655,7 +1655,7 @@ RougelaEvosAttacks:
 	db 56, MOVE_BLIZZARD
 	db 0 ; no more level-up moves
 
-ElebooEvosAttacks:
+ElectabuzzEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_QUICK_ATTACK
 	db  7, MOVE_LEER
@@ -1668,7 +1668,7 @@ ElebooEvosAttacks:
 	db 56, MOVE_THUNDER
 	db 0 ; no more level-up moves
 
-BooberEvosAttacks:
+MagmarEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
 	db  7, MOVE_LEER
@@ -1681,7 +1681,7 @@ BooberEvosAttacks:
 	db 56, MOVE_FLAMETHROWER
 	db 0 ; no more level-up moves
 
-KailiosEvosAttacks:
+PinsirEvosAttacks:
 	db EVOLVE_LEVEL, 42, DEX_PURAKKUSU
 	db 0 ; no more evolutions
 	db  1, MOVE_VICEGRIP
@@ -1695,7 +1695,7 @@ KailiosEvosAttacks:
 	db 69, MOVE_GUILLOTINE
 	db 0 ; no more level-up moves
 
-KentaurosEvosAttacks:
+TaurosEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  8, MOVE_TAIL_WHIP
@@ -1707,7 +1707,7 @@ KentaurosEvosAttacks:
 	db 71, MOVE_TAKE_DOWN
 	db 0 ; no more level-up moves
 
-KoikingEvosAttacks:
+MagikarpEvosAttacks:
 	db EVOLVE_LEVEL, 20, DEX_GYARADOS
 	db 0 ; no more evolutions
 	db  1, MOVE_SPLASH
@@ -1727,7 +1727,7 @@ GyaradosEvosAttacks:
 	db 70, MOVE_HYPER_BEAM
 	db 0 ; no more level-up moves
 
-LaplaceEvosAttacks:
+LaprasEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_WATER_GUN
 	db  9, MOVE_GROWL
@@ -1741,16 +1741,16 @@ LaplaceEvosAttacks:
 	db 65, MOVE_HYDRO_PUMP
 	db 0 ; no more level-up moves
 
-MetamonEvosAttacks:
+DittoEvosAttacks:
 	db EVOLVE_ITEM, 1, ITEM_METAL_COAT, DEX_ANIMON
 	db 0 ; no more evolutions
 	db  1, MOVE_TRANSFORM
 	db 0 ; no more level-up moves
 
-EievuiEvosAttacks:
-	db EVOLVE_STONE, 1, ITEM_WATER_STONE, DEX_SHOWERS
-	db EVOLVE_STONE, 1, ITEM_THUNDERSTONE, DEX_THUNDERS
-	db EVOLVE_STONE, 1, ITEM_FIRE_STONE, DEX_BOOSTER
+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_LEAF_STONE, DEX_LEAFY
@@ -1764,7 +1764,7 @@ EievuiEvosAttacks:
 	db 42, MOVE_TAKE_DOWN
 	db 0 ; no more level-up moves
 
-ShowersEvosAttacks:
+VaporeonEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  7, MOVE_SAND_ATTACK
@@ -1778,7 +1778,7 @@ ShowersEvosAttacks:
 	db 63, MOVE_HYDRO_PUMP
 	db 0 ; no more level-up moves
 
-ThundersEvosAttacks:
+JolteonEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  7, MOVE_SAND_ATTACK
@@ -1792,7 +1792,7 @@ ThundersEvosAttacks:
 	db 63, MOVE_THUNDER
 	db 0 ; no more level-up moves
 
-BoosterEvosAttacks:
+FlareonEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  7, MOVE_SAND_ATTACK
@@ -1820,8 +1820,8 @@ PorygonEvosAttacks:
 	db 50, MOVE_HYPER_BEAM
 	db 0 ; no more level-up moves
 
-OmniteEvosAttacks:
-	db EVOLVE_LEVEL, 40, DEX_OMSTAR
+OmanyteEvosAttacks:
+	db EVOLVE_LEVEL, 40, DEX_OMASTAR
 	db 0 ; no more evolutions
 	db  1, MOVE_WATER_GUN
 	db  7, MOVE_WITHDRAW
@@ -1833,7 +1833,7 @@ OmniteEvosAttacks:
 	db 64, MOVE_HYDRO_PUMP
 	db 0 ; no more level-up moves
 
-OmstarEvosAttacks:
+OmastarEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_WATER_GUN
 	db  8, MOVE_WITHDRAW
@@ -1870,7 +1870,7 @@ KabutopsEvosAttacks:
 	db 71, MOVE_HYDRO_PUMP
 	db 0 ; no more level-up moves
 
-PteraEvosAttacks:
+AerodactylEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_GUST
 	db  8, MOVE_SUPERSONIC
@@ -1882,7 +1882,7 @@ PteraEvosAttacks:
 	db 71, MOVE_HYPER_BEAM
 	db 0 ; no more level-up moves
 
-KabigonEvosAttacks:
+SnorlaxEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
 	db  8, MOVE_HARDEN
@@ -1898,7 +1898,7 @@ KabigonEvosAttacks:
 	db 71, MOVE_HYPER_BEAM
 	db 0 ; no more level-up moves
 
-FreezerEvosAttacks:
+ArticunoEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_PECK
 	db 10, MOVE_LEER
@@ -1911,7 +1911,7 @@ FreezerEvosAttacks:
 	db 80, MOVE_BLIZZARD
 	db 0 ; no more level-up moves
 
-ThunderEvosAttacks:
+ZapdosEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_PECK
 	db 10, MOVE_THUNDER_WAVE
@@ -1924,7 +1924,7 @@ ThunderEvosAttacks:
 	db 80, MOVE_SCARY_FACE
 	db 0 ; no more level-up moves
 
-FireEvosAttacks:
+MoltresEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_PECK
 	db 10, MOVE_EMBER
@@ -1937,8 +1937,8 @@ FireEvosAttacks:
 	db 80, MOVE_SKY_ATTACK
 	db 0 ; no more level-up moves
 
-MiniryuEvosAttacks:
-	db EVOLVE_LEVEL, 30, DEX_HAKURYU
+DratiniEvosAttacks:
+	db EVOLVE_LEVEL, 30, DEX_DRAGONAIR
 	db 0 ; no more evolutions
 	db  1, MOVE_POUND
 	db  3, MOVE_LEER
@@ -1953,8 +1953,8 @@ MiniryuEvosAttacks:
 	db 66, MOVE_HYPER_BEAM
 	db 0 ; no more level-up moves
 
-HakuryuEvosAttacks:
-	db EVOLVE_LEVEL, 55, DEX_KAIRYU
+DragonairEvosAttacks:
+	db EVOLVE_LEVEL, 55, DEX_DRAGONITE
 	db 0 ; no more evolutions
 	db  1, MOVE_POUND
 	db  4, MOVE_LEER
@@ -1969,7 +1969,7 @@ HakuryuEvosAttacks:
 	db 76, MOVE_HYPER_BEAM
 	db 0 ; no more level-up moves
 
-KairyuEvosAttacks:
+DragoniteEvosAttacks:
 	db 0 ; no more evolutions
 	db  1, MOVE_POUND
 	db  5, MOVE_LEER
@@ -2204,7 +2204,7 @@ DenryuEvosAttacks:
 	db 0 ; no more level-up moves
 
 MikonEvosAttacks:
-	db EVOLVE_LEVEL, 13, DEX_ROKON
+	db EVOLVE_LEVEL, 13, DEX_VULPIX
 	db 0 ; no more evolutions
 	db  1, MOVE_TAIL_WHIP
 	db  4, MOVE_QUICK_ATTACK
@@ -2218,7 +2218,7 @@ MikonEvosAttacks:
 	db 0 ; no more level-up moves
 
 MonjaEvosAttacks:
-	db EVOLVE_LEVEL, 22, DEX_MONJARA
+	db EVOLVE_LEVEL, 22, DEX_TANGELA
 	db 0 ; no more evolutions
 	db  1, MOVE_CONSTRICT
 	db  4, MOVE_ABSORB
@@ -2297,7 +2297,7 @@ PichuEvosAttacks:
 	db 0 ; no more level-up moves
 
 PyEvosAttacks:
-	db EVOLVE_LEVEL, 12, DEX_PIPPI
+	db EVOLVE_LEVEL, 12, DEX_CLEFAIRY
 	db 0 ; no more evolutions
 	db  1, MOVE_CHARM
 	db  2, MOVE_POUND
@@ -2312,7 +2312,7 @@ PyEvosAttacks:
 	db 0 ; no more level-up moves
 
 PupurinEvosAttacks:
-	db EVOLVE_LEVEL, 12, DEX_PURIN
+	db EVOLVE_LEVEL, 12, DEX_JIGGLYPUFF
 	db 0 ; no more evolutions
 	db  1, MOVE_CHARM
 	db  4, MOVE_SING
@@ -2363,7 +2363,7 @@ NatioEvosAttacks:
 	db 0 ; no more level-up moves
 
 GyopinEvosAttacks:
-	db EVOLVE_LEVEL, 16, DEX_TOSAKINTO
+	db EVOLVE_LEVEL, 16, DEX_GOLDEEN
 	db 0 ; no more evolutions
 	db  1, MOVE_PECK
 	db  3, MOVE_TAIL_WHIP
@@ -2500,7 +2500,7 @@ AnimonEvosAttacks:
 	db 0 ; no more level-up moves
 
 HinazuEvosAttacks:
-	db EVOLVE_LEVEL, 16, DEX_DODO
+	db EVOLVE_LEVEL, 16, DEX_DODUO
 	db 0 ; no more evolutions
 	db  1, MOVE_GROWL
 	db  5, MOVE_PECK
@@ -2583,7 +2583,7 @@ PainterEvosAttacks:
 	db 0 ; no more level-up moves
 
 KounyaEvosAttacks:
-	db EVOLVE_LEVEL, 14, DEX_NYARTH
+	db EVOLVE_LEVEL, 14, DEX_MEOWTH
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
 	db  4, MOVE_GROWL
@@ -2722,7 +2722,7 @@ TurbanEvosAttacks:
 	db 0 ; no more level-up moves
 
 BetbabyEvosAttacks:
-	db EVOLVE_LEVEL, 19, DEX_BETBETER
+	db EVOLVE_LEVEL, 19, DEX_GRIMER
 	db 0 ; no more evolutions
 	db  1, MOVE_POUND
 	db  2, MOVE_POISON_GAS
@@ -2761,8 +2761,8 @@ OkutankEvosAttacks:
 	db 0 ; no more level-up moves
 
 GonguEvosAttacks:
-	db EVOLVE_LEVEL, 15, DEX_SAWAMULAR
-	db EVOLVE_LEVEL, 15, DEX_EBIWALAR
+	db EVOLVE_LEVEL, 15, DEX_HITMONLEE
+	db EVOLVE_LEVEL, 15, DEX_HITMONCHAN
 	db EVOLVE_LEVEL, 15, DEX_KAPOERER
 	db 0 ; no more evolutions
 	db  1, MOVE_TACKLE
@@ -2783,7 +2783,7 @@ KapoererEvosAttacks:
 	db 0 ; no more level-up moves
 
 PudieEvosAttacks:
-	db EVOLVE_LEVEL, 13, DEX_GARDIE
+	db EVOLVE_LEVEL, 13, DEX_GROWLITHE
 	db 0 ; no more evolutions
 	db  1, MOVE_EMBER
 	db  5, MOVE_ROAR
@@ -2838,7 +2838,7 @@ WatanekoEvosAttacks:
 	db 0 ; no more level-up moves
 
 BaririnaEvosAttacks:
-	db EVOLVE_LEVEL, 15, DEX_BARRIERD
+	db EVOLVE_LEVEL, 15, DEX_MRMIME
 	db 0 ; no more evolutions
 	db  1, MOVE_CONFUSION
 	db  6, MOVE_BARRIER
@@ -2854,7 +2854,7 @@ BaririnaEvosAttacks:
 	db 0 ; no more level-up moves
 
 LipEvosAttacks:
-	db EVOLVE_LEVEL, 15, DEX_ROUGELA
+	db EVOLVE_LEVEL, 15, DEX_JYNX
 	db 0 ; no more evolutions
 	db  1, MOVE_POUND
 	db  6, MOVE_SING
@@ -2869,7 +2869,7 @@ LipEvosAttacks:
 	db 0 ; no more level-up moves
 
 ElebabyEvosAttacks:
-	db EVOLVE_LEVEL, 15, DEX_ELEBOO
+	db EVOLVE_LEVEL, 15, DEX_ELECTABUZZ
 	db 0 ; no more evolutions
 	db  1, MOVE_QUICK_ATTACK
 	db  6, MOVE_LEER
@@ -2883,7 +2883,7 @@ ElebabyEvosAttacks:
 	db 0 ; no more level-up moves
 
 BoobyEvosAttacks:
-	db EVOLVE_LEVEL, 15, DEX_BOOBER
+	db EVOLVE_LEVEL, 15, DEX_MAGMAR
 	db 0 ; no more evolutions
 	db  1, MOVE_SCRATCH
 	db  6, MOVE_LEER
diff --git a/data/pokemon/evos_attacks_pointers.inc b/data/pokemon/evos_attacks_pointers.inc
index 33836fb..2e3459f 100644
--- a/data/pokemon/evos_attacks_pointers.inc
+++ b/data/pokemon/evos_attacks_pointers.inc
@@ -1,155 +1,155 @@
 ; Evolutions and attacks are grouped together since they're both checked at level-up.
 
 EvosAttacksPointers::
-	dw FushigidaneEvosAttacks
-	dw FushigisouEvosAttacks
-	dw FushigibanaEvosAttacks
-	dw HitokageEvosAttacks
-	dw LizardoEvosAttacks
-	dw LizardonEvosAttacks
-	dw ZenigameEvosAttacks
-	dw KameilEvosAttacks
-	dw KamexEvosAttacks
+	dw BulbasaurEvosAttacks
+	dw IvysaurEvosAttacks
+	dw VenusaurEvosAttacks
+	dw CharmanderEvosAttacks
+	dw CharmeleonEvosAttacks
+	dw CharizardEvosAttacks
+	dw SquirtleEvosAttacks
+	dw WartortleEvosAttacks
+	dw BlastoiseEvosAttacks
 	dw CaterpieEvosAttacks
-	dw TranselEvosAttacks
+	dw MetapodEvosAttacks
 	dw ButterfreeEvosAttacks
-	dw BeedleEvosAttacks
-	dw CocoonEvosAttacks
-	dw SpearEvosAttacks
-	dw PoppoEvosAttacks
-	dw PigeonEvosAttacks
-	dw PigeotEvosAttacks
-	dw KorattaEvosAttacks
-	dw RattaEvosAttacks
-	dw OnisuzumeEvosAttacks
-	dw OnidrillEvosAttacks
-	dw ArboEvosAttacks
+	dw WeedleEvosAttacks
+	dw KakunaEvosAttacks
+	dw BeedrillEvosAttacks
+	dw PidgeyEvosAttacks
+	dw PidgeottoEvosAttacks
+	dw PidgeotEvosAttacks
+	dw RattataEvosAttacks
+	dw RaticateEvosAttacks
+	dw SpearowEvosAttacks
+	dw FearowEvosAttacks
+	dw EkansEvosAttacks
 	dw ArbokEvosAttacks
 	dw PikachuEvosAttacks
 	dw RaichuEvosAttacks
-	dw SandEvosAttacks
-	dw SandpanEvosAttacks
+	dw SandshrewEvosAttacks
+	dw SandslashEvosAttacks
 	dw NidoranFEvosAttacks
 	dw NidorinaEvosAttacks
 	dw NidoqueenEvosAttacks
 	dw NidoranMEvosAttacks
 	dw NidorinoEvosAttacks
 	dw NidokingEvosAttacks
-	dw PippiEvosAttacks
-	dw PixyEvosAttacks
-	dw RokonEvosAttacks
-	dw KyukonEvosAttacks
-	dw PurinEvosAttacks
-	dw PukurinEvosAttacks
+	dw ClefairyEvosAttacks
+	dw ClefableEvosAttacks
+	dw VulpixEvosAttacks
+	dw NinetalesEvosAttacks
+	dw JigglypuffEvosAttacks
+	dw WigglytuffEvosAttacks
 	dw ZubatEvosAttacks
 	dw GolbatEvosAttacks
-	dw NazonokusaEvosAttacks
-	dw KusaihanaEvosAttacks
-	dw RuffresiaEvosAttacks
+	dw OddishEvosAttacks
+	dw GloomEvosAttacks
+	dw VileplumeEvosAttacks
 	dw ParasEvosAttacks
 	dw ParasectEvosAttacks
-	dw KongpangEvosAttacks
-	dw MorphonEvosAttacks
-	dw DigdaEvosAttacks
+	dw VenonatEvosAttacks
+	dw VenomothEvosAttacks
+	dw DiglettEvosAttacks
 	dw DugtrioEvosAttacks
-	dw NyarthEvosAttacks
+	dw MeowthEvosAttacks
 	dw PersianEvosAttacks
-	dw KoduckEvosAttacks
+	dw PsyduckEvosAttacks
 	dw GolduckEvosAttacks
 	dw MankeyEvosAttacks
-	dw OkorizaruEvosAttacks
-	dw GardieEvosAttacks
-	dw WindieEvosAttacks
-	dw NyoromoEvosAttacks
-	dw NyorozoEvosAttacks
-	dw NyorobonEvosAttacks
-	dw CaseyEvosAttacks
-	dw YungererEvosAttacks
-	dw FoodinEvosAttacks
-	dw WanrikyEvosAttacks
-	dw GorikyEvosAttacks
-	dw KairikyEvosAttacks
-	dw MadatsubomiEvosAttacks
-	dw UtsudonEvosAttacks
-	dw UtsubotEvosAttacks
-	dw MenokurageEvosAttacks
-	dw DokukurageEvosAttacks
-	dw IsitsubuteEvosAttacks
-	dw GoloneEvosAttacks
-	dw GolonyaEvosAttacks
+	dw PrimeapeEvosAttacks
+	dw GrowlitheEvosAttacks
+	dw ArcanineEvosAttacks
+	dw PoliwagEvosAttacks
+	dw PoliwhirlEvosAttacks
+	dw PoliwrathEvosAttacks
+	dw AbraEvosAttacks
+	dw KadabraEvosAttacks
+	dw AlakazamEvosAttacks
+	dw MachopEvosAttacks
+	dw MachokeEvosAttacks
+	dw MachampEvosAttacks
+	dw BellsproutEvosAttacks
+	dw WeepinbellEvosAttacks
+	dw VictreebelEvosAttacks
+	dw TentacoolEvosAttacks
+	dw TentacruelEvosAttacks
+	dw GeodudeEvosAttacks
+	dw GravelerEvosAttacks
+	dw GolemEvosAttacks
 	dw PonytaEvosAttacks
-	dw GallopEvosAttacks
-	dw YadonEvosAttacks
-	dw YadoranEvosAttacks
-	dw CoilEvosAttacks
-	dw RarecoilEvosAttacks
-	dw KamonegiEvosAttacks
-	dw DodoEvosAttacks
-	dw DodorioEvosAttacks
-	dw PawouEvosAttacks
-	dw JugonEvosAttacks
-	dw BetbeterEvosAttacks
-	dw BetbetonEvosAttacks
+	dw RapidashEvosAttacks
+	dw SlowpokeEvosAttacks
+	dw SlowbroEvosAttacks
+	dw MagnemiteEvosAttacks
+	dw MagnetonEvosAttacks
+	dw FarfetchdEvosAttacks
+	dw DoduoEvosAttacks
+	dw DodrioEvosAttacks
+	dw SeelEvosAttacks
+	dw DewgongEvosAttacks
+	dw GrimerEvosAttacks
+	dw MukEvosAttacks
 	dw ShellderEvosAttacks
-	dw ParshenEvosAttacks
-	dw GhosEvosAttacks
-	dw GhostEvosAttacks
-	dw GangarEvosAttacks
-	dw IwarkEvosAttacks
-	dw SleepeEvosAttacks
-	dw SleeperEvosAttacks
-	dw CrabEvosAttacks
+	dw CloysterEvosAttacks
+	dw GastlyEvosAttacks
+	dw HaunterEvosAttacks
+	dw GengarEvosAttacks
+	dw OnixEvosAttacks
+	dw DrowzeeEvosAttacks
+	dw HypnoEvosAttacks
+	dw KrabbyEvosAttacks
 	dw KinglerEvosAttacks
-	dw BiriridamaEvosAttacks
-	dw MarumineEvosAttacks
-	dw TamatamaEvosAttacks
-	dw NassyEvosAttacks
-	dw KarakaraEvosAttacks
-	dw GaragaraEvosAttacks
-	dw SawamularEvosAttacks
-	dw EbiwalarEvosAttacks
-	dw BeroringaEvosAttacks
-	dw DogarsEvosAttacks
-	dw MatadogasEvosAttacks
-	dw SihornEvosAttacks
-	dw SidonEvosAttacks
-	dw LuckyEvosAttacks
-	dw MonjaraEvosAttacks
-	dw GaruraEvosAttacks
-	dw TattuEvosAttacks
+	dw VoltorbEvosAttacks
+	dw ElectrodeEvosAttacks
+	dw ExeggcuteEvosAttacks
+	dw ExeggutorEvosAttacks
+	dw CuboneEvosAttacks
+	dw MarowakEvosAttacks
+	dw HitmonleeEvosAttacks
+	dw HitmonchanEvosAttacks
+	dw LickitungEvosAttacks
+	dw KoffingEvosAttacks
+	dw WeezingEvosAttacks
+	dw RhyhornEvosAttacks
+	dw RhydonEvosAttacks
+	dw ChanseyEvosAttacks
+	dw TangelaEvosAttacks
+	dw KangaskhanEvosAttacks
+	dw HorseaEvosAttacks
 	dw SeadraEvosAttacks
-	dw TosakintoEvosAttacks
-	dw AzumaoEvosAttacks
-	dw HitodemanEvosAttacks
+	dw GoldeenEvosAttacks
+	dw SeakingEvosAttacks
+	dw StaryuEvosAttacks
 	dw StarmieEvosAttacks
-	dw BarrierdEvosAttacks
-	dw StrikeEvosAttacks
-	dw RougelaEvosAttacks
-	dw ElebooEvosAttacks
-	dw BooberEvosAttacks
-	dw KailiosEvosAttacks
-	dw KentaurosEvosAttacks
-	dw KoikingEvosAttacks
+	dw MrMimeEvosAttacks
+	dw ScytherEvosAttacks
+	dw JynxEvosAttacks
+	dw ElectabuzzEvosAttacks
+	dw MagmarEvosAttacks
+	dw PinsirEvosAttacks
+	dw TaurosEvosAttacks
+	dw MagikarpEvosAttacks
 	dw GyaradosEvosAttacks
-	dw LaplaceEvosAttacks
-	dw MetamonEvosAttacks
-	dw EievuiEvosAttacks
-	dw ShowersEvosAttacks
-	dw ThundersEvosAttacks
-	dw BoosterEvosAttacks
+	dw LaprasEvosAttacks
+	dw DittoEvosAttacks
+	dw EeveeEvosAttacks
+	dw VaporeonEvosAttacks
+	dw JolteonEvosAttacks
+	dw FlareonEvosAttacks
 	dw PorygonEvosAttacks
-	dw OmniteEvosAttacks
-	dw OmstarEvosAttacks
+	dw OmanyteEvosAttacks
+	dw OmastarEvosAttacks
 	dw KabutoEvosAttacks
 	dw KabutopsEvosAttacks
-	dw PteraEvosAttacks
-	dw KabigonEvosAttacks
-	dw FreezerEvosAttacks
-	dw ThunderEvosAttacks
-	dw FireEvosAttacks
-	dw MiniryuEvosAttacks
-	dw HakuryuEvosAttacks
-	dw KairyuEvosAttacks
+	dw AerodactylEvosAttacks
+	dw SnorlaxEvosAttacks
+	dw ArticunoEvosAttacks
+	dw ZapdosEvosAttacks
+	dw MoltresEvosAttacks
+	dw DratiniEvosAttacks
+	dw DragonairEvosAttacks
+	dw DragoniteEvosAttacks
 	dw MewtwoEvosAttacks
 	dw MewEvosAttacks
 	dw HappaEvosAttacks
diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm
index 344317d..545d82a 100644
--- a/data/pokemon/menu_icons.asm
+++ b/data/pokemon/menu_icons.asm
@@ -3,254 +3,254 @@ INCLUDE "constants.asm"
 SECTION "data/pokemon/menu_icons.asm", ROMX
 
 MonMenuIcons::
-	db ICON_FUSHIGIDANE ; 01 FUSHIGIDANE
-	db ICON_FUSHIGIDANE ; 02 FUSHIGISOU
-	db ICON_FUSHIGIDANE ; 03 FUSHIGIBANA
-	db ICON_HITOKAGE    ; 04 HITOKAGE
-	db ICON_HITOKAGE    ; 05 LIZARDO
-	db ICON_HITOKAGE    ; 06 LIZARDON
-	db ICON_ZENIGAME    ; 07 ZENIGAME
-	db ICON_ZENIGAME    ; 08 KAMEIL
-	db ICON_ZENIGAME    ; 09 KAMEX
-	db ICON_BEEDLE      ; 0a CATERPIE
-	db ICON_BEEDLE      ; 0b TRANSEL
-	db ICON_BUTTERFREE  ; 0c BUTTERFREE
-	db ICON_BEEDLE      ; 0d BEEDLE
-	db ICON_BEEDLE      ; 0e COCOON
-	db ICON_MUSHI       ; 0f SPEAR
-	db ICON_POPPO       ; 10 POPPO
-	db ICON_POPPO       ; 11 PIGEON
-	db ICON_POPPO       ; 12 PIGEOT
-	db ICON_LOKON       ; 13 KORATTA
-	db ICON_LOKON       ; 14 RATTA
-	db ICON_POPPO       ; 15 ONISUZUME
-	db ICON_POPPO       ; 16 ONIDRILL
-	db ICON_IWARK       ; 17 ARBO
-	db ICON_IWARK       ; 18 ARBOK
-	db ICON_PIKACHU     ; 19 PIKACHU
-	db ICON_PIKACHU     ; 1a RAICHU
-	db ICON_SIDON       ; 1b SAND
-	db ICON_SIDON       ; 1c SANDPAN
-	db ICON_LOKON       ; 1d NIDORAN_F
-	db ICON_LOKON       ; 1e NIDORINA
-	db ICON_SIDON       ; 1f NIDOQUEEN
-	db ICON_LOKON       ; 20 NIDORAN_M
-	db ICON_LOKON       ; 21 NIDORINO
-	db ICON_SIDON       ; 22 NIDOKING
-	db ICON_PIPPI       ; 23 PIPPI
-	db ICON_PIPPI       ; 24 PIXY
-	db ICON_LOKON       ; 25 ROKON
-	db ICON_LOKON       ; 26 KYUKON
-	db ICON_PURIN       ; 27 PURIN
-	db ICON_PURIN       ; 28 PUKURIN
-	db ICON_ZUBAT       ; 29 ZUBAT
-	db ICON_ZUBAT       ; 2a GOLBAT
-	db ICON_NAZONOKUSA  ; 2b NAZONOKUSA
-	db ICON_NAZONOKUSA  ; 2c KUSAIHANA
-	db ICON_NAZONOKUSA  ; 2d RUFFRESIA
-	db ICON_MUSHI       ; 2e PARAS
-	db ICON_MUSHI       ; 2f PARASECT
-	db ICON_MUSHI       ; 30 KONGPANG
-	db ICON_BUTTERFREE  ; 31 MORPHON
-	db ICON_DIGDA       ; 32 DIGDA
-	db ICON_DIGDA       ; 33 DUGTRIO
-	db ICON_LOKON       ; 34 NYARTH
-	db ICON_LOKON       ; 35 PERSIAN
-	db ICON_SIDON       ; 36 KODUCK
-	db ICON_SIDON       ; 37 GOLDUCK
-	db ICON_WANRIKY     ; 38 MANKEY
-	db ICON_WANRIKY     ; 39 OKORIZARU
-	db ICON_LOKON       ; 3a GARDIE
-	db ICON_LOKON       ; 3b WINDIE
-	db ICON_NYOROMO     ; 3c NYOROMO
-	db ICON_NYOROMO     ; 3d NYOROZO
-	db ICON_NYOROMO     ; 3e NYOROBON
-	db ICON_BARRIERD    ; 3f CASEY
-	db ICON_BARRIERD    ; 40 YUNGERER
-	db ICON_BARRIERD    ; 41 FOODIN
-	db ICON_WANRIKY     ; 42 WANRIKY
-	db ICON_WANRIKY     ; 43 GORIKY
-	db ICON_WANRIKY     ; 44 KAIRIKY
-	db ICON_NAZONOKUSA  ; 45 MADATSUBOMI
-	db ICON_NAZONOKUSA  ; 46 UTSUDON
-	db ICON_NAZONOKUSA  ; 47 UTSUBOT
-	db ICON_MENOKURAGE  ; 48 MENOKURAGE
-	db ICON_MENOKURAGE  ; 49 DOKUKURAGE
-	db ICON_ISITSUBUTE  ; 4a ISITSUBUTE
-	db ICON_ISITSUBUTE  ; 4b GOLONE
-	db ICON_ISITSUBUTE  ; 4c GOLONYA
-	db ICON_KENTAUROS   ; 4d PONYTA
-	db ICON_KENTAUROS   ; 4e GALLOP
-	db ICON_SIDON       ; 4f YADON
-	db ICON_SIDON       ; 50 YADORAN
-	db ICON_BIRIRIDAMA  ; 51 COIL
-	db ICON_BIRIRIDAMA  ; 52 RARECOIL
-	db ICON_POPPO       ; 53 KAMONEGI
-	db ICON_POPPO       ; 54 DODO
-	db ICON_POPPO       ; 55 DODORIO
-	db ICON_LAPLACE     ; 56 PAWOU
-	db ICON_LAPLACE     ; 57 JUGON
-	db ICON_METAMON     ; 58 BETBETER
-	db ICON_METAMON     ; 59 BETBETON
-	db ICON_SHELLDER    ; 5a SHELLDER
-	db ICON_SHELLDER    ; 5b PARSHEN
-	db ICON_GANGAR      ; 5c GHOS
-	db ICON_GANGAR      ; 5d GHOST
-	db ICON_GANGAR      ; 5e GANGAR
-	db ICON_ISITSUBUTE  ; 5f IWARK
-	db ICON_BARRIERD    ; 60 SLEEPE
-	db ICON_BARRIERD    ; 61 SLEEPER
-	db ICON_SHELLDER    ; 62 CRAB
-	db ICON_SHELLDER    ; 63 KINGLER
-	db ICON_BIRIRIDAMA  ; 64 BIRIRIDAMA
-	db ICON_BIRIRIDAMA  ; 65 MARUMINE
-	db ICON_NAZONOKUSA  ; 66 TAMATAMA
-	db ICON_NAZONOKUSA  ; 67 NASSY
-	db ICON_SIDON       ; 68 KARAKARA
-	db ICON_SIDON       ; 69 GARAGARA
-	db ICON_WANRIKY     ; 6a SAWAMULAR
-	db ICON_WANRIKY     ; 6b EBIWALAR
-	db ICON_SIDON       ; 6c BERORINGA
-	db ICON_METAMON     ; 6d DOGARS
-	db ICON_METAMON     ; 6e MATADOGAS
-	db ICON_KENTAUROS   ; 6f SIHORN
-	db ICON_SIDON       ; 70 SIDON
-	db ICON_SIDON       ; 71 LUCKY
-	db ICON_NAZONOKUSA  ; 72 MONJARA
-	db ICON_SIDON       ; 73 GARURA
-	db ICON_KOIKING     ; 74 TATTU
-	db ICON_KOIKING     ; 75 SEADRA
-	db ICON_KOIKING     ; 76 TOSAKINTO
-	db ICON_KOIKING     ; 77 AZUMAO
-	db ICON_HITODEMAN   ; 78 HITODEMAN
-	db ICON_HITODEMAN   ; 79 STARMIE
-	db ICON_BARRIERD    ; 7a BARRIERD
-	db ICON_MUSHI       ; 7b STRIKE
-	db ICON_BARRIERD    ; 7c ROUGELA
-	db ICON_BARRIERD    ; 7d ELEBOO
-	db ICON_BARRIERD    ; 7e BOOBER
-	db ICON_MUSHI       ; 7f KAILIOS
-	db ICON_KENTAUROS   ; 80 KENTAUROS
-	db ICON_KOIKING     ; 81 KOIKING
-	db ICON_IWARK       ; 82 GYARADOS
-	db ICON_LAPLACE     ; 83 LAPLACE
-	db ICON_METAMON     ; 84 METAMON
-	db ICON_LOKON       ; 85 EIEVUI
-	db ICON_LOKON       ; 86 SHOWERS
-	db ICON_LOKON       ; 87 THUNDERS
-	db ICON_LOKON       ; 88 BOOSTER
-	db ICON_BIRIRIDAMA  ; 89 PORYGON
-	db ICON_SHELLDER    ; 8a OMNITE
-	db ICON_SHELLDER    ; 8b OMSTAR
-	db ICON_SIDON       ; 8c KABUTO
-	db ICON_SIDON       ; 8d KABUTOPS
-	db ICON_POPPO       ; 8e PTERA
-	db ICON_KABIGON     ; 8f KABIGON
-	db ICON_POPPO       ; 90 FREEZER
-	db ICON_POPPO       ; 91 THUNDER
-	db ICON_POPPO       ; 92 FIRE
-	db ICON_IWARK       ; 93 MINIRYU
-	db ICON_IWARK       ; 94 HAKURYU
-	db ICON_LAPLACE     ; 95 KAIRYU
-	db ICON_BARRIERD    ; 96 MEWTWO
-	db ICON_BARRIERD    ; 97 MEW
-	db ICON_NAZONOKUSA  ; 98 HAPPA
-	db ICON_NAZONOKUSA  ; 99 HANAMOGURA
-	db ICON_NAZONOKUSA  ; 9a HANARYU
-	db ICON_SIDON       ; 9b HONOGUMA
-	db ICON_SIDON       ; 9c VOLBEAR
-	db ICON_SIDON       ; 9d DYNABEAR
-	db ICON_LAPLACE     ; 9e KURUSU
-	db ICON_LAPLACE     ; 9f AQUA
-	db ICON_LAPLACE     ; a0 AQUARIA
-	db ICON_POPPO       ; a1 HOHO
-	db ICON_POPPO       ; a2 BOBO
-	db ICON_LOKON       ; a3 PACHIMEE
-	db ICON_LOKON       ; a4 MOKOKO
-	db ICON_SIDON       ; a5 DENRYU
-	db ICON_LOKON       ; a6 MIKON
-	db ICON_NAZONOKUSA  ; a7 MONJA
-	db ICON_NAZONOKUSA  ; a8 JARANRA
-	db ICON_KOIKING     ; a9 HANEEI
-	db ICON_KOIKING     ; aa PUKU
-	db ICON_KOIKING     ; ab SHIBIREFUGU
-	db ICON_PIKACHU     ; ac PICHU
-	db ICON_PIPPI       ; ad PY
-	db ICON_PURIN       ; ae PUPURIN
-	db ICON_SIDON       ; af MIZUUO
-	db ICON_POPPO       ; b0 NATY
-	db ICON_POPPO       ; b1 NATIO
-	db ICON_KOIKING     ; b2 GYOPIN
-	db ICON_PURIN       ; b3 MARIL
-	db ICON_KOIKING     ; b4 MANBO1
-	db ICON_KOIKING     ; b5 IKARI
-	db ICON_KOIKING     ; b6 GROTESS
-	db ICON_ZUBAT       ; b7 EKSING
-	db ICON_MUSHI       ; b8 PARA
-	db ICON_MUSHI       ; b9 KOKUMO
-	db ICON_MUSHI       ; ba TWOHEAD
-	db ICON_POPPO       ; bb YOROIDORI
-	db ICON_METAMON     ; bc ANIMON
-	db ICON_POPPO       ; bd HINAZU
-	db ICON_NAZONOKUSA  ; be SUNNY
-	db ICON_KENTAUROS   ; bf PAON
-	db ICON_KENTAUROS   ; c0 DONPHAN
-	db ICON_GANGAR      ; c1 TWINZ
-	db ICON_LOKON       ; c2 KIRINRIKI
-	db ICON_BARRIERD    ; c3 PAINTER
-	db ICON_LOKON       ; c4 KOUNYA
-	db ICON_LOKON       ; c5 RINRIN
-	db ICON_LOKON       ; c6 BERURUN
-	db ICON_NYOROMO     ; c7 NYOROTONO
-	db ICON_SIDON       ; c8 YADOKING
-	db ICON_ANNON       ; c9 ANNON
-	db ICON_MUSHI       ; ca REDIBA
-	db ICON_MUSHI       ; cb MITSUBOSHI
-	db ICON_KENTAUROS   ; cc PUCHICORN
-	db ICON_LOKON       ; cd EIFIE
-	db ICON_LOKON       ; ce BLACKY
-	db ICON_LOKON       ; cf TURBAN
-	db ICON_METAMON     ; d0 BETBABY
-	db ICON_KOIKING     ; d1 TEPPOUO
-	db ICON_KOIKING     ; d2 OKUTANK
-	db ICON_WANRIKY     ; d3 GONGU
-	db ICON_WANRIKY     ; d4 KAPOERER
-	db ICON_LOKON       ; d5 PUDIE
-	db ICON_NAZONOKUSA  ; d6 HANEKO
-	db ICON_NAZONOKUSA  ; d7 POPONEKO
-	db ICON_NAZONOKUSA  ; d8 WATANEKO
-	db ICON_BARRIERD    ; d9 BARIRINA
-	db ICON_BARRIERD    ; da LIP
-	db ICON_BARRIERD    ; db ELEBABY
-	db ICON_BARRIERD    ; dc BOOBY
-	db ICON_NAZONOKUSA  ; dd KIREIHANA
-	db ICON_NAZONOKUSA  ; de TSUBOMITTO
-	db ICON_KENTAUROS   ; df MILTANK
-	db ICON_LAPLACE     ; e0 BOMBSEEKER
-	db ICON_PIPPI       ; e1 GIFT
-	db ICON_LOKON       ; e2 KOTORA
-	db ICON_LOKON       ; e3 RAITORA
-	db ICON_POPPO       ; e4 MADAME
-	db ICON_GANGAR      ; e5 NOROWARA
-	db ICON_GANGAR      ; e6 KYONPAN
-	db ICON_POPPO       ; e7 YAMIKARASU
-	db ICON_SIDON       ; e8 HAPPI
-	db ICON_MUSHI       ; e9 SCISSORS
-	db ICON_MUSHI       ; ea PURAKKUSU
-	db ICON_LOKON       ; eb DEVIL
-	db ICON_LOKON       ; ec HELGAA
-	db ICON_SIDON       ; ed WOLFMAN
-	db ICON_SIDON       ; ee WARWOLF
-	db ICON_BIRIRIDAMA  ; ef PORYGON2
-	db ICON_SIDON       ; f0 NAMEIL
-	db ICON_IWARK       ; f1 HAGANEIL
-	db ICON_LAPLACE     ; f2 KINGDRA
-	db ICON_LOKON       ; f3 RAI
-	db ICON_LOKON       ; f4 EN
-	db ICON_LOKON       ; f5 SUI
-	db ICON_LOKON       ; f6 NYULA
-	db ICON_POPPO       ; f7 HOUOU
-	db ICON_PIPPI       ; f8 TOGEPY
-	db ICON_PIPPI       ; f9 BULU
-	db ICON_LOKON       ; fa TAIL
-	db ICON_LOKON       ; fb LEAFY
+	db ICON_BULBASAUR  ; 01 BULBASAUR
+	db ICON_BULBASAUR  ; 02 IVYSAUR
+	db ICON_BULBASAUR  ; 03 VENUSAUR
+	db ICON_CHARMANDER ; 04 CHARMANDER
+	db ICON_CHARMANDER ; 05 CHARMELEON
+	db ICON_CHARMANDER ; 06 CHARIZARD
+	db ICON_SQUIRTLE   ; 07 SQUIRTLE
+	db ICON_SQUIRTLE   ; 08 WARTORTLE
+	db ICON_SQUIRTLE   ; 09 BLASTOISE
+	db ICON_WEEDLE     ; 0a CATERPIE
+	db ICON_WEEDLE     ; 0b METAPOD
+	db ICON_BUTTERFREE ; 0c BUTTERFREE
+	db ICON_WEEDLE     ; 0d WEEDLE
+	db ICON_WEEDLE     ; 0e KAKUNA
+	db ICON_MUSHI      ; 0f BEEDRILL
+	db ICON_PIDGEY     ; 10 PIDGEY
+	db ICON_PIDGEY     ; 11 PIDGEOTTO
+	db ICON_PIDGEY     ; 12 PIDGEOT
+	db ICON_LOKON      ; 13 RATTATA
+	db ICON_LOKON      ; 14 RATICATE
+	db ICON_PIDGEY     ; 15 SPEAROW
+	db ICON_PIDGEY     ; 16 FEAROW
+	db ICON_ONIX       ; 17 EKANS
+	db ICON_ONIX       ; 18 ARBOK
+	db ICON_PIKACHU    ; 19 PIKACHU
+	db ICON_PIKACHU    ; 1a RAICHU
+	db ICON_RHYDON     ; 1b SANDSHREW
+	db ICON_RHYDON     ; 1c SANDSLASH
+	db ICON_LOKON      ; 1d NIDORAN_F
+	db ICON_LOKON      ; 1e NIDORINA
+	db ICON_RHYDON     ; 1f NIDOQUEEN
+	db ICON_LOKON      ; 20 NIDORAN_M
+	db ICON_LOKON      ; 21 NIDORINO
+	db ICON_RHYDON     ; 22 NIDOKING
+	db ICON_CLEFAIRY   ; 23 CLEFAIRY
+	db ICON_CLEFAIRY   ; 24 CLEFABLE
+	db ICON_LOKON      ; 25 VULPIX
+	db ICON_LOKON      ; 26 NINETALES
+	db ICON_JIGGLYPUFF ; 27 JIGGLYPUFF
+	db ICON_JIGGLYPUFF ; 28 WIGGLYTUFF
+	db ICON_ZUBAT      ; 29 ZUBAT
+	db ICON_ZUBAT      ; 2a GOLBAT
+	db ICON_ODDISH     ; 2b ODDISH
+	db ICON_ODDISH     ; 2c GLOOM
+	db ICON_ODDISH     ; 2d VILEPLUME
+	db ICON_MUSHI      ; 2e PARAS
+	db ICON_MUSHI      ; 2f PARASECT
+	db ICON_MUSHI      ; 30 VENONAT
+	db ICON_BUTTERFREE ; 31 VENOMOTH
+	db ICON_DIGLETT    ; 32 DIGLETT
+	db ICON_DIGLETT    ; 33 DUGTRIO
+	db ICON_LOKON      ; 34 MEOWTH
+	db ICON_LOKON      ; 35 PERSIAN
+	db ICON_RHYDON     ; 36 PSYDUCK
+	db ICON_RHYDON     ; 37 GOLDUCK
+	db ICON_MACHOP     ; 38 MANKEY
+	db ICON_MACHOP     ; 39 PRIMEAPE
+	db ICON_LOKON      ; 3a GROWLITHE
+	db ICON_LOKON      ; 3b ARCANINE
+	db ICON_POLIWAG    ; 3c POLIWAG
+	db ICON_POLIWAG    ; 3d POLIWHIRL
+	db ICON_POLIWAG    ; 3e POLIWRATH
+	db ICON_MRMIME     ; 3f ABRA
+	db ICON_MRMIME     ; 40 KADABRA
+	db ICON_MRMIME     ; 41 ALAKAZAM
+	db ICON_MACHOP     ; 42 MACHOP
+	db ICON_MACHOP     ; 43 MACHOKE
+	db ICON_MACHOP     ; 44 MACHAMP
+	db ICON_ODDISH     ; 45 BELLSPROUT
+	db ICON_ODDISH     ; 46 WEEPINBELL
+	db ICON_ODDISH     ; 47 VICTREEBEL
+	db ICON_TENTACOOL  ; 48 TENTACOOL
+	db ICON_TENTACOOL  ; 49 TENTACRUEL
+	db ICON_GEODUDE    ; 4a GEODUDE
+	db ICON_GEODUDE    ; 4b GRAVELER
+	db ICON_GEODUDE    ; 4c GOLEM
+	db ICON_TAUROS     ; 4d PONYTA
+	db ICON_TAUROS     ; 4e RAPIDASH
+	db ICON_RHYDON     ; 4f SLOWPOKE
+	db ICON_RHYDON     ; 50 SLOWBRO
+	db ICON_VOLTORB    ; 51 MAGNEMITE
+	db ICON_VOLTORB    ; 52 MAGNETON
+	db ICON_PIDGEY     ; 53 FARFETCHD
+	db ICON_PIDGEY     ; 54 DODUO
+	db ICON_PIDGEY     ; 55 DODRIO
+	db ICON_LAPRAS     ; 56 SEEL
+	db ICON_LAPRAS     ; 57 DEWGONG
+	db ICON_DITTO      ; 58 GRIMER
+	db ICON_DITTO      ; 59 MUK
+	db ICON_SHELLDER   ; 5a SHELLDER
+	db ICON_SHELLDER   ; 5b CLOYSTER
+	db ICON_GENGAR     ; 5c GASTLY
+	db ICON_GENGAR     ; 5d HAUNTER
+	db ICON_GENGAR     ; 5e GENGAR
+	db ICON_GEODUDE    ; 5f ONIX
+	db ICON_MRMIME     ; 60 DROWZEE
+	db ICON_MRMIME     ; 61 HYPNO
+	db ICON_SHELLDER   ; 62 KRABBY
+	db ICON_SHELLDER   ; 63 KINGLER
+	db ICON_VOLTORB    ; 64 VOLTORB
+	db ICON_VOLTORB    ; 65 ELECTRODE
+	db ICON_ODDISH     ; 66 EXEGGCUTE
+	db ICON_ODDISH     ; 67 EXEGGUTOR
+	db ICON_RHYDON     ; 68 CUBONE
+	db ICON_RHYDON     ; 69 MAROWAK
+	db ICON_MACHOP     ; 6a HITMONLEE
+	db ICON_MACHOP     ; 6b HITMONCHAN
+	db ICON_RHYDON     ; 6c LICKITUNG
+	db ICON_DITTO      ; 6d KOFFING
+	db ICON_DITTO      ; 6e WEEZING
+	db ICON_TAUROS     ; 6f RHYHORN
+	db ICON_RHYDON     ; 70 RHYDON
+	db ICON_RHYDON     ; 71 CHANSEY
+	db ICON_ODDISH     ; 72 TANGELA
+	db ICON_RHYDON     ; 73 KANGASKHAN
+	db ICON_MAGIKARP   ; 74 HORSEA
+	db ICON_MAGIKARP   ; 75 SEADRA
+	db ICON_MAGIKARP   ; 76 GOLDEEN
+	db ICON_MAGIKARP   ; 77 SEAKING
+	db ICON_STARYU     ; 78 STARYU
+	db ICON_STARYU     ; 79 STARMIE
+	db ICON_MRMIME     ; 7a MRMIME
+	db ICON_MUSHI      ; 7b SCYTHER
+	db ICON_MRMIME     ; 7c JYNX
+	db ICON_MRMIME     ; 7d ELECTABUZZ
+	db ICON_MRMIME     ; 7e MAGMAR
+	db ICON_MUSHI      ; 7f PINSIR
+	db ICON_TAUROS     ; 80 TAUROS
+	db ICON_MAGIKARP   ; 81 MAGIKARP
+	db ICON_ONIX       ; 82 GYARADOS
+	db ICON_LAPRAS     ; 83 LAPRAS
+	db ICON_DITTO      ; 84 DITTO
+	db ICON_LOKON      ; 85 EEVEE
+	db ICON_LOKON      ; 86 VAPOREON
+	db ICON_LOKON      ; 87 JOLTEON
+	db ICON_LOKON      ; 88 FLAREON
+	db ICON_VOLTORB    ; 89 PORYGON
+	db ICON_SHELLDER   ; 8a OMANYTE
+	db ICON_SHELLDER   ; 8b OMASTAR
+	db ICON_RHYDON     ; 8c KABUTO
+	db ICON_RHYDON     ; 8d KABUTOPS
+	db ICON_PIDGEY     ; 8e AERODACTYL
+	db ICON_SNORLAX    ; 8f SNORLAX
+	db ICON_PIDGEY     ; 90 ARTICUNO
+	db ICON_PIDGEY     ; 91 ZAPDOS
+	db ICON_PIDGEY     ; 92 MOLTRES
+	db ICON_ONIX       ; 93 DRATINI
+	db ICON_ONIX       ; 94 DRAGONAIR
+	db ICON_LAPRAS     ; 95 DRAGONITE
+	db ICON_MRMIME     ; 96 MEWTWO
+	db ICON_MRMIME     ; 97 MEW
+	db ICON_ODDISH     ; 98 HAPPA
+	db ICON_ODDISH     ; 99 HANAMOGURA
+	db ICON_ODDISH     ; 9a HANARYU
+	db ICON_RHYDON     ; 9b HONOGUMA
+	db ICON_RHYDON     ; 9c VOLBEAR
+	db ICON_RHYDON     ; 9d DYNABEAR
+	db ICON_LAPRAS     ; 9e KURUSU
+	db ICON_LAPRAS     ; 9f AQUA
+	db ICON_LAPRAS     ; a0 AQUARIA
+	db ICON_PIDGEY     ; a1 HOHO
+	db ICON_PIDGEY     ; a2 BOBO
+	db ICON_LOKON      ; a3 PACHIMEE
+	db ICON_LOKON      ; a4 MOKOKO
+	db ICON_RHYDON     ; a5 DENRYU
+	db ICON_LOKON      ; a6 MIKON
+	db ICON_ODDISH     ; a7 MONJA
+	db ICON_ODDISH     ; a8 JARANRA
+	db ICON_MAGIKARP   ; a9 HANEEI
+	db ICON_MAGIKARP   ; aa PUKU
+	db ICON_MAGIKARP   ; ab SHIBIREFUGU
+	db ICON_PIKACHU    ; ac PICHU
+	db ICON_CLEFAIRY   ; ad PY
+	db ICON_JIGGLYPUFF ; ae PUPURIN
+	db ICON_RHYDON     ; af MIZUUO
+	db ICON_PIDGEY     ; b0 NATY
+	db ICON_PIDGEY     ; b1 NATIO
+	db ICON_MAGIKARP   ; b2 GYOPIN
+	db ICON_JIGGLYPUFF ; b3 MARIL
+	db ICON_MAGIKARP   ; b4 MANBO1
+	db ICON_MAGIKARP   ; b5 IKARI
+	db ICON_MAGIKARP   ; b6 GROTESS
+	db ICON_ZUBAT      ; b7 EKSING
+	db ICON_MUSHI      ; b8 PARA
+	db ICON_MUSHI      ; b9 KOKUMO
+	db ICON_MUSHI      ; ba TWOHEAD
+	db ICON_PIDGEY     ; bb YOROIDORI
+	db ICON_DITTO      ; bc ANIMON
+	db ICON_PIDGEY     ; bd HINAZU
+	db ICON_ODDISH     ; be SUNNY
+	db ICON_TAUROS     ; bf PAON
+	db ICON_TAUROS     ; c0 DONPHAN
+	db ICON_GENGAR     ; c1 TWINZ
+	db ICON_LOKON      ; c2 KIRINRIKI
+	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_MUSHI      ; cb MITSUBOSHI
+	db ICON_TAUROS     ; cc PUCHICORN
+	db ICON_LOKON      ; cd EIFIE
+	db ICON_LOKON      ; ce BLACKY
+	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_LOKON      ; d5 PUDIE
+	db ICON_ODDISH     ; d6 HANEKO
+	db ICON_ODDISH     ; d7 POPONEKO
+	db ICON_ODDISH     ; d8 WATANEKO
+	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_ODDISH     ; de TSUBOMITTO
+	db ICON_TAUROS     ; df MILTANK
+	db ICON_LAPRAS     ; e0 BOMBSEEKER
+	db ICON_CLEFAIRY   ; e1 GIFT
+	db ICON_LOKON      ; e2 KOTORA
+	db ICON_LOKON      ; e3 RAITORA
+	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_MUSHI      ; e9 SCISSORS
+	db ICON_MUSHI      ; ea PURAKKUSU
+	db ICON_LOKON      ; eb DEVIL
+	db ICON_LOKON      ; ec HELGAA
+	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_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      ; fa TAIL
+	db ICON_LOKON      ; fb LEAFY
diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm
index c4e822b..e911a32 100644
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@@ -3,155 +3,155 @@ INCLUDE "constants.asm"
 SECTION "data/pokemon/names.asm", ROMX
 
 PokemonNames::
-	db "フシギダネ" ; FUSHIGIDANE
-	db "フシギソウ" ; FUSHIGISOU
-	db "フシギバナ" ; FUSHIGIBANA
-	db "ヒトカゲ@" ; HITOKAGE
-	db "りザード@" ; LIZARDO
-	db "りザードン" ; LIZARDON
-	db "ゼニガメ@" ; ZENIGAME
-	db "カメール@" ; KAMEIL
-	db "カメックス" ; KAMEX
+	db "フシギダネ" ; BULBASAUR
+	db "フシギソウ" ; IVYSAUR
+	db "フシギバナ" ; VENUSAUR
+	db "ヒトカゲ@" ; CHARMANDER
+	db "りザード@" ; CHARMELEON
+	db "りザードン" ; CHARIZARD
+	db "ゼニガメ@" ; SQUIRTLE
+	db "カメール@" ; WARTORTLE
+	db "カメックス" ; BLASTOISE
 	db "キャタピー" ; CATERPIE
-	db "トランセル" ; TRANSEL
+	db "トランセル" ; METAPOD
 	db "バタフりー" ; BUTTERFREE
-	db "ビードル@" ; BEEDLE
-	db "コクーン@" ; COCOON
-	db "スピアー@" ; SPEAR
-	db "ポッポ@@" ; POPPO
-	db "ピジョン@" ; PIGEON
-	db "ピジョット" ; PIGEOT
-	db "コラッタ@" ; KORATTA
-	db "ラッタ@@" ; RATTA
-	db "オニスズメ" ; ONISUZUME
-	db "オニドりル" ; ONIDRILL
-	db "アーボ@@" ; ARBO
+	db "ビードル@" ; WEEDLE
+	db "コクーン@" ; KAKUNA
+	db "スピアー@" ; BEEDRILL
+	db "ポッポ@@" ; PIDGEY
+	db "ピジョン@" ; PIDGEOTTO
+	db "ピジョット" ; PIDGEOT
+	db "コラッタ@" ; RATTATA
+	db "ラッタ@@" ; RATICATE
+	db "オニスズメ" ; SPEAROW
+	db "オニドりル" ; FEAROW
+	db "アーボ@@" ; EKANS
 	db "アーボック" ; ARBOK
 	db "ピカチュウ" ; PIKACHU
 	db "ライチュウ" ; RAICHU
-	db "サンド@@" ; SAND
-	db "サンドパン" ; SANDPAN
+	db "サンド@@" ; SANDSHREW
+	db "サンドパン" ; SANDSLASH
 	db "ニドラン♀" ; NIDORAN_F
 	db "ニドりーナ" ; NIDORINA
 	db "ニドクイン" ; NIDOQUEEN
 	db "ニドラン♂" ; NIDORAN_M
 	db "ニドりーノ" ; NIDORINO
 	db "ニドキング" ; NIDOKING
-	db "ピッピ@@" ; PIPPI
-	db "ピクシー@" ; PIXY
-	db "ロコン@@" ; ROKON
-	db "キュウコン" ; KYUKON
-	db "プりン@@" ; PURIN
-	db "プクりン@" ; PUKURIN
+	db "ピッピ@@" ; CLEFAIRY
+	db "ピクシー@" ; CLEFABLE
+	db "ロコン@@" ; VULPIX
+	db "キュウコン" ; NINETALES
+	db "プりン@@" ; JIGGLYPUFF
+	db "プクりン@" ; WIGGLYTUFF
 	db "ズバット@" ; ZUBAT
 	db "ゴルバット" ; GOLBAT
-	db "ナゾノクサ" ; NAZONOKUSA
-	db "クサイハナ" ; KUSAIHANA
-	db "ラフレシア" ; RUFFRESIA
+	db "ナゾノクサ" ; ODDISH
+	db "クサイハナ" ; GLOOM
+	db "ラフレシア" ; VILEPLUME
 	db "パラス@@" ; PARAS
 	db "パラセクト" ; PARASECT
-	db "コンパン@" ; KONGPANG
-	db "モルフォン" ; MORPHON
-	db "ディグダ@" ; DIGDA
+	db "コンパン@" ; VENONAT
+	db "モルフォン" ; VENOMOTH
+	db "ディグダ@" ; DIGLETT
 	db "ダグトりオ" ; DUGTRIO
-	db "ニャース@" ; NYARTH
+	db "ニャース@" ; MEOWTH
 	db "ぺルシアン" ; PERSIAN
-	db "コダック@" ; KODUCK
+	db "コダック@" ; PSYDUCK
 	db "ゴルダック" ; GOLDUCK
 	db "マンキー@" ; MANKEY
-	db "オコりザル" ; OKORIZARU
-	db "ガーディ@" ; GARDIE
-	db "ウインディ" ; WINDIE
-	db "ニョロモ@" ; NYOROMO
-	db "ニョロゾ@" ; NYOROZO
-	db "ニョロボン" ; NYOROBON
-	db "ケーシィ@" ; CASEY
-	db "ユンゲラー" ; YUNGERER
-	db "フーディン" ; FOODIN
-	db "ワンりキー" ; WANRIKY
-	db "ゴーりキー" ; GORIKY
-	db "カイりキー" ; KAIRIKY
-	db "マダツボミ" ; MADATSUBOMI
-	db "ウツドン@" ; UTSUDON
-	db "ウツボット" ; UTSUBOT
-	db "メノクラゲ" ; MENOKURAGE
-	db "ドククラゲ" ; DOKUKURAGE
-	db "イシツブテ" ; ISITSUBUTE
-	db "ゴローン@" ; GOLONE
-	db "ゴローニャ" ; GOLONYA
+	db "オコりザル" ; PRIMEAPE
+	db "ガーディ@" ; GROWLITHE
+	db "ウインディ" ; ARCANINE
+	db "ニョロモ@" ; POLIWAG
+	db "ニョロゾ@" ; POLIWHIRL
+	db "ニョロボン" ; POLIWRATH
+	db "ケーシィ@" ; ABRA
+	db "ユンゲラー" ; KADABRA
+	db "フーディン" ; ALAKAZAM
+	db "ワンりキー" ; MACHOP
+	db "ゴーりキー" ; MACHOKE
+	db "カイりキー" ; MACHAMP
+	db "マダツボミ" ; BELLSPROUT
+	db "ウツドン@" ; WEEPINBELL
+	db "ウツボット" ; VICTREEBEL
+	db "メノクラゲ" ; TENTACOOL
+	db "ドククラゲ" ; TENTACRUEL
+	db "イシツブテ" ; GEODUDE
+	db "ゴローン@" ; GRAVELER
+	db "ゴローニャ" ; GOLEM
 	db "ポニータ@" ; PONYTA
-	db "ギャロップ" ; GALLOP
-	db "ヤドン@@" ; YADON
-	db "ヤドラン@" ; YADORAN
-	db "コイル@@" ; COIL
-	db "レアコイル" ; RARECOIL
-	db "カモネギ@" ; KAMONEGI
-	db "ドードー@" ; DODO
-	db "ドードりオ" ; DODORIO
-	db "パウワウ@" ; PAWOU
-	db "ジュゴン@" ; JUGON
-	db "べトべター" ; BETBETER
-	db "べトべトン" ; BETBETON
+	db "ギャロップ" ; RAPIDASH
+	db "ヤドン@@" ; SLOWPOKE
+	db "ヤドラン@" ; SLOWBRO
+	db "コイル@@" ; MAGNEMITE
+	db "レアコイル" ; MAGNETON
+	db "カモネギ@" ; FARFETCHD
+	db "ドードー@" ; DODUO
+	db "ドードりオ" ; DODRIO
+	db "パウワウ@" ; SEEL
+	db "ジュゴン@" ; DEWGONG
+	db "べトべター" ; GRIMER
+	db "べトべトン" ; MUK
 	db "シェルダー" ; SHELLDER
-	db "パルシェン" ; PARSHEN
-	db "ゴース@@" ; GHOS
-	db "ゴースト@" ; GHOST
-	db "ゲンガー@" ; GANGAR
-	db "イワーク@" ; IWARK
-	db "スりープ@" ; SLEEPE
-	db "スりーパー" ; SLEEPER
-	db "クラブ@@" ; CRAB
+	db "パルシェン" ; CLOYSTER
+	db "ゴース@@" ; GASTLY
+	db "ゴースト@" ; HAUNTER
+	db "ゲンガー@" ; GENGAR
+	db "イワーク@" ; ONIX
+	db "スりープ@" ; DROWZEE
+	db "スりーパー" ; HYPNO
+	db "クラブ@@" ; KRABBY
 	db "キングラー" ; KINGLER
-	db "ビりりダマ" ; BIRIRIDAMA
-	db "マルマイン" ; MARUMINE
-	db "タマタマ@" ; TAMATAMA
-	db "ナッシー@" ; NASSY
-	db "カラカラ@" ; KARAKARA
-	db "ガラガラ@" ; GARAGARA
-	db "サワムラー" ; SAWAMULAR
-	db "エビワラー" ; EBIWALAR
-	db "べロりンガ" ; BERORINGA
-	db "ドガース@" ; DOGARS
-	db "マタドガス" ; MATADOGAS
-	db "サイホーン" ; SIHORN
-	db "サイドン@" ; SIDON
-	db "ラッキー@" ; LUCKY
-	db "モンジャラ" ; MONJARA
-	db "ガルーラ@" ; GARURA
-	db "タッツー@" ; TATTU
+	db "ビりりダマ" ; VOLTORB
+	db "マルマイン" ; ELECTRODE
+	db "タマタマ@" ; EXEGGCUTE
+	db "ナッシー@" ; EXEGGUTOR
+	db "カラカラ@" ; CUBONE
+	db "ガラガラ@" ; MAROWAK
+	db "サワムラー" ; HITMONLEE
+	db "エビワラー" ; HITMONCHAN
+	db "べロりンガ" ; LICKITUNG
+	db "ドガース@" ; KOFFING
+	db "マタドガス" ; WEEZING
+	db "サイホーン" ; RHYHORN
+	db "サイドン@" ; RHYDON
+	db "ラッキー@" ; CHANSEY
+	db "モンジャラ" ; TANGELA
+	db "ガルーラ@" ; KANGASKHAN
+	db "タッツー@" ; HORSEA
 	db "シードラ@" ; SEADRA
-	db "トサキント" ; TOSAKINTO
-	db "アズマオウ" ; AZUMAO
-	db "ヒトデマン" ; HITODEMAN
+	db "トサキント" ; GOLDEEN
+	db "アズマオウ" ; SEAKING
+	db "ヒトデマン" ; STARYU
 	db "スターミー" ; STARMIE
-	db "バりヤード" ; BARRIERD
-	db "ストライク" ; STRIKE
-	db "ルージュラ" ; ROUGELA
-	db "エレブー@" ; ELEBOO
-	db "ブーバー@" ; BOOBER
-	db "カイロス@" ; KAILIOS
-	db "ケンタロス" ; KENTAUROS
-	db "コイキング" ; KOIKING
+	db "バりヤード" ; MRMIME
+	db "ストライク" ; SCYTHER
+	db "ルージュラ" ; JYNX
+	db "エレブー@" ; ELECTABUZZ
+	db "ブーバー@" ; MAGMAR
+	db "カイロス@" ; PINSIR
+	db "ケンタロス" ; TAUROS
+	db "コイキング" ; MAGIKARP
 	db "ギャラドス" ; GYARADOS
-	db "ラプラス@" ; LAPLACE
-	db "メタモン@" ; METAMON
-	db "イーブイ@" ; EIEVUI
-	db "シャワーズ" ; SHOWERS
-	db "サンダース" ; THUNDERS
-	db "ブースター" ; BOOSTER
+	db "ラプラス@" ; LAPRAS
+	db "メタモン@" ; DITTO
+	db "イーブイ@" ; EEVEE
+	db "シャワーズ" ; VAPOREON
+	db "サンダース" ; JOLTEON
+	db "ブースター" ; FLAREON
 	db "ポりゴン@" ; PORYGON
-	db "オムナイト" ; OMNITE
-	db "オムスター" ; OMSTAR
+	db "オムナイト" ; OMANYTE
+	db "オムスター" ; OMASTAR
 	db "カブト@@" ; KABUTO
 	db "カブトプス" ; KABUTOPS
-	db "プテラ@@" ; PTERA
-	db "カビゴン@" ; KABIGON
-	db "フりーザー" ; FREEZER
-	db "サンダー@" ; THUNDER
-	db "ファイヤー" ; FIRE
-	db "ミニりュウ" ; MINIRYU
-	db "ハクりュー" ; HAKURYU
-	db "カイりュー" ; KAIRYU
+	db "プテラ@@" ; AERODACTYL
+	db "カビゴン@" ; SNORLAX
+	db "フりーザー" ; ARTICUNO
+	db "サンダー@" ; ZAPDOS
+	db "ファイヤー" ; MOLTRES
+	db "ミニりュウ" ; DRATINI
+	db "ハクりュー" ; DRAGONAIR
+	db "カイりュー" ; DRAGONITE
 	db "ミュウツー" ; MEWTWO
 	db "ミュウ@@" ; MEW
 	db "ハッパ@@" ; HAPPA
diff --git a/data/pokemon/palettes.inc b/data/pokemon/palettes.inc
index a38cd99..71a526d 100755
--- a/data/pokemon/palettes.inc
+++ b/data/pokemon/palettes.inc
@@ -1,154 +1,154 @@
 PokemonPalettes:
 	db PAL_MEWMON    ; NONE
-	db PAL_GREENMON  ; FUSHIGIDANE
-	db PAL_GREENMON  ; FUSHIGISOU
-	db PAL_GREENMON  ; FUSHIGIBANA
-	db PAL_REDMON    ; HITOKAGE
-	db PAL_REDMON    ; LIZARDO
-	db PAL_REDMON    ; LIZARDON
-	db PAL_CYANMON   ; ZENIGAME
-	db PAL_CYANMON   ; KAMEIL
-	db PAL_CYANMON   ; KAMEX
+	db PAL_GREENMON  ; BULBASAUR
+	db PAL_GREENMON  ; IVYSAUR
+	db PAL_GREENMON  ; VENUSAUR
+	db PAL_REDMON    ; CHARMANDER
+	db PAL_REDMON    ; CHARMELEON
+	db PAL_REDMON    ; CHARIZARD
+	db PAL_CYANMON   ; SQUIRTLE
+	db PAL_CYANMON   ; WARTORTLE
+	db PAL_CYANMON   ; BLASTOISE
 	db PAL_GREENMON  ; CATERPIE
-	db PAL_GREENMON  ; TRANSEL
+	db PAL_GREENMON  ; METAPOD
 	db PAL_CYANMON   ; BUTTERFREE
-	db PAL_YELLOWMON ; BEEDLE
-	db PAL_YELLOWMON ; COCOON
-	db PAL_YELLOWMON ; SPEAR
-	db PAL_BROWNMON  ; POPPO
-	db PAL_BROWNMON  ; PIGEON
-	db PAL_BROWNMON  ; PIGEOT
-	db PAL_GREYMON   ; KORATTA
-	db PAL_GREYMON   ; RATTA
-	db PAL_BROWNMON  ; ONISUZUME
-	db PAL_BROWNMON  ; ONIDRILL
-	db PAL_PURPLEMON ; ARBO
+	db PAL_YELLOWMON ; WEEDLE
+	db PAL_YELLOWMON ; KAKUNA
+	db PAL_YELLOWMON ; BEEDRILL
+	db PAL_BROWNMON  ; PIDGEY
+	db PAL_BROWNMON  ; PIDGEOTTO
+	db PAL_BROWNMON  ; PIDGEOT
+	db PAL_GREYMON   ; RATTATA
+	db PAL_GREYMON   ; RATICATE
+	db PAL_BROWNMON  ; SPEAROW
+	db PAL_BROWNMON  ; FEAROW
+	db PAL_PURPLEMON ; EKANS
 	db PAL_PURPLEMON ; ARBOK
 	db PAL_YELLOWMON ; PIKACHU
 	db PAL_YELLOWMON ; RAICHU
-	db PAL_BROWNMON  ; SAND
-	db PAL_BROWNMON  ; SANDPAN
+	db PAL_BROWNMON  ; SANDSHREW
+	db PAL_BROWNMON  ; SANDSLASH
 	db PAL_BLUEMON   ; NIDORAN_F
 	db PAL_BLUEMON   ; NIDORINA
 	db PAL_BLUEMON   ; NIDOQUEEN
 	db PAL_PURPLEMON ; NIDORAN_M
 	db PAL_PURPLEMON ; NIDORINO
 	db PAL_PURPLEMON ; NIDOKING
-	db PAL_PINKMON   ; PIPPI
-	db PAL_PINKMON   ; PIXY
-	db PAL_REDMON    ; ROKON
-	db PAL_YELLOWMON ; KYUKON
-	db PAL_PINKMON   ; PURIN
-	db PAL_PINKMON   ; PUKURIN
+	db PAL_PINKMON   ; CLEFAIRY
+	db PAL_PINKMON   ; CLEFABLE
+	db PAL_REDMON    ; VULPIX
+	db PAL_YELLOWMON ; NINETALES
+	db PAL_PINKMON   ; JIGGLYPUFF
+	db PAL_PINKMON   ; WIGGLYTUFF
 	db PAL_BLUEMON   ; ZUBAT
 	db PAL_BLUEMON   ; GOLBAT
-	db PAL_GREENMON  ; NAZONOKUSA
-	db PAL_REDMON    ; KUSAIHANA
-	db PAL_REDMON    ; RUFFRESIA
+	db PAL_GREENMON  ; ODDISH
+	db PAL_REDMON    ; GLOOM
+	db PAL_REDMON    ; VILEPLUME
 	db PAL_REDMON    ; PARAS
 	db PAL_REDMON    ; PARASECT
-	db PAL_PURPLEMON ; KONGPANG
-	db PAL_PURPLEMON ; MORPHON
-	db PAL_BROWNMON  ; DIGDA
+	db PAL_PURPLEMON ; VENONAT
+	db PAL_PURPLEMON ; VENOMOTH
+	db PAL_BROWNMON  ; DIGLETT
 	db PAL_BROWNMON  ; DUGTRIO
-	db PAL_YELLOWMON ; NYARTH
+	db PAL_YELLOWMON ; MEOWTH
 	db PAL_YELLOWMON ; PERSIAN
-	db PAL_YELLOWMON ; KODUCK
+	db PAL_YELLOWMON ; PSYDUCK
 	db PAL_CYANMON   ; GOLDUCK
 	db PAL_BROWNMON  ; MANKEY
-	db PAL_BROWNMON  ; OKORIZARU
-	db PAL_BROWNMON  ; GARDIE
-	db PAL_REDMON    ; WINDIE
-	db PAL_BLUEMON   ; NYOROMO
-	db PAL_BLUEMON   ; NYOROZO
-	db PAL_BLUEMON   ; NYOROBON
-	db PAL_YELLOWMON ; CASEY
-	db PAL_YELLOWMON ; YUNGERER
-	db PAL_YELLOWMON ; FOODIN
-	db PAL_GREYMON   ; WANRIKY
-	db PAL_GREYMON   ; GORIKY
-	db PAL_GREYMON   ; KAIRIKY
-	db PAL_GREENMON  ; MADATSUBOMI
-	db PAL_GREENMON  ; UTSUDON
-	db PAL_GREENMON  ; UTSUBOT
-	db PAL_CYANMON   ; MENOKURAGE
-	db PAL_CYANMON   ; DOKUKURAGE
-	db PAL_GREYMON   ; ISITSUBUTE
-	db PAL_GREYMON   ; GOLONE
-	db PAL_GREYMON   ; GOLONYA
+	db PAL_BROWNMON  ; PRIMEAPE
+	db PAL_BROWNMON  ; GROWLITHE
+	db PAL_REDMON    ; ARCANINE
+	db PAL_BLUEMON   ; POLIWAG
+	db PAL_BLUEMON   ; POLIWHIRL
+	db PAL_BLUEMON   ; POLIWRATH
+	db PAL_YELLOWMON ; ABRA
+	db PAL_YELLOWMON ; KADABRA
+	db PAL_YELLOWMON ; ALAKAZAM
+	db PAL_GREYMON   ; MACHOP
+	db PAL_GREYMON   ; MACHOKE
+	db PAL_GREYMON   ; MACHAMP
+	db PAL_GREENMON  ; BELLSPROUT
+	db PAL_GREENMON  ; WEEPINBELL
+	db PAL_GREENMON  ; VICTREEBEL
+	db PAL_CYANMON   ; TENTACOOL
+	db PAL_CYANMON   ; TENTACRUEL
+	db PAL_GREYMON   ; GEODUDE
+	db PAL_GREYMON   ; GRAVELER
+	db PAL_GREYMON   ; GOLEM
 	db PAL_REDMON    ; PONYTA
-	db PAL_REDMON    ; GALLOP
-	db PAL_PINKMON   ; YADON
-	db PAL_PINKMON   ; YADORAN
-	db PAL_GREYMON   ; COIL
-	db PAL_GREYMON   ; RARECOIL
-	db PAL_BROWNMON  ; KAMONEGI
-	db PAL_BROWNMON  ; DODO
-	db PAL_BROWNMON  ; DODORIO
-	db PAL_BLUEMON   ; PAWOU
-	db PAL_BLUEMON   ; JUGON
-	db PAL_PURPLEMON ; BETBETER
-	db PAL_PURPLEMON ; BETBETON
+	db PAL_REDMON    ; RAPIDASH
+	db PAL_PINKMON   ; SLOWPOKE
+	db PAL_PINKMON   ; SLOWBRO
+	db PAL_GREYMON   ; MAGNEMITE
+	db PAL_GREYMON   ; MAGNETON
+	db PAL_BROWNMON  ; FARFETCHD
+	db PAL_BROWNMON  ; DODUO
+	db PAL_BROWNMON  ; DODRIO
+	db PAL_BLUEMON   ; SEEL
+	db PAL_BLUEMON   ; DEWGONG
+	db PAL_PURPLEMON ; GRIMER
+	db PAL_PURPLEMON ; MUK
 	db PAL_GREYMON   ; SHELLDER
-	db PAL_GREYMON   ; PARSHEN
-	db PAL_PURPLEMON ; GHOS
-	db PAL_PURPLEMON ; GHOST
-	db PAL_PURPLEMON ; GANGAR
-	db PAL_GREYMON   ; IWARK
-	db PAL_YELLOWMON ; SLEEPE
-	db PAL_YELLOWMON ; SLEEPER
-	db PAL_REDMON    ; CRAB
+	db PAL_GREYMON   ; CLOYSTER
+	db PAL_PURPLEMON ; GASTLY
+	db PAL_PURPLEMON ; HAUNTER
+	db PAL_PURPLEMON ; GENGAR
+	db PAL_GREYMON   ; ONIX
+	db PAL_YELLOWMON ; DROWZEE
+	db PAL_YELLOWMON ; HYPNO
+	db PAL_REDMON    ; KRABBY
 	db PAL_REDMON    ; KINGLER
-	db PAL_YELLOWMON ; BIRIRIDAMA
-	db PAL_YELLOWMON ; MARUMINE
-	db PAL_PINKMON   ; TAMATAMA
-	db PAL_GREENMON  ; NASSY
-	db PAL_GREYMON   ; KARAKARA
-	db PAL_GREYMON   ; GARAGARA
-	db PAL_BROWNMON  ; SAWAMULAR
-	db PAL_BROWNMON  ; EBIWALAR
-	db PAL_PINKMON   ; BERORINGA
-	db PAL_PURPLEMON ; DOGARS
-	db PAL_PURPLEMON ; MATADOGAS
-	db PAL_GREYMON   ; SIHORN
-	db PAL_GREYMON   ; SIDON
-	db PAL_PINKMON   ; LUCKY
-	db PAL_BLUEMON   ; MONJARA
-	db PAL_BROWNMON  ; GARURA
-	db PAL_CYANMON   ; TATTU
+	db PAL_YELLOWMON ; VOLTORB
+	db PAL_YELLOWMON ; ELECTRODE
+	db PAL_PINKMON   ; EXEGGCUTE
+	db PAL_GREENMON  ; EXEGGUTOR
+	db PAL_GREYMON   ; CUBONE
+	db PAL_GREYMON   ; MAROWAK
+	db PAL_BROWNMON  ; HITMONLEE
+	db PAL_BROWNMON  ; HITMONCHAN
+	db PAL_PINKMON   ; LICKITUNG
+	db PAL_PURPLEMON ; KOFFING
+	db PAL_PURPLEMON ; WEEZING
+	db PAL_GREYMON   ; RHYHORN
+	db PAL_GREYMON   ; RHYDON
+	db PAL_PINKMON   ; CHANSEY
+	db PAL_BLUEMON   ; TANGELA
+	db PAL_BROWNMON  ; KANGASKHAN
+	db PAL_CYANMON   ; HORSEA
 	db PAL_CYANMON   ; SEADRA
-	db PAL_REDMON    ; TOSAKINTO
-	db PAL_REDMON    ; AZUMAO
-	db PAL_REDMON    ; HITODEMAN
+	db PAL_REDMON    ; GOLDEEN
+	db PAL_REDMON    ; SEAKING
+	db PAL_REDMON    ; STARYU
 	db PAL_GREYMON   ; STARMIE
-	db PAL_PINKMON   ; BARRIERD
-	db PAL_GREENMON  ; STRIKE
-	db PAL_MEWMON    ; ROUGELA
-	db PAL_YELLOWMON ; ELEBOO
-	db PAL_REDMON    ; BOOBER
-	db PAL_BROWNMON  ; KAILIOS
-	db PAL_GREYMON   ; KENTAUROS
-	db PAL_REDMON    ; KOIKING
+	db PAL_PINKMON   ; MRMIME
+	db PAL_GREENMON  ; SCYTHER
+	db PAL_MEWMON    ; JYNX
+	db PAL_YELLOWMON ; ELECTABUZZ
+	db PAL_REDMON    ; MAGMAR
+	db PAL_BROWNMON  ; PINSIR
+	db PAL_GREYMON   ; TAUROS
+	db PAL_REDMON    ; MAGIKARP
 	db PAL_BLUEMON   ; GYARADOS
-	db PAL_CYANMON   ; LAPLACE
-	db PAL_GREYMON   ; METAMON
-	db PAL_GREYMON   ; EIEVUI
-	db PAL_CYANMON   ; SHOWERS
-	db PAL_YELLOWMON ; THUNDERS
-	db PAL_REDMON    ; BOOSTER
+	db PAL_CYANMON   ; LAPRAS
+	db PAL_GREYMON   ; DITTO
+	db PAL_GREYMON   ; EEVEE
+	db PAL_CYANMON   ; VAPOREON
+	db PAL_YELLOWMON ; JOLTEON
+	db PAL_REDMON    ; FLAREON
 	db PAL_GREYMON   ; PORYGON
-	db PAL_BLUEMON   ; OMNITE
-	db PAL_BLUEMON   ; OMSTAR
+	db PAL_BLUEMON   ; OMANYTE
+	db PAL_BLUEMON   ; OMASTAR
 	db PAL_BROWNMON  ; KABUTO
 	db PAL_BROWNMON  ; KABUTOPS
-	db PAL_GREYMON   ; PTERA
-	db PAL_PINKMON   ; KABIGON
-	db PAL_BLUEMON   ; FREEZER
-	db PAL_YELLOWMON ; THUNDER
-	db PAL_REDMON    ; FIRE
-	db PAL_GREYMON   ; MINIRYU
-	db PAL_BLUEMON   ; HAKURYU
-	db PAL_BROWNMON  ; KAIRYU
+	db PAL_GREYMON   ; AERODACTYL
+	db PAL_PINKMON   ; SNORLAX
+	db PAL_BLUEMON   ; ARTICUNO
+	db PAL_YELLOWMON ; ZAPDOS
+	db PAL_REDMON    ; MOLTRES
+	db PAL_GREYMON   ; DRATINI
+	db PAL_BLUEMON   ; DRAGONAIR
+	db PAL_BROWNMON  ; DRAGONITE
 	db PAL_MEWMON    ; MEWTWO
 	db PAL_MEWMON    ; MEW
 	db PAL_GREENMON  ; HAPPA
diff --git a/data/super_palettes.inc b/data/super_palettes.inc
index 67142ab..02fbed3 100644
--- a/data/super_palettes.inc
+++ b/data/super_palettes.inc
@@ -48,10 +48,10 @@ endc
 	RGB 28,28,28, 15,28,26, 12,22,26, 03,16,14 ; INTRO_WATER
 	RGB 28,28,28, 15,28,26, 23,24,24, 04,04,04 ; INTRO_LAPRAS
 	RGB 31,31,24, 07,27,19, 26,20,10, 19,12,08 ; INTRO_FOREST
-	RGB 28,28,28, 31,28,14, 30,22,24, 04,04,04 ; INTRO_PURIN_PIKACHU
-	RGB 28,28,28, 16,18,21, 10,12,18, 04,04,04 ; INTRO_KAMEX
-	RGB 28,28,28, 23,21,16, 12,12,10, 04,04,04 ; INTRO_FUSHIGIBANA
-	RGB 28,28,28, 31,20,10, 26,10,06, 04,04,04 ; INTRO_LIZARDON
+	RGB 28,28,28, 31,28,14, 30,22,24, 04,04,04 ; INTRO_JIGGLYPUFF_PIKACHU
+	RGB 28,28,28, 16,18,21, 10,12,18, 04,04,04 ; INTRO_BLASTOISE
+	RGB 28,28,28, 23,21,16, 12,12,10, 04,04,04 ; INTRO_VENUSAUR
+	RGB 28,28,28, 31,20,10, 26,10,06, 04,04,04 ; INTRO_CHARIZARD
 	RGB 28,28,28, 26,21,22, 26,10,06, 04,04,04 ; SLOTS_1
 	RGB 28,28,28, 30,27,04, 24,20,11, 04,04,04 ; SLOTS_2
 	RGB 28,28,28, 27,15,21, 24,20,11, 04,04,04 ; SLOTS_3
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index cb50776..6a4a511 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -19,19 +19,19 @@ if DEF(GOLD)
 
 HayatoGroup::
 ; Leftover Youngster data from Red/Blue
-	db 11, MON_KORATTA, MON_ARBO, 0
-	db 14, MON_ONISUZUME, 0
-	db 10, MON_KORATTA, MON_KORATTA, MON_ZUBAT, 0
-	db 14, MON_KORATTA, MON_ARBO, MON_ZUBAT, 0
-	db 15, MON_KORATTA, MON_ONISUZUME, 0
-	db 17, MON_YADON, 0
-	db 14, MON_ARBO, MON_SAND, 0
+	db 11, MON_RATTATA, MON_EKANS, 0
+	db 14, MON_SPEAROW, 0
+	db 10, MON_RATTATA, MON_RATTATA, MON_ZUBAT, 0
+	db 14, MON_RATTATA, MON_EKANS, MON_ZUBAT, 0
+	db 15, MON_RATTATA, MON_SPEAROW, 0
+	db 17, MON_SLOWPOKE, 0
+	db 14, MON_EKANS, MON_SANDSHREW, 0
 	db 21, MON_NIDORAN_M, 0
-	db 21, MON_ARBO, 0
-	db 19, MON_SAND, MON_ZUBAT, 0
-	db 17, MON_KORATTA, MON_KORATTA, MON_RATTA, 0
+	db 21, MON_EKANS, 0
+	db 19, MON_SANDSHREW, MON_ZUBAT, 0
+	db 17, MON_RATTATA, MON_RATTATA, MON_RATICATE, 0
 	db 18, MON_NIDORAN_M, MON_NIDORINO, 0
-	db 17, MON_ONISUZUME, MON_KORATTA, MON_KORATTA, MON_ONISUZUME, 0
+	db 17, MON_SPEAROW, MON_RATTATA, MON_RATTATA, MON_SPEAROW, 0
 
 AkaneGroup::
 BugCatcherBoyGroup::
@@ -46,179 +46,179 @@ BugCatcherBoyGroup::
 	db -1 ; end
 
 ; Leftover Bug Catcher data from Red/Blue
-	db  6, MON_BEEDLE, MON_CATERPIE, 0
-	db  7, MON_BEEDLE, MON_COCOON, MON_BEEDLE, 0
-	db  9, MON_BEEDLE, 0
-	db 10, MON_CATERPIE, MON_BEEDLE, MON_CATERPIE, 0
-	db  9, MON_BEEDLE, MON_COCOON, MON_CATERPIE, MON_TRANSEL, 0
-	db 11, MON_CATERPIE, MON_TRANSEL, 0
-	db 11, MON_BEEDLE, MON_COCOON, 0
-	db 10, MON_CATERPIE, MON_TRANSEL, MON_CATERPIE, 0
-	db 14, MON_CATERPIE, MON_BEEDLE, 0
-	db 16, MON_BEEDLE, MON_CATERPIE, MON_BEEDLE, 0
+	db  6, MON_WEEDLE, MON_CATERPIE, 0
+	db  7, MON_WEEDLE, MON_KAKUNA, MON_WEEDLE, 0
+	db  9, MON_WEEDLE, 0
+	db 10, MON_CATERPIE, MON_WEEDLE, MON_CATERPIE, 0
+	db  9, MON_WEEDLE, MON_KAKUNA, MON_CATERPIE, MON_METAPOD, 0
+	db 11, MON_CATERPIE, MON_METAPOD, 0
+	db 11, MON_WEEDLE, MON_KAKUNA, 0
+	db 10, MON_CATERPIE, MON_METAPOD, MON_CATERPIE, 0
+	db 14, MON_CATERPIE, MON_WEEDLE, 0
+	db 16, MON_WEEDLE, MON_CATERPIE, MON_WEEDLE, 0
 	db 20, MON_BUTTERFREE, 0
-	db 18, MON_TRANSEL, MON_CATERPIE, MON_KONGPANG, 0
-	db 19, MON_SPEAR, MON_SPEAR, 0
-	db 20, MON_CATERPIE, MON_BEEDLE, MON_KONGPANG, 0
+	db 18, MON_METAPOD, MON_CATERPIE, MON_VENONAT, 0
+	db 19, MON_BEEDRILL, MON_BEEDRILL, 0
+	db 20, MON_CATERPIE, MON_WEEDLE, MON_VENONAT, 0
 
 TsukishiGroup::
 LassGroup::
 	; LASS_ATSUKO
 	db "あつこ@", TRAINERTYPE_ITEM_MOVES
-	db  8, DEX_NAZONOKUSA, ITEM_NONE
+	db  8, DEX_ODDISH, ITEM_NONE
 	; No moves?
 	db -1 ; end
 
 ; Leftover Lass data from Red/Blue
-	db  9, MON_POPPO, MON_POPPO, 0
-	db 10, MON_KORATTA, MON_NIDORAN_M, 0
-	db 14, MON_PURIN, 0
+	db  9, MON_PIDGEY, MON_PIDGEY, 0
+	db 10, MON_RATTATA, MON_NIDORAN_M, 0
+	db 14, MON_JIGGLYPUFF, 0
 	db 31, MON_PARAS, MON_PARAS, MON_PARASECT, 0
-	db 11, MON_NAZONOKUSA, MON_MADATSUBOMI, 0
-	db 14, MON_PIPPI, 0
-	db 16, MON_POPPO, MON_NIDORAN_F, 0
-	db 14, MON_POPPO, MON_NIDORAN_F, 0
+	db 11, MON_ODDISH, MON_BELLSPROUT, 0
+	db 14, MON_CLEFAIRY, 0
+	db 16, MON_PIDGEY, MON_NIDORAN_F, 0
+	db 14, MON_PIDGEY, MON_NIDORAN_F, 0
 	db 15, MON_NIDORAN_M, MON_NIDORAN_F, 0
-	db 13, MON_NAZONOKUSA, MON_POPPO, MON_NAZONOKUSA, 0
-	db 18, MON_POPPO, MON_NIDORAN_F, 0
-	db 18, MON_KORATTA, MON_PIKACHU, 0
+	db 13, MON_ODDISH, MON_PIDGEY, MON_ODDISH, 0
+	db 18, MON_PIDGEY, MON_NIDORAN_F, 0
+	db 18, MON_RATTATA, MON_PIKACHU, 0
 	db 23, MON_NIDORAN_F, MON_NIDORINA, 0
-	db 24, MON_NYARTH, MON_NYARTH, MON_NYARTH, 0
-	db 19, MON_POPPO, MON_KORATTA, MON_NIDORAN_M, MON_NYARTH, MON_PIKACHU, 0
-	db 22, MON_PIPPI, MON_PIPPI, 0
-	db 23, MON_MADATSUBOMI, MON_UTSUDON, 0
-	db 23, MON_NAZONOKUSA, MON_KUSAIHANA, 0
+	db 24, MON_MEOWTH, MON_MEOWTH, MON_MEOWTH, 0
+	db 19, MON_PIDGEY, MON_RATTATA, MON_NIDORAN_M, MON_MEOWTH, MON_PIKACHU, 0
+	db 22, MON_CLEFAIRY, MON_CLEFAIRY, 0
+	db 23, MON_BELLSPROUT, MON_WEEPINBELL, 0
+	db 23, MON_ODDISH, MON_GLOOM, 0
 
 EnokiGroup::
 ; Leftover Sailor data from Red/Blue
-	db 18, MON_WANRIKY, MON_SHELLDER, 0
-	db 17, MON_WANRIKY, MON_MENOKURAGE, 0
+	db 18, MON_MACHOP, MON_SHELLDER, 0
+	db 17, MON_MACHOP, MON_TENTACOOL, 0
 	db 21, MON_SHELLDER, 0
-	db 17, MON_TATTU, MON_SHELLDER, MON_MENOKURAGE, 0
-	db 18, MON_MENOKURAGE, MON_HITODEMAN, 0
-	db 17, MON_TATTU, MON_TATTU, MON_TATTU, 0
-	db 20, MON_WANRIKY, 0
+	db 17, MON_HORSEA, MON_SHELLDER, MON_TENTACOOL, 0
+	db 18, MON_TENTACOOL, MON_STARYU, 0
+	db 17, MON_HORSEA, MON_HORSEA, MON_HORSEA, 0
+	db 20, MON_MACHOP, 0
 	db 21, MON_PIKACHU, MON_PIKACHU, 0
 
 OkeraGroup::
 ; Leftover Jr.Trainer♂ data from Red/Blue
-	db 11, MON_DIGDA, MON_SAND, 0
-	db 14, MON_KORATTA, MON_ARBO, 0
+	db 11, MON_DIGLETT, MON_SANDSHREW, 0
+	db 14, MON_RATTATA, MON_EKANS, 0
 	db 18, MON_MANKEY, 0
-	db 20, MON_ZENIGAME, 0
-	db 16, MON_ONISUZUME, MON_RATTA, 0
-	db 18, MON_DIGDA, MON_DIGDA, MON_SAND, 0
-	db 21, MON_GARDIE, MON_HITOKAGE, 0
-	db 19, MON_KORATTA, MON_DIGDA, MON_ARBO, MON_SAND, 0
+	db 20, MON_SQUIRTLE, 0
+	db 16, MON_SPEAROW, MON_RATICATE, 0
+	db 18, MON_DIGLETT, MON_DIGLETT, MON_SANDSHREW, 0
+	db 21, MON_GROWLITHE, MON_CHARMANDER, 0
+	db 19, MON_RATTATA, MON_DIGLETT, MON_EKANS, MON_SANDSHREW, 0
 	db 29, MON_NIDORAN_M, MON_NIDORINO, 0
 
 MikanGroup::
 ; Leftover Jr.Trainer♀ data from Red/Blue
-	db 19, MON_TOSAKINTO, 0
-	db 16, MON_KORATTA, MON_PIKACHU, 0
-	db 16, MON_POPPO, MON_POPPO, MON_POPPO, 0
-	db 22, MON_FUSHIGIDANE, 0
-	db 18, MON_NAZONOKUSA, MON_MADATSUBOMI, MON_NAZONOKUSA, MON_MADATSUBOMI, 0
-	db 23, MON_NYARTH, 0
-	db 20, MON_PIKACHU, MON_PIPPI, 0
-	db 21, MON_POPPO, MON_PIGEON, 0
-	db 21, MON_PURIN, MON_POPPO, MON_NYARTH, 0
-	db 22, MON_NAZONOKUSA, MON_FUSHIGIDANE, 0
-	db 24, MON_FUSHIGIDANE, MON_FUSHIGISOU, 0
-	db 24, MON_POPPO, MON_NYARTH, MON_KORATTA, MON_PIKACHU, MON_NYARTH, 0
-	db 30, MON_NYOROMO, MON_NYOROMO, 0
-	db 27, MON_POPPO, MON_NYARTH, MON_POPPO, MON_PIGEON, 0
-	db 28, MON_TOSAKINTO, MON_NYOROMO, MON_TATTU, 0
-	db 31, MON_TOSAKINTO, MON_AZUMAO, 0
-	db 22, MON_MADATSUBOMI, MON_PIPPI, 0
-	db 20, MON_NYARTH, MON_NAZONOKUSA, MON_POPPO, 0
-	db 19, MON_POPPO, MON_KORATTA, MON_KORATTA, MON_MADATSUBOMI, 0
-	db 28, MON_KUSAIHANA, MON_NAZONOKUSA, MON_NAZONOKUSA, 0
+	db 19, MON_GOLDEEN, 0
+	db 16, MON_RATTATA, MON_PIKACHU, 0
+	db 16, MON_PIDGEY, MON_PIDGEY, MON_PIDGEY, 0
+	db 22, MON_BULBASAUR, 0
+	db 18, MON_ODDISH, MON_BELLSPROUT, MON_ODDISH, MON_BELLSPROUT, 0
+	db 23, MON_MEOWTH, 0
+	db 20, MON_PIKACHU, MON_CLEFAIRY, 0
+	db 21, MON_PIDGEY, MON_PIDGEOTTO, 0
+	db 21, MON_JIGGLYPUFF, MON_PIDGEY, MON_MEOWTH, 0
+	db 22, MON_ODDISH, MON_BULBASAUR, 0
+	db 24, MON_BULBASAUR, MON_IVYSAUR, 0
+	db 24, MON_PIDGEY, MON_MEOWTH, MON_RATTATA, MON_PIKACHU, MON_MEOWTH, 0
+	db 30, MON_POLIWAG, MON_POLIWAG, 0
+	db 27, MON_PIDGEY, MON_MEOWTH, MON_PIDGEY, MON_PIDGEOTTO, 0
+	db 28, MON_GOLDEEN, MON_POLIWAG, MON_HORSEA, 0
+	db 31, MON_GOLDEEN, MON_SEAKING, 0
+	db 22, MON_BELLSPROUT, MON_CLEFAIRY, 0
+	db 20, MON_MEOWTH, MON_ODDISH, MON_PIDGEY, 0
+	db 19, MON_PIDGEY, MON_RATTATA, MON_RATTATA, MON_BELLSPROUT, 0
+	db 28, MON_GLOOM, MON_ODDISH, MON_ODDISH, 0
 	db 29, MON_PIKACHU, MON_RAICHU, 0
-	db 33, MON_PIPPI, 0
-	db 29, MON_MADATSUBOMI, MON_NAZONOKUSA, MON_MONJARA, 0
-	db 30, MON_MENOKURAGE, MON_TATTU, MON_PAWOU, 0
+	db 33, MON_CLEFAIRY, 0
+	db 29, MON_BELLSPROUT, MON_ODDISH, MON_TANGELA, 0
+	db 30, MON_TENTACOOL, MON_HORSEA, MON_SEEL, 0
 
 BlueGroup::
 ; Leftover Pokémaniac data from Red/Blue
-	db 30, MON_SIHORN, MON_BERORINGA, 0
-	db 20, MON_KARAKARA, MON_YADON, 0
-	db 20, MON_YADON, MON_YADON, MON_YADON, 0
-	db 22, MON_HITOKAGE, MON_KARAKARA, 0
-	db 25, MON_YADON, 0
-	db 40, MON_LIZARDO, MON_LAPLACE, MON_BERORINGA, 0
-	db 23, MON_KARAKARA, MON_YADON, 0
+	db 30, MON_RHYHORN, MON_LICKITUNG, 0
+	db 20, MON_CUBONE, MON_SLOWPOKE, 0
+	db 20, MON_SLOWPOKE, MON_SLOWPOKE, MON_SLOWPOKE, 0
+	db 22, MON_CHARMANDER, MON_CUBONE, 0
+	db 25, MON_SLOWPOKE, 0
+	db 40, MON_CHARMELEON, MON_LAPRAS, MON_LICKITUNG, 0
+	db 23, MON_CUBONE, MON_SLOWPOKE, 0
 
 GamaGroup::
 ; Leftover Super Nerd data from Red/Blue
-	db 11, MON_COIL, MON_BIRIRIDAMA, 0
-	db 12, MON_BETBETER, MON_BIRIRIDAMA, MON_DOGARS, 0
-	db 20, MON_BIRIRIDAMA, MON_DOGARS, MON_BIRIRIDAMA, MON_COIL, 0
-	db 22, MON_BETBETER, MON_BETBETON, MON_BETBETER, 0
-	db 26, MON_DOGARS, 0
-	db 22, MON_DOGARS, MON_COIL, MON_MATADOGAS, 0
-	db 20, MON_COIL, MON_COIL, MON_DOGARS, MON_COIL, 0
-	db 24, MON_COIL, MON_BIRIRIDAMA, 0
-	db 36, MON_ROKON, MON_ROKON, MON_KYUKON, 0
-	db 34, MON_PONYTA, MON_HITOKAGE, MON_ROKON, MON_GARDIE, 0
-	db 41, MON_GALLOP, 0
-	db 37, MON_GARDIE, MON_ROKON, 0
+	db 11, MON_MAGNEMITE, MON_VOLTORB, 0
+	db 12, MON_GRIMER, MON_VOLTORB, MON_KOFFING, 0
+	db 20, MON_VOLTORB, MON_KOFFING, MON_VOLTORB, MON_MAGNEMITE, 0
+	db 22, MON_GRIMER, MON_MUK, MON_GRIMER, 0
+	db 26, MON_KOFFING, 0
+	db 22, MON_KOFFING, MON_MAGNEMITE, MON_WEEZING, 0
+	db 20, MON_MAGNEMITE, MON_MAGNEMITE, MON_KOFFING, MON_MAGNEMITE, 0
+	db 24, MON_MAGNEMITE, MON_VOLTORB, 0
+	db 36, MON_VULPIX, MON_VULPIX, MON_NINETALES, 0
+	db 34, MON_PONYTA, MON_CHARMANDER, MON_VULPIX, MON_GROWLITHE, 0
+	db 41, MON_RAPIDASH, 0
+	db 37, MON_GROWLITHE, MON_VULPIX, 0
 
 RivalGroup::
 	db  5, DEX_KURUSU, 0
 	db  5, DEX_HAPPA, 0
 	db  5, DEX_HONOGUMA, 0
 ; Leftover Hiker data from Red/Blue
-	db 10, MON_ISITSUBUTE, MON_ISITSUBUTE, MON_IWARK, 0
-	db 15, MON_WANRIKY, MON_ISITSUBUTE, 0
-	db 13, MON_ISITSUBUTE, MON_ISITSUBUTE, MON_WANRIKY, MON_ISITSUBUTE, 0
-	db 17, MON_IWARK, 0
-	db 21, MON_ISITSUBUTE, MON_IWARK, 0
-	db 20, MON_ISITSUBUTE, MON_WANRIKY, MON_ISITSUBUTE, 0
-	db 21, MON_ISITSUBUTE, MON_IWARK, 0
-	db 19, MON_IWARK, MON_GOLONE, 0
-	db 21, MON_ISITSUBUTE, MON_ISITSUBUTE, MON_GOLONE, 0
-	db 25, MON_ISITSUBUTE, 0
-	db 20, MON_WANRIKY, MON_IWARK, 0
-	db 19, MON_ISITSUBUTE, MON_WANRIKY, MON_ISITSUBUTE, MON_ISITSUBUTE, 0
-	db 20, MON_IWARK, MON_IWARK, MON_ISITSUBUTE, 0
-	db 21, MON_ISITSUBUTE, MON_GOLONE, 0
+	db 10, MON_GEODUDE, MON_GEODUDE, MON_ONIX, 0
+	db 15, MON_MACHOP, MON_GEODUDE, 0
+	db 13, MON_GEODUDE, MON_GEODUDE, MON_MACHOP, MON_GEODUDE, 0
+	db 17, MON_ONIX, 0
+	db 21, MON_GEODUDE, MON_ONIX, 0
+	db 20, MON_GEODUDE, MON_MACHOP, MON_GEODUDE, 0
+	db 21, MON_GEODUDE, MON_ONIX, 0
+	db 19, MON_ONIX, MON_GRAVELER, 0
+	db 21, MON_GEODUDE, MON_GEODUDE, MON_GRAVELER, 0
+	db 25, MON_GEODUDE, 0
+	db 20, MON_MACHOP, MON_ONIX, 0
+	db 19, MON_GEODUDE, MON_MACHOP, MON_GEODUDE, MON_GEODUDE, 0
+	db 20, MON_ONIX, MON_ONIX, MON_GEODUDE, 0
+	db 21, MON_GEODUDE, MON_GRAVELER, 0
 
 OkidoGroup::
 ; Leftover Biker data from Red/Blue
-	db 28, MON_DOGARS, MON_DOGARS, MON_DOGARS, 0
-	db 29, MON_DOGARS, MON_BETBETER, 0
-	db 25, MON_DOGARS, MON_DOGARS, MON_MATADOGAS, MON_DOGARS, MON_BETBETER, 0
-	db 28, MON_DOGARS, MON_BETBETER, MON_MATADOGAS, 0
-	db 29, MON_BETBETER, MON_DOGARS, 0
-	db 33, MON_MATADOGAS, 0
-	db 26, MON_BETBETER, MON_BETBETER, MON_BETBETER, MON_BETBETER, 0
-	db 28, MON_MATADOGAS, MON_DOGARS, MON_MATADOGAS, 0
-	db 33, MON_BETBETON, 0
-	db 29, MON_BIRIRIDAMA, MON_BIRIRIDAMA, 0
-	db 29, MON_MATADOGAS, MON_BETBETON, 0
-	db 25, MON_DOGARS, MON_MATADOGAS, MON_DOGARS, MON_DOGARS, MON_MATADOGAS, 0
-	db 26, MON_DOGARS, MON_DOGARS, MON_BETBETER, MON_DOGARS, 0
-	db 28, MON_BETBETER, MON_BETBETER, MON_DOGARS, 0
-	db 29, MON_DOGARS, MON_BETBETON, 0
+	db 28, MON_KOFFING, MON_KOFFING, MON_KOFFING, 0
+	db 29, MON_KOFFING, MON_GRIMER, 0
+	db 25, MON_KOFFING, MON_KOFFING, MON_WEEZING, MON_KOFFING, MON_GRIMER, 0
+	db 28, MON_KOFFING, MON_GRIMER, MON_WEEZING, 0
+	db 29, MON_GRIMER, MON_KOFFING, 0
+	db 33, MON_WEEZING, 0
+	db 26, MON_GRIMER, MON_GRIMER, MON_GRIMER, MON_GRIMER, 0
+	db 28, MON_WEEZING, MON_KOFFING, MON_WEEZING, 0
+	db 33, MON_MUK, 0
+	db 29, MON_VOLTORB, MON_VOLTORB, 0
+	db 29, MON_WEEZING, MON_MUK, 0
+	db 25, MON_KOFFING, MON_WEEZING, MON_KOFFING, MON_KOFFING, MON_WEEZING, 0
+	db 26, MON_KOFFING, MON_KOFFING, MON_GRIMER, MON_KOFFING, 0
+	db 28, MON_GRIMER, MON_GRIMER, MON_KOFFING, 0
+	db 29, MON_KOFFING, MON_MUK, 0
 
 SakakiGroup::
 ; Leftover Burglar data from Red/Blue
-	db 29, MON_GARDIE, MON_ROKON, 0
-	db 33, MON_GARDIE, 0
-	db 28, MON_ROKON, MON_HITOKAGE, MON_PONYTA, 0
-	db 36, MON_GARDIE, MON_ROKON, MON_KYUKON, 0
+	db 29, MON_GROWLITHE, MON_VULPIX, 0
+	db 33, MON_GROWLITHE, 0
+	db 28, MON_VULPIX, MON_CHARMANDER, MON_PONYTA, 0
+	db 36, MON_GROWLITHE, MON_VULPIX, MON_NINETALES, 0
 	db 41, MON_PONYTA, 0
-	db 37, MON_ROKON, MON_GARDIE, 0
-	db 34, MON_HITOKAGE, MON_LIZARDO, 0
-	db 38, MON_KYUKON, 0
-	db 34, MON_GARDIE, MON_PONYTA, 0
+	db 37, MON_VULPIX, MON_GROWLITHE, 0
+	db 34, MON_CHARMANDER, MON_CHARMELEON, 0
+	db 38, MON_NINETALES, 0
+	db 34, MON_GROWLITHE, MON_PONYTA, 0
 
 ProtagonistGroup::
 ; Leftover Engineer data from Red/Blue
-	db 21, MON_BIRIRIDAMA, MON_COIL, 0
-	db 21, MON_COIL, 0
-	db 18, MON_COIL, MON_COIL, MON_RARECOIL, 0
+	db 21, MON_VOLTORB, MON_MAGNEMITE, 0
+	db 21, MON_MAGNEMITE, 0
+	db 18, MON_MAGNEMITE, MON_MAGNEMITE, MON_MAGNETON, 0
 
 SibaGroup::
 KasumiGroup::
@@ -229,349 +229,349 @@ FisherGroup::
 	; No moves?
 	db -1 ; end
 ; Leftover Fisher data from Red/Blue
-	db 17, MON_TOSAKINTO, MON_MENOKURAGE, MON_TOSAKINTO, 0
-	db 17, MON_MENOKURAGE, MON_HITODEMAN, MON_SHELLDER, 0
-	db 22, MON_TOSAKINTO, MON_NYOROMO, MON_TOSAKINTO, 0
-	db 24, MON_MENOKURAGE, MON_TOSAKINTO, 0
-	db 27, MON_TOSAKINTO, 0
-	db 21, MON_NYOROMO, MON_SHELLDER, MON_TOSAKINTO, MON_TATTU, 0
-	db 28, MON_AZUMAO, MON_TOSAKINTO, MON_AZUMAO, MON_AZUMAO, 0
-	db 31, MON_SHELLDER, MON_PARSHEN, 0
-	db 27, MON_KOIKING, MON_KOIKING, MON_KOIKING, MON_KOIKING, MON_KOIKING, MON_KOIKING, 0
-	db 33, MON_AZUMAO, MON_TOSAKINTO, 0
-	db 24, MON_KOIKING, MON_KOIKING, 0
+	db 17, MON_GOLDEEN, MON_TENTACOOL, MON_GOLDEEN, 0
+	db 17, MON_TENTACOOL, MON_STARYU, MON_SHELLDER, 0
+	db 22, MON_GOLDEEN, MON_POLIWAG, MON_GOLDEEN, 0
+	db 24, MON_TENTACOOL, MON_GOLDEEN, 0
+	db 27, MON_GOLDEEN, 0
+	db 21, MON_POLIWAG, MON_SHELLDER, MON_GOLDEEN, MON_HORSEA, 0
+	db 28, MON_SEAKING, MON_GOLDEEN, MON_SEAKING, MON_SEAKING, 0
+	db 31, MON_SHELLDER, MON_CLOYSTER, 0
+	db 27, MON_MAGIKARP, MON_MAGIKARP, MON_MAGIKARP, MON_MAGIKARP, MON_MAGIKARP, MON_MAGIKARP, 0
+	db 33, MON_SEAKING, MON_GOLDEEN, 0
+	db 24, MON_MAGIKARP, MON_MAGIKARP, 0
 
 KannaGroup::
 ; Leftover Swimmer data from Red/Blue
-	db 16, MON_TATTU, MON_SHELLDER, 0
-	db 30, MON_MENOKURAGE, MON_SHELLDER, 0
-	db 29, MON_TOSAKINTO, MON_TATTU, MON_HITODEMAN, 0
-	db 30, MON_NYOROMO, MON_NYOROZO, 0
-	db 27, MON_TATTU, MON_MENOKURAGE, MON_MENOKURAGE, MON_TOSAKINTO, 0
-	db 29, MON_TOSAKINTO, MON_SHELLDER, MON_AZUMAO, 0
-	db 30, MON_TATTU, MON_TATTU, 0
-	db 27, MON_MENOKURAGE, MON_MENOKURAGE, MON_HITODEMAN, MON_TATTU, MON_DOKUKURAGE, 0
-	db 31, MON_SHELLDER, MON_PARSHEN, 0
-	db 35, MON_HITODEMAN, 0
-	db 28, MON_TATTU, MON_TATTU, MON_SEADRA, MON_TATTU, 0
-	db 33, MON_SEADRA, MON_DOKUKURAGE, 0
+	db 16, MON_HORSEA, MON_SHELLDER, 0
+	db 30, MON_TENTACOOL, MON_SHELLDER, 0
+	db 29, MON_GOLDEEN, MON_HORSEA, MON_STARYU, 0
+	db 30, MON_POLIWAG, MON_POLIWHIRL, 0
+	db 27, MON_HORSEA, MON_TENTACOOL, MON_TENTACOOL, MON_GOLDEEN, 0
+	db 29, MON_GOLDEEN, MON_SHELLDER, MON_SEAKING, 0
+	db 30, MON_HORSEA, MON_HORSEA, 0
+	db 27, MON_TENTACOOL, MON_TENTACOOL, MON_STARYU, MON_HORSEA, MON_TENTACRUEL, 0
+	db 31, MON_SHELLDER, MON_CLOYSTER, 0
+	db 35, MON_STARYU, 0
+	db 28, MON_HORSEA, MON_HORSEA, MON_SEADRA, MON_HORSEA, 0
+	db 33, MON_SEADRA, MON_TENTACRUEL, 0
 	db 37, MON_STARMIE, 0
-	db 33, MON_HITODEMAN, MON_KAMEIL, 0
-	db 32, MON_NYOROZO, MON_MENOKURAGE, MON_SEADRA, 0
+	db 33, MON_STARYU, MON_WARTORTLE, 0
+	db 32, MON_POLIWHIRL, MON_TENTACOOL, MON_SEADRA, 0
 
 WataruGroup::
 ; Leftover Cue Ball data from Red/Blue
-	db 28, MON_WANRIKY, MON_MANKEY, MON_WANRIKY, 0
-	db 29, MON_MANKEY, MON_WANRIKY, 0
-	db 33, MON_WANRIKY, 0
-	db 29, MON_MANKEY, MON_OKORIZARU, 0
-	db 29, MON_WANRIKY, MON_GORIKY, 0
-	db 33, MON_GORIKY, 0
-	db 26, MON_MANKEY, MON_MANKEY, MON_GORIKY, MON_WANRIKY, 0
-	db 29, MON_OKORIZARU, MON_GORIKY, 0
-	db 31, MON_MENOKURAGE, MON_MENOKURAGE, MON_DOKUKURAGE, 0
+	db 28, MON_MACHOP, MON_MANKEY, MON_MACHOP, 0
+	db 29, MON_MANKEY, MON_MACHOP, 0
+	db 33, MON_MACHOP, 0
+	db 29, MON_MANKEY, MON_PRIMEAPE, 0
+	db 29, MON_MACHOP, MON_MACHOKE, 0
+	db 33, MON_MACHOKE, 0
+	db 26, MON_MANKEY, MON_MANKEY, MON_MACHOKE, MON_MACHOP, 0
+	db 29, MON_PRIMEAPE, MON_MACHOKE, 0
+	db 31, MON_TENTACOOL, MON_TENTACOOL, MON_TENTACRUEL, 0
 
 GerugeMemberMGroup::
 ; Leftover Gambler data from Red/Blue
-	db 18, MON_NYOROMO, MON_TATTU, 0
-	db 18, MON_MADATSUBOMI, MON_NAZONOKUSA, 0
-	db 18, MON_BIRIRIDAMA, MON_COIL, 0
-	db 18, MON_GARDIE, MON_ROKON, 0
-	db 22, MON_NYOROMO, MON_NYOROMO, MON_NYOROZO, 0
-	db 22, MON_IWARK, MON_ISITSUBUTE, MON_GOLONE, 0
-	db 24, MON_GARDIE, MON_ROKON, 0
+	db 18, MON_POLIWAG, MON_HORSEA, 0
+	db 18, MON_BELLSPROUT, MON_ODDISH, 0
+	db 18, MON_VOLTORB, MON_MAGNEMITE, 0
+	db 18, MON_GROWLITHE, MON_VULPIX, 0
+	db 22, MON_POLIWAG, MON_POLIWAG, MON_POLIWHIRL, 0
+	db 22, MON_ONIX, MON_GEODUDE, MON_GRAVELER, 0
+	db 24, MON_GROWLITHE, MON_VULPIX, 0
 
 Trio1Group::
 BeautyGroup::
 	; BEAUTY_MEGUMI
 	db "めぐみ@", TRAINERTYPE_ITEM_MOVES
-	db 10, DEX_NYARTH, ITEM_NONE, MOVE_PAY_DAY, MOVE_GROWL, MOVE_NONE, MOVE_NONE
+	db 10, DEX_MEOWTH, ITEM_NONE, MOVE_PAY_DAY, MOVE_GROWL, MOVE_NONE, MOVE_NONE
 	db -1 ; end
 ; Leftover Beauty data from Red/Blue
-	db 21, MON_NAZONOKUSA, MON_MADATSUBOMI, MON_NAZONOKUSA, MON_MADATSUBOMI, 0
-	db 24, MON_MADATSUBOMI, MON_MADATSUBOMI, 0
-	db 26, MON_TAMATAMA, 0
-	db 27, MON_KORATTA, MON_PIKACHU, MON_KORATTA, 0
-	db 29, MON_PIPPI, MON_NYARTH, 0
-	db 35, MON_AZUMAO, 0
-	db 30, MON_SHELLDER, MON_SHELLDER, MON_PARSHEN, 0
-	db 31, MON_NYOROMO, MON_AZUMAO, 0
-	db 29, MON_PIGEON, MON_PUKURIN, 0
-	db 29, MON_FUSHIGIDANE, MON_FUSHIGISOU, 0
-	db 33, MON_UTSUDON, MON_MADATSUBOMI, MON_UTSUDON, 0
-	db 27, MON_NYOROMO, MON_TOSAKINTO, MON_AZUMAO, MON_TOSAKINTO, MON_NYOROMO, 0
-	db 30, MON_TOSAKINTO, MON_AZUMAO, 0
-	db 29, MON_HITODEMAN, MON_HITODEMAN, MON_HITODEMAN, 0
-	db 30, MON_SEADRA, MON_TATTU, MON_SEADRA, 0
+	db 21, MON_ODDISH, MON_BELLSPROUT, MON_ODDISH, MON_BELLSPROUT, 0
+	db 24, MON_BELLSPROUT, MON_BELLSPROUT, 0
+	db 26, MON_EXEGGCUTE, 0
+	db 27, MON_RATTATA, MON_PIKACHU, MON_RATTATA, 0
+	db 29, MON_CLEFAIRY, MON_MEOWTH, 0
+	db 35, MON_SEAKING, 0
+	db 30, MON_SHELLDER, MON_SHELLDER, MON_CLOYSTER, 0
+	db 31, MON_POLIWAG, MON_SEAKING, 0
+	db 29, MON_PIDGEOTTO, MON_WIGGLYTUFF, 0
+	db 29, MON_BULBASAUR, MON_IVYSAUR, 0
+	db 33, MON_WEEPINBELL, MON_BELLSPROUT, MON_WEEPINBELL, 0
+	db 27, MON_POLIWAG, MON_GOLDEEN, MON_SEAKING, MON_GOLDEEN, MON_POLIWAG, 0
+	db 30, MON_GOLDEEN, MON_SEAKING, 0
+	db 29, MON_STARYU, MON_STARYU, MON_STARYU, 0
+	db 30, MON_SEADRA, MON_HORSEA, MON_SEADRA, 0
 
 Trio2Group::
 ; Leftover Psychic data from Red/Blue
-	db 31, MON_YUNGERER, MON_YADON, MON_BARRIERD, MON_YUNGERER, 0
-	db 34, MON_BARRIERD, MON_YUNGERER, 0
-	db 33, MON_YADON, MON_YADON, MON_YADORAN, 0
-	db 38, MON_YADORAN, 0
+	db 31, MON_KADABRA, MON_SLOWPOKE, MON_MRMIME, MON_KADABRA, 0
+	db 34, MON_MRMIME, MON_KADABRA, 0
+	db 33, MON_SLOWPOKE, MON_SLOWPOKE, MON_SLOWBRO, 0
+	db 38, MON_SLOWBRO, 0
 
 Trio3Group::
 ; Leftover Rocker data from Red/Blue
-	db 20, MON_BIRIRIDAMA, MON_COIL, MON_BIRIRIDAMA, 0
-	db 29, MON_BIRIRIDAMA, MON_MARUMINE, 0
+	db 20, MON_VOLTORB, MON_MAGNEMITE, MON_VOLTORB, 0
+	db 29, MON_VOLTORB, MON_ELECTRODE, 0
 
 RocketFGroup::
 ; Leftover Juggler data from Red/Blue
-	db 29, MON_YUNGERER, MON_BARRIERD, 0
-	db 41, MON_SLEEPE, MON_SLEEPER, MON_YUNGERER, MON_YUNGERER, 0
-	db 31, MON_SLEEPE, MON_SLEEPE, MON_YUNGERER, MON_SLEEPE, 0
-	db 34, MON_SLEEPE, MON_SLEEPER, 0
-	db 48, MON_BARRIERD, 0
-	db 33, MON_SLEEPER, 0
-	db 38, MON_SLEEPER, 0
-	db 34, MON_SLEEPE, MON_YUNGERER, 0
+	db 29, MON_KADABRA, MON_MRMIME, 0
+	db 41, MON_DROWZEE, MON_HYPNO, MON_KADABRA, MON_KADABRA, 0
+	db 31, MON_DROWZEE, MON_DROWZEE, MON_KADABRA, MON_DROWZEE, 0
+	db 34, MON_DROWZEE, MON_HYPNO, 0
+	db 48, MON_MRMIME, 0
+	db 33, MON_HYPNO, 0
+	db 38, MON_HYPNO, 0
+	db 34, MON_DROWZEE, MON_KADABRA, 0
 
 YoungsterGroup::
 ; Leftover Tamer data from Red/Blue
-	db 34, MON_SANDPAN, MON_ARBOK, 0
-	db 33, MON_ARBOK, MON_SANDPAN, MON_ARBOK, 0
-	db 43, MON_SIHORN, 0
-	db 39, MON_ARBOK, MON_KENTAUROS, 0
+	db 34, MON_SANDSLASH, MON_ARBOK, 0
+	db 33, MON_ARBOK, MON_SANDSLASH, MON_ARBOK, 0
+	db 43, MON_RHYHORN, 0
+	db 39, MON_ARBOK, MON_TAUROS, 0
 	db 44, MON_PERSIAN, MON_GOLDUCK, 0
-	db 42, MON_SIHORN, MON_OKORIZARU, MON_ARBOK, MON_KENTAUROS, 0
+	db 42, MON_RHYHORN, MON_PRIMEAPE, MON_ARBOK, MON_TAUROS, 0
 ; Leftover Bird Keeper data from Red/Blue
-	db 29, MON_POPPO, MON_PIGEON, 0
-	db 25, MON_ONISUZUME, MON_POPPO, MON_POPPO, MON_ONISUZUME, MON_ONISUZUME, 0
-	db 26, MON_POPPO, MON_PIGEON, MON_ONISUZUME, MON_ONIDRILL, 0
-	db 33, MON_KAMONEGI, 0
-	db 29, MON_ONISUZUME, MON_ONIDRILL, 0
-	db 26, MON_PIGEON, MON_KAMONEGI, MON_DODO, MON_POPPO, 0
-	db 28, MON_DODORIO, MON_DODO, MON_DODO, 0
-	db 29, MON_ONISUZUME, MON_ONIDRILL, 0
-	db 34, MON_DODORIO, 0
-	db 26, MON_ONISUZUME, MON_ONISUZUME, MON_ONIDRILL, MON_ONISUZUME, 0
-	db 30, MON_ONIDRILL, MON_ONIDRILL, MON_PIGEON, 0
-	db 39, MON_PIGEON, MON_PIGEON, MON_POPPO, MON_PIGEON, 0
-	db 42, MON_KAMONEGI, MON_ONIDRILL, 0
-	db 28, MON_POPPO, MON_DODO, MON_PIGEON, 0
-	db 26, MON_POPPO, MON_ONISUZUME, MON_POPPO, MON_ONIDRILL, 0
-	db 29, MON_PIGEON, MON_ONIDRILL, 0
-	db 28, MON_ONISUZUME, MON_DODO, MON_ONIDRILL, 0
+	db 29, MON_PIDGEY, MON_PIDGEOTTO, 0
+	db 25, MON_SPEAROW, MON_PIDGEY, MON_PIDGEY, MON_SPEAROW, MON_SPEAROW, 0
+	db 26, MON_PIDGEY, MON_PIDGEOTTO, MON_SPEAROW, MON_FEAROW, 0
+	db 33, MON_FARFETCHD, 0
+	db 29, MON_SPEAROW, MON_FEAROW, 0
+	db 26, MON_PIDGEOTTO, MON_FARFETCHD, MON_DODUO, MON_PIDGEY, 0
+	db 28, MON_DODRIO, MON_DODUO, MON_DODUO, 0
+	db 29, MON_SPEAROW, MON_FEAROW, 0
+	db 34, MON_DODRIO, 0
+	db 26, MON_SPEAROW, MON_SPEAROW, MON_FEAROW, MON_SPEAROW, 0
+	db 30, MON_FEAROW, MON_FEAROW, MON_PIDGEOTTO, 0
+	db 39, MON_PIDGEOTTO, MON_PIDGEOTTO, MON_PIDGEY, MON_PIDGEOTTO, 0
+	db 42, MON_FARFETCHD, MON_FEAROW, 0
+	db 28, MON_PIDGEY, MON_DODUO, MON_PIDGEOTTO, 0
+	db 26, MON_PIDGEY, MON_SPEAROW, MON_PIDGEY, MON_FEAROW, 0
+	db 29, MON_PIDGEOTTO, MON_FEAROW, 0
+	db 28, MON_SPEAROW, MON_DODUO, MON_FEAROW, 0
 
 FledglingGroup::
 ; Leftover Blackbelt data from Red/Blue
-	db 37, MON_SAWAMULAR, MON_EBIWALAR, 0
-	db 31, MON_MANKEY, MON_MANKEY, MON_OKORIZARU, 0
-	db 32, MON_WANRIKY, MON_GORIKY, 0
-	db 36, MON_OKORIZARU, 0
-	db 31, MON_WANRIKY, MON_MANKEY, MON_OKORIZARU, 0
-	db 40, MON_WANRIKY, MON_GORIKY, 0
-	db 43, MON_GORIKY, 0
-	db 38, MON_GORIKY, MON_WANRIKY, MON_GORIKY, 0
-	db 43, MON_GORIKY, MON_WANRIKY, MON_GORIKY, 0
+	db 37, MON_HITMONLEE, MON_HITMONCHAN, 0
+	db 31, MON_MANKEY, MON_MANKEY, MON_PRIMEAPE, 0
+	db 32, MON_MACHOP, MON_MACHOKE, 0
+	db 36, MON_PRIMEAPE, 0
+	db 31, MON_MACHOP, MON_MANKEY, MON_PRIMEAPE, 0
+	db 40, MON_MACHOP, MON_MACHOKE, 0
+	db 43, MON_MACHOKE, 0
+	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_FUSHIGIDANE, DEX_HITOKAGE, DEX_ZENIGAME, 0
+	db 50, DEX_TEPPOUO, DEX_LIP, DEX_KIREIHANA, DEX_BULBASAUR, DEX_CHARMANDER, DEX_SQUIRTLE, 0
 ; Leftover Green data from Red/Blue
-	db 5, MON_FUSHIGIDANE, 0
-	db 5, MON_HITOKAGE, 0
-	db -1, 9, MON_POPPO, 8, MON_ZENIGAME, 0
-	db -1, 9, MON_POPPO, 8, MON_FUSHIGIDANE, 0
-	db -1, 9, MON_POPPO, 8, MON_HITOKAGE, 0
-	db -1, 18, MON_PIGEON, 15, MON_CASEY, 15, MON_KORATTA, 17, MON_ZENIGAME, 0
-	db -1, 18, MON_PIGEON, 15, MON_CASEY, 15, MON_KORATTA, 17, MON_FUSHIGIDANE, 0
-	db -1, 18, MON_PIGEON, 15, MON_CASEY, 15, MON_KORATTA, 17, MON_HITOKAGE, 0
+	db 5, MON_BULBASAUR, 0
+	db 5, MON_CHARMANDER, 0
+	db -1, 9, MON_PIDGEY, 8, MON_SQUIRTLE, 0
+	db -1, 9, MON_PIDGEY, 8, MON_BULBASAUR, 0
+	db -1, 9, MON_PIDGEY, 8, MON_CHARMANDER, 0
+	db -1, 18, MON_PIDGEOTTO, 15, MON_ABRA, 15, MON_RATTATA, 17, MON_SQUIRTLE, 0
+	db -1, 18, MON_PIDGEOTTO, 15, MON_ABRA, 15, MON_RATTATA, 17, MON_BULBASAUR, 0
+	db -1, 18, MON_PIDGEOTTO, 15, MON_ABRA, 15, MON_RATTATA, 17, MON_CHARMANDER, 0
 
 ProdigyGroup::
 ; Leftover Prof.Oak data from Red/Blue
-	db -1, 66, MON_KENTAUROS, 67, MON_NASSY, 68, MON_WINDIE, 69, MON_KAMEX, 70, MON_GYARADOS, 0
-	db -1, 66, MON_KENTAUROS, 67, MON_NASSY, 68, MON_WINDIE, 69, MON_FUSHIGIBANA, 70, MON_GYARADOS, 0
-	db -1, 66, MON_KENTAUROS, 67, MON_NASSY, 68, MON_WINDIE, 69, MON_LIZARDON, 70, MON_GYARADOS, 0
+	db -1, 66, MON_TAUROS, 67, MON_EXEGGUTOR, 68, MON_ARCANINE, 69, MON_BLASTOISE, 70, MON_GYARADOS, 0
+	db -1, 66, MON_TAUROS, 67, MON_EXEGGUTOR, 68, MON_ARCANINE, 69, MON_VENUSAUR, 70, MON_GYARADOS, 0
+	db -1, 66, MON_TAUROS, 67, MON_EXEGGUTOR, 68, MON_ARCANINE, 69, MON_CHARIZARD, 70, MON_GYARADOS, 0
 
 ProfessionalMGroup::
 ProfessionalFGroup::
 ; Leftover Scientist data from Red/Blue
-	db 34, MON_DOGARS, MON_BIRIRIDAMA, 0
-	db 26, MON_BETBETER, MON_MATADOGAS, MON_DOGARS, MON_MATADOGAS, 0
-	db 28, MON_COIL, MON_BIRIRIDAMA, MON_RARECOIL, 0
-	db 29, MON_MARUMINE, MON_MATADOGAS, 0
-	db 33, MON_MARUMINE, 0
-	db 26, MON_RARECOIL, MON_DOGARS, MON_MATADOGAS, MON_COIL, 0
-	db 25, MON_BIRIRIDAMA, MON_DOGARS, MON_RARECOIL, MON_COIL, MON_DOGARS, 0
-	db 29, MON_MARUMINE, MON_BETBETON, 0
-	db 29, MON_BETBETER, MON_MARUMINE, 0
-	db 28, MON_BIRIRIDAMA, MON_DOGARS, MON_RARECOIL, 0
-	db 29, MON_COIL, MON_DOGARS, 0
-	db 33, MON_COIL, MON_RARECOIL, MON_BIRIRIDAMA, 0
-	db 34, MON_COIL, MON_MARUMINE, 0
+	db 34, MON_KOFFING, MON_VOLTORB, 0
+	db 26, MON_GRIMER, MON_WEEZING, MON_KOFFING, MON_WEEZING, 0
+	db 28, MON_MAGNEMITE, MON_VOLTORB, MON_MAGNETON, 0
+	db 29, MON_ELECTRODE, MON_WEEZING, 0
+	db 33, MON_ELECTRODE, 0
+	db 26, MON_MAGNETON, MON_KOFFING, MON_WEEZING, MON_MAGNEMITE, 0
+	db 25, MON_VOLTORB, MON_KOFFING, MON_MAGNETON, MON_MAGNEMITE, MON_KOFFING, 0
+	db 29, MON_ELECTRODE, MON_MUK, 0
+	db 29, MON_GRIMER, MON_ELECTRODE, 0
+	db 28, MON_VOLTORB, MON_KOFFING, MON_MAGNETON, 0
+	db 29, MON_MAGNEMITE, MON_KOFFING, 0
+	db 33, MON_MAGNEMITE, MON_MAGNETON, MON_VOLTORB, 0
+	db 34, MON_MAGNEMITE, MON_ELECTRODE, 0
 ; Leftover Giovanni data from Red/Blue
-	db -1, 25, MON_IWARK, 24, MON_SIHORN, 29, MON_GARURA, 0
-	db -1, 37, MON_NIDORINO, 35, MON_GARURA, 37, MON_SIHORN, 41, MON_NIDOQUEEN, 0
-	db -1, 45, MON_SIHORN, 42, MON_DUGTRIO, 44, MON_NIDOQUEEN, 45, MON_NIDOKING, 50, MON_SIDON, 0
+	db -1, 25, MON_ONIX, 24, MON_RHYHORN, 29, MON_KANGASKHAN, 0
+	db -1, 37, MON_NIDORINO, 35, MON_KANGASKHAN, 37, MON_RHYHORN, 41, MON_NIDOQUEEN, 0
+	db -1, 45, MON_RHYHORN, 42, MON_DUGTRIO, 44, MON_NIDOQUEEN, 45, MON_NIDOKING, 50, MON_RHYDON, 0
 
 PokeManiacGroup::
 ; Leftover Rocket data from Red/Blue
-	db 13, MON_KORATTA, MON_ZUBAT, 0
-	db 11, MON_SAND, MON_KORATTA, MON_ZUBAT, 0
-	db 12, MON_ZUBAT, MON_ARBO, 0
-	db 16, MON_RATTA, 0
-	db 17, MON_WANRIKY, MON_SLEEPE, 0
-	db 15, MON_ARBO, MON_ZUBAT, 0
-	db 20, MON_RATTA, MON_ZUBAT, 0
-	db 21, MON_SLEEPE, MON_WANRIKY, 0
-	db 21, MON_RATTA, MON_RATTA, 0
-	db 20, MON_BETBETER, MON_DOGARS, MON_DOGARS, 0
-	db 19, MON_KORATTA, MON_RATTA, MON_RATTA, MON_KORATTA, 0
-	db 22, MON_BETBETER, MON_DOGARS, 0
-	db 17, MON_ZUBAT, MON_DOGARS, MON_BETBETER, MON_ZUBAT, MON_RATTA, 0
-	db 20, MON_KORATTA, MON_RATTA, MON_SLEEPE, 0
-	db 21, MON_WANRIKY, MON_WANRIKY, 0
-	db 23, MON_SAND, MON_ARBO, MON_SANDPAN, 0
-	db 23, MON_ARBO, MON_SAND, MON_ARBOK, 0
-	db 21, MON_DOGARS, MON_ZUBAT, 0
+	db 13, MON_RATTATA, MON_ZUBAT, 0
+	db 11, MON_SANDSHREW, MON_RATTATA, MON_ZUBAT, 0
+	db 12, MON_ZUBAT, MON_EKANS, 0
+	db 16, MON_RATICATE, 0
+	db 17, MON_MACHOP, MON_DROWZEE, 0
+	db 15, MON_EKANS, MON_ZUBAT, 0
+	db 20, MON_RATICATE, MON_ZUBAT, 0
+	db 21, MON_DROWZEE, MON_MACHOP, 0
+	db 21, MON_RATICATE, MON_RATICATE, 0
+	db 20, MON_GRIMER, MON_KOFFING, MON_KOFFING, 0
+	db 19, MON_RATTATA, MON_RATICATE, MON_RATICATE, MON_RATTATA, 0
+	db 22, MON_GRIMER, MON_KOFFING, 0
+	db 17, MON_ZUBAT, MON_KOFFING, MON_GRIMER, MON_ZUBAT, MON_RATICATE, 0
+	db 20, MON_RATTATA, MON_RATICATE, MON_DROWZEE, 0
+	db 21, MON_MACHOP, MON_MACHOP, 0
+	db 23, MON_SANDSHREW, MON_EKANS, MON_SANDSLASH, 0
+	db 23, MON_EKANS, MON_SANDSHREW, MON_ARBOK, 0
+	db 21, MON_KOFFING, MON_ZUBAT, 0
 	db 25, MON_ZUBAT, MON_ZUBAT, MON_GOLBAT, 0
-	db 26, MON_DOGARS, MON_SLEEPE, 0
-	db 23, MON_ZUBAT, MON_KORATTA, MON_RATTA, MON_ZUBAT, 0
-	db 26, MON_SLEEPE, MON_DOGARS, 0
-	db 29, MON_KARAKARA, MON_ZUBAT, 0
-	db 25, MON_GOLBAT, MON_ZUBAT, MON_ZUBAT, MON_RATTA, MON_ZUBAT, 0
-	db 28, MON_RATTA, MON_SLEEPER, MON_RATTA, 0
-	db 29, MON_WANRIKY, MON_SLEEPE, 0
-	db 28, MON_ARBO, MON_ZUBAT, MON_KARAKARA, 0
+	db 26, MON_KOFFING, MON_DROWZEE, 0
+	db 23, MON_ZUBAT, MON_RATTATA, MON_RATICATE, MON_ZUBAT, 0
+	db 26, MON_DROWZEE, MON_KOFFING, 0
+	db 29, MON_CUBONE, MON_ZUBAT, 0
+	db 25, MON_GOLBAT, MON_ZUBAT, MON_ZUBAT, MON_RATICATE, MON_ZUBAT, 0
+	db 28, MON_RATICATE, MON_HYPNO, MON_RATICATE, 0
+	db 29, MON_MACHOP, MON_DROWZEE, 0
+	db 28, MON_EKANS, MON_ZUBAT, MON_CUBONE, 0
 	db 33, MON_ARBOK, 0
-	db 33, MON_SLEEPER, 0
-	db 29, MON_WANRIKY, MON_GORIKY, 0
+	db 33, MON_HYPNO, 0
+	db 29, MON_MACHOP, MON_MACHOKE, 0
 	db 28, MON_ZUBAT, MON_ZUBAT, MON_GOLBAT, 0
-	db 26, MON_RATTA, MON_ARBOK, MON_DOGARS, MON_GOLBAT, 0
-	db 29, MON_KARAKARA, MON_KARAKARA, 0
-	db 29, MON_SAND, MON_SANDPAN, 0
-	db 26, MON_RATTA, MON_ZUBAT, MON_GOLBAT, MON_KORATTA, 0
-	db 28, MON_MATADOGAS, MON_GOLBAT, MON_DOGARS, 0
-	db 28, MON_SLEEPE, MON_BETBETER, MON_WANRIKY, 0
-	db 28, MON_GOLBAT, MON_SLEEPE, MON_SLEEPER, 0
-	db 33, MON_GORIKY, 0
-	db 25, MON_KORATTA, MON_KORATTA, MON_ZUBAT, MON_KORATTA, MON_ARBO, 0
-	db 32, MON_KARAKARA, MON_SLEEPE, MON_GARAGARA, 0
+	db 26, MON_RATICATE, MON_ARBOK, MON_KOFFING, MON_GOLBAT, 0
+	db 29, MON_CUBONE, MON_CUBONE, 0
+	db 29, MON_SANDSHREW, MON_SANDSLASH, 0
+	db 26, MON_RATICATE, MON_ZUBAT, MON_GOLBAT, MON_RATTATA, 0
+	db 28, MON_WEEZING, MON_GOLBAT, MON_KOFFING, 0
+	db 28, MON_DROWZEE, MON_GRIMER, MON_MACHOP, 0
+	db 28, MON_GOLBAT, MON_DROWZEE, MON_HYPNO, 0
+	db 33, MON_MACHOKE, 0
+	db 25, MON_RATTATA, MON_RATTATA, MON_ZUBAT, MON_RATTATA, MON_EKANS, 0
+	db 32, MON_CUBONE, MON_DROWZEE, MON_MAROWAK, 0
 
 RocketMGroup::
 ; Unused
 	db 13, DEX_KOTORA, DEX_GONGU, DEX_KIREIHANA, 0
 ; Leftover Cooltrainer♂ data from Red/Blue
 	db 39, MON_NIDORINO, MON_NIDOKING, 0
-	db 43, MON_NASSY, MON_PARSHEN, MON_WINDIE, 0
-	db 43, MON_KINGLER, MON_DOKUKURAGE, MON_KAMEX, 0
+	db 43, MON_EXEGGUTOR, MON_CLOYSTER, MON_ARCANINE, 0
+	db 43, MON_KINGLER, MON_TENTACRUEL, MON_BLASTOISE, 0
 	db 45, MON_KINGLER, MON_STARMIE, 0
-	db 42, MON_FUSHIGISOU, MON_KAMEIL, MON_LIZARDO, MON_LIZARDON, 0
-	db 44, MON_FUSHIGISOU, MON_KAMEIL, MON_LIZARDO, 0
+	db 42, MON_IVYSAUR, MON_WARTORTLE, MON_CHARMELEON, MON_CHARIZARD, 0
+	db 44, MON_IVYSAUR, MON_WARTORTLE, MON_CHARMELEON, 0
 	db 49, MON_NIDOKING, 0
-	db 44, MON_KINGLER, MON_PARSHEN, 0
-	db 39, MON_SANDPAN, MON_DUGTRIO, 0
-	db 43, MON_SIHORN, 0
+	db 44, MON_KINGLER, MON_CLOYSTER, 0
+	db 39, MON_SANDSLASH, MON_DUGTRIO, 0
+	db 43, MON_RHYHORN, 0
 
 GentlemanGroup::
 ; Leftover Cooltrainer♀ data from Red/Blue
-	db 24, MON_UTSUDON, MON_KUSAIHANA, MON_FUSHIGISOU, 0
-	db 43, MON_MADATSUBOMI, MON_UTSUDON, MON_UTSUBOT, 0
-	db 43, MON_PARASECT, MON_JUGON, MON_LUCKY, 0
-	db 46, MON_RUFFRESIA, MON_BUTTERFREE, 0
-	db 44, MON_PERSIAN, MON_KYUKON, 0
-	db 45, MON_FUSHIGISOU, MON_FUSHIGIBANA, 0
+	db 24, MON_WEEPINBELL, MON_GLOOM, MON_IVYSAUR, 0
+	db 43, MON_BELLSPROUT, MON_WEEPINBELL, MON_VICTREEBEL, 0
+	db 43, MON_PARASECT, MON_DEWGONG, MON_CHANSEY, 0
+	db 46, MON_VILEPLUME, MON_BUTTERFREE, 0
+	db 44, MON_PERSIAN, MON_NINETALES, 0
+	db 45, MON_IVYSAUR, MON_VENUSAUR, 0
 	db 45, MON_NIDORINA, MON_NIDOQUEEN, 0
-	db 43, MON_PERSIAN, MON_KYUKON, MON_RAICHU, 0
+	db 43, MON_PERSIAN, MON_NINETALES, MON_RAICHU, 0
 
 TeacherMGroup::
 ; Leftover Bruno data from Red/Blue
-	db -1, 53, MON_IWARK, 55, MON_EBIWALAR, 55, MON_SAWAMULAR, 56, MON_IWARK, 58, MON_KAIRIKY, 0
+	db -1, 53, MON_ONIX, 55, MON_HITMONCHAN, 55, MON_HITMONLEE, 56, MON_ONIX, 58, MON_MACHAMP, 0
 
 TeacherFGroup::
 ; Leftover Brock data from Red/Blue
-	db -1, 12, MON_ISITSUBUTE, 14, MON_IWARK, 0
+	db -1, 12, MON_GEODUDE, 14, MON_ONIX, 0
 
 ManchildGroup::
 ; Leftover Misty data from Red/Blue
-	db -1, 18, MON_HITODEMAN, 21, MON_STARMIE, 0
+	db -1, 18, MON_STARYU, 21, MON_STARMIE, 0
 
 ; Leftover Lt.Surge data from Red/Blue
-	db -1, 21, MON_BIRIRIDAMA, 18, MON_PIKACHU, 24, MON_RAICHU, 0
+	db -1, 21, MON_VOLTORB, 18, MON_PIKACHU, 24, MON_RAICHU, 0
 
 ; Leftover Erika data from Red/Blue
-	db -1, 29, MON_UTSUBOT, 24, MON_MONJARA, 29, MON_RUFFRESIA, 0
+	db -1, 29, MON_VICTREEBEL, 24, MON_TANGELA, 29, MON_VILEPLUME, 0
 
 SwimmerFGroup::
 ; Leftover Koga data from Red/Blue
-	db -1, 37, MON_DOGARS, 39, MON_BETBETON, 37, MON_DOGARS, 43, MON_MATADOGAS, 0
+	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
 
 SailorGroup::
 ; Leftover Sabrina data from Red/Blue
-	db -1, 38, MON_YUNGERER, 37, MON_BARRIERD, 38, MON_MORPHON, 43, MON_FOODIN, 0
+	db -1, 38, MON_KADABRA, 37, MON_MRMIME, 38, MON_VENOMOTH, 43, MON_ALAKAZAM, 0
 
 SuperNerdGroup::
 ; Leftover Gentleman data from Red/Blue
-	db 18, MON_GARDIE, MON_GARDIE, 0
+	db 18, MON_GROWLITHE, MON_GROWLITHE, 0
 	db 19, MON_NIDORAN_M, MON_NIDORAN_F, 0
 	db 23, MON_PIKACHU, 0
-	db 48, MON_OKORIZARU, 0
-	db 17, MON_GARDIE, MON_PONYTA, 0
+	db 48, MON_PRIMEAPE, 0
+	db 17, MON_GROWLITHE, MON_PONYTA, 0
 
 EngineerGroup::
 ; Leftover Green data from Red/Blue
-	db -1, 19, MON_PIGEON, 16, MON_RATTA, 18, MON_YUNGERER, 20, MON_KAMEIL, 0
-	db -1, 19, MON_PIGEON, 16, MON_RATTA, 18, MON_YUNGERER, 20, MON_FUSHIGISOU, 0
-	db -1, 19, MON_PIGEON, 16, MON_RATTA, 18, MON_YUNGERER, 20, MON_LIZARDO, 0
-	db -1, 25, MON_PIGEON, 23, MON_GARDIE, 22, MON_TAMATAMA, 20, MON_YUNGERER, 25, MON_KAMEIL, 0
-	db -1, 25, MON_PIGEON, 23, MON_GYARADOS, 22, MON_GARDIE, 20, MON_YUNGERER, 25, MON_FUSHIGISOU, 0
-	db -1, 25, MON_PIGEON, 23, MON_TAMATAMA, 22, MON_GYARADOS, 20, MON_YUNGERER, 25, MON_LIZARDO, 0
-	db -1, 37, MON_PIGEOT, 38, MON_GARDIE, 35, MON_TAMATAMA, 35, MON_FOODIN, 40, MON_KAMEX, 0
-	db -1, 37, MON_PIGEOT, 38, MON_GYARADOS, 35, MON_GARDIE, 35, MON_FOODIN, 40, MON_FUSHIGIBANA, 0
-	db -1, 37, MON_PIGEOT, 38, MON_TAMATAMA, 35, MON_GYARADOS, 35, MON_FOODIN, 40, MON_LIZARDON, 0
-	db -1, 47, MON_PIGEOT, 45, MON_SIHORN, 45, MON_GARDIE, 47, MON_TAMATAMA, 50, MON_FOODIN, 53, MON_KAMEX, 0
-	db -1, 47, MON_PIGEOT, 45, MON_SIHORN, 45, MON_GYARADOS, 47, MON_GARDIE, 50, MON_FOODIN, 53, MON_FUSHIGIBANA, 0
-	db -1, 47, MON_PIGEOT, 45, MON_SIHORN, 45, MON_TAMATAMA, 47, MON_GYARADOS, 50, MON_FOODIN, 53, MON_LIZARDON, 0
+	db -1, 19, MON_PIDGEOTTO, 16, MON_RATICATE, 18, MON_KADABRA, 20, MON_WARTORTLE, 0
+	db -1, 19, MON_PIDGEOTTO, 16, MON_RATICATE, 18, MON_KADABRA, 20, MON_IVYSAUR, 0
+	db -1, 19, MON_PIDGEOTTO, 16, MON_RATICATE, 18, MON_KADABRA, 20, MON_CHARMELEON, 0
+	db -1, 25, MON_PIDGEOTTO, 23, MON_GROWLITHE, 22, MON_EXEGGCUTE, 20, MON_KADABRA, 25, MON_WARTORTLE, 0
+	db -1, 25, MON_PIDGEOTTO, 23, MON_GYARADOS, 22, MON_GROWLITHE, 20, MON_KADABRA, 25, MON_IVYSAUR, 0
+	db -1, 25, MON_PIDGEOTTO, 23, MON_EXEGGCUTE, 22, MON_GYARADOS, 20, MON_KADABRA, 25, MON_CHARMELEON, 0
+	db -1, 37, MON_PIDGEOT, 38, MON_GROWLITHE, 35, MON_EXEGGCUTE, 35, MON_ALAKAZAM, 40, MON_BLASTOISE, 0
+	db -1, 37, MON_PIDGEOT, 38, MON_GYARADOS, 35, MON_GROWLITHE, 35, MON_ALAKAZAM, 40, MON_VENUSAUR, 0
+	db -1, 37, MON_PIDGEOT, 38, MON_EXEGGCUTE, 35, MON_GYARADOS, 35, MON_ALAKAZAM, 40, MON_CHARIZARD, 0
+	db -1, 47, MON_PIDGEOT, 45, MON_RHYHORN, 45, MON_GROWLITHE, 47, MON_EXEGGCUTE, 50, MON_ALAKAZAM, 53, MON_BLASTOISE, 0
+	db -1, 47, MON_PIDGEOT, 45, MON_RHYHORN, 45, MON_GYARADOS, 47, MON_GROWLITHE, 50, MON_ALAKAZAM, 53, MON_VENUSAUR, 0
+	db -1, 47, MON_PIDGEOT, 45, MON_RHYHORN, 45, MON_EXEGGCUTE, 47, MON_GYARADOS, 50, MON_ALAKAZAM, 53, MON_CHARIZARD, 0
 
 RockerGroup::
 ; Unused
 	db 40, $C6, $C7, $C8, 0
 ; Leftover Green data from Red/Blue
-	db -1, 61, MON_PIGEOT, 59, MON_FOODIN, 61, MON_SIDON, 61, MON_WINDIE, 63, MON_NASSY, 65, MON_KAMEX, 0
-	db -1, 61, MON_PIGEOT, 59, MON_FOODIN, 61, MON_SIDON, 61, MON_GYARADOS, 63, MON_WINDIE, 65, MON_FUSHIGIBANA, 0
-	db -1, 61, MON_PIGEOT, 59, MON_FOODIN, 61, MON_SIDON, 61, MON_NASSY, 63, MON_GYARADOS, 65, MON_LIZARDON, 0
+	db -1, 61, MON_PIDGEOT, 59, MON_ALAKAZAM, 61, MON_RHYDON, 61, MON_ARCANINE, 63, MON_EXEGGUTOR, 65, MON_BLASTOISE, 0
+	db -1, 61, MON_PIDGEOT, 59, MON_ALAKAZAM, 61, MON_RHYDON, 61, MON_GYARADOS, 63, MON_ARCANINE, 65, MON_VENUSAUR, 0
+	db -1, 61, MON_PIDGEOT, 59, MON_ALAKAZAM, 61, MON_RHYDON, 61, MON_EXEGGUTOR, 63, MON_GYARADOS, 65, MON_CHARIZARD, 0
 
 HikerGroup::
 ; Leftover Lorelei data from Red/Blue
-	db -1, 54, MON_JUGON, 53, MON_PARSHEN, 54, MON_YADORAN, 56, MON_ROUGELA, 56, MON_LAPLACE, 0
+	db -1, 54, MON_DEWGONG, 53, MON_CLOYSTER, 54, MON_SLOWBRO, 56, MON_JYNX, 56, MON_LAPRAS, 0
 
 BikerGroup::
 ; Leftover Channeler data from Red/Blue
-	db 22, MON_GHOS, 0
-	db 24, MON_GHOS, 0
-	db 23, MON_GHOS, MON_GHOS, 0
-	db 24, MON_GHOS, 0
-	db 23, MON_GHOS, 0
-	db 24, MON_GHOS, 0
-	db 24, MON_GHOST, 0
-	db 22, MON_GHOS, 0
-	db 24, MON_GHOS, 0
-	db 23, MON_GHOS, MON_GHOS, 0
-	db 24, MON_GHOS, 0
-	db 22, MON_GHOS, 0
-	db 24, MON_GHOS, 0
-	db 23, MON_GHOST, 0
-	db 24, MON_GHOS, 0
-	db 22, MON_GHOS, 0
-	db 24, MON_GHOS, 0
-	db 22, MON_GHOST, 0
-	db 22, MON_GHOS, MON_GHOS, MON_GHOS, 0
-	db 24, MON_GHOS, 0
-	db 24, MON_GHOS, 0
-	db 34, MON_GHOS, MON_GHOST, 0
-	db 38, MON_GHOST, 0
-	db 33, MON_GHOS, MON_GHOS, MON_GHOST, 0
+	db 22, MON_GASTLY, 0
+	db 24, MON_GASTLY, 0
+	db 23, MON_GASTLY, MON_GASTLY, 0
+	db 24, MON_GASTLY, 0
+	db 23, MON_GASTLY, 0
+	db 24, MON_GASTLY, 0
+	db 24, MON_HAUNTER, 0
+	db 22, MON_GASTLY, 0
+	db 24, MON_GASTLY, 0
+	db 23, MON_GASTLY, MON_GASTLY, 0
+	db 24, MON_GASTLY, 0
+	db 22, MON_GASTLY, 0
+	db 24, MON_GASTLY, 0
+	db 23, MON_HAUNTER, 0
+	db 24, MON_GASTLY, 0
+	db 22, MON_GASTLY, 0
+	db 24, MON_GASTLY, 0
+	db 22, MON_HAUNTER, 0
+	db 22, MON_GASTLY, MON_GASTLY, MON_GASTLY, 0
+	db 24, MON_GASTLY, 0
+	db 24, MON_GASTLY, 0
+	db 34, MON_GASTLY, MON_HAUNTER, 0
+	db 38, MON_HAUNTER, 0
+	db 33, MON_GASTLY, MON_GASTLY, MON_HAUNTER, 0
 
 RockClimberGroup::
 ; Leftover Agatha data from Red/Blue
-	db -1, 56, MON_GANGAR, 56, MON_GOLBAT, 55, MON_GHOST, 58, MON_ARBOK, 60, MON_GANGAR, 0
+	db -1, 56, MON_GENGAR, 56, MON_GOLBAT, 55, MON_HAUNTER, 58, MON_ARBOK, 60, MON_GENGAR, 0
 
 BurglarGroup::
 ; Leftover Lance data from Red/Blue
-	db -1, 58, MON_GYARADOS, 56, MON_HAKURYU, 56, MON_HAKURYU, 60, MON_PTERA, 62, MON_KAIRYU, 0
+	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
@@ -599,7 +599,7 @@ SchoolboyGroup::
 	db -1 ; end
 
 FirebreatherGroup::
-	; FIREBREATHER_AKITO
+	; MOLTRESBREATHER_AKITO
 	db "あきと@", TRAINERTYPE_ITEM_MOVES
 	db 10, DEX_BOOBY, ITEM_NONE, MOVE_SCRATCH, MOVE_SMOG, MOVE_NONE, MOVE_NONE
 	db -1 ; end
@@ -613,12 +613,12 @@ SportsmanGroup::
 KimonoGirlGroup::
 	; KIMONO_GIRL_TAMAO
 	db "たまお@", TRAINERTYPE_ITEM_MOVES
-	db 12, DEX_PURIN, ITEM_NONE, MOVE_CHARM, MOVE_ENCORE, MOVE_POUND, MOVE_NONE
+	db 12, DEX_JIGGLYPUFF, ITEM_NONE, MOVE_CHARM, MOVE_ENCORE, MOVE_POUND, MOVE_NONE
 	db -1 ; end
 
 	; KIMONO_GIRL_KOUME
 	db "こうめ@", TRAINERTYPE_ITEM_MOVES
-	db 10, DEX_PIPPI, ITEM_NONE, MOVE_CHARM, MOVE_SWEET_KISS, MOVE_POUND, MOVE_NONE
+	db 10, DEX_CLEFAIRY, ITEM_NONE, MOVE_CHARM, MOVE_SWEET_KISS, MOVE_POUND, MOVE_NONE
 	db -1 ; end
 
 else
@@ -633,7 +633,7 @@ BugCatcherBoyGroup::
 
 	; BUG_CATCHER_BOY_KEN
 	db "けん@", TRAINERTYPE_ITEM_MOVES
-	db  7, DEX_KONGPANG, ITEM_NONE, MOVE_STUN_SPORE, MOVE_LEECH_LIFE, MOVE_NONE, MOVE_NONE
+	db  7, DEX_VENONAT, ITEM_NONE, MOVE_STUN_SPORE, MOVE_LEECH_LIFE, MOVE_NONE, MOVE_NONE
 	db -1 ; end
 
 SECTION "data/trainers/parties.asm@Trainer Parties 2 TEMPORARY", ROMX
@@ -685,7 +685,7 @@ KimonoGirlGroup::
 
 	; KIMONO_GIRL_TAMAO
 	db "たまお@", TRAINERTYPE_ITEM_MOVES
-	db 10, DEX_PURIN, ITEM_NONE, MOVE_CHARM, MOVE_POUND, MOVE_ENCORE, MOVE_NONE
+	db 10, DEX_JIGGLYPUFF, ITEM_NONE, MOVE_CHARM, MOVE_POUND, MOVE_ENCORE, MOVE_NONE
 	db -1 ; end
 
 SECTION "data/trainers/parties.asm@Trainer Parties 16 TEMPORARY", ROMX
@@ -738,7 +738,7 @@ SchoolboyGroup::
 
 SECTION "data/trainers/parties.asm@Trainer Parties 30 TEMPORARY", ROMX
 FirebreatherGroup::
-	; FIREBREATHER_AKITO
+	; MOLTRESBREATHER_AKITO
 	db "あきと@", TRAINERTYPE_ITEM
 	db  8, DEX_BOOBY, ITEM_NONE
 	db -1 ; end
diff --git a/data/wild.asm b/data/wild.asm
index ad0a356..43af5b0 100644
--- a/data/wild.asm
+++ b/data/wild.asm
@@ -12,15 +12,15 @@ if DEF(GOLD)
 	db 3, DEX_SUNNY
 	db 5, DEX_SUNNY
 else
-	db 8, DEX_POPPO
-	db 8, DEX_POPPO
-	db 7, DEX_POPPO
+	db 8, DEX_PIDGEY
+	db 8, DEX_PIDGEY
+	db 7, DEX_PIDGEY
 endc
 	db 5, DEX_PIKACHU
-	db 5, DEX_POPPO
-	db 5, DEX_POPPO
+	db 5, DEX_PIDGEY
+	db 5, DEX_PIDGEY
 	; day
-	db 4, DEX_KORATTA
+	db 4, DEX_RATTATA
 	db 6, DEX_KIRINRIKI
 	db 4, DEX_KIRINRIKI
 if DEF(GOLD)
@@ -28,15 +28,15 @@ if DEF(GOLD)
 else
 	db 4, DEX_MARIL
 endc
-	db 4, DEX_POPPO
-	db 8, DEX_KORATTA
+	db 4, DEX_PIDGEY
+	db 8, DEX_RATTATA
 	; nite
-	db 7, DEX_KORATTA
-	db 5, DEX_KORATTA
-	db 5, DEX_KORATTA
+	db 7, DEX_RATTATA
+	db 5, DEX_RATTATA
+	db 5, DEX_RATTATA
 if DEF(GOLD)
-	db 7, DEX_KORATTA
-	db 8, DEX_KORATTA
+	db 7, DEX_RATTATA
+	db 8, DEX_RATTATA
 else
 	db 5, DEX_HOHO
 	db 3, DEX_HOHO
@@ -51,249 +51,249 @@ if DEF(GOLD)
 	db 6, DEX_SUNNY
 	db 6, DEX_SUNNY
 else
-	db 8, DEX_POPPO
-	db 8, DEX_POPPO
-	db 6, DEX_POPPO
+	db 8, DEX_PIDGEY
+	db 8, DEX_PIDGEY
+	db 6, DEX_PIDGEY
 endc
 	db 5, DEX_PIKACHU
-	db 4, DEX_ARBO
-	db 5, DEX_KORATTA
+	db 4, DEX_EKANS
+	db 5, DEX_RATTATA
 	; day
-	db 5, DEX_POPPO
+	db 5, DEX_PIDGEY
 	db 7, DEX_YOROIDORI
-	db 5, DEX_KORATTA
+	db 5, DEX_RATTATA
 if DEF(GOLD)
 	db 8, DEX_HANEKO
 else
 	db 8, DEX_MARIL
 endc
-	db 4, DEX_POPPO
-	db 7, DEX_KORATTA
+	db 4, DEX_PIDGEY
+	db 7, DEX_RATTATA
 	; nite
-	db 7, DEX_KORATTA
-	db 6, DEX_ARBO
+	db 7, DEX_RATTATA
+	db 6, DEX_EKANS
 if DEF(GOLD)
-	db 6, DEX_KORATTA
+	db 6, DEX_RATTATA
 else
 	db 6, DEX_HOHO
 endc
-	db 7, DEX_ARBO
-	db 8, DEX_KORATTA
+	db 7, DEX_EKANS
+	db 8, DEX_RATTATA
 	db 5, DEX_PIKACHU
 
 	map_id ROUTE_2
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn
 	db 9, DEX_CATERPIE
-	db 9, DEX_TRANSEL
+	db 9, DEX_METAPOD
 	db 8, DEX_CATERPIE
-	db 7, DEX_TRANSEL
-	db 10, DEX_POPPO
+	db 7, DEX_METAPOD
+	db 10, DEX_PIDGEY
 	db 7, DEX_CATERPIE
 	; day
 	db 8, DEX_CATERPIE
-	db 9, DEX_POPPO
-	db 11, DEX_KORATTA
-	db 9, DEX_KORATTA
-	db 10, DEX_KORATTA
+	db 9, DEX_PIDGEY
+	db 11, DEX_RATTATA
+	db 9, DEX_RATTATA
+	db 10, DEX_RATTATA
 	db 8, DEX_CATERPIE
 	; nite
-	db 9, DEX_KORATTA
+	db 9, DEX_RATTATA
 	db 10, DEX_HOHO
-	db 11, DEX_NAZONOKUSA
+	db 11, DEX_ODDISH
 	db 12, DEX_HOHO
-	db 11, DEX_NAZONOKUSA
-	db 13, DEX_NAZONOKUSA
+	db 11, DEX_ODDISH
+	db 13, DEX_ODDISH
 
 	map_id BAADON_ROUTE_1
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn
-	db 19, DEX_METAMON
-	db 20, DEX_ONIDRILL
-	db 18, DEX_METAMON
-	db 17, DEX_TRANSEL
-	db 21, DEX_ONIDRILL
-	db 17, DEX_METAMON
+	db 19, DEX_DITTO
+	db 20, DEX_FEAROW
+	db 18, DEX_DITTO
+	db 17, DEX_METAPOD
+	db 21, DEX_FEAROW
+	db 17, DEX_DITTO
 	; day
-	db 17, DEX_ONISUZUME
-	db 18, DEX_ONISUZUME
-	db 21, DEX_DODO
-	db 19, DEX_DODO
-	db 20, DEX_DODO
-	db 18, DEX_METAMON
+	db 17, DEX_SPEAROW
+	db 18, DEX_SPEAROW
+	db 21, DEX_DODUO
+	db 19, DEX_DODUO
+	db 20, DEX_DODUO
+	db 18, DEX_DITTO
 	; nite
-	db 19, DEX_SLEEPE
-	db 20, DEX_SLEEPE
-	db 21, DEX_SLEEPE
-	db 22, DEX_SLEEPE
-	db 23, DEX_SLEEPE
-	db 23, DEX_SLEEPE
+	db 19, DEX_DROWZEE
+	db 20, DEX_DROWZEE
+	db 21, DEX_DROWZEE
+	db 22, DEX_DROWZEE
+	db 23, DEX_DROWZEE
+	db 23, DEX_DROWZEE
 
 	map_id HAITEKU_WEST_ROUTE
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn
-	db 12, DEX_TAMATAMA
-	db 12, DEX_KONGPANG
-	db 11, DEX_TAMATAMA
-	db 10, DEX_KONGPANG
-	db 13, DEX_ONISUZUME
-	db 10, DEX_TAMATAMA
+	db 12, DEX_EXEGGCUTE
+	db 12, DEX_VENONAT
+	db 11, DEX_EXEGGCUTE
+	db 10, DEX_VENONAT
+	db 13, DEX_SPEAROW
+	db 10, DEX_EXEGGCUTE
 	; day
-	db 11, DEX_ONISUZUME
-	db 12, DEX_ONISUZUME
-	db 14, DEX_ISITSUBUTE
-	db 12, DEX_ISITSUBUTE
-	db 13, DEX_ISITSUBUTE
-	db 11, DEX_TAMATAMA
+	db 11, DEX_SPEAROW
+	db 12, DEX_SPEAROW
+	db 14, DEX_GEODUDE
+	db 12, DEX_GEODUDE
+	db 13, DEX_GEODUDE
+	db 11, DEX_EXEGGCUTE
 	; nite
-	db 12, DEX_ARBO
-	db 13, DEX_ARBO
-	db 14, DEX_ARBO
-	db 15, DEX_ARBO
-	db 16, DEX_ARBO
-	db 16, DEX_ARBO
+	db 12, DEX_EKANS
+	db 13, DEX_EKANS
+	db 14, DEX_EKANS
+	db 15, DEX_EKANS
+	db 16, DEX_EKANS
+	db 16, DEX_EKANS
 
 	map_id HAITEKU_WEST_ROUTE_OCEAN
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn
-	db 25, DEX_MENOKURAGE
-	db 25, DEX_MENOKURAGE
-	db 20, DEX_MENOKURAGE
-	db 15, DEX_MENOKURAGE
+	db 25, DEX_TENTACOOL
+	db 25, DEX_TENTACOOL
+	db 20, DEX_TENTACOOL
+	db 15, DEX_TENTACOOL
 	db 35, DEX_HANEEI
-	db 15, DEX_MENOKURAGE
+	db 15, DEX_TENTACOOL
 	; day
-	db 20, DEX_MENOKURAGE
-	db 35, DEX_DOKUKURAGE
-	db 35, DEX_MENOKURAGE
-	db 25, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
+	db 20, DEX_TENTACOOL
+	db 35, DEX_TENTACRUEL
+	db 35, DEX_TENTACOOL
+	db 25, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
 	; nite
-	db 25, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
-	db 35, DEX_MENOKURAGE
-	db 40, DEX_MENOKURAGE
+	db 25, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
+	db 35, DEX_TENTACOOL
+	db 40, DEX_TENTACOOL
 	db 35, DEX_HANEEI
-	db 45, DEX_MENOKURAGE
+	db 45, DEX_TENTACOOL
 
 	map_id FONTO_ROUTE_1
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn
-	db 25, DEX_MENOKURAGE
-	db 25, DEX_MENOKURAGE
-	db 20, DEX_MENOKURAGE
-	db 15, DEX_MENOKURAGE
+	db 25, DEX_TENTACOOL
+	db 25, DEX_TENTACOOL
+	db 20, DEX_TENTACOOL
+	db 15, DEX_TENTACOOL
 	db 35, DEX_HANEEI
-	db 15, DEX_MENOKURAGE
+	db 15, DEX_TENTACOOL
 	; day
-	db 20, DEX_MENOKURAGE
-	db 35, DEX_DOKUKURAGE
-	db 35, DEX_MENOKURAGE
-	db 25, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
+	db 20, DEX_TENTACOOL
+	db 35, DEX_TENTACRUEL
+	db 35, DEX_TENTACOOL
+	db 25, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
 	; nite
-	db 25, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
-	db 35, DEX_MENOKURAGE
-	db 40, DEX_MENOKURAGE
+	db 25, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
+	db 35, DEX_TENTACOOL
+	db 40, DEX_TENTACOOL
 	db 35, DEX_HANEEI
-	db 45, DEX_MENOKURAGE
+	db 45, DEX_TENTACOOL
 
 	map_id FONTO_ROUTE_2
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn
-	db 25, DEX_MENOKURAGE
-	db 25, DEX_MENOKURAGE
-	db 20, DEX_MENOKURAGE
-	db 15, DEX_MENOKURAGE
+	db 25, DEX_TENTACOOL
+	db 25, DEX_TENTACOOL
+	db 20, DEX_TENTACOOL
+	db 15, DEX_TENTACOOL
 	db 35, DEX_HANEEI
-	db 15, DEX_MENOKURAGE
+	db 15, DEX_TENTACOOL
 	; day
-	db 20, DEX_MENOKURAGE
-	db 35, DEX_DOKUKURAGE
-	db 35, DEX_MENOKURAGE
-	db 25, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
+	db 20, DEX_TENTACOOL
+	db 35, DEX_TENTACRUEL
+	db 35, DEX_TENTACOOL
+	db 25, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
 	; nite
-	db 25, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
-	db 35, DEX_MENOKURAGE
-	db 40, DEX_MENOKURAGE
+	db 25, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
+	db 35, DEX_TENTACOOL
+	db 40, DEX_TENTACOOL
 	db 35, DEX_HANEEI
-	db 45, DEX_MENOKURAGE
+	db 45, DEX_TENTACOOL
 
 	map_id FONTO_ROUTE_3
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn
-	db 16, DEX_WANRIKY
-	db 16, DEX_WANRIKY
-	db 15, DEX_WANRIKY
-	db 14, DEX_WANRIKY
-	db 17, DEX_ONISUZUME
-	db 14, DEX_WANRIKY
+	db 16, DEX_MACHOP
+	db 16, DEX_MACHOP
+	db 15, DEX_MACHOP
+	db 14, DEX_MACHOP
+	db 17, DEX_SPEAROW
+	db 14, DEX_MACHOP
 	; day
-	db 15, DEX_ONISUZUME
-	db 16, DEX_ONISUZUME
-	db 18, DEX_KORATTA
-	db 16, DEX_KORATTA
-	db 17, DEX_KORATTA
-	db 15, DEX_ONISUZUME
+	db 15, DEX_SPEAROW
+	db 16, DEX_SPEAROW
+	db 18, DEX_RATTATA
+	db 16, DEX_RATTATA
+	db 17, DEX_RATTATA
+	db 15, DEX_SPEAROW
 	; nite
-	db 16, DEX_SLEEPE
-	db 17, DEX_SLEEPE
-	db 18, DEX_SLEEPE
-	db 19, DEX_SLEEPE
-	db 20, DEX_SLEEPE
-	db 20, DEX_SLEEPE
+	db 16, DEX_DROWZEE
+	db 17, DEX_DROWZEE
+	db 18, DEX_DROWZEE
+	db 19, DEX_DROWZEE
+	db 20, DEX_DROWZEE
+	db 20, DEX_DROWZEE
 
 	map_id FONTO_ROUTE_4
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn
-	db 17, DEX_ONISUZUME
-	db 17, DEX_ONISUZUME
-	db 16, DEX_ONISUZUME
-	db 15, DEX_ONISUZUME
-	db 18, DEX_DODO
-	db 15, DEX_ONISUZUME
+	db 17, DEX_SPEAROW
+	db 17, DEX_SPEAROW
+	db 16, DEX_SPEAROW
+	db 15, DEX_SPEAROW
+	db 18, DEX_DODUO
+	db 15, DEX_SPEAROW
 	; day
-	db 16, DEX_DODO
+	db 16, DEX_DODUO
 	db 17, DEX_DONPHAN
-	db 19, DEX_SAND
-	db 17, DEX_SAND
-	db 18, DEX_SAND
-	db 16, DEX_DODO
+	db 19, DEX_SANDSHREW
+	db 17, DEX_SANDSHREW
+	db 18, DEX_SANDSHREW
+	db 16, DEX_DODUO
 	; nite
-	db 17, DEX_DODO
-	db 18, DEX_DODO
-	db 19, DEX_DODO
-	db 20, DEX_DODO
+	db 17, DEX_DODUO
+	db 18, DEX_DODUO
+	db 19, DEX_DODUO
+	db 20, DEX_DODUO
 	db 21, DEX_BULU
 	db 21, DEX_BULU
 
 	map_id BAADON_ROUTE_2
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn
-	db 21, DEX_ONISUZUME
-	db 21, DEX_ONISUZUME
-	db 20, DEX_ONIDRILL
-	db 19, DEX_ONIDRILL
-	db 22, DEX_ONIDRILL
-	db 19, DEX_ONISUZUME
+	db 21, DEX_SPEAROW
+	db 21, DEX_SPEAROW
+	db 20, DEX_FEAROW
+	db 19, DEX_FEAROW
+	db 22, DEX_FEAROW
+	db 19, DEX_SPEAROW
 	; day
-	db 20, DEX_DODO
-	db 22, DEX_SANDPAN
+	db 20, DEX_DODUO
+	db 22, DEX_SANDSLASH
 	db 21, DEX_DONPHAN
-	db 21, DEX_SAND
-	db 23, DEX_SAND
-	db 20, DEX_DODO
+	db 21, DEX_SANDSHREW
+	db 23, DEX_SANDSHREW
+	db 20, DEX_DODUO
 	; nite
-	db 21, DEX_DODO
-	db 22, DEX_DODO
-	db 23, DEX_DODO
-	db 24, DEX_DODO
+	db 21, DEX_DODUO
+	db 22, DEX_DODUO
+	db 23, DEX_DODUO
+	db 24, DEX_DODUO
 	db 25, DEX_BULU
 	db 25, DEX_BULU
 
@@ -304,13 +304,13 @@ endc
 	db 23, DEX_POPONEKO
 	db 22, DEX_HANEKO
 	db 25, DEX_POPONEKO
-	db 24, DEX_SAND
+	db 24, DEX_SANDSHREW
 	db 21, DEX_HANEKO
 	; day
-	db 22, DEX_SAND
-	db 23, DEX_SANDPAN
-	db 25, DEX_ROKON
-	db 23, DEX_ROKON
+	db 22, DEX_SANDSHREW
+	db 23, DEX_SANDSLASH
+	db 25, DEX_VULPIX
+	db 23, DEX_VULPIX
 	db 21, DEX_MIKON
 	db 22, DEX_HANEKO
 	; nite
@@ -331,43 +331,43 @@ endc
 	db 25, DEX_POPONEKO
 	db 22, DEX_HANEKO
 	; day
-	db 23, DEX_POPPO
-	db 24, DEX_PIGEON
-	db 26, DEX_ROKON
-	db 24, DEX_ROKON
-	db 25, DEX_ROKON
+	db 23, DEX_PIDGEY
+	db 24, DEX_PIDGEOTTO
+	db 26, DEX_VULPIX
+	db 24, DEX_VULPIX
+	db 25, DEX_VULPIX
 	db 23, DEX_HANEKO
 	; nite
 	db 24, DEX_HOHO
 	db 25, DEX_HOHO
-	db 26, DEX_SLEEPE
-	db 27, DEX_SLEEPE
-	db 28, DEX_SLEEPER
-	db 28, DEX_SLEEPER
+	db 26, DEX_DROWZEE
+	db 27, DEX_DROWZEE
+	db 28, DEX_HYPNO
+	db 28, DEX_HYPNO
 
 	map_id SUGAR_ROUTE
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn
-	db 25, DEX_MENOKURAGE
-	db 25, DEX_MENOKURAGE
-	db 20, DEX_MENOKURAGE
-	db 15, DEX_MENOKURAGE
+	db 25, DEX_TENTACOOL
+	db 25, DEX_TENTACOOL
+	db 20, DEX_TENTACOOL
+	db 15, DEX_TENTACOOL
 	db 35, DEX_IKARI
-	db 15, DEX_MENOKURAGE
+	db 15, DEX_TENTACOOL
 	; day
-	db 20, DEX_MENOKURAGE
-	db 35, DEX_DOKUKURAGE
-	db 35, DEX_MENOKURAGE
-	db 25, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
+	db 20, DEX_TENTACOOL
+	db 35, DEX_TENTACRUEL
+	db 35, DEX_TENTACOOL
+	db 25, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
 	; nite
-	db 25, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
-	db 35, DEX_MENOKURAGE
-	db 40, DEX_MENOKURAGE
+	db 25, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
+	db 35, DEX_TENTACOOL
+	db 40, DEX_TENTACOOL
 	db 35, DEX_IKARI
-	db 45, DEX_MENOKURAGE
+	db 45, DEX_TENTACOOL
 
 	map_id NEWTYPE_ROUTE
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
@@ -379,19 +379,19 @@ endc
 	db 30, DEX_POPONEKO
 	db 27, DEX_HANEKO
 	; day
-	db 28, DEX_POPPO
-	db 29, DEX_PIGEON
-	db 31, DEX_ROKON
-	db 29, DEX_ROKON
-	db 30, DEX_ROKON
+	db 28, DEX_PIDGEY
+	db 29, DEX_PIDGEOTTO
+	db 31, DEX_VULPIX
+	db 29, DEX_VULPIX
+	db 30, DEX_VULPIX
 	db 28, DEX_HANEKO
 	; nite
 	db 29, DEX_HOHO
 	db 31, DEX_HOHO
-	db 32, DEX_SLEEPE
-	db 33, DEX_SLEEPE
-	db 34, DEX_SLEEPER
-	db 34, DEX_SLEEPER
+	db 32, DEX_DROWZEE
+	db 33, DEX_DROWZEE
+	db 34, DEX_HYPNO
+	db 34, DEX_HYPNO
 
 	map_id ROUTE_18
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
@@ -401,20 +401,20 @@ endc
 	db 27, DEX_REDIBA
 	db 28, DEX_MANKEY
 	db 31, DEX_MANKEY
-	db 28, DEX_POPPO
+	db 28, DEX_PIDGEY
 	; day
 	db 29, DEX_MANKEY
-	db 30, DEX_PIGEON
-	db 32, DEX_ROKON
+	db 30, DEX_PIDGEOTTO
+	db 32, DEX_VULPIX
 	db 30, DEX_WOLFMAN
 	db 31, DEX_WOLFMAN
 	db 29, DEX_REDIBA
 	; nite
 	db 30, DEX_WOLFMAN
 	db 33, DEX_WOLFMAN
-	db 34, DEX_SLEEPE
+	db 34, DEX_DROWZEE
 	db 35, DEX_WOLFMAN
-	db 36, DEX_SLEEPER
+	db 36, DEX_HYPNO
 	db 36, DEX_WOLFMAN
 
 	map_id BULL_FOREST_ROUTE_1
@@ -428,10 +428,10 @@ endc
 	db 29, DEX_REDIBA
 	; day
 	db 30, DEX_MANKEY
-	db 31, DEX_OKORIZARU
-	db 33, DEX_NYOROMO
-	db 31, DEX_NYOROZO
-	db 32, DEX_NYOROMO
+	db 31, DEX_PRIMEAPE
+	db 33, DEX_POLIWAG
+	db 31, DEX_POLIWHIRL
+	db 32, DEX_POLIWAG
 	db 30, DEX_REDIBA
 	; nite
 	db 31, DEX_WOLFMAN
@@ -448,14 +448,14 @@ endc
 	db 32, DEX_MILTANK
 	db 31, DEX_MILTANK
 	db 32, DEX_MILTANK
-	db 35, DEX_OKORIZARU
+	db 35, DEX_PRIMEAPE
 	db 32, DEX_REDIBA
 	; day
 	db 33, DEX_MANKEY
-	db 34, DEX_OKORIZARU
-	db 36, DEX_NYOROMO
-	db 34, DEX_NYOROZO
-	db 35, DEX_NYOROZO
+	db 34, DEX_PRIMEAPE
+	db 36, DEX_POLIWAG
+	db 34, DEX_POLIWHIRL
+	db 35, DEX_POLIWHIRL
 	db 33, DEX_REDIBA
 	; nite
 	db 34, DEX_WOLFMAN
@@ -468,25 +468,25 @@ endc
 	map_id STAND_ROUTE
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn
-	db 29, DEX_KARAKARA
-	db 29, DEX_GARAGARA
-	db 28, DEX_KARAKARA
-	db 29, DEX_GARAGARA
-	db 32, DEX_SIHORN
-	db 29, DEX_KARAKARA
+	db 29, DEX_CUBONE
+	db 29, DEX_MAROWAK
+	db 28, DEX_CUBONE
+	db 29, DEX_MAROWAK
+	db 32, DEX_RHYHORN
+	db 29, DEX_CUBONE
 	; day
-	db 30, DEX_SIHORN
-	db 31, DEX_SIHORN
+	db 30, DEX_RHYHORN
+	db 31, DEX_RHYHORN
 	db 33, DEX_YOROIDORI
 	db 31, DEX_YOROIDORI
 	db 32, DEX_YOROIDORI
-	db 30, DEX_KARAKARA
+	db 30, DEX_CUBONE
 	; nite
-	db 31, DEX_ARBO
-	db 34, DEX_ARBO
+	db 31, DEX_EKANS
+	db 34, DEX_EKANS
 	db 35, DEX_ARBOK
 	db 36, DEX_ARBOK
-	db 37, DEX_ARBO
+	db 37, DEX_EKANS
 	db 37, DEX_ARBOK
 
 	map_id KANTO_EAST_ROUTE
@@ -495,22 +495,22 @@ endc
 	db 28, DEX_PICHU
 	db 28, DEX_PICHU
 	db 27, DEX_PIKACHU
-	db 28, DEX_NAZONOKUSA
-	db 31, DEX_KUSAIHANA
+	db 28, DEX_ODDISH
+	db 31, DEX_GLOOM
 	db 28, DEX_PIKACHU
 	; day
-	db 29, DEX_NAZONOKUSA
+	db 29, DEX_ODDISH
 	db 30, DEX_PAINTER
-	db 32, DEX_NYARTH
-	db 32, DEX_RATTA
-	db 31, DEX_NYARTH
-	db 29, DEX_NAZONOKUSA
+	db 32, DEX_MEOWTH
+	db 32, DEX_RATICATE
+	db 31, DEX_MEOWTH
+	db 29, DEX_ODDISH
 	; nite
-	db 31, DEX_RATTA
-	db 33, DEX_ARBO
+	db 31, DEX_RATICATE
+	db 33, DEX_EKANS
 	db 34, DEX_ARBOK
 	db 35, DEX_ARBOK
-	db 36, DEX_ARBO
+	db 36, DEX_EKANS
 	db 36, DEX_ARBOK
 
 	map_id ROUTE_SILENT_EAST
@@ -519,20 +519,20 @@ endc
 	db 29, DEX_PICHU
 	db 29, DEX_PICHU
 	db 28, DEX_PIKACHU
-	db 29, DEX_NAZONOKUSA
-	db 32, DEX_KUSAIHANA
+	db 29, DEX_ODDISH
+	db 32, DEX_GLOOM
 	db 27, DEX_PIKACHU
 	; day
-	db 28, DEX_NAZONOKUSA
+	db 28, DEX_ODDISH
 	db 29, DEX_PAINTER
-	db 32, DEX_NYARTH
-	db 32, DEX_RATTA
-	db 30, DEX_NYARTH
-	db 28, DEX_NAZONOKUSA
+	db 32, DEX_MEOWTH
+	db 32, DEX_RATICATE
+	db 30, DEX_MEOWTH
+	db 28, DEX_ODDISH
 	; nite
-	db 30, DEX_RATTA
+	db 30, DEX_RATICATE
 	db 32, DEX_HOHO
-	db 33, DEX_ARBO
+	db 33, DEX_EKANS
 	db 34, DEX_HOHO
 	db 35, DEX_ARBOK
 	db 35, DEX_HOHO
@@ -540,86 +540,86 @@ endc
 	map_id FONTO_ROUTE_5
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn
-	db 25, DEX_MENOKURAGE
-	db 25, DEX_MENOKURAGE
-	db 20, DEX_MENOKURAGE
-	db 15, DEX_MENOKURAGE
+	db 25, DEX_TENTACOOL
+	db 25, DEX_TENTACOOL
+	db 20, DEX_TENTACOOL
+	db 15, DEX_TENTACOOL
 	db 35, DEX_HANEEI
-	db 15, DEX_MENOKURAGE
+	db 15, DEX_TENTACOOL
 	; day
-	db 20, DEX_MENOKURAGE
-	db 35, DEX_DOKUKURAGE
-	db 35, DEX_MENOKURAGE
-	db 25, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
+	db 20, DEX_TENTACOOL
+	db 35, DEX_TENTACRUEL
+	db 35, DEX_TENTACOOL
+	db 25, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
 	; nite
-	db 25, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
-	db 35, DEX_MENOKURAGE
-	db 40, DEX_MENOKURAGE
+	db 25, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
+	db 35, DEX_TENTACOOL
+	db 40, DEX_TENTACOOL
 	db 35, DEX_HANEEI
-	db 45, DEX_MENOKURAGE
+	db 45, DEX_TENTACOOL
 
 	map_id FONTO_ROUTE_6
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn
-	db 25, DEX_MENOKURAGE
-	db 25, DEX_MENOKURAGE
-	db 20, DEX_MENOKURAGE
-	db 15, DEX_MENOKURAGE
+	db 25, DEX_TENTACOOL
+	db 25, DEX_TENTACOOL
+	db 20, DEX_TENTACOOL
+	db 15, DEX_TENTACOOL
 	db 35, DEX_HANEEI
-	db 15, DEX_MENOKURAGE
+	db 15, DEX_TENTACOOL
 	; day
-	db 20, DEX_MENOKURAGE
-	db 35, DEX_DOKUKURAGE
-	db 35, DEX_MENOKURAGE
-	db 25, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
+	db 20, DEX_TENTACOOL
+	db 35, DEX_TENTACRUEL
+	db 35, DEX_TENTACOOL
+	db 25, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
 	; nite
-	db 25, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
-	db 35, DEX_MENOKURAGE
-	db 40, DEX_MENOKURAGE
+	db 25, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
+	db 35, DEX_TENTACOOL
+	db 40, DEX_TENTACOOL
 	db 35, DEX_HANEEI
-	db 45, DEX_MENOKURAGE
+	db 45, DEX_TENTACOOL
 
 	map_id BULL_FOREST_ROUTE_3
 	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
 	; morn
-	db 25, DEX_MENOKURAGE
-	db 25, DEX_MENOKURAGE
-	db 20, DEX_MENOKURAGE
-	db 15, DEX_MENOKURAGE
-	db 35, DEX_DOKUKURAGE
-	db 15, DEX_MENOKURAGE
+	db 25, DEX_TENTACOOL
+	db 25, DEX_TENTACOOL
+	db 20, DEX_TENTACOOL
+	db 15, DEX_TENTACOOL
+	db 35, DEX_TENTACRUEL
+	db 15, DEX_TENTACOOL
 	; day
-	db 20, DEX_MENOKURAGE
-	db 35, DEX_DOKUKURAGE
-	db 35, DEX_MENOKURAGE
-	db 25, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
+	db 20, DEX_TENTACOOL
+	db 35, DEX_TENTACRUEL
+	db 35, DEX_TENTACOOL
+	db 25, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
 	; nite
-	db 25, DEX_MENOKURAGE
-	db 30, DEX_MENOKURAGE
-	db 35, DEX_MENOKURAGE
-	db 40, DEX_MENOKURAGE
-	db 35, DEX_DOKUKURAGE
-	db 45, DEX_MENOKURAGE
+	db 25, DEX_TENTACOOL
+	db 30, DEX_TENTACOOL
+	db 35, DEX_TENTACOOL
+	db 40, DEX_TENTACOOL
+	db 35, DEX_TENTACRUEL
+	db 45, DEX_TENTACOOL
 
 	map_id SHIZUKANA_OKA
 	db 8 percent, 8 percent, 8 percent ; encounter rates: morn/day/nite
 	; morn
 	db 7, DEX_REDIBA
 	db 7, DEX_REDIBA
-	db 5, DEX_TRANSEL
+	db 5, DEX_METAPOD
 	db 5, DEX_PIKACHU
-	db 7, DEX_POPPO
-	db 5, DEX_POPPO
+	db 7, DEX_PIDGEY
+	db 5, DEX_PIDGEY
 	; day
-	db 6, DEX_POPPO
+	db 6, DEX_PIDGEY
 	db 4, DEX_CATERPIE
 	db 6, DEX_CATERPIE
 if DEF(GOLD)
@@ -630,15 +630,15 @@ endc
 	db 5, DEX_CATERPIE
 	db 8, DEX_REDIBA
 	; nite
-	db 4, DEX_TRANSEL
-	db 6, DEX_KORATTA
+	db 4, DEX_METAPOD
+	db 6, DEX_RATTATA
 if DEF(GOLD)
 	db 6, DEX_CATERPIE
 else
 	db 5, DEX_HOHO
 endc
 	db 6, DEX_REDIBA
-	db 5, DEX_TRANSEL
+	db 5, DEX_METAPOD
 	db 5, DEX_PIKACHU
 
 	db -1 ; end
diff --git a/engine/dumps/bank02.asm b/engine/dumps/bank02.asm
index 17e2930..97590e4 100755
--- a/engine/dumps/bank02.asm
+++ b/engine/dumps/bank02.asm
@@ -745,10 +745,10 @@ Function8494:
 
 Function849b:
 	inc [hl]
-	ld hl, PippiSpriteGFX
+	ld hl, ClefairySpriteGFX
 	ld de, vChars0
 	ld b, $06
-	ld c, BANK(PippiSpriteGFX)
+	ld c, BANK(ClefairySpriteGFX)
 	jp Function8419
 
 Function84a9:
@@ -1180,13 +1180,13 @@ Function886a:
 	ret
 
 Function88b3:
-	ld de, PoppoSpriteGFX
+	ld de, PidgeySpriteGFX
 	ld hl, vChars0 + $80
-	lb bc, BANK(PoppoSpriteGFX), $04
+	lb bc, BANK(PidgeySpriteGFX), $04
 	call Request2bpp
-	ld de, PoppoSpriteGFX + $c0
+	ld de, PidgeySpriteGFX + $c0
 	ld hl, vChars0 + $c0
-	lb bc, BANK(PoppoSpriteGFX), $04
+	lb bc, BANK(PidgeySpriteGFX), $04
 	call Request2bpp
 	ld de, $0000
 	ld a, $41
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index 8a36294..9010cf7 100644
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -1158,5 +1158,5 @@ PlayerSpriteTable:
 	db PLAYER_NORMAL, SPRITE_GOLD
 	db PLAYER_BIKE,   SPRITE_GOLD_BIKE
 	db PLAYER_SKATE,  SPRITE_GOLD_SKATEBOARD
-	db PLAYER_SURF,   SPRITE_LAPLACE
+	db PLAYER_SURF,   SPRITE_LAPRAS
 	db -1
diff --git a/engine/sprites/sprites.asm b/engine/sprites/sprites.asm
index 9f9e4e5..1c97321 100644
--- a/engine/sprites/sprites.asm
+++ b/engine/sprites/sprites.asm
@@ -138,14 +138,14 @@ OverworldSprites::
 	overworld_sprite SailorSpriteGFX, 12
 	overworld_sprite HelmetSpriteGFX, 12
 	overworld_sprite BurglarSpriteGFX, 12
-	overworld_sprite SidonSpriteGFX, 12
-	overworld_sprite PippiSpriteGFX, 12
-	overworld_sprite PoppoSpriteGFX, 12
-	overworld_sprite LizardonSpriteGFX, 12
-	overworld_sprite KabigonSpriteGFX, 4
-	overworld_sprite PawouSpriteGFX, 12
-	overworld_sprite NyorobonSpriteGFX, 12
-	overworld_sprite LaplaceSpriteGFX, 12
+	overworld_sprite RhydonSpriteGFX, 12
+	overworld_sprite ClefairySpriteGFX, 12
+	overworld_sprite PidgeySpriteGFX, 12
+	overworld_sprite CharizardSpriteGFX, 12
+	overworld_sprite SnorlaxSpriteGFX, 4
+	overworld_sprite SeelSpriteGFX, 12
+	overworld_sprite PoliwrathSpriteGFX, 12
+	overworld_sprite LaprasSpriteGFX, 12
 	overworld_sprite PokeBallSpriteGFX, 4
 	overworld_sprite PokedexSpriteGFX, 4
 	overworld_sprite PaperSpriteGFX, 4
diff --git a/gfx/gfx.asm b/gfx/gfx.asm
index e0ed3ee..44e1c07 100644
--- a/gfx/gfx.asm
+++ b/gfx/gfx.asm
@@ -372,38 +372,38 @@ INCBIN "gfx/battle_anims/pointer.2bpp"
 INCBIN "gfx/battle_anims/attack_animations_2.2bpp"
 
 SECTION "gfx.asm@Pokemon Party Sprites", ROMX
-NyoromoIcon:: INCBIN "gfx/icons/nyoromo.2bpp"
-PurinIcon:: INCBIN "gfx/icons/purin.2bpp"
-DigdaIcon:: INCBIN "gfx/icons/digda.2bpp"
+PoliwagIcon:: INCBIN "gfx/icons/poliwag.2bpp"
+JigglypuffIcon:: INCBIN "gfx/icons/jigglypuff.2bpp"
+DiglettIcon:: INCBIN "gfx/icons/diglett.2bpp"
 PikachuIcon:: INCBIN "gfx/icons/pikachu.2bpp"
-HitodemanIcon:: INCBIN "gfx/icons/hitodeman.2bpp"
-KoikingIcon:: INCBIN "gfx/icons/koiking.2bpp"
-PoppoIcon:: INCBIN "gfx/icons/poppo.2bpp"
-SidonIcon:: INCBIN "gfx/icons/sidon.2bpp"
-PippiIcon:: INCBIN "gfx/icons/pippi.2bpp"
-NazonokusaIcon:: INCBIN "gfx/icons/nazonokusa.2bpp"
+StaryuIcon:: INCBIN "gfx/icons/staryu.2bpp"
+MagikarpIcon:: INCBIN "gfx/icons/magikarp.2bpp"
+PidgeyIcon:: INCBIN "gfx/icons/pidgey.2bpp"
+RhydonIcon:: INCBIN "gfx/icons/rhydon.2bpp"
+ClefairyIcon:: INCBIN "gfx/icons/clefairy.2bpp"
+OddishIcon:: INCBIN "gfx/icons/oddish.2bpp"
 MushiIcon:: INCBIN "gfx/icons/mushi.2bpp"
-GangarIcon:: INCBIN "gfx/icons/gangar.2bpp"
-LaplaceIcon:: INCBIN "gfx/icons/laplace.2bpp"
-BarrierdIcon:: INCBIN "gfx/icons/barrierd.2bpp"
+GengarIcon:: INCBIN "gfx/icons/gengar.2bpp"
+LaprasIcon:: INCBIN "gfx/icons/lapras.2bpp"
+MrMimeIcon:: INCBIN "gfx/icons/mrmime.2bpp"
 LokonIcon:: INCBIN "gfx/icons/lokon.2bpp"
-KentaurosIcon:: INCBIN "gfx/icons/kentauros.2bpp"
+TaurosIcon:: INCBIN "gfx/icons/tauros.2bpp"
 ShellderIcon:: INCBIN "gfx/icons/shellder.2bpp"
-MetamonIcon:: INCBIN "gfx/icons/metamon.2bpp"
-IwarkIcon:: INCBIN "gfx/icons/iwark.2bpp"
-BiriridamaIcon:: INCBIN "gfx/icons/biriridama.2bpp"
-ZenigameIcon:: INCBIN "gfx/icons/zenigame.2bpp"
-FushigidaneIcon:: INCBIN "gfx/icons/fushigidane.2bpp"
-HitokageIcon:: INCBIN "gfx/icons/hitokage.2bpp"
-BeedleIcon:: INCBIN "gfx/icons/beedle.2bpp"
+DittoIcon:: INCBIN "gfx/icons/ditto.2bpp"
+OnixIcon:: INCBIN "gfx/icons/onix.2bpp"
+VoltorbIcon:: INCBIN "gfx/icons/voltorb.2bpp"
+SquirtleIcon:: INCBIN "gfx/icons/squirtle.2bpp"
+BulbasaurIcon:: INCBIN "gfx/icons/bulbasaur.2bpp"
+CharmanderIcon:: INCBIN "gfx/icons/charmander.2bpp"
+WeedleIcon:: INCBIN "gfx/icons/weedle.2bpp"
 AnnonIcon:: INCBIN "gfx/icons/annon.2bpp"
-IsitsubuteIcon:: INCBIN "gfx/icons/isitsubute.2bpp"
-WanrikyIcon:: INCBIN "gfx/icons/wanriky.2bpp"
+GeodudeIcon:: INCBIN "gfx/icons/geodude.2bpp"
+MachopIcon:: INCBIN "gfx/icons/machop.2bpp"
 EggIcon:: INCBIN "gfx/icons/egg.2bpp"
-MenokurageIcon:: INCBIN "gfx/icons/menokurage.2bpp"
+TentacoolIcon:: INCBIN "gfx/icons/tentacool.2bpp"
 ButterfreeIcon:: INCBIN "gfx/icons/butterfree.2bpp"
 ZubatIcon:: INCBIN "gfx/icons/zubat.2bpp"
-KabigonIcon:: INCBIN "gfx/icons/kabigon.2bpp"
+SnorlaxIcon:: INCBIN "gfx/icons/snorlax.2bpp"
 
 SECTION "gfx.asm@Slot Machine GFX", ROMX
 SlotMachineGFX::
@@ -472,14 +472,14 @@ GymGuySpriteGFX:: INCBIN "gfx/sprites/gym_guy.2bpp"
 SailorSpriteGFX:: INCBIN "gfx/sprites/sailor.2bpp"
 HelmetSpriteGFX:: INCBIN "gfx/sprites/helmet.2bpp"
 BurglarSpriteGFX:: INCBIN "gfx/sprites/burglar.2bpp"
-SidonSpriteGFX:: INCBIN "gfx/sprites/sidon.2bpp"
-PippiSpriteGFX:: INCBIN "gfx/sprites/pippi.2bpp"
-PoppoSpriteGFX:: INCBIN "gfx/sprites/poppo.2bpp"
-LizardonSpriteGFX:: INCBIN "gfx/sprites/lizardon.2bpp"
-KabigonSpriteGFX:: INCBIN "gfx/sprites/kabigon.2bpp"
-PawouSpriteGFX:: INCBIN "gfx/sprites/pawou.2bpp"
-NyorobonSpriteGFX:: INCBIN "gfx/sprites/nyorobon.2bpp"
-LaplaceSpriteGFX:: INCBIN "gfx/sprites/laplace.2bpp"
+RhydonSpriteGFX:: INCBIN "gfx/sprites/rhydon.2bpp"
+ClefairySpriteGFX:: INCBIN "gfx/sprites/clefairy.2bpp"
+PidgeySpriteGFX:: INCBIN "gfx/sprites/pidgey.2bpp"
+CharizardSpriteGFX:: INCBIN "gfx/sprites/charizard.2bpp"
+SnorlaxSpriteGFX:: INCBIN "gfx/sprites/snorlax.2bpp"
+SeelSpriteGFX:: INCBIN "gfx/sprites/seel.2bpp"
+PoliwrathSpriteGFX:: INCBIN "gfx/sprites/poliwrath.2bpp"
+LaprasSpriteGFX:: INCBIN "gfx/sprites/lapras.2bpp"
 PokeBallSpriteGFX:: INCBIN "gfx/sprites/poke_ball.2bpp"
 PokedexSpriteGFX:: INCBIN "gfx/sprites/pokedex.2bpp"
 PaperSpriteGFX:: INCBIN "gfx/sprites/paper.2bpp"
@@ -554,20 +554,20 @@ IntroForestGFX::
 INCBIN "gfx/intro/forest.2bpp"
 
 SECTION "gfx.asm@Intro Mon", ROMX
-IntroPurinPikachuGFX::
-INCBIN "gfx/intro/purin_pikachu.2bpp"
-IntroLizardon1GFX::
-INCBIN "gfx/intro/lizardon_1.2bpp"
-IntroLizardon2GFX::
-INCBIN "gfx/intro/lizardon_2.2bpp"
-IntroLizardon3GFX::
-INCBIN "gfx/intro/lizardon_3.2bpp"
-IntroLizardonFlamesGFX::
-INCBIN "gfx/intro/lizardon_flames.2bpp"
-IntroKamexGFX::
-INCBIN "gfx/intro/kamex.2bpp"
-IntroFushigibanaGFX::
-INCBIN "gfx/intro/fushigibana.2bpp"
+IntroJigglypuffPikachuGFX::
+INCBIN "gfx/intro/jigglypuff_pikachu.2bpp"
+IntroCharizard1GFX::
+INCBIN "gfx/intro/charizard_1.2bpp"
+IntroCharizard2GFX::
+INCBIN "gfx/intro/charizard_2.2bpp"
+IntroCharizard3GFX::
+INCBIN "gfx/intro/charizard_3.2bpp"
+IntroCharizardFlamesGFX::
+INCBIN "gfx/intro/charizard_flames.2bpp"
+IntroBlastoiseGFX::
+INCBIN "gfx/intro/blastoise.2bpp"
+IntroVenusaurGFX::
+INCBIN "gfx/intro/venusaur.2bpp"
 
 SECTION "gfx.asm@Misc GFX", ROMX
 FontExtraGFX::
diff --git a/gfx/gfx.mk b/gfx/gfx.mk
index 05b940c..fe01521 100644
--- a/gfx/gfx.mk
+++ b/gfx/gfx.mk
@@ -15,7 +15,7 @@ $(BUILD)/gfx/trainer_gear/town_map.2bpp: tools/gfx += --trim-trailing
 $(BUILD)/gfx/minigames/slots.2bpp: tools/gfx += --trim-whitespace
 $(BUILD)/gfx/minigames/poker.2bpp: tools/gfx += --trim-whitespace
 
-$(BUILD)/gfx/intro/purin_pikachu.2bpp: tools/gfx += --trim-whitespace
+$(BUILD)/gfx/intro/jigglypuff_pikachu.2bpp: tools/gfx += --trim-whitespace
 
 $(BUILD)/gfx/battle_anims/attack_animations_1.2bpp: tools/gfx += --trim-whitespace
 $(BUILD)/gfx/battle_anims/attack_animations_2.2bpp: tools/gfx += --trim-whitespace
diff --git a/gfx/icons/fushigidane.png b/gfx/icons/bulbasaur.png
index 74cee15..74cee15 100644
--- a/gfx/icons/fushigidane.png
+++ b/gfx/icons/bulbasaur.png
diff --git a/gfx/icons/hitokage.png b/gfx/icons/charmander.png
index 3f83cba..3f83cba 100644
--- a/gfx/icons/hitokage.png
+++ b/gfx/icons/charmander.png
diff --git a/gfx/icons/pippi.png b/gfx/icons/clefairy.png
index bb8454b..bb8454b 100644
--- a/gfx/icons/pippi.png
+++ b/gfx/icons/clefairy.png
diff --git a/gfx/icons/digda.png b/gfx/icons/diglett.png
index 336c4b8..336c4b8 100644
--- a/gfx/icons/digda.png
+++ b/gfx/icons/diglett.png
diff --git a/gfx/icons/metamon.png b/gfx/icons/ditto.png
index a72faee..a72faee 100644
--- a/gfx/icons/metamon.png
+++ b/gfx/icons/ditto.png
diff --git a/gfx/icons/gangar.png b/gfx/icons/gengar.png
index 59c3e7f..59c3e7f 100644
--- a/gfx/icons/gangar.png
+++ b/gfx/icons/gengar.png
diff --git a/gfx/icons/isitsubute.png b/gfx/icons/geodude.png
index e8def42..e8def42 100644
--- a/gfx/icons/isitsubute.png
+++ b/gfx/icons/geodude.png
diff --git a/gfx/icons/purin.png b/gfx/icons/jigglypuff.png
index 63e226b..63e226b 100644
--- a/gfx/icons/purin.png
+++ b/gfx/icons/jigglypuff.png
diff --git a/gfx/icons/laplace.png b/gfx/icons/lapras.png
index 489fd85..489fd85 100644
--- a/gfx/icons/laplace.png
+++ b/gfx/icons/lapras.png
diff --git a/gfx/icons/wanriky.png b/gfx/icons/machop.png
index 21a8bde..21a8bde 100644
--- a/gfx/icons/wanriky.png
+++ b/gfx/icons/machop.png
diff --git a/gfx/icons/koiking.png b/gfx/icons/magikarp.png
index 3624402..3624402 100644
--- a/gfx/icons/koiking.png
+++ b/gfx/icons/magikarp.png
diff --git a/gfx/icons/barrierd.png b/gfx/icons/mrmime.png
index 54784f4..54784f4 100644
--- a/gfx/icons/barrierd.png
+++ b/gfx/icons/mrmime.png
diff --git a/gfx/icons/nazonokusa.png b/gfx/icons/oddish.png
index 7c36012..7c36012 100644
--- a/gfx/icons/nazonokusa.png
+++ b/gfx/icons/oddish.png
diff --git a/gfx/icons/iwark.png b/gfx/icons/onix.png
index 14e8c3a..14e8c3a 100644
--- a/gfx/icons/iwark.png
+++ b/gfx/icons/onix.png
diff --git a/gfx/icons/poppo.png b/gfx/icons/pidgey.png
index 7b025e6..7b025e6 100644
--- a/gfx/icons/poppo.png
+++ b/gfx/icons/pidgey.png
diff --git a/gfx/icons/nyoromo.png b/gfx/icons/poliwag.png
index 1de70d9..1de70d9 100644
--- a/gfx/icons/nyoromo.png
+++ b/gfx/icons/poliwag.png
diff --git a/gfx/icons/sidon.png b/gfx/icons/rhydon.png
index ac54c6f..ac54c6f 100644
--- a/gfx/icons/sidon.png
+++ b/gfx/icons/rhydon.png
diff --git a/gfx/icons/kabigon.png b/gfx/icons/snorlax.png
index f6d7e43..f6d7e43 100644
--- a/gfx/icons/kabigon.png
+++ b/gfx/icons/snorlax.png
diff --git a/gfx/icons/zenigame.png b/gfx/icons/squirtle.png
index 09a8e41..09a8e41 100644
--- a/gfx/icons/zenigame.png
+++ b/gfx/icons/squirtle.png
diff --git a/gfx/icons/hitodeman.png b/gfx/icons/staryu.png
index 97eef67..97eef67 100644
--- a/gfx/icons/hitodeman.png
+++ b/gfx/icons/staryu.png
diff --git a/gfx/icons/kentauros.png b/gfx/icons/tauros.png
index d76634c..d76634c 100644
--- a/gfx/icons/kentauros.png
+++ b/gfx/icons/tauros.png
diff --git a/gfx/icons/menokurage.png b/gfx/icons/tentacool.png
index 761bc3f..761bc3f 100644
--- a/gfx/icons/menokurage.png
+++ b/gfx/icons/tentacool.png
diff --git a/gfx/icons/biriridama.png b/gfx/icons/voltorb.png
index 8b30886..8b30886 100644
--- a/gfx/icons/biriridama.png
+++ b/gfx/icons/voltorb.png
diff --git a/gfx/icons/beedle.png b/gfx/icons/weedle.png
index bbaa3d6..bbaa3d6 100644
--- a/gfx/icons/beedle.png
+++ b/gfx/icons/weedle.png
diff --git a/gfx/intro/kamex.png b/gfx/intro/blastoise.png
index 255ca08..255ca08 100644
--- a/gfx/intro/kamex.png
+++ b/gfx/intro/blastoise.png
diff --git a/gfx/intro/lizardon_1.png b/gfx/intro/charizard_1.png
index 0aa062c..0aa062c 100644
--- a/gfx/intro/lizardon_1.png
+++ b/gfx/intro/charizard_1.png
diff --git a/gfx/intro/lizardon_2.png b/gfx/intro/charizard_2.png
index a3e7ff3..a3e7ff3 100644
--- a/gfx/intro/lizardon_2.png
+++ b/gfx/intro/charizard_2.png
diff --git a/gfx/intro/lizardon_3.png b/gfx/intro/charizard_3.png
index be9e22a..be9e22a 100644
--- a/gfx/intro/lizardon_3.png
+++ b/gfx/intro/charizard_3.png
diff --git a/gfx/intro/lizardon_flames.png b/gfx/intro/charizard_flames.png
index 2b99a62..2b99a62 100644
--- a/gfx/intro/lizardon_flames.png
+++ b/gfx/intro/charizard_flames.png
diff --git a/gfx/intro/purin_pikachu.png b/gfx/intro/jigglypuff_pikachu.png
index eab3c2d..eab3c2d 100644
--- a/gfx/intro/purin_pikachu.png
+++ b/gfx/intro/jigglypuff_pikachu.png
diff --git a/gfx/intro/fushigibana.png b/gfx/intro/venusaur.png
index 784a1c0..784a1c0 100644
--- a/gfx/intro/fushigibana.png
+++ b/gfx/intro/venusaur.png
diff --git a/gfx/pokemon/casey/back.png b/gfx/pokemon/abra/back.png
index 8e872cf..8e872cf 100644
--- a/gfx/pokemon/casey/back.png
+++ b/gfx/pokemon/abra/back.png
diff --git a/gfx/pokemon/casey/front.png b/gfx/pokemon/abra/front.png
index 12045ee..12045ee 100644
--- a/gfx/pokemon/casey/front.png
+++ b/gfx/pokemon/abra/front.png
diff --git a/gfx/pokemon/ptera/back.png b/gfx/pokemon/aerodactyl/back.png
index 8c51349..8c51349 100644
--- a/gfx/pokemon/ptera/back.png
+++ b/gfx/pokemon/aerodactyl/back.png
diff --git a/gfx/pokemon/ptera/front.png b/gfx/pokemon/aerodactyl/front.png
index 4cbfdee..4cbfdee 100644
--- a/gfx/pokemon/ptera/front.png
+++ b/gfx/pokemon/aerodactyl/front.png
diff --git a/gfx/pokemon/foodin/back.png b/gfx/pokemon/alakazam/back.png
index 1e31a7d..1e31a7d 100644
--- a/gfx/pokemon/foodin/back.png
+++ b/gfx/pokemon/alakazam/back.png
diff --git a/gfx/pokemon/foodin/front.png b/gfx/pokemon/alakazam/front.png
index 9c379b6..9c379b6 100644
--- a/gfx/pokemon/foodin/front.png
+++ b/gfx/pokemon/alakazam/front.png
diff --git a/gfx/pokemon/windie/back.png b/gfx/pokemon/arcanine/back.png
index b4aa719..b4aa719 100644
--- a/gfx/pokemon/windie/back.png
+++ b/gfx/pokemon/arcanine/back.png
diff --git a/gfx/pokemon/windie/front.png b/gfx/pokemon/arcanine/front.png
index a60bf37..a60bf37 100644
--- a/gfx/pokemon/windie/front.png
+++ b/gfx/pokemon/arcanine/front.png
diff --git a/gfx/pokemon/freezer/back.png b/gfx/pokemon/articuno/back.png
index a17f977..a17f977 100644
--- a/gfx/pokemon/freezer/back.png
+++ b/gfx/pokemon/articuno/back.png
diff --git a/gfx/pokemon/freezer/front.png b/gfx/pokemon/articuno/front.png
index 66986ad..66986ad 100644
--- a/gfx/pokemon/freezer/front.png
+++ b/gfx/pokemon/articuno/front.png
diff --git a/gfx/pokemon/spear/back.png b/gfx/pokemon/beedrill/back.png
index 60ac706..60ac706 100644
--- a/gfx/pokemon/spear/back.png
+++ b/gfx/pokemon/beedrill/back.png
diff --git a/gfx/pokemon/spear/front.png b/gfx/pokemon/beedrill/front.png
index 9a640d1..9a640d1 100644
--- a/gfx/pokemon/spear/front.png
+++ b/gfx/pokemon/beedrill/front.png
diff --git a/gfx/pokemon/madatsubomi/back.png b/gfx/pokemon/bellsprout/back.png
index d668f24..d668f24 100644
--- a/gfx/pokemon/madatsubomi/back.png
+++ b/gfx/pokemon/bellsprout/back.png
diff --git a/gfx/pokemon/madatsubomi/front.png b/gfx/pokemon/bellsprout/front.png
index 4099321..4099321 100644
--- a/gfx/pokemon/madatsubomi/front.png
+++ b/gfx/pokemon/bellsprout/front.png
diff --git a/gfx/pokemon/kamex/back.png b/gfx/pokemon/blastoise/back.png
index 087a374..087a374 100644
--- a/gfx/pokemon/kamex/back.png
+++ b/gfx/pokemon/blastoise/back.png
diff --git a/gfx/pokemon/kamex/front.png b/gfx/pokemon/blastoise/front.png
index 00480e7..00480e7 100644
--- a/gfx/pokemon/kamex/front.png
+++ b/gfx/pokemon/blastoise/front.png
diff --git a/gfx/pokemon/fushigidane/back.png b/gfx/pokemon/bulbasaur/back.png
index 4f1c96f..4f1c96f 100644
--- a/gfx/pokemon/fushigidane/back.png
+++ b/gfx/pokemon/bulbasaur/back.png
diff --git a/gfx/pokemon/fushigidane/front.png b/gfx/pokemon/bulbasaur/front.png
index 8eb7345..8eb7345 100644
--- a/gfx/pokemon/fushigidane/front.png
+++ b/gfx/pokemon/bulbasaur/front.png
diff --git a/gfx/pokemon/lucky/back.png b/gfx/pokemon/chansey/back.png
index 70702fa..70702fa 100644
--- a/gfx/pokemon/lucky/back.png
+++ b/gfx/pokemon/chansey/back.png
diff --git a/gfx/pokemon/lucky/front.png b/gfx/pokemon/chansey/front.png
index f676e4c..f676e4c 100644
--- a/gfx/pokemon/lucky/front.png
+++ b/gfx/pokemon/chansey/front.png
diff --git a/gfx/pokemon/lizardon/back.png b/gfx/pokemon/charizard/back.png
index 8201f50..8201f50 100644
--- a/gfx/pokemon/lizardon/back.png
+++ b/gfx/pokemon/charizard/back.png
diff --git a/gfx/pokemon/lizardon/front.png b/gfx/pokemon/charizard/front.png
index cc60d90..cc60d90 100644
--- a/gfx/pokemon/lizardon/front.png
+++ b/gfx/pokemon/charizard/front.png
diff --git a/gfx/pokemon/hitokage/back.png b/gfx/pokemon/charmander/back.png
index 218ad76..218ad76 100644
--- a/gfx/pokemon/hitokage/back.png
+++ b/gfx/pokemon/charmander/back.png
diff --git a/gfx/pokemon/hitokage/front.png b/gfx/pokemon/charmander/front.png
index 712ef16..712ef16 100644
--- a/gfx/pokemon/hitokage/front.png
+++ b/gfx/pokemon/charmander/front.png
diff --git a/gfx/pokemon/lizardo/back.png b/gfx/pokemon/charmeleon/back.png
index 7351704..7351704 100644
--- a/gfx/pokemon/lizardo/back.png
+++ b/gfx/pokemon/charmeleon/back.png
diff --git a/gfx/pokemon/lizardo/front.png b/gfx/pokemon/charmeleon/front.png
index 10a4a0d..10a4a0d 100644
--- a/gfx/pokemon/lizardo/front.png
+++ b/gfx/pokemon/charmeleon/front.png
diff --git a/gfx/pokemon/pixy/back.png b/gfx/pokemon/clefable/back.png
index 72f8840..72f8840 100644
--- a/gfx/pokemon/pixy/back.png
+++ b/gfx/pokemon/clefable/back.png
diff --git a/gfx/pokemon/pixy/front.png b/gfx/pokemon/clefable/front.png
index f9c6396..f9c6396 100644
--- a/gfx/pokemon/pixy/front.png
+++ b/gfx/pokemon/clefable/front.png
diff --git a/gfx/pokemon/pippi/back.png b/gfx/pokemon/clefairy/back.png
index b83889d..b83889d 100644
--- a/gfx/pokemon/pippi/back.png
+++ b/gfx/pokemon/clefairy/back.png
diff --git a/gfx/pokemon/pippi/front.png b/gfx/pokemon/clefairy/front.png
index cabeea7..cabeea7 100644
--- a/gfx/pokemon/pippi/front.png
+++ b/gfx/pokemon/clefairy/front.png
diff --git a/gfx/pokemon/parshen/back.png b/gfx/pokemon/cloyster/back.png
index 328be06..328be06 100644
--- a/gfx/pokemon/parshen/back.png
+++ b/gfx/pokemon/cloyster/back.png
diff --git a/gfx/pokemon/parshen/front.png b/gfx/pokemon/cloyster/front.png
index 2ae6546..2ae6546 100644
--- a/gfx/pokemon/parshen/front.png
+++ b/gfx/pokemon/cloyster/front.png
diff --git a/gfx/pokemon/karakara/back.png b/gfx/pokemon/cubone/back.png
index 7b8ce3d..7b8ce3d 100644
--- a/gfx/pokemon/karakara/back.png
+++ b/gfx/pokemon/cubone/back.png
diff --git a/gfx/pokemon/karakara/front.png b/gfx/pokemon/cubone/front.png
index 23e3a23..23e3a23 100644
--- a/gfx/pokemon/karakara/front.png
+++ b/gfx/pokemon/cubone/front.png
diff --git a/gfx/pokemon/jugon/back.png b/gfx/pokemon/dewgong/back.png
index a8ebfa1..a8ebfa1 100644
--- a/gfx/pokemon/jugon/back.png
+++ b/gfx/pokemon/dewgong/back.png
diff --git a/gfx/pokemon/jugon/front.png b/gfx/pokemon/dewgong/front.png
index 1acc0b9..1acc0b9 100644
--- a/gfx/pokemon/jugon/front.png
+++ b/gfx/pokemon/dewgong/front.png
diff --git a/gfx/pokemon/digda/back.png b/gfx/pokemon/diglett/back.png
index 2e32dde..2e32dde 100644
--- a/gfx/pokemon/digda/back.png
+++ b/gfx/pokemon/diglett/back.png
diff --git a/gfx/pokemon/digda/front.png b/gfx/pokemon/diglett/front.png
index 1339078..1339078 100644
--- a/gfx/pokemon/digda/front.png
+++ b/gfx/pokemon/diglett/front.png
diff --git a/gfx/pokemon/metamon/back.png b/gfx/pokemon/ditto/back.png
index 11d8a81..11d8a81 100644
--- a/gfx/pokemon/metamon/back.png
+++ b/gfx/pokemon/ditto/back.png
diff --git a/gfx/pokemon/metamon/front.png b/gfx/pokemon/ditto/front.png
index e2e944f..e2e944f 100644
--- a/gfx/pokemon/metamon/front.png
+++ b/gfx/pokemon/ditto/front.png
diff --git a/gfx/pokemon/dodorio/back.png b/gfx/pokemon/dodrio/back.png
index 0c91362..0c91362 100644
--- a/gfx/pokemon/dodorio/back.png
+++ b/gfx/pokemon/dodrio/back.png
diff --git a/gfx/pokemon/dodorio/front.png b/gfx/pokemon/dodrio/front.png
index 6404d4a..6404d4a 100644
--- a/gfx/pokemon/dodorio/front.png
+++ b/gfx/pokemon/dodrio/front.png
diff --git a/gfx/pokemon/dodo/back.png b/gfx/pokemon/doduo/back.png
index 926e521..926e521 100644
--- a/gfx/pokemon/dodo/back.png
+++ b/gfx/pokemon/doduo/back.png
diff --git a/gfx/pokemon/dodo/front.png b/gfx/pokemon/doduo/front.png
index 73a0b26..73a0b26 100644
--- a/gfx/pokemon/dodo/front.png
+++ b/gfx/pokemon/doduo/front.png
diff --git a/gfx/pokemon/hakuryu/back.png b/gfx/pokemon/dragonair/back.png
index 03a9d57..03a9d57 100644
--- a/gfx/pokemon/hakuryu/back.png
+++ b/gfx/pokemon/dragonair/back.png
diff --git a/gfx/pokemon/hakuryu/front.png b/gfx/pokemon/dragonair/front.png
index b8eaef6..b8eaef6 100644
--- a/gfx/pokemon/hakuryu/front.png
+++ b/gfx/pokemon/dragonair/front.png
diff --git a/gfx/pokemon/kairyu/back.png b/gfx/pokemon/dragonite/back.png
index fb93e2f..fb93e2f 100644
--- a/gfx/pokemon/kairyu/back.png
+++ b/gfx/pokemon/dragonite/back.png
diff --git a/gfx/pokemon/kairyu/front.png b/gfx/pokemon/dragonite/front.png
index a3edb82..a3edb82 100644
--- a/gfx/pokemon/kairyu/front.png
+++ b/gfx/pokemon/dragonite/front.png
diff --git a/gfx/pokemon/miniryu/back.png b/gfx/pokemon/dratini/back.png
index bdffa59..bdffa59 100644
--- a/gfx/pokemon/miniryu/back.png
+++ b/gfx/pokemon/dratini/back.png
diff --git a/gfx/pokemon/miniryu/front.png b/gfx/pokemon/dratini/front.png
index 1fcef94..1fcef94 100644
--- a/gfx/pokemon/miniryu/front.png
+++ b/gfx/pokemon/dratini/front.png
diff --git a/gfx/pokemon/sleepe/back.png b/gfx/pokemon/drowzee/back.png
index 0a0fafa..0a0fafa 100644
--- a/gfx/pokemon/sleepe/back.png
+++ b/gfx/pokemon/drowzee/back.png
diff --git a/gfx/pokemon/sleepe/front.png b/gfx/pokemon/drowzee/front.png
index cc85510..cc85510 100644
--- a/gfx/pokemon/sleepe/front.png
+++ b/gfx/pokemon/drowzee/front.png
diff --git a/gfx/pokemon/eievui/back.png b/gfx/pokemon/eevee/back.png
index 5fc5228..5fc5228 100644
--- a/gfx/pokemon/eievui/back.png
+++ b/gfx/pokemon/eevee/back.png
diff --git a/gfx/pokemon/eievui/front.png b/gfx/pokemon/eevee/front.png
index 38df0b0..38df0b0 100644
--- a/gfx/pokemon/eievui/front.png
+++ b/gfx/pokemon/eevee/front.png
diff --git a/gfx/pokemon/arbo/back.png b/gfx/pokemon/ekans/back.png
index 9175e22..9175e22 100644
--- a/gfx/pokemon/arbo/back.png
+++ b/gfx/pokemon/ekans/back.png
diff --git a/gfx/pokemon/arbo/front.png b/gfx/pokemon/ekans/front.png
index 48ceba3..48ceba3 100644
--- a/gfx/pokemon/arbo/front.png
+++ b/gfx/pokemon/ekans/front.png
diff --git a/gfx/pokemon/eleboo/back.png b/gfx/pokemon/electabuzz/back.png
index d6685e5..d6685e5 100644
--- a/gfx/pokemon/eleboo/back.png
+++ b/gfx/pokemon/electabuzz/back.png
diff --git a/gfx/pokemon/eleboo/front.png b/gfx/pokemon/electabuzz/front.png
index 0ddccbe..0ddccbe 100644
--- a/gfx/pokemon/eleboo/front.png
+++ b/gfx/pokemon/electabuzz/front.png
diff --git a/gfx/pokemon/marumine/back.png b/gfx/pokemon/electrode/back.png
index 90880ac..90880ac 100644
--- a/gfx/pokemon/marumine/back.png
+++ b/gfx/pokemon/electrode/back.png
diff --git a/gfx/pokemon/marumine/front.png b/gfx/pokemon/electrode/front.png
index 8df79e6..8df79e6 100644
--- a/gfx/pokemon/marumine/front.png
+++ b/gfx/pokemon/electrode/front.png
diff --git a/gfx/pokemon/tamatama/back.png b/gfx/pokemon/exeggcute/back.png
index 905fe76..905fe76 100644
--- a/gfx/pokemon/tamatama/back.png
+++ b/gfx/pokemon/exeggcute/back.png
diff --git a/gfx/pokemon/tamatama/front.png b/gfx/pokemon/exeggcute/front.png
index 0ddf8e3..0ddf8e3 100644
--- a/gfx/pokemon/tamatama/front.png
+++ b/gfx/pokemon/exeggcute/front.png
diff --git a/gfx/pokemon/nassy/back.png b/gfx/pokemon/exeggutor/back.png
index 01bb87d..01bb87d 100644
--- a/gfx/pokemon/nassy/back.png
+++ b/gfx/pokemon/exeggutor/back.png
diff --git a/gfx/pokemon/nassy/front.png b/gfx/pokemon/exeggutor/front.png
index 3e8d37c..3e8d37c 100644
--- a/gfx/pokemon/nassy/front.png
+++ b/gfx/pokemon/exeggutor/front.png
diff --git a/gfx/pokemon/kamonegi/back.png b/gfx/pokemon/farfetchd/back.png
index cca3371..cca3371 100644
--- a/gfx/pokemon/kamonegi/back.png
+++ b/gfx/pokemon/farfetchd/back.png
diff --git a/gfx/pokemon/kamonegi/front.png b/gfx/pokemon/farfetchd/front.png
index 9238f94..9238f94 100644
--- a/gfx/pokemon/kamonegi/front.png
+++ b/gfx/pokemon/farfetchd/front.png
diff --git a/gfx/pokemon/onidrill/back.png b/gfx/pokemon/fearow/back.png
index 3e0108b..3e0108b 100644
--- a/gfx/pokemon/onidrill/back.png
+++ b/gfx/pokemon/fearow/back.png
diff --git a/gfx/pokemon/onidrill/front.png b/gfx/pokemon/fearow/front.png
index c2c6525..c2c6525 100644
--- a/gfx/pokemon/onidrill/front.png
+++ b/gfx/pokemon/fearow/front.png
diff --git a/gfx/pokemon/booster/back.png b/gfx/pokemon/flareon/back.png
index 61c420a..61c420a 100644
--- a/gfx/pokemon/booster/back.png
+++ b/gfx/pokemon/flareon/back.png
diff --git a/gfx/pokemon/booster/front.png b/gfx/pokemon/flareon/front.png
index 2fb6526..2fb6526 100644
--- a/gfx/pokemon/booster/front.png
+++ b/gfx/pokemon/flareon/front.png
diff --git a/gfx/pokemon/ghos/back.png b/gfx/pokemon/gastly/back.png
index 6f36886..6f36886 100644
--- a/gfx/pokemon/ghos/back.png
+++ b/gfx/pokemon/gastly/back.png
diff --git a/gfx/pokemon/ghos/front.png b/gfx/pokemon/gastly/front.png
index 5afb2f0..5afb2f0 100644
--- a/gfx/pokemon/ghos/front.png
+++ b/gfx/pokemon/gastly/front.png
diff --git a/gfx/pokemon/gangar/back.png b/gfx/pokemon/gengar/back.png
index 0c467d0..0c467d0 100644
--- a/gfx/pokemon/gangar/back.png
+++ b/gfx/pokemon/gengar/back.png
diff --git a/gfx/pokemon/gangar/front.png b/gfx/pokemon/gengar/front.png
index 02a6b3f..02a6b3f 100644
--- a/gfx/pokemon/gangar/front.png
+++ b/gfx/pokemon/gengar/front.png
diff --git a/gfx/pokemon/isitsubute/back.png b/gfx/pokemon/geodude/back.png
index 1f6c711..1f6c711 100644
--- a/gfx/pokemon/isitsubute/back.png
+++ b/gfx/pokemon/geodude/back.png
diff --git a/gfx/pokemon/isitsubute/front.png b/gfx/pokemon/geodude/front.png
index 4202192..4202192 100644
--- a/gfx/pokemon/isitsubute/front.png
+++ b/gfx/pokemon/geodude/front.png
diff --git a/gfx/pokemon/kusaihana/back.png b/gfx/pokemon/gloom/back.png
index 046acb1..046acb1 100644
--- a/gfx/pokemon/kusaihana/back.png
+++ b/gfx/pokemon/gloom/back.png
diff --git a/gfx/pokemon/kusaihana/front.png b/gfx/pokemon/gloom/front.png
index 3d144b0..3d144b0 100644
--- a/gfx/pokemon/kusaihana/front.png
+++ b/gfx/pokemon/gloom/front.png
diff --git a/gfx/pokemon/tosakinto/back.png b/gfx/pokemon/goldeen/back.png
index 9b364b4..9b364b4 100644
--- a/gfx/pokemon/tosakinto/back.png
+++ b/gfx/pokemon/goldeen/back.png
diff --git a/gfx/pokemon/tosakinto/front.png b/gfx/pokemon/goldeen/front.png
index 155d1d9..155d1d9 100644
--- a/gfx/pokemon/tosakinto/front.png
+++ b/gfx/pokemon/goldeen/front.png
diff --git a/gfx/pokemon/golonya/back.png b/gfx/pokemon/golem/back.png
index 186af7e..186af7e 100644
--- a/gfx/pokemon/golonya/back.png
+++ b/gfx/pokemon/golem/back.png
diff --git a/gfx/pokemon/golonya/front.png b/gfx/pokemon/golem/front.png
index 9309da7..9309da7 100644
--- a/gfx/pokemon/golonya/front.png
+++ b/gfx/pokemon/golem/front.png
diff --git a/gfx/pokemon/golone/back.png b/gfx/pokemon/graveler/back.png
index 0af022c..0af022c 100644
--- a/gfx/pokemon/golone/back.png
+++ b/gfx/pokemon/graveler/back.png
diff --git a/gfx/pokemon/golone/front.png b/gfx/pokemon/graveler/front.png
index cdc8bc2..cdc8bc2 100644
--- a/gfx/pokemon/golone/front.png
+++ b/gfx/pokemon/graveler/front.png
diff --git a/gfx/pokemon/betbeter/back.png b/gfx/pokemon/grimer/back.png
index b0b35f8..b0b35f8 100644
--- a/gfx/pokemon/betbeter/back.png
+++ b/gfx/pokemon/grimer/back.png
diff --git a/gfx/pokemon/betbeter/front.png b/gfx/pokemon/grimer/front.png
index 57d4644..57d4644 100644
--- a/gfx/pokemon/betbeter/front.png
+++ b/gfx/pokemon/grimer/front.png
diff --git a/gfx/pokemon/gardie/back.png b/gfx/pokemon/growlithe/back.png
index 2b55504..2b55504 100644
--- a/gfx/pokemon/gardie/back.png
+++ b/gfx/pokemon/growlithe/back.png
diff --git a/gfx/pokemon/gardie/front.png b/gfx/pokemon/growlithe/front.png
index 4c94abd..4c94abd 100644
--- a/gfx/pokemon/gardie/front.png
+++ b/gfx/pokemon/growlithe/front.png
diff --git a/gfx/pokemon/ghost/back.png b/gfx/pokemon/haunter/back.png
index df7a51e..df7a51e 100644
--- a/gfx/pokemon/ghost/back.png
+++ b/gfx/pokemon/haunter/back.png
diff --git a/gfx/pokemon/ghost/front.png b/gfx/pokemon/haunter/front.png
index 3f824cb..3f824cb 100644
--- a/gfx/pokemon/ghost/front.png
+++ b/gfx/pokemon/haunter/front.png
diff --git a/gfx/pokemon/ebiwalar/back.png b/gfx/pokemon/hitmonchan/back.png
index 6910754..6910754 100644
--- a/gfx/pokemon/ebiwalar/back.png
+++ b/gfx/pokemon/hitmonchan/back.png
diff --git a/gfx/pokemon/ebiwalar/front.png b/gfx/pokemon/hitmonchan/front.png
index d8a6ffd..d8a6ffd 100644
--- a/gfx/pokemon/ebiwalar/front.png
+++ b/gfx/pokemon/hitmonchan/front.png
diff --git a/gfx/pokemon/sawamular/back.png b/gfx/pokemon/hitmonlee/back.png
index e66fac4..e66fac4 100644
--- a/gfx/pokemon/sawamular/back.png
+++ b/gfx/pokemon/hitmonlee/back.png
diff --git a/gfx/pokemon/sawamular/front.png b/gfx/pokemon/hitmonlee/front.png
index 36042c6..36042c6 100644
--- a/gfx/pokemon/sawamular/front.png
+++ b/gfx/pokemon/hitmonlee/front.png
diff --git a/gfx/pokemon/tattu/back.png b/gfx/pokemon/horsea/back.png
index 2b870fa..2b870fa 100644
--- a/gfx/pokemon/tattu/back.png
+++ b/gfx/pokemon/horsea/back.png
diff --git a/gfx/pokemon/tattu/front.png b/gfx/pokemon/horsea/front.png
index 3afa531..3afa531 100644
--- a/gfx/pokemon/tattu/front.png
+++ b/gfx/pokemon/horsea/front.png
diff --git a/gfx/pokemon/sleeper/back.png b/gfx/pokemon/hypno/back.png
index 8a6242f..8a6242f 100644
--- a/gfx/pokemon/sleeper/back.png
+++ b/gfx/pokemon/hypno/back.png
diff --git a/gfx/pokemon/sleeper/front.png b/gfx/pokemon/hypno/front.png
index 0344c19..0344c19 100644
--- a/gfx/pokemon/sleeper/front.png
+++ b/gfx/pokemon/hypno/front.png
diff --git a/gfx/pokemon/fushigisou/back.png b/gfx/pokemon/ivysaur/back.png
index b9492e1..b9492e1 100644
--- a/gfx/pokemon/fushigisou/back.png
+++ b/gfx/pokemon/ivysaur/back.png
diff --git a/gfx/pokemon/fushigisou/front.png b/gfx/pokemon/ivysaur/front.png
index ebf3a16..ebf3a16 100644
--- a/gfx/pokemon/fushigisou/front.png
+++ b/gfx/pokemon/ivysaur/front.png
diff --git a/gfx/pokemon/purin/back.png b/gfx/pokemon/jigglypuff/back.png
index 6314ace..6314ace 100644
--- a/gfx/pokemon/purin/back.png
+++ b/gfx/pokemon/jigglypuff/back.png
diff --git a/gfx/pokemon/purin/front.png b/gfx/pokemon/jigglypuff/front.png
index 27fa318..27fa318 100644
--- a/gfx/pokemon/purin/front.png
+++ b/gfx/pokemon/jigglypuff/front.png
diff --git a/gfx/pokemon/thunders/back.png b/gfx/pokemon/jolteon/back.png
index 591975f..591975f 100644
--- a/gfx/pokemon/thunders/back.png
+++ b/gfx/pokemon/jolteon/back.png
diff --git a/gfx/pokemon/thunders/front.png b/gfx/pokemon/jolteon/front.png
index e4e81ad..e4e81ad 100644
--- a/gfx/pokemon/thunders/front.png
+++ b/gfx/pokemon/jolteon/front.png
diff --git a/gfx/pokemon/rougela/back.png b/gfx/pokemon/jynx/back.png
index 32d1a56..32d1a56 100644
--- a/gfx/pokemon/rougela/back.png
+++ b/gfx/pokemon/jynx/back.png
diff --git a/gfx/pokemon/rougela/front.png b/gfx/pokemon/jynx/front.png
index 9a8c061..9a8c061 100644
--- a/gfx/pokemon/rougela/front.png
+++ b/gfx/pokemon/jynx/front.png
diff --git a/gfx/pokemon/yungerer/back.png b/gfx/pokemon/kadabra/back.png
index da6f89c..da6f89c 100644
--- a/gfx/pokemon/yungerer/back.png
+++ b/gfx/pokemon/kadabra/back.png
diff --git a/gfx/pokemon/yungerer/front.png b/gfx/pokemon/kadabra/front.png
index 3658944..3658944 100644
--- a/gfx/pokemon/yungerer/front.png
+++ b/gfx/pokemon/kadabra/front.png
diff --git a/gfx/pokemon/cocoon/back.png b/gfx/pokemon/kakuna/back.png
index 77738d4..77738d4 100644
--- a/gfx/pokemon/cocoon/back.png
+++ b/gfx/pokemon/kakuna/back.png
diff --git a/gfx/pokemon/cocoon/front.png b/gfx/pokemon/kakuna/front.png
index 4ba336d..4ba336d 100644
--- a/gfx/pokemon/cocoon/front.png
+++ b/gfx/pokemon/kakuna/front.png
diff --git a/gfx/pokemon/garura/back.png b/gfx/pokemon/kangaskhan/back.png
index 3a3a757..3a3a757 100644
--- a/gfx/pokemon/garura/back.png
+++ b/gfx/pokemon/kangaskhan/back.png
diff --git a/gfx/pokemon/garura/front.png b/gfx/pokemon/kangaskhan/front.png
index 1c0ba99..1c0ba99 100644
--- a/gfx/pokemon/garura/front.png
+++ b/gfx/pokemon/kangaskhan/front.png
diff --git a/gfx/pokemon/dogars/back.png b/gfx/pokemon/koffing/back.png
index 7d08ad2..7d08ad2 100644
--- a/gfx/pokemon/dogars/back.png
+++ b/gfx/pokemon/koffing/back.png
diff --git a/gfx/pokemon/dogars/front.png b/gfx/pokemon/koffing/front.png
index 2021abb..2021abb 100644
--- a/gfx/pokemon/dogars/front.png
+++ b/gfx/pokemon/koffing/front.png
diff --git a/gfx/pokemon/crab/back.png b/gfx/pokemon/krabby/back.png
index 3690410..3690410 100644
--- a/gfx/pokemon/crab/back.png
+++ b/gfx/pokemon/krabby/back.png
diff --git a/gfx/pokemon/crab/front.png b/gfx/pokemon/krabby/front.png
index b280e8d..b280e8d 100644
--- a/gfx/pokemon/crab/front.png
+++ b/gfx/pokemon/krabby/front.png
diff --git a/gfx/pokemon/laplace/back.png b/gfx/pokemon/lapras/back.png
index 5501efc..5501efc 100644
--- a/gfx/pokemon/laplace/back.png
+++ b/gfx/pokemon/lapras/back.png
diff --git a/gfx/pokemon/laplace/front.png b/gfx/pokemon/lapras/front.png
index 822c00e..822c00e 100644
--- a/gfx/pokemon/laplace/front.png
+++ b/gfx/pokemon/lapras/front.png
diff --git a/gfx/pokemon/beroringa/back.png b/gfx/pokemon/lickitung/back.png
index cb916df..cb916df 100644
--- a/gfx/pokemon/beroringa/back.png
+++ b/gfx/pokemon/lickitung/back.png
diff --git a/gfx/pokemon/beroringa/front.png b/gfx/pokemon/lickitung/front.png
index 4176577..4176577 100644
--- a/gfx/pokemon/beroringa/front.png
+++ b/gfx/pokemon/lickitung/front.png
diff --git a/gfx/pokemon/kairiky/back.png b/gfx/pokemon/machamp/back.png
index 6f64b7a..6f64b7a 100644
--- a/gfx/pokemon/kairiky/back.png
+++ b/gfx/pokemon/machamp/back.png
diff --git a/gfx/pokemon/kairiky/front.png b/gfx/pokemon/machamp/front.png
index c854a2c..c854a2c 100644
--- a/gfx/pokemon/kairiky/front.png
+++ b/gfx/pokemon/machamp/front.png
diff --git a/gfx/pokemon/goriky/back.png b/gfx/pokemon/machoke/back.png
index 62d77de..62d77de 100644
--- a/gfx/pokemon/goriky/back.png
+++ b/gfx/pokemon/machoke/back.png
diff --git a/gfx/pokemon/goriky/front.png b/gfx/pokemon/machoke/front.png
index 3f3db5e..3f3db5e 100644
--- a/gfx/pokemon/goriky/front.png
+++ b/gfx/pokemon/machoke/front.png
diff --git a/gfx/pokemon/wanriky/back.png b/gfx/pokemon/machop/back.png
index e8157dd..e8157dd 100644
--- a/gfx/pokemon/wanriky/back.png
+++ b/gfx/pokemon/machop/back.png
diff --git a/gfx/pokemon/wanriky/front.png b/gfx/pokemon/machop/front.png
index 18eac7a..18eac7a 100644
--- a/gfx/pokemon/wanriky/front.png
+++ b/gfx/pokemon/machop/front.png
diff --git a/gfx/pokemon/koiking/back.png b/gfx/pokemon/magikarp/back.png
index ae1ba54..ae1ba54 100644
--- a/gfx/pokemon/koiking/back.png
+++ b/gfx/pokemon/magikarp/back.png
diff --git a/gfx/pokemon/koiking/front.png b/gfx/pokemon/magikarp/front.png
index e71402f..e71402f 100644
--- a/gfx/pokemon/koiking/front.png
+++ b/gfx/pokemon/magikarp/front.png
diff --git a/gfx/pokemon/boober/back.png b/gfx/pokemon/magmar/back.png
index 7909354..7909354 100644
--- a/gfx/pokemon/boober/back.png
+++ b/gfx/pokemon/magmar/back.png
diff --git a/gfx/pokemon/boober/front.png b/gfx/pokemon/magmar/front.png
index 9bc1d92..9bc1d92 100644
--- a/gfx/pokemon/boober/front.png
+++ b/gfx/pokemon/magmar/front.png
diff --git a/gfx/pokemon/coil/back.png b/gfx/pokemon/magnemite/back.png
index 5da6f47..5da6f47 100644
--- a/gfx/pokemon/coil/back.png
+++ b/gfx/pokemon/magnemite/back.png
diff --git a/gfx/pokemon/coil/front.png b/gfx/pokemon/magnemite/front.png
index f2254be..f2254be 100644
--- a/gfx/pokemon/coil/front.png
+++ b/gfx/pokemon/magnemite/front.png
diff --git a/gfx/pokemon/rarecoil/back.png b/gfx/pokemon/magneton/back.png
index 28e5da9..28e5da9 100644
--- a/gfx/pokemon/rarecoil/back.png
+++ b/gfx/pokemon/magneton/back.png
diff --git a/gfx/pokemon/rarecoil/front.png b/gfx/pokemon/magneton/front.png
index 3d9c190..3d9c190 100644
--- a/gfx/pokemon/rarecoil/front.png
+++ b/gfx/pokemon/magneton/front.png
diff --git a/gfx/pokemon/garagara/back.png b/gfx/pokemon/marowak/back.png
index 4c7e62d..4c7e62d 100644
--- a/gfx/pokemon/garagara/back.png
+++ b/gfx/pokemon/marowak/back.png
diff --git a/gfx/pokemon/garagara/front.png b/gfx/pokemon/marowak/front.png
index b2d1843..b2d1843 100644
--- a/gfx/pokemon/garagara/front.png
+++ b/gfx/pokemon/marowak/front.png
diff --git a/gfx/pokemon/nyarth/back.png b/gfx/pokemon/meowth/back.png
index 1ccfe01..1ccfe01 100644
--- a/gfx/pokemon/nyarth/back.png
+++ b/gfx/pokemon/meowth/back.png
diff --git a/gfx/pokemon/nyarth/front.png b/gfx/pokemon/meowth/front.png
index e21b749..e21b749 100644
--- a/gfx/pokemon/nyarth/front.png
+++ b/gfx/pokemon/meowth/front.png
diff --git a/gfx/pokemon/transel/back.png b/gfx/pokemon/metapod/back.png
index aba701f..aba701f 100644
--- a/gfx/pokemon/transel/back.png
+++ b/gfx/pokemon/metapod/back.png
diff --git a/gfx/pokemon/transel/front.png b/gfx/pokemon/metapod/front.png
index 129dca0..129dca0 100644
--- a/gfx/pokemon/transel/front.png
+++ b/gfx/pokemon/metapod/front.png
diff --git a/gfx/pokemon/fire/back.png b/gfx/pokemon/moltres/back.png
index f3198a6..f3198a6 100644
--- a/gfx/pokemon/fire/back.png
+++ b/gfx/pokemon/moltres/back.png
diff --git a/gfx/pokemon/fire/front.png b/gfx/pokemon/moltres/front.png
index 7c15399..7c15399 100644
--- a/gfx/pokemon/fire/front.png
+++ b/gfx/pokemon/moltres/front.png
diff --git a/gfx/pokemon/barrierd/back.png b/gfx/pokemon/mrmime/back.png
index 1d55b96..1d55b96 100644
--- a/gfx/pokemon/barrierd/back.png
+++ b/gfx/pokemon/mrmime/back.png
diff --git a/gfx/pokemon/barrierd/front.png b/gfx/pokemon/mrmime/front.png
index d9085ec..d9085ec 100644
--- a/gfx/pokemon/barrierd/front.png
+++ b/gfx/pokemon/mrmime/front.png
diff --git a/gfx/pokemon/betbeton/back.png b/gfx/pokemon/muk/back.png
index f30d189..f30d189 100644
--- a/gfx/pokemon/betbeton/back.png
+++ b/gfx/pokemon/muk/back.png
diff --git a/gfx/pokemon/betbeton/front.png b/gfx/pokemon/muk/front.png
index 0f9b1d5..0f9b1d5 100644
--- a/gfx/pokemon/betbeton/front.png
+++ b/gfx/pokemon/muk/front.png
diff --git a/gfx/pokemon/kyukon/back.png b/gfx/pokemon/ninetales/back.png
index 9cc66f5..9cc66f5 100644
--- a/gfx/pokemon/kyukon/back.png
+++ b/gfx/pokemon/ninetales/back.png
diff --git a/gfx/pokemon/kyukon/front.png b/gfx/pokemon/ninetales/front.png
index 2c421cd..2c421cd 100644
--- a/gfx/pokemon/kyukon/front.png
+++ b/gfx/pokemon/ninetales/front.png
diff --git a/gfx/pokemon/nazonokusa/back.png b/gfx/pokemon/oddish/back.png
index 764874f..764874f 100644
--- a/gfx/pokemon/nazonokusa/back.png
+++ b/gfx/pokemon/oddish/back.png
diff --git a/gfx/pokemon/nazonokusa/front.png b/gfx/pokemon/oddish/front.png
index f4f2535..f4f2535 100644
--- a/gfx/pokemon/nazonokusa/front.png
+++ b/gfx/pokemon/oddish/front.png
diff --git a/gfx/pokemon/omnite/back.png b/gfx/pokemon/omanyte/back.png
index 39b2e33..39b2e33 100644
--- a/gfx/pokemon/omnite/back.png
+++ b/gfx/pokemon/omanyte/back.png
diff --git a/gfx/pokemon/omnite/front.png b/gfx/pokemon/omanyte/front.png
index bdfa544..bdfa544 100644
--- a/gfx/pokemon/omnite/front.png
+++ b/gfx/pokemon/omanyte/front.png
diff --git a/gfx/pokemon/omstar/back.png b/gfx/pokemon/omastar/back.png
index d70f0d0..d70f0d0 100644
--- a/gfx/pokemon/omstar/back.png
+++ b/gfx/pokemon/omastar/back.png
diff --git a/gfx/pokemon/omstar/front.png b/gfx/pokemon/omastar/front.png
index 3221d3d..3221d3d 100644
--- a/gfx/pokemon/omstar/front.png
+++ b/gfx/pokemon/omastar/front.png
diff --git a/gfx/pokemon/iwark/back.png b/gfx/pokemon/onix/back.png
index 9de5172..9de5172 100644
--- a/gfx/pokemon/iwark/back.png
+++ b/gfx/pokemon/onix/back.png
diff --git a/gfx/pokemon/iwark/front.png b/gfx/pokemon/onix/front.png
index 44a21a6..44a21a6 100644
--- a/gfx/pokemon/iwark/front.png
+++ b/gfx/pokemon/onix/front.png
diff --git a/gfx/pokemon/pigeot/back.png b/gfx/pokemon/pidgeot/back.png
index c11ce4f..c11ce4f 100644
--- a/gfx/pokemon/pigeot/back.png
+++ b/gfx/pokemon/pidgeot/back.png
diff --git a/gfx/pokemon/pigeot/front.png b/gfx/pokemon/pidgeot/front.png
index 7daf609..7daf609 100644
--- a/gfx/pokemon/pigeot/front.png
+++ b/gfx/pokemon/pidgeot/front.png
diff --git a/gfx/pokemon/pigeon/back.png b/gfx/pokemon/pidgeotto/back.png
index 5a614b1..5a614b1 100644
--- a/gfx/pokemon/pigeon/back.png
+++ b/gfx/pokemon/pidgeotto/back.png
diff --git a/gfx/pokemon/pigeon/front.png b/gfx/pokemon/pidgeotto/front.png
index c86b86f..c86b86f 100644
--- a/gfx/pokemon/pigeon/front.png
+++ b/gfx/pokemon/pidgeotto/front.png
diff --git a/gfx/pokemon/poppo/back.png b/gfx/pokemon/pidgey/back.png
index b833c79..b833c79 100644
--- a/gfx/pokemon/poppo/back.png
+++ b/gfx/pokemon/pidgey/back.png
diff --git a/gfx/pokemon/poppo/front.png b/gfx/pokemon/pidgey/front.png
index a4a917b..a4a917b 100644
--- a/gfx/pokemon/poppo/front.png
+++ b/gfx/pokemon/pidgey/front.png
diff --git a/gfx/pokemon/kailios/back.png b/gfx/pokemon/pinsir/back.png
index 226c68e..226c68e 100644
--- a/gfx/pokemon/kailios/back.png
+++ b/gfx/pokemon/pinsir/back.png
diff --git a/gfx/pokemon/kailios/front.png b/gfx/pokemon/pinsir/front.png
index 320c79c..320c79c 100644
--- a/gfx/pokemon/kailios/front.png
+++ b/gfx/pokemon/pinsir/front.png
diff --git a/gfx/pokemon/pkmn_pic_banks.inc b/gfx/pokemon/pkmn_pic_banks.inc
index dd0fc42..2969484 100644
--- a/gfx/pokemon/pkmn_pic_banks.inc
+++ b/gfx/pokemon/pkmn_pic_banks.inc
@@ -2,10 +2,10 @@ MonSpriteBankList::
 	; last mon in bank, bank #
 	db DEX_RAICHU,     BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 0
 	db DEX_DUGTRIO,    BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 1
-	db DEX_GOLONE,     BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 2
-	db DEX_CRAB,       BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 3
+	db DEX_GRAVELER,   BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 2
+	db DEX_KRABBY,     BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 3
 	db DEX_STARMIE,    BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 4
-	db DEX_FREEZER,    BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 5
+	db DEX_ARTICUNO,   BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 5
 	db DEX_JARANRA,    BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 6
 	db DEX_KOUNYA,     BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 7
 	db DEX_BOMBSEEKER, BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 8
diff --git a/gfx/pokemon/pkmn_pics.inc b/gfx/pokemon/pkmn_pics.inc
index 178b738..1dba21e 100644
--- a/gfx/pokemon/pkmn_pics.inc
+++ b/gfx/pokemon/pkmn_pics.inc
@@ -1,51 +1,51 @@
 SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 1", ROMX
 
-FushigidanePicFront:: INCBIN "gfx/pokemon/fushigidane/front.pic"
-FushigidanePicBack::  INCBIN "gfx/pokemon/fushigidane/back.pic"
-FushigisouPicFront::  INCBIN "gfx/pokemon/fushigisou/front.pic"
-FushigisouPicBack::   INCBIN "gfx/pokemon/fushigisou/back.pic"
-FushigibanaPicFront:: INCBIN "gfx/pokemon/fushigibana/front.pic"
-FushigibanaPicBack::  INCBIN "gfx/pokemon/fushigibana/back.pic"
-HitokagePicFront::    INCBIN "gfx/pokemon/hitokage/front.pic"
-HitokagePicBack::     INCBIN "gfx/pokemon/hitokage/back.pic"
-LizardoPicFront::     INCBIN "gfx/pokemon/lizardo/front.pic"
-LizardoPicBack::      INCBIN "gfx/pokemon/lizardo/back.pic"
-LizardonPicFront::    INCBIN "gfx/pokemon/lizardon/front.pic"
-LizardonPicBack::     INCBIN "gfx/pokemon/lizardon/back.pic"
-ZenigamePicFront::    INCBIN "gfx/pokemon/zenigame/front.pic"
-ZenigamePicBack::     INCBIN "gfx/pokemon/zenigame/back.pic"
-KameilPicFront::      INCBIN "gfx/pokemon/kameil/front.pic"
-KameilPicBack::       INCBIN "gfx/pokemon/kameil/back.pic"
-KamexPicFront::       INCBIN "gfx/pokemon/kamex/front.pic"
-KamexPicBack::        INCBIN "gfx/pokemon/kamex/back.pic"
+BulbasaurPicFront::   INCBIN "gfx/pokemon/bulbasaur/front.pic"
+BulbasaurPicBack::    INCBIN "gfx/pokemon/bulbasaur/back.pic"
+IvysaurPicFront::     INCBIN "gfx/pokemon/ivysaur/front.pic"
+IvysaurPicBack::      INCBIN "gfx/pokemon/ivysaur/back.pic"
+VenusaurPicFront::    INCBIN "gfx/pokemon/venusaur/front.pic"
+VenusaurPicBack::     INCBIN "gfx/pokemon/venusaur/back.pic"
+CharmanderPicFront::  INCBIN "gfx/pokemon/charmander/front.pic"
+CharmanderPicBack::   INCBIN "gfx/pokemon/charmander/back.pic"
+CharmeleonPicFront::  INCBIN "gfx/pokemon/charmeleon/front.pic"
+CharmeleonPicBack::   INCBIN "gfx/pokemon/charmeleon/back.pic"
+CharizardPicFront::   INCBIN "gfx/pokemon/charizard/front.pic"
+CharizardPicBack::    INCBIN "gfx/pokemon/charizard/back.pic"
+SquirtlePicFront::    INCBIN "gfx/pokemon/squirtle/front.pic"
+SquirtlePicBack::     INCBIN "gfx/pokemon/squirtle/back.pic"
+WartortlePicFront::   INCBIN "gfx/pokemon/wartortle/front.pic"
+WartortlePicBack::    INCBIN "gfx/pokemon/wartortle/back.pic"
+BlastoisePicFront::   INCBIN "gfx/pokemon/blastoise/front.pic"
+BlastoisePicBack::    INCBIN "gfx/pokemon/blastoise/back.pic"
 CaterpiePicFront::    INCBIN "gfx/pokemon/caterpie/front.pic"
 CaterpiePicBack::     INCBIN "gfx/pokemon/caterpie/back.pic"
-TranselPicFront::     INCBIN "gfx/pokemon/transel/front.pic"
-TranselPicBack::      INCBIN "gfx/pokemon/transel/back.pic"
+MetapodPicFront::     INCBIN "gfx/pokemon/metapod/front.pic"
+MetapodPicBack::      INCBIN "gfx/pokemon/metapod/back.pic"
 ButterfreePicFront::  INCBIN "gfx/pokemon/butterfree/front.pic"
 ButterfreePicBack::   INCBIN "gfx/pokemon/butterfree/back.pic"
-BeedlePicFront::      INCBIN "gfx/pokemon/beedle/front.pic"
-BeedlePicBack::       INCBIN "gfx/pokemon/beedle/back.pic"
-CocoonPicFront::      INCBIN "gfx/pokemon/cocoon/front.pic"
-CocoonPicBack::       INCBIN "gfx/pokemon/cocoon/back.pic"
-SpearPicFront::       INCBIN "gfx/pokemon/spear/front.pic"
-SpearPicBack::        INCBIN "gfx/pokemon/spear/back.pic"
-PoppoPicFront::       INCBIN "gfx/pokemon/poppo/front.pic"
-PoppoPicBack::        INCBIN "gfx/pokemon/poppo/back.pic"
-PigeonPicFront::      INCBIN "gfx/pokemon/pigeon/front.pic"
-PigeonPicBack::       INCBIN "gfx/pokemon/pigeon/back.pic"
-PigeotPicFront::      INCBIN "gfx/pokemon/pigeot/front.pic"
-PigeotPicBack::       INCBIN "gfx/pokemon/pigeot/back.pic"
-KorattaPicFront::     INCBIN "gfx/pokemon/koratta/front.pic"
-KorattaPicBack::      INCBIN "gfx/pokemon/koratta/back.pic"
-RattaPicFront::       INCBIN "gfx/pokemon/ratta/front.pic"
-RattaPicBack::        INCBIN "gfx/pokemon/ratta/back.pic"
-OnisuzumePicFront::   INCBIN "gfx/pokemon/onisuzume/front.pic"
-OnisuzumePicBack::    INCBIN "gfx/pokemon/onisuzume/back.pic"
-OnidrillPicFront::    INCBIN "gfx/pokemon/onidrill/front.pic"
-OnidrillPicBack::     INCBIN "gfx/pokemon/onidrill/back.pic"
-ArboPicFront::        INCBIN "gfx/pokemon/arbo/front.pic"
-ArboPicBack::         INCBIN "gfx/pokemon/arbo/back.pic"
+WeedlePicFront::      INCBIN "gfx/pokemon/weedle/front.pic"
+WeedlePicBack::       INCBIN "gfx/pokemon/weedle/back.pic"
+KakunaPicFront::      INCBIN "gfx/pokemon/kakuna/front.pic"
+KakunaPicBack::       INCBIN "gfx/pokemon/kakuna/back.pic"
+BeedrillPicFront::    INCBIN "gfx/pokemon/beedrill/front.pic"
+BeedrillPicBack::     INCBIN "gfx/pokemon/beedrill/back.pic"
+PidgeyPicFront::      INCBIN "gfx/pokemon/pidgey/front.pic"
+PidgeyPicBack::       INCBIN "gfx/pokemon/pidgey/back.pic"
+PidgeottoPicFront::   INCBIN "gfx/pokemon/pidgeotto/front.pic"
+PidgeottoPicBack::    INCBIN "gfx/pokemon/pidgeotto/back.pic"
+PidgeotPicFront::     INCBIN "gfx/pokemon/pidgeot/front.pic"
+PidgeotPicBack::      INCBIN "gfx/pokemon/pidgeot/back.pic"
+RattataPicFront::     INCBIN "gfx/pokemon/rattata/front.pic"
+RattataPicBack::      INCBIN "gfx/pokemon/rattata/back.pic"
+RaticatePicFront::    INCBIN "gfx/pokemon/raticate/front.pic"
+RaticatePicBack::     INCBIN "gfx/pokemon/raticate/back.pic"
+SpearowPicFront::     INCBIN "gfx/pokemon/spearow/front.pic"
+SpearowPicBack::      INCBIN "gfx/pokemon/spearow/back.pic"
+FearowPicFront::      INCBIN "gfx/pokemon/fearow/front.pic"
+FearowPicBack::       INCBIN "gfx/pokemon/fearow/back.pic"
+EkansPicFront::       INCBIN "gfx/pokemon/ekans/front.pic"
+EkansPicBack::        INCBIN "gfx/pokemon/ekans/back.pic"
 ArbokPicFront::       INCBIN "gfx/pokemon/arbok/front.pic"
 ArbokPicBack::        INCBIN "gfx/pokemon/arbok/back.pic"
 PikachuPicFront::     INCBIN "gfx/pokemon/pikachu/front.pic"
@@ -56,10 +56,10 @@ RaichuPicBack::       INCBIN "gfx/pokemon/raichu/back.pic"
 
 SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 2", ROMX
 
-SandPicFront::        INCBIN "gfx/pokemon/sand/front.pic"
-SandPicBack::         INCBIN "gfx/pokemon/sand/back.pic"
-SandpanPicFront::     INCBIN "gfx/pokemon/sandpan/front.pic"
-SandpanPicBack::      INCBIN "gfx/pokemon/sandpan/back.pic"
+SandshrewPicFront::   INCBIN "gfx/pokemon/sandshrew/front.pic"
+SandshrewPicBack::    INCBIN "gfx/pokemon/sandshrew/back.pic"
+SandslashPicFront::   INCBIN "gfx/pokemon/sandslash/front.pic"
+SandslashPicBack::    INCBIN "gfx/pokemon/sandslash/back.pic"
 Nidoran_FPicFront::   INCBIN "gfx/pokemon/nidoran_f/front.pic"
 Nidoran_FPicBack::    INCBIN "gfx/pokemon/nidoran_f/back.pic"
 NidorinaPicFront::    INCBIN "gfx/pokemon/nidorina/front.pic"
@@ -72,256 +72,256 @@ NidorinoPicFront::    INCBIN "gfx/pokemon/nidorino/front.pic"
 NidorinoPicBack::     INCBIN "gfx/pokemon/nidorino/back.pic"
 NidokingPicFront::    INCBIN "gfx/pokemon/nidoking/front.pic"
 NidokingPicBack::     INCBIN "gfx/pokemon/nidoking/back.pic"
-PippiPicFront::       INCBIN "gfx/pokemon/pippi/front.pic"
-PippiPicBack::        INCBIN "gfx/pokemon/pippi/back.pic"
-PixyPicFront::        INCBIN "gfx/pokemon/pixy/front.pic"
-PixyPicBack::         INCBIN "gfx/pokemon/pixy/back.pic"
-RokonPicFront::       INCBIN "gfx/pokemon/rokon/front.pic"
-RokonPicBack::        INCBIN "gfx/pokemon/rokon/back.pic"
-KyukonPicFront::      INCBIN "gfx/pokemon/kyukon/front.pic"
-KyukonPicBack::       INCBIN "gfx/pokemon/kyukon/back.pic"
-PurinPicFront::       INCBIN "gfx/pokemon/purin/front.pic"
-PurinPicBack::        INCBIN "gfx/pokemon/purin/back.pic"
-PukurinPicFront::     INCBIN "gfx/pokemon/pukurin/front.pic"
-PukurinPicBack::      INCBIN "gfx/pokemon/pukurin/back.pic"
+ClefairyPicFront::    INCBIN "gfx/pokemon/clefairy/front.pic"
+ClefairyPicBack::     INCBIN "gfx/pokemon/clefairy/back.pic"
+ClefablePicFront::    INCBIN "gfx/pokemon/clefable/front.pic"
+ClefablePicBack::     INCBIN "gfx/pokemon/clefable/back.pic"
+VulpixPicFront::      INCBIN "gfx/pokemon/vulpix/front.pic"
+VulpixPicBack::       INCBIN "gfx/pokemon/vulpix/back.pic"
+NinetalesPicFront::   INCBIN "gfx/pokemon/ninetales/front.pic"
+NinetalesPicBack::    INCBIN "gfx/pokemon/ninetales/back.pic"
+JigglypuffPicFront::  INCBIN "gfx/pokemon/jigglypuff/front.pic"
+JigglypuffPicBack::   INCBIN "gfx/pokemon/jigglypuff/back.pic"
+WigglytuffPicFront::  INCBIN "gfx/pokemon/wigglytuff/front.pic"
+WigglytuffPicBack::   INCBIN "gfx/pokemon/wigglytuff/back.pic"
 ZubatPicFront::       INCBIN "gfx/pokemon/zubat/front.pic"
 ZubatPicBack::        INCBIN "gfx/pokemon/zubat/back.pic"
 GolbatPicFront::      INCBIN "gfx/pokemon/golbat/front.pic"
 GolbatPicBack::       INCBIN "gfx/pokemon/golbat/back.pic"
-NazonokusaPicFront::  INCBIN "gfx/pokemon/nazonokusa/front.pic"
-NazonokusaPicBack::   INCBIN "gfx/pokemon/nazonokusa/back.pic"
-KusaihanaPicFront::   INCBIN "gfx/pokemon/kusaihana/front.pic"
-KusaihanaPicBack::    INCBIN "gfx/pokemon/kusaihana/back.pic"
-RuffresiaPicFront::   INCBIN "gfx/pokemon/ruffresia/front.pic"
-RuffresiaPicBack::    INCBIN "gfx/pokemon/ruffresia/back.pic"
+OddishPicFront::      INCBIN "gfx/pokemon/oddish/front.pic"
+OddishPicBack::       INCBIN "gfx/pokemon/oddish/back.pic"
+GloomPicFront::       INCBIN "gfx/pokemon/gloom/front.pic"
+GloomPicBack::        INCBIN "gfx/pokemon/gloom/back.pic"
+VileplumePicFront::   INCBIN "gfx/pokemon/vileplume/front.pic"
+VileplumePicBack::    INCBIN "gfx/pokemon/vileplume/back.pic"
 ParasPicFront::       INCBIN "gfx/pokemon/paras/front.pic"
 ParasPicBack::        INCBIN "gfx/pokemon/paras/back.pic"
 ParasectPicFront::    INCBIN "gfx/pokemon/parasect/front.pic"
 ParasectPicBack::     INCBIN "gfx/pokemon/parasect/back.pic"
-KongpangPicFront::    INCBIN "gfx/pokemon/kongpang/front.pic"
-KongpangPicBack::     INCBIN "gfx/pokemon/kongpang/back.pic"
-MorphonPicFront::     INCBIN "gfx/pokemon/morphon/front.pic"
-MorphonPicBack::      INCBIN "gfx/pokemon/morphon/back.pic"
-DigdaPicFront::       INCBIN "gfx/pokemon/digda/front.pic"
-DigdaPicBack::        INCBIN "gfx/pokemon/digda/back.pic"
+VenonatPicFront::     INCBIN "gfx/pokemon/venonat/front.pic"
+VenonatPicBack::      INCBIN "gfx/pokemon/venonat/back.pic"
+VenomothPicFront::    INCBIN "gfx/pokemon/venomoth/front.pic"
+VenomothPicBack::     INCBIN "gfx/pokemon/venomoth/back.pic"
+DiglettPicFront::     INCBIN "gfx/pokemon/diglett/front.pic"
+DiglettPicBack::      INCBIN "gfx/pokemon/diglett/back.pic"
 DugtrioPicFront::     INCBIN "gfx/pokemon/dugtrio/front.pic"
 DugtrioPicBack::      INCBIN "gfx/pokemon/dugtrio/back.pic"
 
 
 SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 3", ROMX
 
-NyarthPicFront::      INCBIN "gfx/pokemon/nyarth/front.pic"
-NyarthPicBack::       INCBIN "gfx/pokemon/nyarth/back.pic"
+MeowthPicFront::      INCBIN "gfx/pokemon/meowth/front.pic"
+MeowthPicBack::       INCBIN "gfx/pokemon/meowth/back.pic"
 PersianPicFront::     INCBIN "gfx/pokemon/persian/front.pic"
 PersianPicBack::      INCBIN "gfx/pokemon/persian/back.pic"
-KoduckPicFront::      INCBIN "gfx/pokemon/koduck/front.pic"
-KoduckPicBack::       INCBIN "gfx/pokemon/koduck/back.pic"
+PsyduckPicFront::     INCBIN "gfx/pokemon/psyduck/front.pic"
+PsyduckPicBack::      INCBIN "gfx/pokemon/psyduck/back.pic"
 GolduckPicFront::     INCBIN "gfx/pokemon/golduck/front.pic"
 GolduckPicBack::      INCBIN "gfx/pokemon/golduck/back.pic"
 MankeyPicFront::      INCBIN "gfx/pokemon/mankey/front.pic"
 MankeyPicBack::       INCBIN "gfx/pokemon/mankey/back.pic"
-OkorizaruPicFront::   INCBIN "gfx/pokemon/okorizaru/front.pic"
-OkorizaruPicBack::    INCBIN "gfx/pokemon/okorizaru/back.pic"
-GardiePicFront::      INCBIN "gfx/pokemon/gardie/front.pic"
-GardiePicBack::       INCBIN "gfx/pokemon/gardie/back.pic"
-WindiePicFront::      INCBIN "gfx/pokemon/windie/front.pic"
-WindiePicBack::       INCBIN "gfx/pokemon/windie/back.pic"
-NyoromoPicFront::     INCBIN "gfx/pokemon/nyoromo/front.pic"
-NyoromoPicBack::      INCBIN "gfx/pokemon/nyoromo/back.pic"
-NyorozoPicFront::     INCBIN "gfx/pokemon/nyorozo/front.pic"
-NyorozoPicBack::      INCBIN "gfx/pokemon/nyorozo/back.pic"
-NyorobonPicFront::    INCBIN "gfx/pokemon/nyorobon/front.pic"
-NyorobonPicBack::     INCBIN "gfx/pokemon/nyorobon/back.pic"
-CaseyPicFront::       INCBIN "gfx/pokemon/casey/front.pic"
-CaseyPicBack::        INCBIN "gfx/pokemon/casey/back.pic"
-YungererPicFront::    INCBIN "gfx/pokemon/yungerer/front.pic"
-YungererPicBack::     INCBIN "gfx/pokemon/yungerer/back.pic"
-FoodinPicFront::      INCBIN "gfx/pokemon/foodin/front.pic"
-FoodinPicBack::       INCBIN "gfx/pokemon/foodin/back.pic"
-WanrikyPicFront::     INCBIN "gfx/pokemon/wanriky/front.pic"
-WanrikyPicBack::      INCBIN "gfx/pokemon/wanriky/back.pic"
-GorikyPicFront::      INCBIN "gfx/pokemon/goriky/front.pic"
-GorikyPicBack::       INCBIN "gfx/pokemon/goriky/back.pic"
-KairikyPicFront::     INCBIN "gfx/pokemon/kairiky/front.pic"
-KairikyPicBack::      INCBIN "gfx/pokemon/kairiky/back.pic"
-MadatsubomiPicFront:: INCBIN "gfx/pokemon/madatsubomi/front.pic"
-MadatsubomiPicBack::  INCBIN "gfx/pokemon/madatsubomi/back.pic"
-UtsudonPicFront::     INCBIN "gfx/pokemon/utsudon/front.pic"
-UtsudonPicBack::      INCBIN "gfx/pokemon/utsudon/back.pic"
-UtsubotPicFront::     INCBIN "gfx/pokemon/utsubot/front.pic"
-UtsubotPicBack::      INCBIN "gfx/pokemon/utsubot/back.pic"
-MenokuragePicFront::  INCBIN "gfx/pokemon/menokurage/front.pic"
-MenokuragePicBack::   INCBIN "gfx/pokemon/menokurage/back.pic"
-DokukuragePicFront::  INCBIN "gfx/pokemon/dokukurage/front.pic"
-DokukuragePicBack::   INCBIN "gfx/pokemon/dokukurage/back.pic"
-IsitsubutePicFront::  INCBIN "gfx/pokemon/isitsubute/front.pic"
-IsitsubutePicBack::   INCBIN "gfx/pokemon/isitsubute/back.pic"
-GolonePicFront::      INCBIN "gfx/pokemon/golone/front.pic"
-GolonePicBack::       INCBIN "gfx/pokemon/golone/back.pic"
+PrimeapePicFront::    INCBIN "gfx/pokemon/primeape/front.pic"
+PrimeapePicBack::     INCBIN "gfx/pokemon/primeape/back.pic"
+GrowlithePicFront::   INCBIN "gfx/pokemon/growlithe/front.pic"
+GrowlithePicBack::    INCBIN "gfx/pokemon/growlithe/back.pic"
+ArcaninePicFront::    INCBIN "gfx/pokemon/arcanine/front.pic"
+ArcaninePicBack::     INCBIN "gfx/pokemon/arcanine/back.pic"
+PoliwagPicFront::     INCBIN "gfx/pokemon/poliwag/front.pic"
+PoliwagPicBack::      INCBIN "gfx/pokemon/poliwag/back.pic"
+PoliwhirlPicFront::   INCBIN "gfx/pokemon/poliwhirl/front.pic"
+PoliwhirlPicBack::    INCBIN "gfx/pokemon/poliwhirl/back.pic"
+PoliwrathPicFront::   INCBIN "gfx/pokemon/poliwrath/front.pic"
+PoliwrathPicBack::    INCBIN "gfx/pokemon/poliwrath/back.pic"
+AbraPicFront::        INCBIN "gfx/pokemon/abra/front.pic"
+AbraPicBack::         INCBIN "gfx/pokemon/abra/back.pic"
+KadabraPicFront::     INCBIN "gfx/pokemon/kadabra/front.pic"
+KadabraPicBack::      INCBIN "gfx/pokemon/kadabra/back.pic"
+AlakazamPicFront::    INCBIN "gfx/pokemon/alakazam/front.pic"
+AlakazamPicBack::     INCBIN "gfx/pokemon/alakazam/back.pic"
+MachopPicFront::      INCBIN "gfx/pokemon/machop/front.pic"
+MachopPicBack::       INCBIN "gfx/pokemon/machop/back.pic"
+MachokePicFront::     INCBIN "gfx/pokemon/machoke/front.pic"
+MachokePicBack::      INCBIN "gfx/pokemon/machoke/back.pic"
+MachampPicFront::     INCBIN "gfx/pokemon/machamp/front.pic"
+MachampPicBack::      INCBIN "gfx/pokemon/machamp/back.pic"
+BellsproutPicFront::  INCBIN "gfx/pokemon/bellsprout/front.pic"
+BellsproutPicBack::   INCBIN "gfx/pokemon/bellsprout/back.pic"
+WeepinbellPicFront::  INCBIN "gfx/pokemon/weepinbell/front.pic"
+WeepinbellPicBack::   INCBIN "gfx/pokemon/weepinbell/back.pic"
+VictreebelPicFront::  INCBIN "gfx/pokemon/victreebel/front.pic"
+VictreebelPicBack::   INCBIN "gfx/pokemon/victreebel/back.pic"
+TentacoolPicFront::   INCBIN "gfx/pokemon/tentacool/front.pic"
+TentacoolPicBack::    INCBIN "gfx/pokemon/tentacool/back.pic"
+TentacruelPicFront::  INCBIN "gfx/pokemon/tentacruel/front.pic"
+TentacruelPicBack::   INCBIN "gfx/pokemon/tentacruel/back.pic"
+GeodudePicFront::     INCBIN "gfx/pokemon/geodude/front.pic"
+GeodudePicBack::      INCBIN "gfx/pokemon/geodude/back.pic"
+GravelerPicFront::    INCBIN "gfx/pokemon/graveler/front.pic"
+GravelerPicBack::     INCBIN "gfx/pokemon/graveler/back.pic"
 
 
 SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 4", ROMX
 
-GolonyaPicFront::     INCBIN "gfx/pokemon/golonya/front.pic"
-GolonyaPicBack::      INCBIN "gfx/pokemon/golonya/back.pic"
+GolemPicFront::       INCBIN "gfx/pokemon/golem/front.pic"
+GolemPicBack::        INCBIN "gfx/pokemon/golem/back.pic"
 PonytaPicFront::      INCBIN "gfx/pokemon/ponyta/front.pic"
 PonytaPicBack::       INCBIN "gfx/pokemon/ponyta/back.pic"
-GallopPicFront::      INCBIN "gfx/pokemon/gallop/front.pic"
-GallopPicBack::       INCBIN "gfx/pokemon/gallop/back.pic"
-YadonPicFront::       INCBIN "gfx/pokemon/yadon/front.pic"
-YadonPicBack::        INCBIN "gfx/pokemon/yadon/back.pic"
-YadoranPicFront::     INCBIN "gfx/pokemon/yadoran/front.pic"
-YadoranPicBack::      INCBIN "gfx/pokemon/yadoran/back.pic"
-CoilPicFront::        INCBIN "gfx/pokemon/coil/front.pic"
-CoilPicBack::         INCBIN "gfx/pokemon/coil/back.pic"
-RarecoilPicFront::    INCBIN "gfx/pokemon/rarecoil/front.pic"
-RarecoilPicBack::     INCBIN "gfx/pokemon/rarecoil/back.pic"
-KamonegiPicFront::    INCBIN "gfx/pokemon/kamonegi/front.pic"
-KamonegiPicBack::     INCBIN "gfx/pokemon/kamonegi/back.pic"
-DodoPicFront::        INCBIN "gfx/pokemon/dodo/front.pic"
-DodoPicBack::         INCBIN "gfx/pokemon/dodo/back.pic"
-DodorioPicFront::     INCBIN "gfx/pokemon/dodorio/front.pic"
-DodorioPicBack::      INCBIN "gfx/pokemon/dodorio/back.pic"
-PawouPicFront::       INCBIN "gfx/pokemon/pawou/front.pic"
-PawouPicBack::        INCBIN "gfx/pokemon/pawou/back.pic"
-JugonPicFront::       INCBIN "gfx/pokemon/jugon/front.pic"
-JugonPicBack::        INCBIN "gfx/pokemon/jugon/back.pic"
-BetbeterPicFront::    INCBIN "gfx/pokemon/betbeter/front.pic"
-BetbeterPicBack::     INCBIN "gfx/pokemon/betbeter/back.pic"
-BetbetonPicFront::    INCBIN "gfx/pokemon/betbeton/front.pic"
-BetbetonPicBack::     INCBIN "gfx/pokemon/betbeton/back.pic"
+RapidashPicFront::    INCBIN "gfx/pokemon/rapidash/front.pic"
+RapidashPicBack::     INCBIN "gfx/pokemon/rapidash/back.pic"
+SlowpokePicFront::    INCBIN "gfx/pokemon/slowpoke/front.pic"
+SlowpokePicBack::     INCBIN "gfx/pokemon/slowpoke/back.pic"
+SlowbroPicFront::     INCBIN "gfx/pokemon/slowbro/front.pic"
+SlowbroPicBack::      INCBIN "gfx/pokemon/slowbro/back.pic"
+MagnemitePicFront::   INCBIN "gfx/pokemon/magnemite/front.pic"
+MagnemitePicBack::    INCBIN "gfx/pokemon/magnemite/back.pic"
+MagnetonPicFront::    INCBIN "gfx/pokemon/magneton/front.pic"
+MagnetonPicBack::     INCBIN "gfx/pokemon/magneton/back.pic"
+FarfetchdPicFront::   INCBIN "gfx/pokemon/farfetchd/front.pic"
+FarfetchdPicBack::    INCBIN "gfx/pokemon/farfetchd/back.pic"
+DoduoPicFront::       INCBIN "gfx/pokemon/doduo/front.pic"
+DoduoPicBack::        INCBIN "gfx/pokemon/doduo/back.pic"
+DodrioPicFront::      INCBIN "gfx/pokemon/dodrio/front.pic"
+DodrioPicBack::       INCBIN "gfx/pokemon/dodrio/back.pic"
+SeelPicFront::        INCBIN "gfx/pokemon/seel/front.pic"
+SeelPicBack::         INCBIN "gfx/pokemon/seel/back.pic"
+DewgongPicFront::     INCBIN "gfx/pokemon/dewgong/front.pic"
+DewgongPicBack::      INCBIN "gfx/pokemon/dewgong/back.pic"
+GrimerPicFront::      INCBIN "gfx/pokemon/grimer/front.pic"
+GrimerPicBack::       INCBIN "gfx/pokemon/grimer/back.pic"
+MukPicFront::         INCBIN "gfx/pokemon/muk/front.pic"
+MukPicBack::          INCBIN "gfx/pokemon/muk/back.pic"
 ShellderPicFront::    INCBIN "gfx/pokemon/shellder/front.pic"
 ShellderPicBack::     INCBIN "gfx/pokemon/shellder/back.pic"
-ParshenPicFront::     INCBIN "gfx/pokemon/parshen/front.pic"
-ParshenPicBack::      INCBIN "gfx/pokemon/parshen/back.pic"
-GhosPicFront::        INCBIN "gfx/pokemon/ghos/front.pic"
-GhosPicBack::         INCBIN "gfx/pokemon/ghos/back.pic"
-GhostPicFront::       INCBIN "gfx/pokemon/ghost/front.pic"
-GhostPicBack::        INCBIN "gfx/pokemon/ghost/back.pic"
-GangarPicFront::      INCBIN "gfx/pokemon/gangar/front.pic"
-GangarPicBack::       INCBIN "gfx/pokemon/gangar/back.pic"
-IwarkPicFront::       INCBIN "gfx/pokemon/iwark/front.pic"
-IwarkPicBack::        INCBIN "gfx/pokemon/iwark/back.pic"
-SleepePicFront::      INCBIN "gfx/pokemon/sleepe/front.pic"
-SleepePicBack::       INCBIN "gfx/pokemon/sleepe/back.pic"
-SleeperPicFront::     INCBIN "gfx/pokemon/sleeper/front.pic"
-SleeperPicBack::      INCBIN "gfx/pokemon/sleeper/back.pic"
-CrabPicFront::        INCBIN "gfx/pokemon/crab/front.pic"
-CrabPicBack::         INCBIN "gfx/pokemon/crab/back.pic"
+CloysterPicFront::    INCBIN "gfx/pokemon/cloyster/front.pic"
+CloysterPicBack::     INCBIN "gfx/pokemon/cloyster/back.pic"
+GastlyPicFront::      INCBIN "gfx/pokemon/gastly/front.pic"
+GastlyPicBack::       INCBIN "gfx/pokemon/gastly/back.pic"
+HaunterPicFront::     INCBIN "gfx/pokemon/haunter/front.pic"
+HaunterPicBack::      INCBIN "gfx/pokemon/haunter/back.pic"
+GengarPicFront::      INCBIN "gfx/pokemon/gengar/front.pic"
+GengarPicBack::       INCBIN "gfx/pokemon/gengar/back.pic"
+OnixPicFront::        INCBIN "gfx/pokemon/onix/front.pic"
+OnixPicBack::         INCBIN "gfx/pokemon/onix/back.pic"
+DrowzeePicFront::     INCBIN "gfx/pokemon/drowzee/front.pic"
+DrowzeePicBack::      INCBIN "gfx/pokemon/drowzee/back.pic"
+HypnoPicFront::       INCBIN "gfx/pokemon/hypno/front.pic"
+HypnoPicBack::        INCBIN "gfx/pokemon/hypno/back.pic"
+KrabbyPicFront::      INCBIN "gfx/pokemon/krabby/front.pic"
+KrabbyPicBack::       INCBIN "gfx/pokemon/krabby/back.pic"
 
 
 SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 5", ROMX
 
 KinglerPicFront::     INCBIN "gfx/pokemon/kingler/front.pic"
 KinglerPicBack::      INCBIN "gfx/pokemon/kingler/back.pic"
-BiriridamaPicFront::  INCBIN "gfx/pokemon/biriridama/front.pic"
-BiriridamaPicBack::   INCBIN "gfx/pokemon/biriridama/back.pic"
-MaruminePicFront::    INCBIN "gfx/pokemon/marumine/front.pic"
-MaruminePicBack::     INCBIN "gfx/pokemon/marumine/back.pic"
-TamatamaPicFront::    INCBIN "gfx/pokemon/tamatama/front.pic"
-TamatamaPicBack::     INCBIN "gfx/pokemon/tamatama/back.pic"
-NassyPicFront::       INCBIN "gfx/pokemon/nassy/front.pic"
-NassyPicBack::        INCBIN "gfx/pokemon/nassy/back.pic"
-KarakaraPicFront::    INCBIN "gfx/pokemon/karakara/front.pic"
-KarakaraPicBack::     INCBIN "gfx/pokemon/karakara/back.pic"
-GaragaraPicFront::    INCBIN "gfx/pokemon/garagara/front.pic"
-GaragaraPicBack::     INCBIN "gfx/pokemon/garagara/back.pic"
-SawamularPicFront::   INCBIN "gfx/pokemon/sawamular/front.pic"
-SawamularPicBack::    INCBIN "gfx/pokemon/sawamular/back.pic"
-EbiwalarPicFront::    INCBIN "gfx/pokemon/ebiwalar/front.pic"
-EbiwalarPicBack::     INCBIN "gfx/pokemon/ebiwalar/back.pic"
-BeroringaPicFront::   INCBIN "gfx/pokemon/beroringa/front.pic"
-BeroringaPicBack::    INCBIN "gfx/pokemon/beroringa/back.pic"
-DogarsPicFront::      INCBIN "gfx/pokemon/dogars/front.pic"
-DogarsPicBack::       INCBIN "gfx/pokemon/dogars/back.pic"
-MatadogasPicFront::   INCBIN "gfx/pokemon/matadogas/front.pic"
-MatadogasPicBack::    INCBIN "gfx/pokemon/matadogas/back.pic"
-SihornPicFront::      INCBIN "gfx/pokemon/sihorn/front.pic"
-SihornPicBack::       INCBIN "gfx/pokemon/sihorn/back.pic"
-SidonPicFront::       INCBIN "gfx/pokemon/sidon/front.pic"
-SidonPicBack::        INCBIN "gfx/pokemon/sidon/back.pic"
-LuckyPicFront::       INCBIN "gfx/pokemon/lucky/front.pic"
-LuckyPicBack::        INCBIN "gfx/pokemon/lucky/back.pic"
-MonjaraPicFront::     INCBIN "gfx/pokemon/monjara/front.pic"
-MonjaraPicBack::      INCBIN "gfx/pokemon/monjara/back.pic"
-GaruraPicFront::      INCBIN "gfx/pokemon/garura/front.pic"
-GaruraPicBack::       INCBIN "gfx/pokemon/garura/back.pic"
-TattuPicFront::       INCBIN "gfx/pokemon/tattu/front.pic"
-TattuPicBack::        INCBIN "gfx/pokemon/tattu/back.pic"
+VoltorbPicFront::     INCBIN "gfx/pokemon/voltorb/front.pic"
+VoltorbPicBack::      INCBIN "gfx/pokemon/voltorb/back.pic"
+ElectrodePicFront::   INCBIN "gfx/pokemon/electrode/front.pic"
+ElectrodePicBack::    INCBIN "gfx/pokemon/electrode/back.pic"
+ExeggcutePicFront::   INCBIN "gfx/pokemon/exeggcute/front.pic"
+ExeggcutePicBack::    INCBIN "gfx/pokemon/exeggcute/back.pic"
+ExeggutorPicFront::   INCBIN "gfx/pokemon/exeggutor/front.pic"
+ExeggutorPicBack::    INCBIN "gfx/pokemon/exeggutor/back.pic"
+CubonePicFront::      INCBIN "gfx/pokemon/cubone/front.pic"
+CubonePicBack::       INCBIN "gfx/pokemon/cubone/back.pic"
+MarowakPicFront::     INCBIN "gfx/pokemon/marowak/front.pic"
+MarowakPicBack::      INCBIN "gfx/pokemon/marowak/back.pic"
+HitmonleePicFront::   INCBIN "gfx/pokemon/hitmonlee/front.pic"
+HitmonleePicBack::    INCBIN "gfx/pokemon/hitmonlee/back.pic"
+HitmonchanPicFront::  INCBIN "gfx/pokemon/hitmonchan/front.pic"
+HitmonchanPicBack::   INCBIN "gfx/pokemon/hitmonchan/back.pic"
+LickitungPicFront::   INCBIN "gfx/pokemon/lickitung/front.pic"
+LickitungPicBack::    INCBIN "gfx/pokemon/lickitung/back.pic"
+KoffingPicFront::     INCBIN "gfx/pokemon/koffing/front.pic"
+KoffingPicBack::      INCBIN "gfx/pokemon/koffing/back.pic"
+WeezingPicFront::     INCBIN "gfx/pokemon/weezing/front.pic"
+WeezingPicBack::      INCBIN "gfx/pokemon/weezing/back.pic"
+RhyhornPicFront::     INCBIN "gfx/pokemon/rhyhorn/front.pic"
+RhyhornPicBack::      INCBIN "gfx/pokemon/rhyhorn/back.pic"
+RhydonPicFront::      INCBIN "gfx/pokemon/rhydon/front.pic"
+RhydonPicBack::       INCBIN "gfx/pokemon/rhydon/back.pic"
+ChanseyPicFront::     INCBIN "gfx/pokemon/chansey/front.pic"
+ChanseyPicBack::      INCBIN "gfx/pokemon/chansey/back.pic"
+TangelaPicFront::     INCBIN "gfx/pokemon/tangela/front.pic"
+TangelaPicBack::      INCBIN "gfx/pokemon/tangela/back.pic"
+KangaskhanPicFront::  INCBIN "gfx/pokemon/kangaskhan/front.pic"
+KangaskhanPicBack::   INCBIN "gfx/pokemon/kangaskhan/back.pic"
+HorseaPicFront::      INCBIN "gfx/pokemon/horsea/front.pic"
+HorseaPicBack::       INCBIN "gfx/pokemon/horsea/back.pic"
 SeadraPicFront::      INCBIN "gfx/pokemon/seadra/front.pic"
 SeadraPicBack::       INCBIN "gfx/pokemon/seadra/back.pic"
-TosakintoPicFront::   INCBIN "gfx/pokemon/tosakinto/front.pic"
-TosakintoPicBack::    INCBIN "gfx/pokemon/tosakinto/back.pic"
-AzumaoPicFront::      INCBIN "gfx/pokemon/azumao/front.pic"
-AzumaoPicBack::       INCBIN "gfx/pokemon/azumao/back.pic"
-HitodemanPicFront::   INCBIN "gfx/pokemon/hitodeman/front.pic"
-HitodemanPicBack::    INCBIN "gfx/pokemon/hitodeman/back.pic"
+GoldeenPicFront::     INCBIN "gfx/pokemon/goldeen/front.pic"
+GoldeenPicBack::      INCBIN "gfx/pokemon/goldeen/back.pic"
+SeakingPicFront::     INCBIN "gfx/pokemon/seaking/front.pic"
+SeakingPicBack::      INCBIN "gfx/pokemon/seaking/back.pic"
+StaryuPicFront::      INCBIN "gfx/pokemon/staryu/front.pic"
+StaryuPicBack::       INCBIN "gfx/pokemon/staryu/back.pic"
 StarmiePicFront::     INCBIN "gfx/pokemon/starmie/front.pic"
 StarmiePicBack::      INCBIN "gfx/pokemon/starmie/back.pic"
 
 
 SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 6", ROMX
 
-BarrierdPicFront::    INCBIN "gfx/pokemon/barrierd/front.pic"
-BarrierdPicBack::     INCBIN "gfx/pokemon/barrierd/back.pic"
-StrikePicFront::      INCBIN "gfx/pokemon/strike/front.pic"
-StrikePicBack::       INCBIN "gfx/pokemon/strike/back.pic"
-RougelaPicFront::     INCBIN "gfx/pokemon/rougela/front.pic"
-RougelaPicBack::      INCBIN "gfx/pokemon/rougela/back.pic"
-ElebooPicFront::      INCBIN "gfx/pokemon/eleboo/front.pic"
-ElebooPicBack::       INCBIN "gfx/pokemon/eleboo/back.pic"
-BooberPicFront::      INCBIN "gfx/pokemon/boober/front.pic"
-BooberPicBack::       INCBIN "gfx/pokemon/boober/back.pic"
-KailiosPicFront::     INCBIN "gfx/pokemon/kailios/front.pic"
-KailiosPicBack::      INCBIN "gfx/pokemon/kailios/back.pic"
-KentaurosPicFront::   INCBIN "gfx/pokemon/kentauros/front.pic"
-KentaurosPicBack::    INCBIN "gfx/pokemon/kentauros/back.pic"
-KoikingPicFront::     INCBIN "gfx/pokemon/koiking/front.pic"
-KoikingPicBack::      INCBIN "gfx/pokemon/koiking/back.pic"
+MrMimePicFront::      INCBIN "gfx/pokemon/mrmime/front.pic"
+MrMimePicBack::       INCBIN "gfx/pokemon/mrmime/back.pic"
+ScytherPicFront::     INCBIN "gfx/pokemon/scyther/front.pic"
+ScytherPicBack::      INCBIN "gfx/pokemon/scyther/back.pic"
+JynxPicFront::        INCBIN "gfx/pokemon/jynx/front.pic"
+JynxPicBack::         INCBIN "gfx/pokemon/jynx/back.pic"
+ElectabuzzPicFront::  INCBIN "gfx/pokemon/electabuzz/front.pic"
+ElectabuzzPicBack::   INCBIN "gfx/pokemon/electabuzz/back.pic"
+MagmarPicFront::      INCBIN "gfx/pokemon/magmar/front.pic"
+MagmarPicBack::       INCBIN "gfx/pokemon/magmar/back.pic"
+PinsirPicFront::      INCBIN "gfx/pokemon/pinsir/front.pic"
+PinsirPicBack::       INCBIN "gfx/pokemon/pinsir/back.pic"
+TaurosPicFront::      INCBIN "gfx/pokemon/tauros/front.pic"
+TaurosPicBack::       INCBIN "gfx/pokemon/tauros/back.pic"
+MagikarpPicFront::    INCBIN "gfx/pokemon/magikarp/front.pic"
+MagikarpPicBack::     INCBIN "gfx/pokemon/magikarp/back.pic"
 GyaradosPicFront::    INCBIN "gfx/pokemon/gyarados/front.pic"
 GyaradosPicBack::     INCBIN "gfx/pokemon/gyarados/back.pic"
-LaplacePicFront::     INCBIN "gfx/pokemon/laplace/front.pic"
-LaplacePicBack::      INCBIN "gfx/pokemon/laplace/back.pic"
-MetamonPicFront::     INCBIN "gfx/pokemon/metamon/front.pic"
-MetamonPicBack::      INCBIN "gfx/pokemon/metamon/back.pic"
-EievuiPicFront::      INCBIN "gfx/pokemon/eievui/front.pic"
-EievuiPicBack::       INCBIN "gfx/pokemon/eievui/back.pic"
-ShowersPicFront::     INCBIN "gfx/pokemon/showers/front.pic"
-ShowersPicBack::      INCBIN "gfx/pokemon/showers/back.pic"
-ThundersPicFront::    INCBIN "gfx/pokemon/thunders/front.pic"
-ThundersPicBack::     INCBIN "gfx/pokemon/thunders/back.pic"
-BoosterPicFront::     INCBIN "gfx/pokemon/booster/front.pic"
-BoosterPicBack::      INCBIN "gfx/pokemon/booster/back.pic"
+LaprasPicFront::      INCBIN "gfx/pokemon/lapras/front.pic"
+LaprasPicBack::       INCBIN "gfx/pokemon/lapras/back.pic"
+DittoPicFront::       INCBIN "gfx/pokemon/ditto/front.pic"
+DittoPicBack::        INCBIN "gfx/pokemon/ditto/back.pic"
+EeveePicFront::       INCBIN "gfx/pokemon/eevee/front.pic"
+EeveePicBack::        INCBIN "gfx/pokemon/eevee/back.pic"
+VaporeonPicFront::    INCBIN "gfx/pokemon/vaporeon/front.pic"
+VaporeonPicBack::     INCBIN "gfx/pokemon/vaporeon/back.pic"
+JolteonPicFront::     INCBIN "gfx/pokemon/jolteon/front.pic"
+JolteonPicBack::      INCBIN "gfx/pokemon/jolteon/back.pic"
+FlareonPicFront::     INCBIN "gfx/pokemon/flareon/front.pic"
+FlareonPicBack::      INCBIN "gfx/pokemon/flareon/back.pic"
 PorygonPicFront::     INCBIN "gfx/pokemon/porygon/front.pic"
 PorygonPicBack::      INCBIN "gfx/pokemon/porygon/back.pic"
-OmnitePicFront::      INCBIN "gfx/pokemon/omnite/front.pic"
-OmnitePicBack::       INCBIN "gfx/pokemon/omnite/back.pic"
-OmstarPicFront::      INCBIN "gfx/pokemon/omstar/front.pic"
-OmstarPicBack::       INCBIN "gfx/pokemon/omstar/back.pic"
+OmanytePicFront::     INCBIN "gfx/pokemon/omanyte/front.pic"
+OmanytePicBack::      INCBIN "gfx/pokemon/omanyte/back.pic"
+OmastarPicFront::     INCBIN "gfx/pokemon/omastar/front.pic"
+OmastarPicBack::      INCBIN "gfx/pokemon/omastar/back.pic"
 KabutoPicFront::      INCBIN "gfx/pokemon/kabuto/front.pic"
 KabutoPicBack::       INCBIN "gfx/pokemon/kabuto/back.pic"
 KabutopsPicFront::    INCBIN "gfx/pokemon/kabutops/front.pic"
 KabutopsPicBack::     INCBIN "gfx/pokemon/kabutops/back.pic"
-PteraPicFront::       INCBIN "gfx/pokemon/ptera/front.pic"
-PteraPicBack::        INCBIN "gfx/pokemon/ptera/back.pic"
-KabigonPicFront::     INCBIN "gfx/pokemon/kabigon/front.pic"
-KabigonPicBack::      INCBIN "gfx/pokemon/kabigon/back.pic"
-FreezerPicFront::     INCBIN "gfx/pokemon/freezer/front.pic"
-FreezerPicBack::      INCBIN "gfx/pokemon/freezer/back.pic"
+AerodactylPicFront::  INCBIN "gfx/pokemon/aerodactyl/front.pic"
+AerodactylPicBack::   INCBIN "gfx/pokemon/aerodactyl/back.pic"
+SnorlaxPicFront::     INCBIN "gfx/pokemon/snorlax/front.pic"
+SnorlaxPicBack::      INCBIN "gfx/pokemon/snorlax/back.pic"
+ArticunoPicFront::    INCBIN "gfx/pokemon/articuno/front.pic"
+ArticunoPicBack::     INCBIN "gfx/pokemon/articuno/back.pic"
 
 
 SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 7", ROMX
 
-ThunderPicFront::     INCBIN "gfx/pokemon/thunder/front.pic"
-ThunderPicBack::      INCBIN "gfx/pokemon/thunder/back.pic"
-FirePicFront::        INCBIN "gfx/pokemon/fire/front.pic"
-FirePicBack::         INCBIN "gfx/pokemon/fire/back.pic"
-MiniryuPicFront::     INCBIN "gfx/pokemon/miniryu/front.pic"
-MiniryuPicBack::      INCBIN "gfx/pokemon/miniryu/back.pic"
-HakuryuPicFront::     INCBIN "gfx/pokemon/hakuryu/front.pic"
-HakuryuPicBack::      INCBIN "gfx/pokemon/hakuryu/back.pic"
-KairyuPicFront::      INCBIN "gfx/pokemon/kairyu/front.pic"
-KairyuPicBack::       INCBIN "gfx/pokemon/kairyu/back.pic"
+ZapdosPicFront::      INCBIN "gfx/pokemon/zapdos/front.pic"
+ZapdosPicBack::       INCBIN "gfx/pokemon/zapdos/back.pic"
+MoltresPicFront::     INCBIN "gfx/pokemon/moltres/front.pic"
+MoltresPicBack::      INCBIN "gfx/pokemon/moltres/back.pic"
+DratiniPicFront::     INCBIN "gfx/pokemon/dratini/front.pic"
+DratiniPicBack::      INCBIN "gfx/pokemon/dratini/back.pic"
+DragonairPicFront::   INCBIN "gfx/pokemon/dragonair/front.pic"
+DragonairPicBack::    INCBIN "gfx/pokemon/dragonair/back.pic"
+DragonitePicFront::   INCBIN "gfx/pokemon/dragonite/front.pic"
+DragonitePicBack::    INCBIN "gfx/pokemon/dragonite/back.pic"
 MewtwoPicFront::      INCBIN "gfx/pokemon/mewtwo/front.pic"
 MewtwoPicBack::       INCBIN "gfx/pokemon/mewtwo/back.pic"
 MewPicFront::         INCBIN "gfx/pokemon/mew/front.pic"
diff --git a/gfx/pokemon/nyoromo/back.png b/gfx/pokemon/poliwag/back.png
index 1a4d7da..1a4d7da 100644
--- a/gfx/pokemon/nyoromo/back.png
+++ b/gfx/pokemon/poliwag/back.png
diff --git a/gfx/pokemon/nyoromo/front.png b/gfx/pokemon/poliwag/front.png
index 04deb5e..04deb5e 100644
--- a/gfx/pokemon/nyoromo/front.png
+++ b/gfx/pokemon/poliwag/front.png
diff --git a/gfx/pokemon/nyorozo/back.png b/gfx/pokemon/poliwhirl/back.png
index c5028e3..c5028e3 100644
--- a/gfx/pokemon/nyorozo/back.png
+++ b/gfx/pokemon/poliwhirl/back.png
diff --git a/gfx/pokemon/nyorozo/front.png b/gfx/pokemon/poliwhirl/front.png
index ea16237..ea16237 100644
--- a/gfx/pokemon/nyorozo/front.png
+++ b/gfx/pokemon/poliwhirl/front.png
diff --git a/gfx/pokemon/nyorobon/back.png b/gfx/pokemon/poliwrath/back.png
index 8b33b83..8b33b83 100644
--- a/gfx/pokemon/nyorobon/back.png
+++ b/gfx/pokemon/poliwrath/back.png
diff --git a/gfx/pokemon/nyorobon/front.png b/gfx/pokemon/poliwrath/front.png
index 6531a0c..6531a0c 100644
--- a/gfx/pokemon/nyorobon/front.png
+++ b/gfx/pokemon/poliwrath/front.png
diff --git a/gfx/pokemon/okorizaru/back.png b/gfx/pokemon/primeape/back.png
index e4eb256..e4eb256 100644
--- a/gfx/pokemon/okorizaru/back.png
+++ b/gfx/pokemon/primeape/back.png
diff --git a/gfx/pokemon/okorizaru/front.png b/gfx/pokemon/primeape/front.png
index dbca012..dbca012 100644
--- a/gfx/pokemon/okorizaru/front.png
+++ b/gfx/pokemon/primeape/front.png
diff --git a/gfx/pokemon/koduck/back.png b/gfx/pokemon/psyduck/back.png
index 8ca4202..8ca4202 100644
--- a/gfx/pokemon/koduck/back.png
+++ b/gfx/pokemon/psyduck/back.png
diff --git a/gfx/pokemon/koduck/front.png b/gfx/pokemon/psyduck/front.png
index 697e77b..697e77b 100644
--- a/gfx/pokemon/koduck/front.png
+++ b/gfx/pokemon/psyduck/front.png
diff --git a/gfx/pokemon/gallop/back.png b/gfx/pokemon/rapidash/back.png
index 113b263..113b263 100644
--- a/gfx/pokemon/gallop/back.png
+++ b/gfx/pokemon/rapidash/back.png
diff --git a/gfx/pokemon/gallop/front.png b/gfx/pokemon/rapidash/front.png
index afc18e4..afc18e4 100644
--- a/gfx/pokemon/gallop/front.png
+++ b/gfx/pokemon/rapidash/front.png
diff --git a/gfx/pokemon/ratta/back.png b/gfx/pokemon/raticate/back.png
index 24e4d6a..24e4d6a 100644
--- a/gfx/pokemon/ratta/back.png
+++ b/gfx/pokemon/raticate/back.png
diff --git a/gfx/pokemon/ratta/front.png b/gfx/pokemon/raticate/front.png
index 6434084..6434084 100644
--- a/gfx/pokemon/ratta/front.png
+++ b/gfx/pokemon/raticate/front.png
diff --git a/gfx/pokemon/koratta/back.png b/gfx/pokemon/rattata/back.png
index 3e015c3..3e015c3 100644
--- a/gfx/pokemon/koratta/back.png
+++ b/gfx/pokemon/rattata/back.png
diff --git a/gfx/pokemon/koratta/front.png b/gfx/pokemon/rattata/front.png
index 896b372..896b372 100644
--- a/gfx/pokemon/koratta/front.png
+++ b/gfx/pokemon/rattata/front.png
diff --git a/gfx/pokemon/sidon/back.png b/gfx/pokemon/rhydon/back.png
index 155fe2b..155fe2b 100644
--- a/gfx/pokemon/sidon/back.png
+++ b/gfx/pokemon/rhydon/back.png
diff --git a/gfx/pokemon/sidon/front.png b/gfx/pokemon/rhydon/front.png
index 9240647..9240647 100644
--- a/gfx/pokemon/sidon/front.png
+++ b/gfx/pokemon/rhydon/front.png
diff --git a/gfx/pokemon/sihorn/back.png b/gfx/pokemon/rhyhorn/back.png
index 3a64cac..3a64cac 100644
--- a/gfx/pokemon/sihorn/back.png
+++ b/gfx/pokemon/rhyhorn/back.png
diff --git a/gfx/pokemon/sihorn/front.png b/gfx/pokemon/rhyhorn/front.png
index 9452b70..9452b70 100644
--- a/gfx/pokemon/sihorn/front.png
+++ b/gfx/pokemon/rhyhorn/front.png
diff --git a/gfx/pokemon/sand/back.png b/gfx/pokemon/sandshrew/back.png
index 062b92d..062b92d 100644
--- a/gfx/pokemon/sand/back.png
+++ b/gfx/pokemon/sandshrew/back.png
diff --git a/gfx/pokemon/sand/front.png b/gfx/pokemon/sandshrew/front.png
index 80a1ab1..80a1ab1 100644
--- a/gfx/pokemon/sand/front.png
+++ b/gfx/pokemon/sandshrew/front.png
diff --git a/gfx/pokemon/sandpan/back.png b/gfx/pokemon/sandslash/back.png
index 50afa13..50afa13 100644
--- a/gfx/pokemon/sandpan/back.png
+++ b/gfx/pokemon/sandslash/back.png
diff --git a/gfx/pokemon/sandpan/front.png b/gfx/pokemon/sandslash/front.png
index e4327ff..e4327ff 100644
--- a/gfx/pokemon/sandpan/front.png
+++ b/gfx/pokemon/sandslash/front.png
diff --git a/gfx/pokemon/strike/back.png b/gfx/pokemon/scyther/back.png
index 0b137fd..0b137fd 100644
--- a/gfx/pokemon/strike/back.png
+++ b/gfx/pokemon/scyther/back.png
diff --git a/gfx/pokemon/strike/front.png b/gfx/pokemon/scyther/front.png
index 3fe6eea..3fe6eea 100644
--- a/gfx/pokemon/strike/front.png
+++ b/gfx/pokemon/scyther/front.png
diff --git a/gfx/pokemon/azumao/back.png b/gfx/pokemon/seaking/back.png
index 8f0d786..8f0d786 100644
--- a/gfx/pokemon/azumao/back.png
+++ b/gfx/pokemon/seaking/back.png
diff --git a/gfx/pokemon/azumao/front.png b/gfx/pokemon/seaking/front.png
index d9e1433..d9e1433 100644
--- a/gfx/pokemon/azumao/front.png
+++ b/gfx/pokemon/seaking/front.png
diff --git a/gfx/pokemon/pawou/back.png b/gfx/pokemon/seel/back.png
index 1784dbb..1784dbb 100644
--- a/gfx/pokemon/pawou/back.png
+++ b/gfx/pokemon/seel/back.png
diff --git a/gfx/pokemon/pawou/front.png b/gfx/pokemon/seel/front.png
index 08b77f9..08b77f9 100644
--- a/gfx/pokemon/pawou/front.png
+++ b/gfx/pokemon/seel/front.png
diff --git a/gfx/pokemon/yadoran/back.png b/gfx/pokemon/slowbro/back.png
index 3b4c51a..3b4c51a 100644
--- a/gfx/pokemon/yadoran/back.png
+++ b/gfx/pokemon/slowbro/back.png
diff --git a/gfx/pokemon/yadoran/front.png b/gfx/pokemon/slowbro/front.png
index 5ec0d50..5ec0d50 100644
--- a/gfx/pokemon/yadoran/front.png
+++ b/gfx/pokemon/slowbro/front.png
diff --git a/gfx/pokemon/yadon/back.png b/gfx/pokemon/slowpoke/back.png
index 4402fea..4402fea 100644
--- a/gfx/pokemon/yadon/back.png
+++ b/gfx/pokemon/slowpoke/back.png
diff --git a/gfx/pokemon/yadon/front.png b/gfx/pokemon/slowpoke/front.png
index 0730a34..0730a34 100644
--- a/gfx/pokemon/yadon/front.png
+++ b/gfx/pokemon/slowpoke/front.png
diff --git a/gfx/pokemon/kabigon/back.png b/gfx/pokemon/snorlax/back.png
index 44f1e97..44f1e97 100644
--- a/gfx/pokemon/kabigon/back.png
+++ b/gfx/pokemon/snorlax/back.png
diff --git a/gfx/pokemon/kabigon/front.png b/gfx/pokemon/snorlax/front.png
index 132561f..132561f 100644
--- a/gfx/pokemon/kabigon/front.png
+++ b/gfx/pokemon/snorlax/front.png
diff --git a/gfx/pokemon/onisuzume/back.png b/gfx/pokemon/spearow/back.png
index e77a3c5..e77a3c5 100644
--- a/gfx/pokemon/onisuzume/back.png
+++ b/gfx/pokemon/spearow/back.png
diff --git a/gfx/pokemon/onisuzume/front.png b/gfx/pokemon/spearow/front.png
index 320e385..320e385 100644
--- a/gfx/pokemon/onisuzume/front.png
+++ b/gfx/pokemon/spearow/front.png
diff --git a/gfx/pokemon/zenigame/back.png b/gfx/pokemon/squirtle/back.png
index c965b9c..c965b9c 100644
--- a/gfx/pokemon/zenigame/back.png
+++ b/gfx/pokemon/squirtle/back.png
diff --git a/gfx/pokemon/zenigame/front.png b/gfx/pokemon/squirtle/front.png
index bb9f7c9..bb9f7c9 100644
--- a/gfx/pokemon/zenigame/front.png
+++ b/gfx/pokemon/squirtle/front.png
diff --git a/gfx/pokemon/hitodeman/back.png b/gfx/pokemon/staryu/back.png
index 95776f7..95776f7 100644
--- a/gfx/pokemon/hitodeman/back.png
+++ b/gfx/pokemon/staryu/back.png
diff --git a/gfx/pokemon/hitodeman/front.png b/gfx/pokemon/staryu/front.png
index 394732e..394732e 100644
--- a/gfx/pokemon/hitodeman/front.png
+++ b/gfx/pokemon/staryu/front.png
diff --git a/gfx/pokemon/monjara/back.png b/gfx/pokemon/tangela/back.png
index 12c9d18..12c9d18 100644
--- a/gfx/pokemon/monjara/back.png
+++ b/gfx/pokemon/tangela/back.png
diff --git a/gfx/pokemon/monjara/front.png b/gfx/pokemon/tangela/front.png
index eff9c5a..eff9c5a 100644
--- a/gfx/pokemon/monjara/front.png
+++ b/gfx/pokemon/tangela/front.png
diff --git a/gfx/pokemon/kentauros/back.png b/gfx/pokemon/tauros/back.png
index d530081..d530081 100644
--- a/gfx/pokemon/kentauros/back.png
+++ b/gfx/pokemon/tauros/back.png
diff --git a/gfx/pokemon/kentauros/front.png b/gfx/pokemon/tauros/front.png
index 3a4edfe..3a4edfe 100644
--- a/gfx/pokemon/kentauros/front.png
+++ b/gfx/pokemon/tauros/front.png
diff --git a/gfx/pokemon/menokurage/back.png b/gfx/pokemon/tentacool/back.png
index 3d45c1e..3d45c1e 100644
--- a/gfx/pokemon/menokurage/back.png
+++ b/gfx/pokemon/tentacool/back.png
diff --git a/gfx/pokemon/menokurage/front.png b/gfx/pokemon/tentacool/front.png
index 14424d1..14424d1 100644
--- a/gfx/pokemon/menokurage/front.png
+++ b/gfx/pokemon/tentacool/front.png
diff --git a/gfx/pokemon/dokukurage/back.png b/gfx/pokemon/tentacruel/back.png
index 8558bac..8558bac 100644
--- a/gfx/pokemon/dokukurage/back.png
+++ b/gfx/pokemon/tentacruel/back.png
diff --git a/gfx/pokemon/dokukurage/front.png b/gfx/pokemon/tentacruel/front.png
index 7a26a30..7a26a30 100644
--- a/gfx/pokemon/dokukurage/front.png
+++ b/gfx/pokemon/tentacruel/front.png
diff --git a/gfx/pokemon/showers/back.png b/gfx/pokemon/vaporeon/back.png
index 288e12d..288e12d 100644
--- a/gfx/pokemon/showers/back.png
+++ b/gfx/pokemon/vaporeon/back.png
diff --git a/gfx/pokemon/showers/front.png b/gfx/pokemon/vaporeon/front.png
index fcedc75..fcedc75 100644
--- a/gfx/pokemon/showers/front.png
+++ b/gfx/pokemon/vaporeon/front.png
diff --git a/gfx/pokemon/morphon/back.png b/gfx/pokemon/venomoth/back.png
index 4fc5a2e..4fc5a2e 100644
--- a/gfx/pokemon/morphon/back.png
+++ b/gfx/pokemon/venomoth/back.png
diff --git a/gfx/pokemon/morphon/front.png b/gfx/pokemon/venomoth/front.png
index 1c659d9..1c659d9 100644
--- a/gfx/pokemon/morphon/front.png
+++ b/gfx/pokemon/venomoth/front.png
diff --git a/gfx/pokemon/kongpang/back.png b/gfx/pokemon/venonat/back.png
index 73b97cf..73b97cf 100644
--- a/gfx/pokemon/kongpang/back.png
+++ b/gfx/pokemon/venonat/back.png
diff --git a/gfx/pokemon/kongpang/front.png b/gfx/pokemon/venonat/front.png
index 3a59b02..3a59b02 100644
--- a/gfx/pokemon/kongpang/front.png
+++ b/gfx/pokemon/venonat/front.png
diff --git a/gfx/pokemon/fushigibana/back.png b/gfx/pokemon/venusaur/back.png
index ae3d563..ae3d563 100644
--- a/gfx/pokemon/fushigibana/back.png
+++ b/gfx/pokemon/venusaur/back.png
diff --git a/gfx/pokemon/fushigibana/front.png b/gfx/pokemon/venusaur/front.png
index dd39184..dd39184 100644
--- a/gfx/pokemon/fushigibana/front.png
+++ b/gfx/pokemon/venusaur/front.png
diff --git a/gfx/pokemon/utsubot/back.png b/gfx/pokemon/victreebel/back.png
index 903aeb8..903aeb8 100644
--- a/gfx/pokemon/utsubot/back.png
+++ b/gfx/pokemon/victreebel/back.png
diff --git a/gfx/pokemon/utsubot/front.png b/gfx/pokemon/victreebel/front.png
index 5cbf5b5..5cbf5b5 100644
--- a/gfx/pokemon/utsubot/front.png
+++ b/gfx/pokemon/victreebel/front.png
diff --git a/gfx/pokemon/ruffresia/back.png b/gfx/pokemon/vileplume/back.png
index a0d36e8..a0d36e8 100644
--- a/gfx/pokemon/ruffresia/back.png
+++ b/gfx/pokemon/vileplume/back.png
diff --git a/gfx/pokemon/ruffresia/front.png b/gfx/pokemon/vileplume/front.png
index b40d48e..b40d48e 100644
--- a/gfx/pokemon/ruffresia/front.png
+++ b/gfx/pokemon/vileplume/front.png
diff --git a/gfx/pokemon/biriridama/back.png b/gfx/pokemon/voltorb/back.png
index 2d1db46..2d1db46 100644
--- a/gfx/pokemon/biriridama/back.png
+++ b/gfx/pokemon/voltorb/back.png
diff --git a/gfx/pokemon/biriridama/front.png b/gfx/pokemon/voltorb/front.png
index 22d0c67..22d0c67 100644
--- a/gfx/pokemon/biriridama/front.png
+++ b/gfx/pokemon/voltorb/front.png
diff --git a/gfx/pokemon/rokon/back.png b/gfx/pokemon/vulpix/back.png
index b7f5eef..b7f5eef 100644
--- a/gfx/pokemon/rokon/back.png
+++ b/gfx/pokemon/vulpix/back.png
diff --git a/gfx/pokemon/rokon/front.png b/gfx/pokemon/vulpix/front.png
index b49d5a3..b49d5a3 100644
--- a/gfx/pokemon/rokon/front.png
+++ b/gfx/pokemon/vulpix/front.png
diff --git a/gfx/pokemon/kameil/back.png b/gfx/pokemon/wartortle/back.png
index d0a146d..d0a146d 100644
--- a/gfx/pokemon/kameil/back.png
+++ b/gfx/pokemon/wartortle/back.png
diff --git a/gfx/pokemon/kameil/front.png b/gfx/pokemon/wartortle/front.png
index 5599383..5599383 100644
--- a/gfx/pokemon/kameil/front.png
+++ b/gfx/pokemon/wartortle/front.png
diff --git a/gfx/pokemon/beedle/back.png b/gfx/pokemon/weedle/back.png
index 2f7f3a9..2f7f3a9 100644
--- a/gfx/pokemon/beedle/back.png
+++ b/gfx/pokemon/weedle/back.png
diff --git a/gfx/pokemon/beedle/front.png b/gfx/pokemon/weedle/front.png
index 809fde2..809fde2 100644
--- a/gfx/pokemon/beedle/front.png
+++ b/gfx/pokemon/weedle/front.png
diff --git a/gfx/pokemon/utsudon/back.png b/gfx/pokemon/weepinbell/back.png
index cfbca83..cfbca83 100644
--- a/gfx/pokemon/utsudon/back.png
+++ b/gfx/pokemon/weepinbell/back.png
diff --git a/gfx/pokemon/utsudon/front.png b/gfx/pokemon/weepinbell/front.png
index 36b6aed..36b6aed 100644
--- a/gfx/pokemon/utsudon/front.png
+++ b/gfx/pokemon/weepinbell/front.png
diff --git a/gfx/pokemon/matadogas/back.png b/gfx/pokemon/weezing/back.png
index 1ab177d..1ab177d 100644
--- a/gfx/pokemon/matadogas/back.png
+++ b/gfx/pokemon/weezing/back.png
diff --git a/gfx/pokemon/matadogas/front.png b/gfx/pokemon/weezing/front.png
index 8a08573..8a08573 100644
--- a/gfx/pokemon/matadogas/front.png
+++ b/gfx/pokemon/weezing/front.png
diff --git a/gfx/pokemon/pukurin/back.png b/gfx/pokemon/wigglytuff/back.png
index db677c3..db677c3 100644
--- a/gfx/pokemon/pukurin/back.png
+++ b/gfx/pokemon/wigglytuff/back.png
diff --git a/gfx/pokemon/pukurin/front.png b/gfx/pokemon/wigglytuff/front.png
index 85803ee..85803ee 100644
--- a/gfx/pokemon/pukurin/front.png
+++ b/gfx/pokemon/wigglytuff/front.png
diff --git a/gfx/pokemon/thunder/back.png b/gfx/pokemon/zapdos/back.png
index 95c339e..95c339e 100644
--- a/gfx/pokemon/thunder/back.png
+++ b/gfx/pokemon/zapdos/back.png
diff --git a/gfx/pokemon/thunder/front.png b/gfx/pokemon/zapdos/front.png
index 0bd71f4..0bd71f4 100644
--- a/gfx/pokemon/thunder/front.png
+++ b/gfx/pokemon/zapdos/front.png
diff --git a/gfx/sprites/lizardon.png b/gfx/sprites/charizard.png
index 3b6c621..3b6c621 100644
--- a/gfx/sprites/lizardon.png
+++ b/gfx/sprites/charizard.png
diff --git a/gfx/sprites/pippi.png b/gfx/sprites/clefairy.png
index 06fe007..06fe007 100644
--- a/gfx/sprites/pippi.png
+++ b/gfx/sprites/clefairy.png
diff --git a/gfx/sprites/laplace.png b/gfx/sprites/lapras.png
index d124616..d124616 100644
--- a/gfx/sprites/laplace.png
+++ b/gfx/sprites/lapras.png
diff --git a/gfx/sprites/poppo.png b/gfx/sprites/pidgey.png
index 9e20099..9e20099 100644
--- a/gfx/sprites/poppo.png
+++ b/gfx/sprites/pidgey.png
diff --git a/gfx/sprites/nyorobon.png b/gfx/sprites/poliwrath.png
index 058461c..058461c 100644
--- a/gfx/sprites/nyorobon.png
+++ b/gfx/sprites/poliwrath.png
diff --git a/gfx/sprites/sidon.png b/gfx/sprites/rhydon.png
index 80d615b..80d615b 100644
--- a/gfx/sprites/sidon.png
+++ b/gfx/sprites/rhydon.png
diff --git a/gfx/sprites/pawou.png b/gfx/sprites/seel.png
index dbd4c07..dbd4c07 100644
--- a/gfx/sprites/pawou.png
+++ b/gfx/sprites/seel.png
diff --git a/gfx/sprites/kabigon.png b/gfx/sprites/snorlax.png
index 7a2f70c..7a2f70c 100644
--- a/gfx/sprites/kabigon.png
+++ b/gfx/sprites/snorlax.png
diff --git a/home/map_objects.asm b/home/map_objects.asm
index 0415f03..f9dfe05 100644
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -357,7 +357,7 @@ IsAnimatedSprite::
 	ret
 
 .NonAnimatedSprites:
-	db SPRITE_KABIGON
+	db SPRITE_SNORLAX
 	db SPRITE_POKE_BALL
 	db SPRITE_POKEDEX
 	db SPRITE_PAPER
diff --git a/home/text.asm b/home/text.asm
index 29a916d..4b72fc0 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -664,8 +664,8 @@ Text_PlaySound::
 	dbw TX_SOUND_11, $0069
 	dbw TX_SOUND_13, $0027
 	dbw TX_CRY_14,   MON_NIDORINA
-	dbw TX_CRY_15,   MON_PIGEOT
-	dbw TX_CRY_16,   MON_JUGON
+	dbw TX_CRY_15,   MON_PIDGEOT
+	dbw TX_CRY_16,   MON_DEWGONG
 
 Text_TX_DOTS:
 	pop hl
diff --git a/macros/text.asm b/macros/text.asm
index a734df7..b4c13fe 100644
--- a/macros/text.asm
+++ b/macros/text.asm
@@ -119,12 +119,12 @@ cry_nidorina: macro
 endm
 
 	const TX_CRY_15 ; $15
-cry_pigeot: macro
+cry_pidgeot: macro
 	db TX_CRY_15
 endm
 
 	const TX_CRY_16 ; $16
-cry_jugon: macro
+cry_dewgong: macro
 	db TX_CRY_16
 endm
 
diff --git a/utils/dump_text.py b/utils/dump_text.py
index 75a3672..114f466 100644
--- a/utils/dump_text.py
+++ b/utils/dump_text.py
@@ -158,8 +158,8 @@ control_codes = {
     0x12: lambda data: dump_control(data, 'sound_fanfare'           , ''    ),
     0x13: lambda data: dump_control(data, 'sound_slot_machine_start', ''    ),
     0x14: lambda data: dump_control(data, 'cry_nidorina'            , ''    ),
-    0x15: lambda data: dump_control(data, 'cry_pigeot'              , ''    ),
-    0x16: lambda data: dump_control(data, 'cry_jugon'               , ''    ),
+    0x15: lambda data: dump_control(data, 'cry_pidgeot'              , ''    ),
+    0x16: lambda data: dump_control(data, 'cry_dewgong'               , ''    ),
     0x50: lambda data: (True, 'text_end\n'),
 }
 
diff --git a/utils/tests/dump_test.cc.txt b/utils/tests/dump_test.cc.txt
index 4dfd14a..d8ff68b 100644
--- a/utils/tests/dump_test.cc.txt
+++ b/utils/tests/dump_test.cc.txt
@@ -19,8 +19,8 @@
 	sound_fanfare
 	sound_slot_machine_start
 	cry_nidorina
-	cry_pigeot
-	cry_jugon
+	cry_pidgeot
+	cry_dewgong
 	text_end
 	
 .loc_0035:
diff --git a/utils/tests/dump_test.cc_endless.txt b/utils/tests/dump_test.cc_endless.txt
index 5c59830..5235f02 100644
--- a/utils/tests/dump_test.cc_endless.txt
+++ b/utils/tests/dump_test.cc_endless.txt
@@ -19,8 +19,8 @@
 	sound_fanfare
 	sound_slot_machine_start
 	cry_nidorina
-	cry_pigeot
-	cry_jugon
+	cry_pidgeot
+	cry_dewgong
 	text_end
 	
 .loc_0035:
diff --git a/utils/tests/dump_test.cc_tc.txt b/utils/tests/dump_test.cc_tc.txt
index e49a010..75ef0ca 100644
--- a/utils/tests/dump_test.cc_tc.txt
+++ b/utils/tests/dump_test.cc_tc.txt
@@ -20,8 +20,8 @@
 	sound_fanfare
 	sound_slot_machine_start
 	cry_nidorina
-	cry_pigeot
-	cry_jugon
+	cry_pidgeot
+	cry_dewgong
 	text_end
 	
 .loc_0035:
diff --git a/utils/tests/dump_test.cc_tc_endless.txt b/utils/tests/dump_test.cc_tc_endless.txt
index dbf8e8b..dacdd7b 100644
--- a/utils/tests/dump_test.cc_tc_endless.txt
+++ b/utils/tests/dump_test.cc_tc_endless.txt
@@ -20,8 +20,8 @@
 	sound_fanfare
 	sound_slot_machine_start
 	cry_nidorina
-	cry_pigeot
-	cry_jugon
+	cry_pidgeot
+	cry_dewgong
 	text_end
 	
 .loc_0035: