diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm
index 119736ae..adc6054f 100644
--- a/constants/pokedex_constants.asm
+++ b/constants/pokedex_constants.asm
@@ -4,226 +4,230 @@
 ; - MonPartyData (see data/pokemon/menu_icons.asm)
 ; - MonsterPalettes (see data/pokemon/palettes.asm)
 	const_def
-	const DEX_MISSINGNO  ; 0
-	const DEX_BULBASAUR  ; 1
-	const DEX_IVYSAUR    ; 2
-	const DEX_VENUSAUR   ; 3
-	const DEX_CHARMANDER ; 4
-	const DEX_CHARMELEON ; 5
-	const DEX_CHARIZARD  ; 6
-	const DEX_SQUIRTLE   ; 7
-	const DEX_WARTORTLE  ; 8
-	const DEX_TOTARTLE   ; 9
-	const DEX_CATERPIE   ; 10
-	const DEX_METAPOD    ; 11
-	const DEX_BUTTERFREE ; 12
-	const DEX_WEEDLE     ; 13
-	const DEX_KAKUNA     ; 14
-	const DEX_BEEDRILL   ; 15
-	const DEX_PIDGEY     ; 16
-	const DEX_PIDGEOTTO  ; 17
-	const DEX_PIDGEOT    ; 18
-	const DEX_RATTATA    ; 19
-	const DEX_RATICATE   ; 20
-	const DEX_SPEAROW    ; 21
-	const DEX_FEAROW     ; 22
-	const DEX_EKANS      ; 23
-	const DEX_ARBOK      ; 24
-	const DEX_PIKACHU    ; 25
-	const DEX_RAICHU     ; 26
-	const DEX_GOROCHU   
-	const DEX_SANDSHREW  ; 27
-	const DEX_SANDSLASH  ; 28
-	const DEX_NIDORAN_F  ; 29
-	const DEX_NIDORINA   ; 30
-	const DEX_NIDOQUEEN  ; 31
-	const DEX_NIDORAN_M  ; 32
-	const DEX_NIDORINO   ; 33
-	const DEX_NIDOKING   ; 34
-	const DEX_NIDOREIGN
-	const DEX_CLEFAIRY   ; 35
-	const DEX_CLEFABLE   ; 36
-	const DEX_MIKON      
-	const DEX_VULPIX     ; 37
-	const DEX_NINETALES  ; 38
-	const DEX_JIGGLYPUFF ; 39
-	const DEX_WIGGLYTUFF ; 40
-	const DEX_BITTYBAT
-	const DEX_ZUBAT      ; 41
-	const DEX_GOLBAT     ; 42
-	const DEX_CROBAT
-	const DEX_ODDISH     ; 43
-	const DEX_GLOOM      ; 44
-	const DEX_VILEPLUME  ; 45
-	const DEX_BELLOSSOM
-	const DEX_PARA
-	const DEX_PARAS      ; 46
-	const DEX_PARASECT   ; 47
-	const DEX_VENONAT    ; 48
-	const DEX_VENOMOTH   ; 49
-	const DEX_CHEEP    
-	const DEX_JABETTA    
-	const DEX_RIBBITO   
-	const DEX_CROAKOZUNA 
-	const DEX_DIGLETT    ; 50
-	const DEX_DUGTRIO    ; 51
-	const DEX_KONYA 
-	const DEX_MEOWTH     ; 52
-	const DEX_PERSIAN    ; 53
-	; const DEX_PERRSERKER
-	const DEX_PSYDUCK    ; 54
-	const DEX_WEIRDUCK   
-	const DEX_GOLDUCK    ; 55
-	const DEX_MANKEY     ; 56
-	const DEX_PRIMEAPE   ; 57
-	const DEX_PUDI
-	const DEX_GROWLITHE  ; 58
-	const DEX_ARCANINE   ; 59
-	const DEX_POLIWAG    ; 60
-	const DEX_POLIWHIRL  ; 61
-	const DEX_POLIWRATH  ; 62
-	const DEX_POLITOED
-	const DEX_ABRA       ; 63
-	const DEX_KADABRA    ; 64
-	const DEX_ALAKAZAM   ; 65
-	const DEX_MACHOP     ; 66
-	const DEX_MACHOKE    ; 67
-	const DEX_MACHAMP    ; 68
-	const DEX_BELLSPROUT ; 69
-	const DEX_WEEPINBELL ; 70
-	const DEX_VICTREEBEL ; 71
-	const DEX_TSUBOMITTO
-	const DEX_TENTACOOL  ; 72
-	const DEX_TENTACRUEL ; 73
-	const DEX_GEODUDE    ; 74
-	const DEX_GRAVELER   ; 75
-	const DEX_GOLEM      ; 76
-	const DEX_BLOTTLE   
-	const DEX_PENDRAKEN 
-	const DEX_PUCHIKOON
-	const DEX_PONYTA     ; 77
-	const DEX_RAPIDASH   ; 78
-	const DEX_SLOWPOKE   ; 79
-	const DEX_SLOWBRO    ; 80
-	const DEX_SLOWKING
-	const DEX_MAGNEMITE  ; 81
-	const DEX_MAGNETITE
-	const DEX_MAGNETON   ; 82
-	const DEX_MAGNEZONE
-	const DEX_BARUNDA 
-	const DEX_FARFETCHD  ; 83 
-	const DEX_MADAAMU    
-	; const DEX_SIRFETCHD
-	const DEX_BLASTYKE  
-	const DEX_BLASTOISE 
-	const DEX_HINAAZU
-	const DEX_DODUO      ; 84
-	const DEX_DODRIO     ; 85 
-	const DEX_SEEL       ; 86
-	const DEX_DEWGONG    ; 87
-	const DEX_BETOBEBII 
-	const DEX_GRIMER     ; 88
-	const DEX_MUK        ; 89
-	const DEX_SHELLDER   ; 90
-	const DEX_CLOYSTER   ; 91
-	const DEX_GASTLY     ; 92
-	const DEX_HAUNTER    ; 93
-	const DEX_GENGAR     ; 94
-	const DEX_ONIX       ; 95
-	const DEX_STEELIX
-	const DEX_DROWZEE    ; 96
-	const DEX_HYPNO      ; 97
-	const DEX_KOTORA
-	const DEX_GAOTORA
-	const DEX_GOROTORA 
-	const DEX_KRABBY     ; 98
-	const DEX_KINGLER    ; 99
-	const DEX_VOLTORB    ; 100
-	const DEX_ELECTRODE  ; 101
-	const DEX_CACTUS
-	const DEX_CROCKY
-	const DEX_DEER
-	const DEX_EXEGGCUTE  ; 102
-	const DEX_EXEGGUTOR  ; 103
-	const DEX_CUBONE     ; 104
-	const DEX_MAROWAK    ; 105
-	const DEX_GUARDIA 
-	const DEX_KANGASKHAN ; 115
-	const DEX_HITMONLEE  ; 106
-	const DEX_HITMONCHAN ; 107
-	const DEX_HITMONTOP
-	const DEX_LICKITUNG  ; 108
-	const DEX_LICKILICKY
-	const DEX_KOFFING    ; 109
-	const DEX_WEEZING    ; 110
-	const DEX_RHYHORN    ; 111
-	const DEX_RHYDON     ; 112
-	const DEX_RHYPERIOR
-	const DEX_CHANSEY    ; 113
-	const DEX_BLISSEY
-	const DEX_MONJA
-	const DEX_TANGELA    ; 114 
-	const DEX_TANGROWTH
-	const DEX_DECILLA   
-	const DEX_GYAOON     
-	const DEX_OMEGA      
-	const DEX_HORSEA     ; 116
-	const DEX_SEADRA     ; 117
-	const DEX_KINGDRA
-	const DEX_GYOPIN
-	const DEX_GOLDEEN    ; 118
-	const DEX_SEAKING    ; 119
-	const DEX_SKIMPER    
-	const DEX_BAWLIGUA    
-	const DEX_CRYITHAN   
-	const DEX_STARYU     ; 120
-	const DEX_STARMIE    ; 121
-	const DEX_JAGG
-	const DEX_MR_MIME    ; 122
-	; const DEX_MR_RIME
-	const DEX_SCYTHER    ; 123
-	const DEX_SCIZOR
-	const DEX_KLEAVOR
-	const DEX_PINSIR     ; 127
-	const DEX_PURAKKUSU
-	const DEX_JYNX       ; 124
-	const DEX_BUU
-	const DEX_ELECTABUZZ ; 125
-	const DEX_ELECTIVIRE
-	const DEX_MAGMAR     ; 126
-	const DEX_MAGMORTAR
-	const DEX_TRAMPEL    ; 
-	const DEX_TAUROS     ; 128
-	const DEX_MAGIKARP   ; 129
-	const DEX_GYARADOS   ; 130
-	const DEX_LAPRAS     ; 131
-	const DEX_DITTO      ; 132
-	const DEX_ANIMON
-	const DEX_EEVEE      ; 133	
-	const DEX_VAPOREON   ; 134
-	const DEX_JOLTEON    ; 135
-	const DEX_FLAREON    ; 136
-	const DEX_ESPEON
-	const DEX_UMBREON
-	const DEX_LEAFEON
-	const DEX_GLACEON
-	const DEX_SYLVEON
-	const DEX_PORYGON    ; 137
-	const DEX_PORYGON2
-	const DEX_PORYGONZ
-	const DEX_OMANYTE    ; 138
-	const DEX_OMASTAR    ; 139
-	const DEX_KABUTO     ; 140
-	const DEX_KABUTOPS   ; 141
-	const DEX_AERODACTYL ; 142
-	const DEX_SNORLAX    ; 143
-	const DEX_ARTICUNO   ; 144
-	const DEX_ZAPDOS     ; 145
-	const DEX_MOLTRES    ; 146
-	const DEX_DRATINI    ; 147
-	const DEX_DRAGONAIR  ; 148
-	const DEX_DRAGONITE  ; 149
-	const DEX_MEWTWO     ; 150
-	const DEX_MEW        ; 151
+	const DEX_MISSINGNO  ; 0	(000)
+	const DEX_BULBASAUR  ; 1	(001)
+	const DEX_IVYSAUR    ; 2	(002)
+	const DEX_VENUSAUR   ; 3	(003)
+	const DEX_CHARMANDER ; 4	(004)
+	const DEX_CHARMELEON ; 5	(005)
+	const DEX_CHARIZARD  ; 6	(006)
+	const DEX_SQUIRTLE   ; 7	(007)
+	const DEX_WARTORTLE  ; 8	(008)
+	const DEX_TOTARTLE   ; 		(009)
+	const DEX_RATTATA    ; 19	(010)
+	const DEX_RATICATE   ; 20	(011)
+	const DEX_PIDGEY     ; 16	(012)
+	const DEX_PIDGEOTTO  ; 17	(013)
+	const DEX_PIDGEOT    ; 18	(014)
+	const DEX_CATERPIE   ; 10	(015)
+	const DEX_METAPOD    ; 11	(016)
+	const DEX_BUTTERFREE ; 12	(017)
+	const DEX_WEEDLE     ; 13	(018)
+	const DEX_KAKUNA     ; 14	(019)
+	const DEX_BEEDRILL   ; 15	(020)
+	const DEX_KONYA 	 ;		(021)
+	const DEX_MEOWTH     ; 52	(022)
+	const DEX_PERSIAN    ; 53	(023)
+	const DEX_PIKACHU    ; 25	(024)
+	const DEX_RAICHU     ; 26	(025)
+	const DEX_GOROCHU	 ;   	(026)
+	const DEX_SPEAROW    ; 21	(027)
+	const DEX_FEAROW     ; 22	(028)
+	const DEX_EKANS      ; 23	(029)
+	const DEX_ARBOK      ; 24	(030)
+	const DEX_SANDSHREW  ; 27	(031)
+	const DEX_SANDSLASH  ; 28	(032)
+	const DEX_NIDORAN_F  ; 29	(033)
+	const DEX_NIDORINA   ; 30	(034)
+	const DEX_NIDOQUEEN  ; 31	(035)
+	const DEX_NIDORAN_M  ; 32	(036)
+	const DEX_NIDORINO   ; 33	(037)
+	const DEX_NIDOKING   ; 34	(038)
+	const DEX_NIDOREIGN	 ;		(039)
+	const DEX_MAGIKARP   ; 129	(040)
+	const DEX_GYARADOS   ; 130	(041)
+	const DEX_BITTYBAT	 ;		(042)
+	const DEX_ZUBAT      ; 41	(043)
+	const DEX_GOLBAT     ; 42	(044)
+	const DEX_CROBAT	 ;		(045)
+	const DEX_GEODUDE    ; 74	(046)
+	const DEX_GRAVELER   ; 75	(047)
+	const DEX_GOLEM      ; 76	(048)
+	const DEX_PARA		 ;		(049)
+	const DEX_PARAS      ; 46	(050)
+	const DEX_PARASECT   ; 47	(051)
+	const DEX_CLEFAIRY   ; 35	(052)
+	const DEX_CLEFABLE   ; 36	(053)
+	const DEX_JIGGLYPUFF ; 39	(054)
+	const DEX_WIGGLYTUFF ; 40	(055)
+	const DEX_MIKON      ;		(056)
+	const DEX_VULPIX     ; 37	(057)
+	const DEX_NINETALES  ; 38	(058)
+	const DEX_PUDI		 ;		(059)
+	const DEX_GROWLITHE  ; 58	(060)
+	const DEX_ARCANINE   ; 59	(061)
+	const DEX_MANKEY     ; 56	(062)
+	const DEX_PRIMEAPE   ; 57	(063)
+	; const DEX_ANNIHILAPE ;      (064)
+	const DEX_ODDISH     ; 43	(065)
+	const DEX_GLOOM      ; 44	(066)
+	const DEX_VILEPLUME  ; 45	(067)
+	const DEX_BELLOSSOM	 ;		(068)
+	const DEX_BELLSPROUT ; 69	(069)
+	const DEX_WEEPINBELL ; 70	(070)
+	const DEX_VICTREEBEL ; 71	(071)
+	const DEX_TSUBOMITTO ;		(072)
+	const DEX_VENONAT    ; 48	(073)
+	const DEX_VENOMOTH   ; 49	(074)
+	const DEX_GYOPIN	 ;		(075)
+	const DEX_GOLDEEN    ; 118	(076)
+	const DEX_SEAKING    ; 119	(077)
+	const DEX_CHEEP    	 ;		(078)
+	const DEX_JABETTA    ;		(079)
+	const DEX_PSYDUCK    ; 54	(080)
+	const DEX_WEIRDUCK   ;		(081)
+	const DEX_GOLDUCK    ; 55	(082)
+	const DEX_ABRA       ; 63	(083)
+	const DEX_KADABRA    ; 64	(084)
+	const DEX_ALAKAZAM   ; 65	(085)
+	const DEX_POLIWAG    ; 60	(086)
+	const DEX_POLIWHIRL  ; 61	(087)
+	const DEX_POLIWRATH  ; 62	(088)
+	const DEX_POLITOED	 ;		(089)
+	const DEX_FARFETCHD  ; 83 	(090)
+	const DEX_MADAAMU    ;		(091)
+	const DEX_DIGLETT    ; 50	(092)
+	const DEX_DUGTRIO    ; 51	(093)
+	; const DEX_WIGLETT    ; 	  (094)
+	; const DEX_WUGTRIO    ; 	  (095)
+	const DEX_CROCKY	 ;		(096)
+	const DEX_KOTORA	 ;		(097)
+	const DEX_GAOTORA	 ;		(098)
+	const DEX_GOROTORA 	 ;		(099)
+	const DEX_VOLTORB    ; 100	(100)
+	const DEX_ELECTRODE  ; 101	(101)
+	; const DEX_TENTACOOL  ; 72	  (102)
+	; const DEX_TENTACRUEL ; 73	  (103)
+	; const DEX_TOEDSCOOL  ;      (104)
+	; const DEX_TOEDSCRUEL ;      (105)
+	const DEX_DROWZEE    ; 96	(106)
+	const DEX_HYPNO      ; 97	(107)
+	const DEX_LICKITUNG  ; 108	(108)
+	const DEX_LICKILICKY ;		(109)
+	const DEX_ONIX       ; 95	(110)
+	const DEX_STEELIX	 ;		(111)
+	const DEX_MAGNEMITE  ; 81	(112)
+	const DEX_MAGNETITE	 ;		(113)
+	const DEX_MAGNETON   ; 82	(114)
+	const DEX_MAGNEZONE  ;		(115)
+	const DEX_MACHOP     ; 66	(116)
+	const DEX_MACHOKE    ; 67	(117)
+	const DEX_MACHAMP    ; 68	(118)
+	const DEX_RIBBITO    ;		(119)
+	const DEX_CROAKOZUNA ;		(120)
+	const DEX_KRABBY     ; 98	(121)
+	const DEX_KINGLER    ; 99	(122)
+	const DEX_SLOWPOKE   ; 79	(123)
+	const DEX_SLOWBRO    ; 80	(124)
+	const DEX_SLOWKING   ;		(125)
+	const DEX_PUCHIKOON  ;		(126)
+	const DEX_PONYTA     ; 77	(127)
+	const DEX_RAPIDASH   ; 78	(128)
+	const DEX_MONJA		 ;		(129)
+	const DEX_TANGELA    ; 114 	(130)
+	const DEX_TANGROWTH	 ;		(131)
+	const DEX_STARYU     ; 120	(132)
+	const DEX_STARMIE    ; 121	(133)
+	const DEX_HINAAZU	 ;		(134)
+	const DEX_DODUO      ; 84	(135)
+	const DEX_DODRIO     ; 85 	(136)
+	const DEX_BARUNDA    ;		(137)
+	const DEX_GASTLY     ; 92	(138)
+	const DEX_HAUNTER    ; 93	(139)
+	const DEX_GENGAR     ; 94	(140)
+	const DEX_CUBONE     ; 104	(141)
+	const DEX_MAROWAK    ; 105	(142)
+	const DEX_GUARDIA 	 ;		(143)
+	const DEX_BETOBEBII  ;		(144)
+	const DEX_GRIMER     ; 88	(145)
+	const DEX_MUK        ; 89	(146)
+	const DEX_KOFFING    ; 109	(147)
+	const DEX_WEEZING    ; 110	(148)
+	const DEX_BLASTYKE   ;		(149)  
+	const DEX_BLASTOISE  ; 9	(150)
+	const DEX_DITTO      ; 132	(151)
+	const DEX_ANIMON	 ;		(152)
+	const DEX_DEER		 ;		(153)
+	const DEX_HITMONLEE  ; 106	(154)
+	const DEX_HITMONCHAN ; 107	(155)
+	const DEX_HITMONTOP	 ;		(156)
+	const DEX_CACTUS	 ;		(157)
+	const DEX_SHELLDER   ; 90	(158)
+	const DEX_CLOYSTER   ; 91	(159)
+	const DEX_BLOTTLE    ;		(160)
+	const DEX_PENDRAKEN  ;		(161)
+	const DEX_SEEL       ; 86	(162)
+	const DEX_DEWGONG    ; 87	(163)
+	const DEX_HORSEA     ; 116	(164)
+	const DEX_SEADRA     ; 117	(165)
+	const DEX_KINGDRA	 ;		(166)
+	const DEX_JAGG		 ;		(167)
+	const DEX_EXEGGCUTE  ; 102	(168)
+	const DEX_EXEGGUTOR  ; 103	(169)
+	const DEX_RHYHORN    ; 111	(170)
+	const DEX_RHYDON     ; 112	(171)
+	const DEX_RHYPERIOR	 ;		(172)
+	const DEX_SCYTHER    ; 123	(173)
+	const DEX_SCIZOR	 ;		(174)
+	const DEX_KLEAVOR	 ;		(175)
+	const DEX_PINSIR     ; 127	(176)
+	const DEX_PURAKKUSU	 ;		(177)
+	const DEX_KANGASKHAN ; 115	(178)
+	const DEX_TRAMPEL    ; 		(179)
+	const DEX_TAUROS     ; 128	(180)
+	const DEX_CHANSEY    ; 113	(181)
+	const DEX_BLISSEY	 ;		(182)
+	const DEX_SKIMPER    ;		(183)
+	const DEX_BAWLIGUA   ;		(184)
+	const DEX_CRYITHAN   ;		(185)
+	const DEX_MR_MIME    ; 122	(186)
+	const DEX_JYNX       ; 124	(187)
+	const DEX_BUU		 ;		(188)
+	const DEX_ELECTABUZZ ; 125	(189)
+	const DEX_ELECTIVIRE ;		(190)
+	const DEX_MAGMAR     ; 126	(191)
+	const DEX_MAGMORTAR	 ;		(192)
+	const DEX_LAPRAS     ; 131	(193)
+	const DEX_EEVEE      ; 133	(194)
+	const DEX_VAPOREON   ; 134	(195)
+	const DEX_JOLTEON    ; 135	(196)
+	const DEX_FLAREON    ; 136	(197)
+	const DEX_ESPEON	 ;		(198)
+	const DEX_UMBREON	 ;		(199)
+	const DEX_LEAFEON	 ;		(200)
+	const DEX_GLACEON	 ;		(201)
+	const DEX_SYLVEON	 ;		(202)
+	const DEX_PORYGON    ; 137	(203)
+	const DEX_PORYGON2	 ;		(204)
+	const DEX_PORYGONZ	 ;		(205)
+	const DEX_OMANYTE    ; 138	(206)
+	const DEX_OMASTAR    ; 139	(207)
+	const DEX_KABUTO     ; 140	(208)
+	const DEX_KABUTOPS   ; 141	(209)
+	const DEX_AERODACTYL ; 142	(210)
+	const DEX_DECILLA    ;		(211)
+	const DEX_GYAOON     ;		(212)
+	const DEX_OMEGA      ;		(213)
+	const DEX_SNORLAX    ; 143	(214)
+	; const DEX_SCREAM_TAIL ;     (215)
+	; const DEX_SANDY_SHOCKS ;    (216)
+	const DEX_DRATINI    ; 147	(217)
+	const DEX_DRAGONAIR  ; 148	(218)
+	const DEX_DRAGONITE  ; 149	(219)
+	const DEX_ARTICUNO   ; 144	(220)
+	const DEX_ZAPDOS     ; 145	(221)
+	const DEX_MOLTRES    ; 146	(222)
+	const DEX_MEWTWO     ; 150	(223)
+	const DEX_MEW        ; 151	(224)
 
 DEF NUM_POKEMON EQU const_value
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 811c17fb..7d9ec6c7 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -227,20 +227,19 @@
 	const BETOBEBII          ; $DA
 	const MAGNEZONE          ; $DB
 	const PORYGONZ           ; $DC
-	; const PERRSERKER         ; $DD
-	; const SIRFETCHD          ; $DE
-	; const MR_RIME            ; $DF
-	; const PICHU              ; $E0
-	; const CLEFFA             ; $E1
-	; const IGGLYBUFF          ; $E2
-	; const TYROGUE            ; $E3
-	; const SMOOCHUM           ; $E4
-	; const ELEKID             ; $E5
-	; const MAGBY              ; $E6
-	; const MIME_JR            ; $E7
-	; const HAPPINY            ; $E8
-	; const MUNCHLAX           ; $E9
-	const MISSINGNO          ; $EA
+	; const HAPPINY            ; $DD
+	; const MUNCHLAX           ; $DE
+	; const ANNIHILAPE         ; $DF
+	; const SCREAM_TAIL        ; $E0
+	; const SANDY_SHOCKS       ; $E1
+	; const WIGLETT            ; $E2
+	; const WUGTRIO            ; $E3
+	; const TOEDSCOOL          ; $E4
+	; const TOEDSCRUEL         ; $E5
+	; const PERRSERKER         ; $E6
+	; const SIRFETCHD          ; $E7
+	; const MR_RIME            ; $E8
+	const MISSINGNO          ; $E9
 	
 
 DEF NUM_POKEMON_INDEXES EQU const_value - 1
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
index 549c9e10..d9d2f8f9 100644
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@@ -9,24 +9,27 @@ INCLUDE "data/pokemon/base_stats/charizard.asm"
 INCLUDE "data/pokemon/base_stats/squirtle.asm"
 INCLUDE "data/pokemon/base_stats/wartortle.asm"
 INCLUDE "data/pokemon/base_stats/totartle.asm"
+INCLUDE "data/pokemon/base_stats/rattata.asm"
+INCLUDE "data/pokemon/base_stats/raticate.asm"
+INCLUDE "data/pokemon/base_stats/pidgey.asm"
+INCLUDE "data/pokemon/base_stats/pidgeotto.asm"
+INCLUDE "data/pokemon/base_stats/pidgeot.asm"
 INCLUDE "data/pokemon/base_stats/caterpie.asm"
 INCLUDE "data/pokemon/base_stats/metapod.asm"
 INCLUDE "data/pokemon/base_stats/butterfree.asm"
 INCLUDE "data/pokemon/base_stats/weedle.asm"
 INCLUDE "data/pokemon/base_stats/kakuna.asm"
 INCLUDE "data/pokemon/base_stats/beedrill.asm"
-INCLUDE "data/pokemon/base_stats/pidgey.asm"
-INCLUDE "data/pokemon/base_stats/pidgeotto.asm"
-INCLUDE "data/pokemon/base_stats/pidgeot.asm"
-INCLUDE "data/pokemon/base_stats/rattata.asm"
-INCLUDE "data/pokemon/base_stats/raticate.asm"
+INCLUDE "data/pokemon/base_stats/konya.asm"
+INCLUDE "data/pokemon/base_stats/meowth.asm"
+INCLUDE "data/pokemon/base_stats/persian.asm"
+INCLUDE "data/pokemon/base_stats/pikachu.asm"
+INCLUDE "data/pokemon/base_stats/raichu.asm"
+INCLUDE "data/pokemon/base_stats/gorochu.asm"
 INCLUDE "data/pokemon/base_stats/spearow.asm"
 INCLUDE "data/pokemon/base_stats/fearow.asm"
 INCLUDE "data/pokemon/base_stats/ekans.asm"
 INCLUDE "data/pokemon/base_stats/arbok.asm"
-INCLUDE "data/pokemon/base_stats/pikachu.asm"
-INCLUDE "data/pokemon/base_stats/raichu.asm"
-INCLUDE "data/pokemon/base_stats/gorochu.asm"
 INCLUDE "data/pokemon/base_stats/sandshrew.asm"
 INCLUDE "data/pokemon/base_stats/sandslash.asm"
 INCLUDE "data/pokemon/base_stats/nidoranf.asm"
@@ -36,161 +39,160 @@ INCLUDE "data/pokemon/base_stats/nidoranm.asm"
 INCLUDE "data/pokemon/base_stats/nidorino.asm"
 INCLUDE "data/pokemon/base_stats/nidoking.asm"
 INCLUDE "data/pokemon/base_stats/nidoreign.asm"
-INCLUDE "data/pokemon/base_stats/clefairy.asm"
-INCLUDE "data/pokemon/base_stats/clefable.asm"
-INCLUDE "data/pokemon/base_stats/mikon.asm"
-INCLUDE "data/pokemon/base_stats/vulpix.asm"
-INCLUDE "data/pokemon/base_stats/ninetales.asm"
-INCLUDE "data/pokemon/base_stats/jigglypuff.asm"
-INCLUDE "data/pokemon/base_stats/wigglytuff.asm"
+INCLUDE "data/pokemon/base_stats/magikarp.asm"
+INCLUDE "data/pokemon/base_stats/gyarados.asm"
 INCLUDE "data/pokemon/base_stats/bittybat.asm"
 INCLUDE "data/pokemon/base_stats/zubat.asm"
 INCLUDE "data/pokemon/base_stats/golbat.asm"
 INCLUDE "data/pokemon/base_stats/crobat.asm"
+INCLUDE "data/pokemon/base_stats/geodude.asm"
+INCLUDE "data/pokemon/base_stats/graveler.asm"
+INCLUDE "data/pokemon/base_stats/golem.asm"
+INCLUDE "data/pokemon/base_stats/para.asm"
+INCLUDE "data/pokemon/base_stats/paras.asm"
+INCLUDE "data/pokemon/base_stats/parasect.asm"
+INCLUDE "data/pokemon/base_stats/clefairy.asm"
+INCLUDE "data/pokemon/base_stats/clefable.asm"
+INCLUDE "data/pokemon/base_stats/jigglypuff.asm"
+INCLUDE "data/pokemon/base_stats/wigglytuff.asm"
+INCLUDE "data/pokemon/base_stats/mikon.asm"
+INCLUDE "data/pokemon/base_stats/vulpix.asm"
+INCLUDE "data/pokemon/base_stats/ninetales.asm"
+INCLUDE "data/pokemon/base_stats/pudi.asm"
+INCLUDE "data/pokemon/base_stats/growlithe.asm"
+INCLUDE "data/pokemon/base_stats/arcanine.asm"
+INCLUDE "data/pokemon/base_stats/mankey.asm"
+INCLUDE "data/pokemon/base_stats/primeape.asm"
+; INCLUDE "data/pokemon/base_stats/annihilape.asm"
 INCLUDE "data/pokemon/base_stats/oddish.asm"
 INCLUDE "data/pokemon/base_stats/gloom.asm"
 INCLUDE "data/pokemon/base_stats/vileplume.asm"
 INCLUDE "data/pokemon/base_stats/bellossom.asm"
-INCLUDE "data/pokemon/base_stats/para.asm"
-INCLUDE "data/pokemon/base_stats/paras.asm"
-INCLUDE "data/pokemon/base_stats/parasect.asm"
-INCLUDE "data/pokemon/base_stats/venonat.asm"
-INCLUDE "data/pokemon/base_stats/venomoth.asm"
-INCLUDE "data/pokemon/base_stats/cheep.asm"
-INCLUDE "data/pokemon/base_stats/jabetta.asm"
-INCLUDE "data/pokemon/base_stats/ribbito.asm"
-INCLUDE "data/pokemon/base_stats/croakozuna.asm"
-INCLUDE "data/pokemon/base_stats/diglett.asm"
-INCLUDE "data/pokemon/base_stats/dugtrio.asm"
-INCLUDE "data/pokemon/base_stats/konya.asm"
-INCLUDE "data/pokemon/base_stats/meowth.asm"
-INCLUDE "data/pokemon/base_stats/persian.asm"
-INCLUDE "data/pokemon/base_stats/psyduck.asm"
-INCLUDE "data/pokemon/base_stats/weirduck.asm"
-INCLUDE "data/pokemon/base_stats/golduck.asm"
-INCLUDE "data/pokemon/base_stats/mankey.asm"
-INCLUDE "data/pokemon/base_stats/primeape.asm"
-INCLUDE "data/pokemon/base_stats/pudi.asm"
-INCLUDE "data/pokemon/base_stats/growlithe.asm"
-INCLUDE "data/pokemon/base_stats/arcanine.asm"
-INCLUDE "data/pokemon/base_stats/poliwag.asm"
-INCLUDE "data/pokemon/base_stats/poliwhirl.asm"
-INCLUDE "data/pokemon/base_stats/poliwrath.asm"
-INCLUDE "data/pokemon/base_stats/politoed.asm"
-INCLUDE "data/pokemon/base_stats/abra.asm"
-INCLUDE "data/pokemon/base_stats/kadabra.asm"
-INCLUDE "data/pokemon/base_stats/alakazam.asm"
-INCLUDE "data/pokemon/base_stats/machop.asm"
-INCLUDE "data/pokemon/base_stats/machoke.asm"
-INCLUDE "data/pokemon/base_stats/machamp.asm"
 INCLUDE "data/pokemon/base_stats/bellsprout.asm"
 INCLUDE "data/pokemon/base_stats/weepinbell.asm"
 INCLUDE "data/pokemon/base_stats/victreebel.asm"
 INCLUDE "data/pokemon/base_stats/tsubomitto.asm"
+INCLUDE "data/pokemon/base_stats/venonat.asm"
+INCLUDE "data/pokemon/base_stats/venomoth.asm"
+INCLUDE "data/pokemon/base_stats/gyopin.asm"
+INCLUDE "data/pokemon/base_stats/goldeen.asm"
+INCLUDE "data/pokemon/base_stats/seaking.asm"
+INCLUDE "data/pokemon/base_stats/cheep.asm"
+INCLUDE "data/pokemon/base_stats/jabetta.asm"
+INCLUDE "data/pokemon/base_stats/psyduck.asm"
+INCLUDE "data/pokemon/base_stats/weirduck.asm"
+INCLUDE "data/pokemon/base_stats/golduck.asm"
+INCLUDE "data/pokemon/base_stats/abra.asm"
+INCLUDE "data/pokemon/base_stats/kadabra.asm"
+INCLUDE "data/pokemon/base_stats/alakazam.asm"
+INCLUDE "data/pokemon/base_stats/poliwag.asm"
+INCLUDE "data/pokemon/base_stats/poliwhirl.asm"
+INCLUDE "data/pokemon/base_stats/poliwrath.asm"
+INCLUDE "data/pokemon/base_stats/politoed.asm"
+INCLUDE "data/pokemon/base_stats/farfetchd.asm"
+INCLUDE "data/pokemon/base_stats/madaamu.asm"
+INCLUDE "data/pokemon/base_stats/diglett.asm"
+INCLUDE "data/pokemon/base_stats/dugtrio.asm"
+; INCLUDE "data/pokemon/base_stats/wiglett.asm"
+; INCLUDE "data/pokemon/base_stats/wugtrio.asm"
+INCLUDE "data/pokemon/base_stats/crocky.asm"
+INCLUDE "data/pokemon/base_stats/kotora.asm"
+INCLUDE "data/pokemon/base_stats/gaotora.asm"
+INCLUDE "data/pokemon/base_stats/gorotora.asm"
+INCLUDE "data/pokemon/base_stats/voltorb.asm"
+INCLUDE "data/pokemon/base_stats/electrode.asm"
 INCLUDE "data/pokemon/base_stats/tentacool.asm"
 INCLUDE "data/pokemon/base_stats/tentacruel.asm"
-INCLUDE "data/pokemon/base_stats/geodude.asm"
-INCLUDE "data/pokemon/base_stats/graveler.asm"
-INCLUDE "data/pokemon/base_stats/golem.asm"
-INCLUDE "data/pokemon/base_stats/blottle.asm"
-INCLUDE "data/pokemon/base_stats/pendraken.asm"
-INCLUDE "data/pokemon/base_stats/puchikoon.asm"
-INCLUDE "data/pokemon/base_stats/ponyta.asm"
-INCLUDE "data/pokemon/base_stats/rapidash.asm"
-INCLUDE "data/pokemon/base_stats/slowpoke.asm"
-INCLUDE "data/pokemon/base_stats/slowbro.asm"
-INCLUDE "data/pokemon/base_stats/slowking.asm"
+; INCLUDE "data/pokemon/base_stats/toedscool.asm"
+; INCLUDE "data/pokemon/base_stats/toedscruel.asm"
+INCLUDE "data/pokemon/base_stats/drowzee.asm"
+INCLUDE "data/pokemon/base_stats/hypno.asm"
+INCLUDE "data/pokemon/base_stats/lickitung.asm"
+INCLUDE "data/pokemon/base_stats/lickilicky.asm"
+INCLUDE "data/pokemon/base_stats/onix.asm"
+INCLUDE "data/pokemon/base_stats/steelix.asm"
 INCLUDE "data/pokemon/base_stats/magnemite.asm"
 INCLUDE "data/pokemon/base_stats/magnetite.asm"
 INCLUDE "data/pokemon/base_stats/magneton.asm"
 INCLUDE "data/pokemon/base_stats/magnezone.asm"
-INCLUDE "data/pokemon/base_stats/barunda.asm"
-INCLUDE "data/pokemon/base_stats/farfetchd.asm"
-INCLUDE "data/pokemon/base_stats/madaamu.asm"
-INCLUDE "data/pokemon/base_stats/blastyke.asm"
-INCLUDE "data/pokemon/base_stats/blastoise.asm"
-INCLUDE "data/pokemon/base_stats/hinaazu.asm"
-INCLUDE "data/pokemon/base_stats/doduo.asm"
-INCLUDE "data/pokemon/base_stats/dodrio.asm"
-INCLUDE "data/pokemon/base_stats/seel.asm"
-INCLUDE "data/pokemon/base_stats/dewgong.asm"
-INCLUDE "data/pokemon/base_stats/betobebii.asm"
-INCLUDE "data/pokemon/base_stats/grimer.asm"
-INCLUDE "data/pokemon/base_stats/muk.asm"
-INCLUDE "data/pokemon/base_stats/shellder.asm"
-INCLUDE "data/pokemon/base_stats/cloyster.asm"
-INCLUDE "data/pokemon/base_stats/gastly.asm"
-INCLUDE "data/pokemon/base_stats/haunter.asm"
-INCLUDE "data/pokemon/base_stats/gengar.asm"
-INCLUDE "data/pokemon/base_stats/onix.asm"
-INCLUDE "data/pokemon/base_stats/steelix.asm"
-INCLUDE "data/pokemon/base_stats/drowzee.asm"
-INCLUDE "data/pokemon/base_stats/hypno.asm"
-INCLUDE "data/pokemon/base_stats/kotora.asm"
-INCLUDE "data/pokemon/base_stats/gaotora.asm"
-INCLUDE "data/pokemon/base_stats/gorotora.asm"
+INCLUDE "data/pokemon/base_stats/machop.asm"
+INCLUDE "data/pokemon/base_stats/machoke.asm"
+INCLUDE "data/pokemon/base_stats/machamp.asm"
+INCLUDE "data/pokemon/base_stats/ribbito.asm"
+INCLUDE "data/pokemon/base_stats/croakozuna.asm"
 INCLUDE "data/pokemon/base_stats/krabby.asm"
 INCLUDE "data/pokemon/base_stats/kingler.asm"
-INCLUDE "data/pokemon/base_stats/voltorb.asm"
-INCLUDE "data/pokemon/base_stats/electrode.asm"
-INCLUDE "data/pokemon/base_stats/cactus.asm"
-INCLUDE "data/pokemon/base_stats/crocky.asm"
-INCLUDE "data/pokemon/base_stats/deer.asm"
-INCLUDE "data/pokemon/base_stats/exeggcute.asm"
-INCLUDE "data/pokemon/base_stats/exeggutor.asm"
-INCLUDE "data/pokemon/base_stats/cubone.asm"
-INCLUDE "data/pokemon/base_stats/marowak.asm"
-INCLUDE "data/pokemon/base_stats/guardia.asm"
-INCLUDE "data/pokemon/base_stats/kangaskhan.asm"
-INCLUDE "data/pokemon/base_stats/hitmonlee.asm"
-INCLUDE "data/pokemon/base_stats/hitmonchan.asm"
-INCLUDE "data/pokemon/base_stats/hitmontop.asm"
-INCLUDE "data/pokemon/base_stats/lickitung.asm"
-INCLUDE "data/pokemon/base_stats/lickilicky.asm"
-INCLUDE "data/pokemon/base_stats/koffing.asm"
-INCLUDE "data/pokemon/base_stats/weezing.asm"
-INCLUDE "data/pokemon/base_stats/rhyhorn.asm"
-INCLUDE "data/pokemon/base_stats/rhydon.asm"
-INCLUDE "data/pokemon/base_stats/rhyperior.asm"
-INCLUDE "data/pokemon/base_stats/chansey.asm"
-INCLUDE "data/pokemon/base_stats/blissey.asm"
+INCLUDE "data/pokemon/base_stats/slowpoke.asm"
+INCLUDE "data/pokemon/base_stats/slowbro.asm"
+INCLUDE "data/pokemon/base_stats/slowking.asm"
+INCLUDE "data/pokemon/base_stats/puchikoon.asm"
+INCLUDE "data/pokemon/base_stats/ponyta.asm"
+INCLUDE "data/pokemon/base_stats/rapidash.asm"
 INCLUDE "data/pokemon/base_stats/monja.asm"
 INCLUDE "data/pokemon/base_stats/tangela.asm"
 INCLUDE "data/pokemon/base_stats/tangrowth.asm"
-INCLUDE "data/pokemon/base_stats/decilla.asm"
-INCLUDE "data/pokemon/base_stats/gyaoon.asm"
-INCLUDE "data/pokemon/base_stats/omega.asm"
+INCLUDE "data/pokemon/base_stats/staryu.asm"
+INCLUDE "data/pokemon/base_stats/starmie.asm"
+INCLUDE "data/pokemon/base_stats/hinaazu.asm"
+INCLUDE "data/pokemon/base_stats/doduo.asm"
+INCLUDE "data/pokemon/base_stats/dodrio.asm"
+INCLUDE "data/pokemon/base_stats/barunda.asm"
+INCLUDE "data/pokemon/base_stats/gastly.asm"
+INCLUDE "data/pokemon/base_stats/haunter.asm"
+INCLUDE "data/pokemon/base_stats/gengar.asm"
+INCLUDE "data/pokemon/base_stats/cubone.asm"
+INCLUDE "data/pokemon/base_stats/marowak.asm"
+INCLUDE "data/pokemon/base_stats/guardia.asm"
+INCLUDE "data/pokemon/base_stats/betobebii.asm"
+INCLUDE "data/pokemon/base_stats/grimer.asm"
+INCLUDE "data/pokemon/base_stats/muk.asm"
+INCLUDE "data/pokemon/base_stats/koffing.asm"
+INCLUDE "data/pokemon/base_stats/weezing.asm"
+INCLUDE "data/pokemon/base_stats/blastyke.asm"
+INCLUDE "data/pokemon/base_stats/blastoise.asm"
+INCLUDE "data/pokemon/base_stats/ditto.asm"
+INCLUDE "data/pokemon/base_stats/animon.asm"
+INCLUDE "data/pokemon/base_stats/deer.asm"
+INCLUDE "data/pokemon/base_stats/hitmonlee.asm"
+INCLUDE "data/pokemon/base_stats/hitmonchan.asm"
+INCLUDE "data/pokemon/base_stats/hitmontop.asm"
+INCLUDE "data/pokemon/base_stats/cactus.asm"
+INCLUDE "data/pokemon/base_stats/shellder.asm"
+INCLUDE "data/pokemon/base_stats/cloyster.asm"
+INCLUDE "data/pokemon/base_stats/blottle.asm"
+INCLUDE "data/pokemon/base_stats/pendraken.asm"
+INCLUDE "data/pokemon/base_stats/seel.asm"
+INCLUDE "data/pokemon/base_stats/dewgong.asm"
 INCLUDE "data/pokemon/base_stats/horsea.asm"
 INCLUDE "data/pokemon/base_stats/seadra.asm"
 INCLUDE "data/pokemon/base_stats/kingdra.asm"
-INCLUDE "data/pokemon/base_stats/gyopin.asm"
-INCLUDE "data/pokemon/base_stats/goldeen.asm"
-INCLUDE "data/pokemon/base_stats/seaking.asm"
-INCLUDE "data/pokemon/base_stats/skimper.asm"
-INCLUDE "data/pokemon/base_stats/bawligua.asm"
-INCLUDE "data/pokemon/base_stats/cryithan.asm"
-INCLUDE "data/pokemon/base_stats/staryu.asm"
-INCLUDE "data/pokemon/base_stats/starmie.asm"
 INCLUDE "data/pokemon/base_stats/jagg.asm"
-INCLUDE "data/pokemon/base_stats/mrmime.asm"
+INCLUDE "data/pokemon/base_stats/exeggcute.asm"
+INCLUDE "data/pokemon/base_stats/exeggutor.asm"
+INCLUDE "data/pokemon/base_stats/rhyhorn.asm"
+INCLUDE "data/pokemon/base_stats/rhydon.asm"
+INCLUDE "data/pokemon/base_stats/rhyperior.asm"
 INCLUDE "data/pokemon/base_stats/scyther.asm"
 INCLUDE "data/pokemon/base_stats/scizor.asm"
 INCLUDE "data/pokemon/base_stats/kleavor.asm"
 INCLUDE "data/pokemon/base_stats/pinsir.asm"
 INCLUDE "data/pokemon/base_stats/purakkusu.asm"
+INCLUDE "data/pokemon/base_stats/kangaskhan.asm"
+INCLUDE "data/pokemon/base_stats/trampel.asm"
+INCLUDE "data/pokemon/base_stats/tauros.asm"
+INCLUDE "data/pokemon/base_stats/chansey.asm"
+INCLUDE "data/pokemon/base_stats/blissey.asm"
+INCLUDE "data/pokemon/base_stats/skimper.asm"
+INCLUDE "data/pokemon/base_stats/bawligua.asm"
+INCLUDE "data/pokemon/base_stats/cryithan.asm"
+INCLUDE "data/pokemon/base_stats/mrmime.asm"
 INCLUDE "data/pokemon/base_stats/jynx.asm"
 INCLUDE "data/pokemon/base_stats/buu.asm"
 INCLUDE "data/pokemon/base_stats/electabuzz.asm"
 INCLUDE "data/pokemon/base_stats/electivire.asm"
 INCLUDE "data/pokemon/base_stats/magmar.asm"
 INCLUDE "data/pokemon/base_stats/magmortar.asm"
-INCLUDE "data/pokemon/base_stats/trampel.asm"
-INCLUDE "data/pokemon/base_stats/tauros.asm"
-INCLUDE "data/pokemon/base_stats/magikarp.asm"
-INCLUDE "data/pokemon/base_stats/gyarados.asm"
 INCLUDE "data/pokemon/base_stats/lapras.asm"
-INCLUDE "data/pokemon/base_stats/ditto.asm"
-INCLUDE "data/pokemon/base_stats/animon.asm"
 INCLUDE "data/pokemon/base_stats/eevee.asm"
 INCLUDE "data/pokemon/base_stats/vaporeon.asm"
 INCLUDE "data/pokemon/base_stats/jolteon.asm"
@@ -208,13 +210,18 @@ INCLUDE "data/pokemon/base_stats/omastar.asm"
 INCLUDE "data/pokemon/base_stats/kabuto.asm"
 INCLUDE "data/pokemon/base_stats/kabutops.asm"
 INCLUDE "data/pokemon/base_stats/aerodactyl.asm"
+INCLUDE "data/pokemon/base_stats/decilla.asm"
+INCLUDE "data/pokemon/base_stats/gyaoon.asm"
+INCLUDE "data/pokemon/base_stats/omega.asm"
 INCLUDE "data/pokemon/base_stats/snorlax.asm"
-INCLUDE "data/pokemon/base_stats/articuno.asm"
-INCLUDE "data/pokemon/base_stats/zapdos.asm"
-INCLUDE "data/pokemon/base_stats/moltres.asm"
+; INCLUDE "data/pokemon/base_stats/screamtail.asm"
+; INCLUDE "data/pokemon/base_stats/sandyshocks.asm"
 INCLUDE "data/pokemon/base_stats/dratini.asm"
 INCLUDE "data/pokemon/base_stats/dragonair.asm"
 INCLUDE "data/pokemon/base_stats/dragonite.asm"
+INCLUDE "data/pokemon/base_stats/articuno.asm"
+INCLUDE "data/pokemon/base_stats/zapdos.asm"
+INCLUDE "data/pokemon/base_stats/moltres.asm"
 INCLUDE "data/pokemon/base_stats/mewtwo.asm"
 INCLUDE "data/pokemon/base_stats/mew.asm"
 	assert_table_length NUM_POKEMON - 1 ; discount MissingNo
diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm
index cfd56dbf..55c25fd5 100644
--- a/data/pokemon/cries.asm
+++ b/data/pokemon/cries.asm
@@ -226,18 +226,17 @@ CryData::
 	mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
 	mon_cry SFX_CRY_00, $00, $00 ; Magnezone
 	mon_cry SFX_CRY_00, $00, $00 ; Porygon-Z
-	; mon_cry SFX_CRY_00, $00, $00 ; Perrserker
-	; mon_cry SFX_CRY_00, $00, $00 ; Sirfetch'd
-	; mon_cry SFX_CRY_00, $00, $00 ; Mr. Rime
-	; mon_cry SFX_CRY_00, $00, $00 ; Pichu
-	; mon_cry SFX_CRY_00, $00, $00 ; Cleffa
-	; mon_cry SFX_CRY_00, $00, $00 ; Igglybuff
-	; mon_cry SFX_CRY_00, $00, $00 ; Tyrogue
-	; mon_cry SFX_CRY_00, $00, $00 ; Smoochum
-	; mon_cry SFX_CRY_00, $00, $00 ; Elekid
-	; mon_cry SFX_CRY_00, $00, $00 ; Magby
-	; mon_cry SFX_CRY_00, $00, $00 ; Mime Jr.
 	; mon_cry SFX_CRY_00, $00, $00 ; Happiny
 	; mon_cry SFX_CRY_00, $00, $00 ; Munchlax
+	; mon_cry SFX_CRY_20, $00, $1C ; Annihilape
+	; mon_cry SFX_CRY_0E, $FA, $80 ; Scream Tail
+	; mon_cry SFX_CRY_1C, $1F, $DD ; Sandy Shocks
+	; mon_cry SFX_CRY_00, $00, $00 ; Wiglett
+	; mon_cry SFX_CRY_00, $00, $00 ; Wugtrio
+	; mon_cry SFX_CRY_00, $00, $00 ; Toedscool
+	; mon_cry SFX_CRY_00, $00, $00 ; Toedscruel
+	; mon_cry SFX_CRY_19, $1A, $40 ; Perrserker
+	; mon_cry SFX_CRY_10, $64, $40 ; Sirfetch'd
+	; mon_cry SFX_CRY_20, $00, $70 ; Mr. Rime
 	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 	assert_table_length NUM_POKEMON_INDEXES
diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm
index 1fa4f4a1..2b3dd0b7 100644
--- a/data/pokemon/dex_order.asm
+++ b/data/pokemon/dex_order.asm
@@ -220,5 +220,17 @@ PokedexOrder:
 	db DEX_BETOBEBII
 	db DEX_MAGNEZONE
 	db DEX_PORYGONZ
+	; db DEX_HAPPINY
+	; db DEX_MUNCHLAX
+	; db DEX_ANNIHILAPE
+	; db DEX_SCREAM_TAIL
+	; db DEX_SANDY_SHOCKS
+	; db DEX_WIGLETT
+	; db DEX_WUGTRIO
+	; db DEX_TOEDSCOOL
+	; db DEX_TOEDSCRUEL
+	; db DEX_PERRSERKER
+	; db DEX_SIRFETCHD
+	; db DEX_MR_RIME
 	db DEX_MISSINGNO
 	assert_table_length NUM_POKEMON_INDEXES
diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm
index 838c7c9f..aca1592f 100644
--- a/data/pokemon/menu_icons.asm
+++ b/data/pokemon/menu_icons.asm
@@ -9,24 +9,27 @@ MonPartyData:
 	nybble ICON_WATER     ; Squirtle
 	nybble ICON_WATER     ; Wartortle
 	nybble ICON_WATER     ; Totartle
+	nybble ICON_QUADRUPED ; Rattata
+	nybble ICON_QUADRUPED ; Raticate
+	nybble ICON_BIRD      ; Pidgey
+	nybble ICON_BIRD      ; Pidgeotto
+	nybble ICON_BIRD      ; Pidgeot
 	nybble ICON_BUG       ; Caterpie
 	nybble ICON_BUG       ; Metapod
 	nybble ICON_BUG       ; Butterfree
 	nybble ICON_BUG       ; Weedle
 	nybble ICON_BUG       ; Kakuna
 	nybble ICON_BUG       ; Beedrill
-	nybble ICON_BIRD      ; Pidgey
-	nybble ICON_BIRD      ; Pidgeotto
-	nybble ICON_BIRD      ; Pidgeot
-	nybble ICON_QUADRUPED ; Rattata
-	nybble ICON_QUADRUPED ; Raticate
+	nybble ICON_MON       ; Konya
+	nybble ICON_MON       ; Meowth
+	nybble ICON_MON       ; Persian
+	nybble ICON_FAIRY     ; Pikachu
+	nybble ICON_FAIRY     ; Raichu
+	nybble ICON_FAIRY     ; Gorochu
 	nybble ICON_BIRD      ; Spearow
 	nybble ICON_BIRD      ; Fearow
 	nybble ICON_SNAKE     ; Ekans
 	nybble ICON_SNAKE     ; Arbok
-	nybble ICON_FAIRY     ; Pikachu
-	nybble ICON_FAIRY     ; Raichu
-	nybble ICON_FAIRY     ; Gorochu
 	nybble ICON_MON       ; Sandshrew
 	nybble ICON_MON       ; Sandslash
 	nybble ICON_MON       ; NidoranF
@@ -36,161 +39,160 @@ MonPartyData:
 	nybble ICON_MON       ; Nidorino
 	nybble ICON_MON       ; Nidoking
 	nybble ICON_MON       ; Nidoreign
-	nybble ICON_FAIRY     ; Clefairy
-	nybble ICON_FAIRY     ; Clefable
-	nybble ICON_QUADRUPED ; Mikon
-	nybble ICON_QUADRUPED ; Vulpix
-	nybble ICON_QUADRUPED ; Ninetales
-	nybble ICON_FAIRY     ; Jigglypuff
-	nybble ICON_FAIRY     ; Wigglytuff
+	nybble ICON_WATER     ; Magikarp
+	nybble ICON_SNAKE     ; Gyarados
 	nybble ICON_MON       ; Bittybat
 	nybble ICON_MON       ; Zubat
 	nybble ICON_MON       ; Golbat
-	nybble ICON_MON       ; Crobat 
+	nybble ICON_MON       ; Crobat
+	nybble ICON_MON       ; Geodude
+	nybble ICON_MON       ; Graveler
+	nybble ICON_MON       ; Golem
+	nybble ICON_BUG       ; Para
+	nybble ICON_BUG       ; Paras
+	nybble ICON_BUG       ; Parasect
+	nybble ICON_FAIRY     ; Clefairy
+	nybble ICON_FAIRY     ; Clefable
+	nybble ICON_FAIRY     ; Jigglypuff
+	nybble ICON_FAIRY     ; Wigglytuff
+	nybble ICON_QUADRUPED ; Mikon
+	nybble ICON_QUADRUPED ; Vulpix
+	nybble ICON_QUADRUPED ; Ninetales
+	nybble ICON_QUADRUPED ; Pudi
+	nybble ICON_QUADRUPED ; Growlithe
+	nybble ICON_QUADRUPED ; Arcanine
+	nybble ICON_MON       ; Mankey
+	nybble ICON_MON       ; Primeape
+	; nybble ICON_MON       ; Annihilape
 	nybble ICON_GRASS     ; Oddish
 	nybble ICON_GRASS     ; Gloom
 	nybble ICON_GRASS     ; Vileplume
 	nybble ICON_GRASS     ; Bellossom
-	nybble ICON_BUG       ; Para
-	nybble ICON_BUG       ; Paras
-	nybble ICON_BUG       ; Parasect
-	nybble ICON_BUG       ; Venonat
-	nybble ICON_BUG       ; Venomoth
-	nybble ICON_WATER     ; Cheep
-	nybble ICON_WATER     ; Jabetta
-	nybble ICON_MON       ; Ribbito
-	nybble ICON_MON       ; Croakozuna
-	nybble ICON_MON       ; Diglett
-	nybble ICON_MON       ; Dugtrio
-	nybble ICON_MON       ; Konya
-	nybble ICON_MON       ; Meowth
-	nybble ICON_MON       ; Persian
-	nybble ICON_MON       ; Psyduck
-	nybble ICON_MON       ; Weirduck
-	nybble ICON_MON       ; Golduck
-	nybble ICON_MON       ; Mankey
-	nybble ICON_MON       ; Primeape
-	nybble ICON_QUADRUPED ; Pudi
-	nybble ICON_QUADRUPED ; Growlithe
-	nybble ICON_QUADRUPED ; Arcanine
-	nybble ICON_MON       ; Poliwag
-	nybble ICON_MON       ; Poliwhirl
-	nybble ICON_MON       ; Poliwrath
-	nybble ICON_MON       ; Politoed
-	nybble ICON_MON       ; Abra
-	nybble ICON_MON       ; Kadabra
-	nybble ICON_MON       ; Alakazam
-	nybble ICON_MON       ; Machop
-	nybble ICON_MON       ; Machoke
-	nybble ICON_MON       ; Machamp
 	nybble ICON_GRASS     ; Bellsprout
 	nybble ICON_GRASS     ; Weepinbell
 	nybble ICON_GRASS     ; Victreebel
 	nybble ICON_GRASS     ; Tsubomitto
+	nybble ICON_BUG       ; Venonat
+	nybble ICON_BUG       ; Venomoth
+	nybble ICON_WATER     ; Gyopin
+	nybble ICON_WATER     ; Goldeen
+	nybble ICON_WATER     ; Seaking
+	nybble ICON_WATER     ; Cheep
+	nybble ICON_WATER     ; Jabetta
+	nybble ICON_MON       ; Psyduck
+	nybble ICON_MON       ; Weirduck
+	nybble ICON_MON       ; Golduck
+	nybble ICON_MON       ; Abra
+	nybble ICON_MON       ; Kadabra
+	nybble ICON_MON       ; Alakazam
+	nybble ICON_MON       ; Poliwag
+	nybble ICON_MON       ; Poliwhirl
+	nybble ICON_MON       ; Poliwrath
+	nybble ICON_MON       ; Politoed
+	nybble ICON_BIRD      ; Farfetch'd
+	nybble ICON_BIRD	  ; Madaamu
+	nybble ICON_MON       ; Diglett
+	nybble ICON_MON       ; Dugtrio
+	; nybble ICON_WATER     ; Wiglett
+	; nybble ICON_WATER     ; Wugtrio
+	nybble ICON_MON	      ; Crocky
+	nybble ICON_QUADRUPED ; Kotora
+	nybble ICON_QUADRUPED ; Gaotora
+	nybble ICON_QUADRUPED ; Gorotora
+	nybble ICON_BALL      ; Voltorb
+	nybble ICON_BALL      ; Electrode
 	nybble ICON_WATER     ; Tentacool
 	nybble ICON_WATER     ; Tentacruel
-	nybble ICON_MON       ; Geodude
-	nybble ICON_MON       ; Graveler
-	nybble ICON_MON       ; Golem
-	nybble ICON_WATER     ; Blottle
-	nybble ICON_WATER     ; Pendraken
-	nybble ICON_QUADRUPED ; Puchikoon
-	nybble ICON_QUADRUPED ; Ponyta
-	nybble ICON_QUADRUPED ; Rapidash
-	nybble ICON_QUADRUPED ; Slowpoke
-	nybble ICON_MON       ; Slowbro
-	nybble ICON_MON       ; Slowking
+	; nybble ICON_GRASS     ; Toedscool
+	; nybble ICON_GRASS     ; Toedscruel
+	nybble ICON_MON       ; Drowzee
+	nybble ICON_MON       ; Hypno
+	nybble ICON_MON       ; Lickitung
+	nybble ICON_MON       ; Lickilicky
+	nybble ICON_SNAKE     ; Onix
+	nybble ICON_SNAKE     ; Steelix
 	nybble ICON_BALL      ; Magnemite
 	nybble ICON_BALL      ; Magnetite
 	nybble ICON_BALL      ; Magneton
 	nybble ICON_BALL      ; Magnezone
-	nybble ICON_BALL      ; Barunda
-	nybble ICON_BIRD      ; Farfetch'd
-	nybble ICON_BIRD	  ; Madaamu
-	nybble ICON_WATER     ; Blastyke
-	nybble ICON_WATER     ; Blastoise
-	nybble ICON_BIRD      ; Hinaazu
-	nybble ICON_BIRD      ; Doduo
-	nybble ICON_BIRD      ; Dodrio
-	nybble ICON_WATER     ; Seel
-	nybble ICON_WATER     ; Dewgong
-	nybble ICON_MON       ; Betobebii
-	nybble ICON_MON       ; Grimer
-	nybble ICON_MON       ; Muk
-	nybble ICON_HELIX     ; Shellder
-	nybble ICON_HELIX     ; Cloyster
-	nybble ICON_MON       ; Gastly
-	nybble ICON_MON       ; Haunter
-	nybble ICON_MON       ; Gengar
-	nybble ICON_SNAKE     ; Onix
-	nybble ICON_SNAKE     ; Steelix
-	nybble ICON_MON       ; Drowzee
-	nybble ICON_MON       ; Hypno
-	nybble ICON_QUADRUPED ; Kotora
-	nybble ICON_QUADRUPED ; Gaotora
-	nybble ICON_QUADRUPED ; Gorotora
+	nybble ICON_MON       ; Machop
+	nybble ICON_MON       ; Machoke
+	nybble ICON_MON       ; Machamp
+	nybble ICON_MON       ; Ribbito
+	nybble ICON_MON       ; Croakozuna
 	nybble ICON_WATER     ; Krabby
 	nybble ICON_WATER     ; Kingler
-	nybble ICON_BALL      ; Voltorb
-	nybble ICON_BALL      ; Electrode
-	nybble ICON_GRASS	  ; Cactus
-	nybble ICON_MON	      ; Crocky
-	nybble ICON_QUADRUPED ; Deer
-	nybble ICON_GRASS     ; Exeggcute
-	nybble ICON_GRASS     ; Exeggutor
-	nybble ICON_MON       ; Cubone
-	nybble ICON_MON       ; Marowak
-	nybble ICON_MON	      ; Guardia
-	nybble ICON_MON	      ; Kangaskhan
-	nybble ICON_MON       ; Hitmonlee
-	nybble ICON_MON       ; Hitmonchan
-	nybble ICON_MON       ; Hitmontop
-	nybble ICON_MON       ; Lickitung
-	nybble ICON_MON       ; Lickilicky
-	nybble ICON_MON       ; Koffing
-	nybble ICON_MON       ; Weezing
-	nybble ICON_QUADRUPED ; Rhyhorn
-	nybble ICON_MON       ; Rhydon
-	nybble ICON_MON       ; Rhyperior
-	nybble ICON_FAIRY     ; Chansey
-	nybble ICON_FAIRY     ; Blissey
+	nybble ICON_QUADRUPED ; Slowpoke
+	nybble ICON_MON       ; Slowbro
+	nybble ICON_MON       ; Slowking
+	nybble ICON_QUADRUPED ; Puchikoon
+	nybble ICON_QUADRUPED ; Ponyta
+	nybble ICON_QUADRUPED ; Rapidash
 	nybble ICON_GRASS     ; Monja
 	nybble ICON_GRASS     ; Tangela
 	nybble ICON_GRASS     ; Tangrowth
-	nybble ICON_MON	      ; Decilla
-	nybble ICON_MON	      ; Gyaoon
-	nybble ICON_MON	      ; Omega
+	nybble ICON_HELIX     ; Staryu
+	nybble ICON_HELIX     ; Starmie
+	nybble ICON_BIRD      ; Hinaazu
+	nybble ICON_BIRD      ; Doduo
+	nybble ICON_BIRD      ; Dodrio
+	nybble ICON_BALL      ; Barunda
+	nybble ICON_MON       ; Gastly
+	nybble ICON_MON       ; Haunter
+	nybble ICON_MON       ; Gengar
+	nybble ICON_MON       ; Cubone
+	nybble ICON_MON       ; Marowak
+	nybble ICON_MON	      ; Guardia
+	nybble ICON_MON       ; Betobebii
+	nybble ICON_MON       ; Grimer
+	nybble ICON_MON       ; Muk
+	nybble ICON_MON       ; Koffing
+	nybble ICON_MON       ; Weezing
+	nybble ICON_WATER     ; Blastyke
+	nybble ICON_WATER     ; Blastoise
+	nybble ICON_MON       ; Ditto
+	nybble ICON_MON       ; Animon
+	nybble ICON_QUADRUPED ; Deer
+	nybble ICON_MON       ; Hitmonlee
+	nybble ICON_MON       ; Hitmonchan
+	nybble ICON_MON       ; Hitmontop
+	nybble ICON_GRASS	  ; Cactus
+	nybble ICON_HELIX     ; Shellder
+	nybble ICON_HELIX     ; Cloyster
+	nybble ICON_WATER     ; Blottle
+	nybble ICON_WATER     ; Pendraken
+	nybble ICON_WATER     ; Seel
+	nybble ICON_WATER     ; Dewgong
 	nybble ICON_WATER     ; Horsea
 	nybble ICON_WATER     ; Seadra
 	nybble ICON_WATER     ; Kingdra
-	nybble ICON_WATER     ; Gyopin
-	nybble ICON_WATER     ; Goldeen
-	nybble ICON_WATER     ; Seaking
-	nybble ICON_MON	      ; Skimper
-	nybble ICON_MON	      ; Bawligua
-	nybble ICON_MON	      ; Cryithan
-	nybble ICON_HELIX     ; Staryu
-	nybble ICON_HELIX     ; Starmie
 	nybble ICON_WATER	  ; Jagg
-	nybble ICON_MON       ; Mr.Mime
+	nybble ICON_GRASS     ; Exeggcute
+	nybble ICON_GRASS     ; Exeggutor
+	nybble ICON_QUADRUPED ; Rhyhorn
+	nybble ICON_MON       ; Rhydon
+	nybble ICON_MON       ; Rhyperior
 	nybble ICON_BUG       ; Scyther
 	nybble ICON_BUG       ; Scizor
 	nybble ICON_BUG       ; Kleavor
 	nybble ICON_BUG       ; Pinsir
 	nybble ICON_BUG       ; Purakkusu
+	nybble ICON_MON	      ; Kangaskhan
+	nybble ICON_MON       ; Trampel
+	nybble ICON_QUADRUPED ; Tauros
+	nybble ICON_FAIRY     ; Chansey
+	nybble ICON_FAIRY     ; Blissey
+	nybble ICON_MON	      ; Skimper
+	nybble ICON_MON	      ; Bawligua
+	nybble ICON_MON	      ; Cryithan
+	nybble ICON_MON       ; Mr.Mime
 	nybble ICON_MON       ; Jynx
 	nybble ICON_MON       ; Buu
 	nybble ICON_MON       ; Electabuzz
 	nybble ICON_MON       ; Electivire
 	nybble ICON_MON       ; Magmar
 	nybble ICON_MON       ; Magmortar
-	nybble ICON_MON       ; Trampel
-	nybble ICON_QUADRUPED ; Tauros
-	nybble ICON_WATER     ; Magikarp
-	nybble ICON_SNAKE     ; Gyarados
 	nybble ICON_WATER     ; Lapras
-	nybble ICON_MON       ; Ditto
-	nybble ICON_MON       ; Animon
 	nybble ICON_QUADRUPED ; Eevee
 	nybble ICON_QUADRUPED ; Vaporeon
 	nybble ICON_QUADRUPED ; Jolteon
@@ -200,21 +202,26 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Leafeon
 	nybble ICON_QUADRUPED ; Glaceon
 	nybble ICON_QUADRUPED ; Sylveon
-	nybble ICON_MON       ; Porygon
-	nybble ICON_MON       ; Porygon2
-	nybble ICON_MON       ; Porygon-Z
+	nybble ICON_BALL      ; Porygon
+	nybble ICON_BALL      ; Porygon2
+	nybble ICON_BALL      ; Porygon-Z
 	nybble ICON_HELIX     ; Omanyte
 	nybble ICON_HELIX     ; Omastar
 	nybble ICON_HELIX     ; Kabuto
 	nybble ICON_HELIX     ; Kabutops
 	nybble ICON_BIRD      ; Aerodactyl
+	nybble ICON_MON	      ; Decilla
+	nybble ICON_MON	      ; Gyaoon
+	nybble ICON_MON	      ; Omega
 	nybble ICON_MON       ; Snorlax
-	nybble ICON_BIRD      ; Articuno
-	nybble ICON_BIRD      ; Zapdos
-	nybble ICON_BIRD      ; Moltres
 	nybble ICON_SNAKE     ; Dratini
 	nybble ICON_SNAKE     ; Dragonair
 	nybble ICON_SNAKE     ; Dragonite
+	; nybble ICON_FAIRY     ; Scream Tail
+	; nybble ICON_BALL      ; Sandy Shocks
+	nybble ICON_BIRD      ; Articuno
+	nybble ICON_BIRD      ; Zapdos
+	nybble ICON_BIRD      ; Moltres
 	nybble ICON_MON       ; Mewtwo
 	nybble ICON_MON       ; Mew
 	end_nybble_array NUM_POKEMON - 1
diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm
index 79c3f21c..cb8376c3 100644
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@@ -220,6 +220,18 @@ MonsterNames::
 	db "BETOBEBII@"
 	db "MAGNEZONE@"
 	db "PORYGON-Z@"
+	; db "HAPPINY@@@"
+	; db "MUNCHLAX@@"
+	; db "ANNIHILAPE"
+	; db "SCREAMTAIL"
+	; db "SANDY SHOX"
+	; db "WIGLETT@@@"
+	; db "WUGTRIO@@@"
+	; db "TOEDSCOOL@"
+	; db "TOEDSCRUEL"
+	; db "PERRSERKER"
+	; db "SIRFETCH'D"
+	; db "MR.RIME@@@"
 	db "MISSINGNO."
 	
 	assert_table_length NUM_POKEMON_INDEXES
diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm
index 2b160aa0..13c4d55c 100644
--- a/data/pokemon/new_dex_text.asm
+++ b/data/pokemon/new_dex_text.asm
@@ -657,6 +657,76 @@ _KleavorDexEntry::
 	next "fall huge trees"
 	next "in a single slice"
 	dex
+
+_AnnihilapeDexEntry::
+	text "Fuelled by a new,"
+	next "spirit-like power,"
+	next "ANNIHILAPE's blows"
+
+	page "break the minds"
+	next "and the bones"
+	next "of its opponents"
+	dex
+	
+_WiglettDexEntry::
+	text "Appears to be a"
+	next "form of DIGLETT,"
+	next "but the two are"
+
+	page "unrelated. It has"
+	next "an extraordinary"
+	next "sense of smell"
+	dex
+	
+_WugtrioDexEntry::
+	text "A trio of fish"
+	next "#MON that live"
+	next "inside a rock."
+
+	page "They work together"
+	next "to trap and carry"
+	next "off helpless prey"
+	dex
+	
+_ToedscoolDexEntry::
+	text "Looks similar to"
+	next "TENTACOOL, but it"
+	next "is a completely"
+
+	page "different species."
+	next "It scatters spores"
+	next "as it runs around"
+	dex
+	
+_ToedscruelDexEntry::
+	text "They form colonies"
+	next "in dark forests,"
+	next "coiling their many"
+
+	page "tentacles around"
+	next "prey and draining"
+	next "their nutrients"
+	dex
+	
+_ScreamTailDexEntry::
+	text "Though it bears"
+	next "similarity to a"
+	next "regular JIGGLYPUFF,"
+
+	page "it has a savage"
+	next "nature and a"
+	next "distinctive scream"
+	dex
+	
+_SandyShocksDexEntry::
+	text "Greatly resembles"
+	next "MAGNETON. Some"
+	next "speculate that"
+
+	page "MAGNETON looked"
+	next "like this over"
+	next "10,000 years ago"
+	dex
 	
 _ArticunoGDexEntry::
 	text "From its eyes,"
diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm
index caea95fc..063cff98 100644
--- a/data/pokemon/palettes.asm
+++ b/data/pokemon/palettes.asm
@@ -10,24 +10,27 @@ MonsterPalettes:
 	db PAL_CYANMON   ; SQUIRTLE
 	db PAL_CYANMON   ; WARTORTLE
 	db PAL_CYANMON   ; TOTARTLE
+	db PAL_PURPLEMON ; RATTATA
+	db PAL_BROWNMON  ; RATICATE
+	db PAL_BROWNMON  ; PIDGEY
+	db PAL_BROWNMON  ; PIDGEOTTO
+	db PAL_BROWNMON  ; PIDGEOT
 	db PAL_GREENMON  ; CATERPIE
 	db PAL_GREENMON  ; METAPOD
 	db PAL_CYANMON   ; BUTTERFREE
 	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_PURPLEMON ; RATTATA
-	db PAL_BROWNMON  ; RATICATE
+	db PAL_YELLOWMON ; KONYA
+	db PAL_YELLOWMON ; MEOWTH
+	db PAL_YELLOWMON ; PERSIAN
+	db PAL_YELLOWMON ; PIKACHU
+	db PAL_YELLOWMON ; RAICHU
+	db PAL_YELLOWMON ; GOROCHU
 	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_YELLOWMON ; GOROCHU
 	db PAL_BROWNMON  ; SANDSHREW
 	db PAL_BROWNMON  ; SANDSLASH
 	db PAL_BLUEMON   ; NIDORAN_F
@@ -37,161 +40,160 @@ MonsterPalettes:
 	db PAL_PURPLEMON ; NIDORINO
 	db PAL_PURPLEMON ; NIDOKING
 	db PAL_GREYMON   ; NIDOREIGN
-	db PAL_PINKMON   ; CLEFAIRY
-	db PAL_PINKMON   ; CLEFABLE
-	db PAL_REDMON    ; MIKON
-	db PAL_REDMON    ; VULPIX
-	db PAL_YELLOWMON ; NINETALES
-	db PAL_PINKMON   ; JIGGLYPUFF
-	db PAL_PINKMON   ; WIGGLYTUFF
+	db PAL_REDMON    ; MAGIKARP
+	db PAL_BLUEMON   ; GYARADOS
 	db PAL_BLUEMON   ; BITTYBAT
 	db PAL_BLUEMON   ; ZUBAT
 	db PAL_BLUEMON   ; GOLBAT
 	db PAL_PURPLEMON ; CROBAT
+	db PAL_GREYMON   ; GEODUDE
+	db PAL_GREYMON   ; GRAVELER
+	db PAL_GREYMON   ; GOLEM
+	db PAL_REDMON    ; PARA
+	db PAL_REDMON    ; PARAS
+	db PAL_REDMON    ; PARASECT
+	db PAL_PINKMON   ; CLEFAIRY
+	db PAL_PINKMON   ; CLEFABLE
+	db PAL_PINKMON   ; JIGGLYPUFF
+	db PAL_PINKMON   ; WIGGLYTUFF
+	db PAL_REDMON    ; MIKON
+	db PAL_REDMON    ; VULPIX
+	db PAL_YELLOWMON ; NINETALES
+	db PAL_REDMON    ; PUDI
+	db PAL_REDMON    ; GROWLITHE
+	db PAL_REDMON    ; ARCANINE
+	db PAL_BROWNMON  ; MANKEY
+	db PAL_BROWNMON  ; PRIMEAPE
+	; db PAL_GREYMON   ; ANNIHILAPE
 	db PAL_GREENMON  ; ODDISH
 	db PAL_REDMON    ; GLOOM
 	db PAL_REDMON    ; VILEPLUME
 	db PAL_PURPLEMON ; BELLOSSOM
-	db PAL_REDMON    ; PARA
-	db PAL_REDMON    ; PARAS
-	db PAL_REDMON    ; PARASECT
-	db PAL_PURPLEMON ; VENONAT
-	db PAL_PURPLEMON ; VENOMOTH
-	db PAL_PURPLEMON ; CHEEP
-	db PAL_PURPLEMON ; JABETTA
-	db PAL_GREENMON  ; RIBBITO
-	db PAL_GREENMON  ; CROAKOZUNA
-	db PAL_BROWNMON  ; DIGLETT
-	db PAL_BROWNMON  ; DUGTRIO
-	db PAL_YELLOWMON ; KONYA
-	db PAL_YELLOWMON ; MEOWTH
-	db PAL_YELLOWMON ; PERSIAN
-	db PAL_YELLOWMON ; PSYDUCK
-	db PAL_GREENMON  ; WEIRDUCK
-	db PAL_CYANMON   ; GOLDUCK
-	db PAL_BROWNMON  ; MANKEY
-	db PAL_BROWNMON  ; PRIMEAPE
-	db PAL_REDMON    ; PUDI
-	db PAL_REDMON    ; GROWLITHE
-	db PAL_REDMON    ; ARCANINE
-	db PAL_BLUEMON   ; POLIWAG
-	db PAL_BLUEMON   ; POLIWHIRL
-	db PAL_BLUEMON   ; POLIWRATH
-	db PAL_GREENMON  ; POLITOED
-	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_GREENMON  ; TSUBOMITTO
+	db PAL_PURPLEMON ; VENONAT
+	db PAL_PURPLEMON ; VENOMOTH
+	db PAL_REDMON    ; GYOPIN
+	db PAL_REDMON    ; GOLDEEN
+	db PAL_REDMON    ; SEAKING
+	db PAL_PURPLEMON ; CHEEP
+	db PAL_PURPLEMON ; JABETTA
+	db PAL_YELLOWMON ; PSYDUCK
+	db PAL_GREENMON  ; WEIRDUCK
+	db PAL_CYANMON   ; GOLDUCK
+	db PAL_YELLOWMON ; ABRA
+	db PAL_YELLOWMON ; KADABRA
+	db PAL_YELLOWMON ; ALAKAZAM
+	db PAL_BLUEMON   ; POLIWAG
+	db PAL_BLUEMON   ; POLIWHIRL
+	db PAL_BLUEMON   ; POLIWRATH
+	db PAL_GREENMON  ; POLITOED
+	db PAL_BROWNMON  ; FARFETCHD
+	db PAL_BROWNMON  ; MADAAMU
+	db PAL_BROWNMON  ; DIGLETT
+	db PAL_BROWNMON  ; DUGTRIO
+	; db PAL_PINKMON   ; WIGLETT
+	; db PAL_PINKMON   ; WUGTRIO
+	db PAL_GREENMON  ; CROCKY
+	db PAL_YELLOWMON ; KOTORA
+	db PAL_YELLOWMON ; GAOTORA
+	db PAL_YELLOWMON ; GOROTORA
+	db PAL_REDMON    ; VOLTORB
+	db PAL_REDMON    ; ELECTRODE
 	db PAL_CYANMON   ; TENTACOOL
 	db PAL_CYANMON   ; TENTACRUEL
-	db PAL_GREYMON   ; GEODUDE
-	db PAL_GREYMON   ; GRAVELER
-	db PAL_GREYMON   ; GOLEM
-	db PAL_MEWMON    ; BLOTTLE
-	db PAL_MEWMON    ; PENDRAKEN
-	db PAL_REDMON    ; PUCHIKOON
-	db PAL_REDMON    ; PONYTA
-	db PAL_REDMON    ; RAPIDASH
-	db PAL_PINKMON   ; SLOWPOKE
-	db PAL_PINKMON   ; SLOWBRO
-	db PAL_PINKMON   ; SLOWKING
+	; db PAL_BROWNMON  ; TOEDSCOOL
+	; db PAL_YELLOWMON ; TOEDSCRUEL
+	db PAL_YELLOWMON ; DROWZEE
+	db PAL_YELLOWMON ; HYPNO
+	db PAL_PINKMON   ; LICKITUNG
+	db PAL_PINKMON   ; LICKILICKY
+	db PAL_GREYMON   ; ONIX
+	db PAL_GREYMON   ; STEELIX
 	db PAL_GREYMON   ; MAGNEMITE
 	db PAL_GREYMON   ; MAGNETITE
 	db PAL_GREYMON   ; MAGNETON
 	db PAL_GREYMON   ; MAGNEZONE
-	db PAL_PINKMON   ; BARUNDA
-	db PAL_BROWNMON  ; FARFETCHD
-	db PAL_BROWNMON  ; MADAAMU
-	db PAL_CYANMON   ; BLASTYKE
-	db PAL_CYANMON   ; BLASTOISE
-	db PAL_BROWNMON  ; HINAAZU
-	db PAL_BROWNMON  ; DODUO
-	db PAL_BROWNMON  ; DODRIO
-	db PAL_BLUEMON   ; SEEL
-	db PAL_BLUEMON   ; DEWGONG
-	db PAL_PURPLEMON ; HINAAZU
-	db PAL_PURPLEMON ; GRIMER
-	db PAL_PURPLEMON ; MUK
-	db PAL_PURPLEMON ; SHELLDER
-	db PAL_PURPLEMON ; CLOYSTER
-	db PAL_PURPLEMON ; GASTLY
-	db PAL_PURPLEMON ; HAUNTER
-	db PAL_PURPLEMON ; GENGAR
-	db PAL_GREYMON   ; ONIX
-	db PAL_GREYMON   ; STEELIX
-	db PAL_YELLOWMON ; DROWZEE
-	db PAL_YELLOWMON ; HYPNO
-	db PAL_YELLOWMON ; KOTORA
-	db PAL_YELLOWMON ; GAOTORA
-	db PAL_YELLOWMON ; GOROTORA
+	db PAL_GREYMON   ; MACHOP
+	db PAL_GREYMON   ; MACHOKE
+	db PAL_GREYMON   ; MACHAMP
+	db PAL_GREENMON  ; RIBBITO
+	db PAL_GREENMON  ; CROAKOZUNA
 	db PAL_REDMON    ; KRABBY
 	db PAL_REDMON    ; KINGLER
-	db PAL_REDMON    ; VOLTORB
-	db PAL_REDMON    ; ELECTRODE
-	db PAL_GREENMON  ; CACTUS
-	db PAL_GREENMON  ; CROCKY
-	db PAL_BROWNMON  ; DEER
-	db PAL_PINKMON   ; EXEGGCUTE
-	db PAL_GREENMON  ; EXEGGUTOR
-	db PAL_BROWNMON  ; CUBONE
-	db PAL_BROWNMON  ; MAROWAK
-	db PAL_BROWNMON  ; GUARDIA
-	db PAL_BROWNMON  ; KANGASKHAN
-	db PAL_BROWNMON  ; HITMONLEE
-	db PAL_BROWNMON  ; HITMONCHAN
-	db PAL_BROWNMON  ; HITMONTOP
-	db PAL_PINKMON   ; LICKITUNG
-	db PAL_PINKMON   ; LICKILICKY
-	db PAL_PURPLEMON ; KOFFING
-	db PAL_PURPLEMON ; WEEZING
-	db PAL_GREYMON   ; RHYHORN
-	db PAL_GREYMON   ; RHYDON
-	db PAL_BROWNMON  ; RHYPERIOR
-	db PAL_PINKMON   ; CHANSEY
-	db PAL_PINKMON   ; BLISSEY
+	db PAL_PINKMON   ; SLOWPOKE
+	db PAL_PINKMON   ; SLOWBRO
+	db PAL_PINKMON   ; SLOWKING
+	db PAL_REDMON    ; PUCHIKOON
+	db PAL_REDMON    ; PONYTA
+	db PAL_REDMON    ; RAPIDASH
 	db PAL_BLUEMON   ; MONJA
 	db PAL_BLUEMON   ; TANGELA
 	db PAL_CYANMON   ; TANGROWTH
-	db PAL_GREENMON  ; DECILLA
-	db PAL_GREENMON  ; GYAOON
-	db PAL_GREYMON   ; OMEGA
+	db PAL_REDMON    ; STARYU
+	db PAL_PURPLEMON ; STARMIE
+	db PAL_BROWNMON  ; HINAAZU
+	db PAL_BROWNMON  ; DODUO
+	db PAL_BROWNMON  ; DODRIO
+	db PAL_PINKMON   ; BARUNDA
+	db PAL_PURPLEMON ; GASTLY
+	db PAL_PURPLEMON ; HAUNTER
+	db PAL_PURPLEMON ; GENGAR
+	db PAL_BROWNMON  ; CUBONE
+	db PAL_BROWNMON  ; MAROWAK
+	db PAL_BROWNMON  ; GUARDIA
+	db PAL_PURPLEMON ; BETOBEBII
+	db PAL_PURPLEMON ; GRIMER
+	db PAL_PURPLEMON ; MUK
+	db PAL_PURPLEMON ; KOFFING
+	db PAL_PURPLEMON ; WEEZING
+	db PAL_CYANMON   ; BLASTYKE
+	db PAL_CYANMON   ; BLASTOISE
+	db PAL_PURPLEMON ; DITTO
+	db PAL_PURPLEMON ; ANIMON
+	db PAL_BROWNMON  ; DEER
+	db PAL_BROWNMON  ; HITMONLEE
+	db PAL_BROWNMON  ; HITMONCHAN
+	db PAL_BROWNMON  ; HITMONTOP
+	db PAL_GREENMON  ; CACTUS
+	db PAL_PURPLEMON ; SHELLDER
+	db PAL_PURPLEMON ; CLOYSTER
+	db PAL_MEWMON    ; BLOTTLE
+	db PAL_MEWMON    ; PENDRAKEN
+	db PAL_BLUEMON   ; SEEL
+	db PAL_BLUEMON   ; DEWGONG
 	db PAL_CYANMON   ; HORSEA
 	db PAL_CYANMON   ; SEADRA
 	db PAL_CYANMON   ; KINGDRA
-	db PAL_REDMON    ; GYOPIN
-	db PAL_REDMON    ; GOLDEEN
-	db PAL_REDMON    ; SEAKING
-	db PAL_CYANMON   ; SKIMPER
-	db PAL_CYANMON   ; BAWLIGUA
-	db PAL_CYANMON   ; CRYITHAN
-	db PAL_REDMON    ; STARYU
-	db PAL_PURPLEMON ; STARMIE
 	db PAL_BLUEMON   ; JAGG
-	db PAL_PINKMON   ; MR_MIME
+	db PAL_PINKMON   ; EXEGGCUTE
+	db PAL_GREENMON  ; EXEGGUTOR
+	db PAL_GREYMON   ; RHYHORN
+	db PAL_GREYMON   ; RHYDON
+	db PAL_BROWNMON  ; RHYPERIOR
 	db PAL_GREENMON  ; SCYTHER
 	db PAL_GREENMON  ; SCIZOR
 	db PAL_BROWNMON  ; KLEAVOR
 	db PAL_BROWNMON  ; PINSIR
 	db PAL_BROWNMON  ; PURAKKUSU
+	db PAL_BROWNMON  ; KANGASKHAN
+	db PAL_GREYMON   ; TRAMPEL
+	db PAL_BROWNMON  ; TAUROS
+	db PAL_PINKMON   ; CHANSEY
+	db PAL_PINKMON   ; BLISSEY
+	db PAL_CYANMON   ; SKIMPER
+	db PAL_CYANMON   ; BAWLIGUA
+	db PAL_CYANMON   ; CRYITHAN
+	db PAL_PINKMON   ; MR_MIME
 	db PAL_REDBAR    ; JYNX
 	db PAL_BLUEMON   ; BUU
 	db PAL_YELLOWMON ; ELECTABUZZ
 	db PAL_YELLOWMON ; ELECTIVIRE
 	db PAL_REDMON    ; MAGMAR
 	db PAL_REDMON    ; MAGMORTAR
-	db PAL_GREYMON   ; TRAMPEL
-	db PAL_BROWNMON  ; TAUROS
-	db PAL_REDMON    ; MAGIKARP
-	db PAL_BLUEMON   ; GYARADOS
 	db PAL_CYANMON   ; LAPRAS
-	db PAL_PURPLEMON ; DITTO
-	db PAL_PURPLEMON ; ANIMON
 	db PAL_BROWNMON  ; EEVEE
 	db PAL_CYANMON   ; VAPOREON
 	db PAL_YELLOWMON ; JOLTEON
@@ -209,13 +211,18 @@ MonsterPalettes:
 	db PAL_BROWNMON  ; KABUTO
 	db PAL_BROWNMON  ; KABUTOPS
 	db PAL_GREYMON   ; AERODACTYL
+	db PAL_GREENMON  ; DECILLA
+	db PAL_GREENMON  ; GYAOON
+	db PAL_GREYMON   ; OMEGA
 	db PAL_MEWMON    ; SNORLAX
-	db PAL_BLUEMON   ; ARTICUNO
-	db PAL_YELLOWMON ; ZAPDOS
-	db PAL_REDMON    ; MOLTRES
+	db PAL_PINKMON   ; SCREAM_TAIL
+	db PAL_GREYMON   ; SANDY_SHOCKS
 	db PAL_BLUEMON   ; DRATINI
 	db PAL_BLUEMON   ; DRAGONAIR
 	db PAL_BROWNMON  ; DRAGONITE
+	db PAL_BLUEMON   ; ARTICUNO
+	db PAL_YELLOWMON ; ZAPDOS
+	db PAL_REDMON    ; MOLTRES
 	db PAL_MEWMON    ; MEWTWO
 	db PAL_MEWMON    ; MEW
 	assert_table_length NUM_POKEMON
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index ea929f1a..79a21ccb 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -628,7 +628,7 @@ CooltrainerMData:
 	db 43, EXEGGUTOR, CLOYSTER, ARCANINE, 0
 	db 43, KINGLER, TENTACRUEL, BLASTOISE, 0
 ; Unused - this will be used in the Silph Gauntlet
-	db 66, TAUROS, VENUSAUR, NIDOKING, CHARIZARD, SNORLAX, TOTARTLE, 0
+	db 66, ALAKAZAM, VENUSAUR, NIDOKING, CHARIZARD, SNORLAX, TOTARTLE, 0
 ; Victory Road 1F
 	db 42, IVYSAUR, WARTORTLE, CHARMELEON, CHARIZARD, 0
 ; Unused
@@ -655,7 +655,7 @@ CooltrainerFData:
 	db 43, PERSIAN, NINETALES, RAICHU, 0
 
 BrunoData:
-	db $FF, 54, PRIMEAPE, 55, STEELIX, 55, POLIWRATH, 56, HITMONTOP, 56, PURAKKUSU, 58, MACHAMP, 0
+	db $FF, 54, HITMONTOP, 55, STEELIX, 55, POLIWRATH, 56, JABETTA, 56, PURAKKUSU, 58, MACHAMP, 0
 ; post-game rematch team (currently unused)
 	; db $FF, 74, STEELIX, 75, POLIWRATH, 75, SIRFETCHD, 76, PURAKKUSU, 76, MACHAMP, 78, ZAPDOS_G, 0
 
@@ -672,27 +672,27 @@ MistyData:
 LtSurgeData:
 	db $FF, 22, VOLTORB, 21, GAOTORA, 22, MAGNETITE, 23, ELECTABUZZ, 25, GOROCHU, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 66, ELECTRODE, 67, GOROTORA, 67, ELECTIVIRE, 66, JOLTEON, 67, GOROCHU, 70, ZAPDOS, 0
+	; db $FF, 66, GOROTORA, 67, ELECTIVIRE, 67, JOLTEON, 66, SANDY_SHOCKS, 67, GOROCHU, 70, ZAPDOS, 0
 
 ErikaData:
 	db $FF, 28, WEEPINBELL, 28, GLOOM, 29, CACTUS, 28, PARASECT, 31, TANGROWTH, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 66, CACTUS, 67, BELLOSSOM, 67, EXEGGUTOR, 66, VENUSAUR, 67, LEAFEON, 70, TANGROWTH, 0
+	; db $FF, 66, TOEDSCRUEL, 67, BELLOSSOM, 67, EXEGGUTOR, 66, VENUSAUR, 67, LEAFEON, 70, TANGROWTH, 0
 
 KogaData:
 	db $FF, 39, VENOMOTH, 38, NIDOREIGN, 39, MUK, 39, WEEZING, 41, CROBAT, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 66, TENTACRUEL, 67, MUK, 67, WEEZING, 66, VENOMOTH, 67, VICTREEBEL, 70, CROBAT, 0
+	; db $FF, 66, TENTACRUEL, 67, MUK, 67, VENOMOTH, 66, TSUBOMITTO, 67, WEEZING, 70, CROBAT, 0
 
 BlaineData:
-	db $FF, 45, RAPIDASH, 44, NINETALES, 45, ARCANINE, 44, FLAREON, 47, MAGMORTAR, 0
+	db $FF, 45, RAPIDASH, 44, NINETALES, 44, FLAREON, 45, ARCANINE, 47, MAGMORTAR, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 66, NINETALES, 67, ARCANINE, 67, RAPIDASH, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES,  0
+	; db $FF, 66, NINETALES, 67, RAPIDASH, 67, ARCANINE, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES,  0
 
 SabrinaData:
 	db $FF, 39, ESPEON, 40, MR_MIME, 39, SLOWKING, 40, HYPNO, 43, ALAKAZAM, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 66, ESPEON, 67, MR_MIME, 67, HYPNO, 66, SLOWKING, 67, ALAKAZAM, 70, ARTICUNO_G, 0
+	; db $FF, 66, ESPEON, 67, SLOWKING, 67, HYPNO, 66, SCREAM_TAIL, 67, ALAKAZAM, 70, ARTICUNO_G, 0
 
 GentlemanData:
 ; SS Anne 1F Rooms
@@ -735,7 +735,7 @@ Green3Data:
 LoreleiData:
 	db $FF, 54, DEWGONG, 53, CLOYSTER, 54, GLACEON, 55, JYNX, 55, BUU, 56, LAPRAS, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 74, DEWGONG, 73, NINETALES_A, 74, GLACEON, 75, CLOYSTER, 75, LAPRAS, 76, ARTICUNO, 0
+	; db $FF, 74, DEWGONG, 73, CLOYSTER, 74, GLACEON, 75, MR_RIME, 75, LAPRAS, 76, ARTICUNO, 0
 
 ChannelerData:
 ; Unused
@@ -747,7 +747,7 @@ ChannelerData:
 	db 23, MIKON, GASTLY, 0
 	db 24, VULPIX, 0
 ; Unused - this will be used in the Silph Gauntlet
-	db 65, GUARDIA, NINETALES, BARUNDA, HYPNO, MUK, GENGAR, 0
+	db 65, GUARDIA, NINETALES, PRIMEAPE, HYPNO, MUK, GENGAR, 0
 ; Pokémon Tower 3F
 	db 25, GASTLY, HAUNTER, 0
 ; Pokémon Tower 4F, now unused 
@@ -777,12 +777,12 @@ ChannelerData:
 	db 33, GASTLY, GASTLY, HAUNTER, 0
 
 AgathaData:
-	db $FF, 57, CROAKOZUNA, 56, CROBAT, 56, TSUBOMITTO, 58, UMBREON, 58, ARBOK, 60, GENGAR, 0
+	db $FF, 57, CROAKOZUNA, 56, CROBAT, 56, PRIMEAPE, 58, UMBREON, 58, ARBOK, 60, GENGAR, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 77, CROAKOZUNA, 76, MAROWAK_A, 76, UMBREON, 78, CROBAT, 78, GENGAR, 80, MOLTRES_G, 0
+	; db $FF, 77, ANNIHILAPE, 76, MAROWAK_A, 76, UMBREON, 78, CROBAT, 78, GENGAR, 80, MOLTRES_G, 0
 
 LanceData:
-	db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, CRYITHAN, 59, CHARIZARD, 62, DRAGONITE, 0
+	db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, CHARIZARD, 59, CRYITHAN, 62, DRAGONITE, 0
 ; post-game rematch team (currently unused)
 	; db $FF, 78, CROCKY, 77, KINGDRA, 77, AERODACTYL, 79, EXEGGUTOR_A, 79, CRYITHAN, 82, DRAGONITE, 0
 
diff --git a/maps/DiglettsCave.blk b/maps/DiglettsCave.blk
index 60c3ad58..c6d0322a 100644
--- a/maps/DiglettsCave.blk
+++ b/maps/DiglettsCave.blk
@@ -1 +1 @@
-,+,8+>,+
,+
vvvvv
+vv
+vv
nn+v)vL

8+
zt+

r


++s

*f+s




	s







8+~kkkk[[o




>~kk[o
\ No newline at end of file
+,+,+>,+
,)+
vvvvv
+vv
+vv
nn+v)vL

%+77
zt%--%+

r


+s

*f+s




	s







%+~kkkk[[o




>~kk[o
\ No newline at end of file