diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm
index 07d014c3..93b9539d 100644
--- a/constants/pokedex_constants.asm
+++ b/constants/pokedex_constants.asm
@@ -4,7 +4,7 @@
 ; - MonPartyData (see data/pokemon/menu_icons.asm)
 ; - MonsterPalettes (see data/pokemon/palettes.asm)
 	const_def 1
-	const DEX_BULBASAUR  ; 1	(001)
+	const DEX_BULBASAUR  ; 1	(001)	- Pallet Town
 	const DEX_IVYSAUR    ; 2	(002)
 	const DEX_VENUSAUR   ; 3	(003)
 	const DEX_CHARMANDER ; 4	(004)
@@ -26,201 +26,204 @@
 	const DEX_LEAFEON	 ;		(020)
 	const DEX_GLACEON	 ;		(021)
 	const DEX_SYLVEON	 ;		(022)
-	const DEX_RATTATA    ; 19	(023)
+	const DEX_RATTATA    ; 19	(023)	- Route 1
 	const DEX_RATICATE   ; 20	(024)
 	const DEX_RATICATE_A ;  	(025)
 	const DEX_PIDGEY     ; 16	(026)
 	const DEX_PIDGEOTTO  ; 17	(027)
 	const DEX_PIDGEOT    ; 18	(028)
-	const DEX_CATERPIE   ; 10	(029)
-	const DEX_METAPOD    ; 11	(030)
-	const DEX_BUTTERFREE ; 12	(031)
-	const DEX_WEEDLE     ; 13	(032)
-	const DEX_KAKUNA     ; 14	(033)
-	const DEX_BEEDRILL   ; 15	(034)
-	const DEX_KONYA 	 ;		(035)
-	const DEX_MEOWTH     ; 52	(036)
-	const DEX_PERSIAN    ; 53	(037)
-	const DEX_PERSIAN_A  ;	    (038)
-	const DEX_PERRSERKER ;      (039)
-	const DEX_SPEAROW    ; 21	(040)
-	const DEX_FEAROW     ; 22	(041)
-	const DEX_EKANS      ; 23	(042)
-	const DEX_ARBOK      ; 24	(043)
-	const DEX_SANDSHREW  ; 27	(044)
-	const DEX_SANDSLASH  ; 28	(045)
-	const DEX_SANDSLASH_A ;		(046)
-	const DEX_NIDORAN_F  ; 29	(047)
-	const DEX_NIDORINA   ; 30	(048)
-	const DEX_NIDOQUEEN  ; 31	(049)
-	const DEX_NIDORAN_M  ; 32	(050)
-	const DEX_NIDORINO   ; 33	(051)
-	const DEX_NIDOKING   ; 34	(052)
-	const DEX_NIDOREIGN	 ;		(053)
-	const DEX_BITTYBAT	 ;		(054)
-	const DEX_ZUBAT      ; 41	(055)
-	const DEX_GOLBAT     ; 42	(056)
-	const DEX_CROBAT	 ;		(057)
-	const DEX_GEODUDE    ; 74	(058)
-	const DEX_GRAVELER   ; 75	(059)
-	const DEX_GOLEM      ; 76	(060)
-	const DEX_GOLEM_A    ; 	    (061)
-	const DEX_PARA		 ;		(062)
-	const DEX_PARAS      ; 46	(063)
-	const DEX_PARASECT   ; 47	(064)
-	const DEX_CLEFAIRY   ; 35	(065)
-	const DEX_CLEFABLE   ; 36	(066)
-	const DEX_JIGGLYPUFF ; 39	(067)
-	const DEX_WIGGLYTUFF ; 40	(068)
-	const DEX_MIKON      ;		(069)
-	const DEX_VULPIX     ; 37	(070)
-	const DEX_NINETALES  ; 38	(071)
-	const DEX_NINETALES_A ;	    (072)
-	const DEX_PUDI		 ;		(073)
-	const DEX_GROWLITHE  ; 58	(074)
-	const DEX_ARCANINE   ; 59	(075)
-	const DEX_ARCANINE_H ; 		(076)
-	const DEX_MANKEY     ; 56	(077)
-	const DEX_PRIMEAPE   ; 57	(078)
-	const DEX_ANNIHILAPE ;      (079)
-	const DEX_ODDISH     ; 43	(080)
-	const DEX_GLOOM      ; 44	(081)
-	const DEX_VILEPLUME  ; 45	(082)
-	const DEX_BELLOSSOM	 ;		(083)
-	const DEX_BELLSPROUT ; 69	(084)
-	const DEX_WEEPINBELL ; 70	(085)
-	const DEX_VICTREEBEL ; 71	(086)
-	const DEX_TSUBOMITTO ;		(087)
-	const DEX_MAGIKARP   ; 129	(088)
-	const DEX_GYARADOS   ; 130	(089)
-	const DEX_GYOPIN	 ;		(090)
-	const DEX_GOLDEEN    ; 118	(091)
-	const DEX_SEAKING    ; 119	(092)
-	const DEX_VENONAT    ; 48	(093)
-	const DEX_VENOMOTH   ; 49	(094)
-	const DEX_CHEEP    	 ;		(095)
-	const DEX_JABETTA    ;		(096)
-	const DEX_PSYDUCK    ; 54	(097)
-	const DEX_WEIRDUCK   ;		(098)
-	const DEX_GOLDUCK    ; 55	(099)
-	const DEX_POLIWAG    ; 60	(100)
-	const DEX_POLIWHIRL  ; 61	(101)
-	const DEX_POLIWRATH  ; 62	(102)
-	const DEX_POLITOED	 ;		(103)
-	const DEX_RIBBITO    ;		(104)
-	const DEX_CROAKOZUNA ;		(105)
-	const DEX_DROWZEE    ; 96	(106)
-	const DEX_HYPNO      ; 97	(107)
-	const DEX_LICKITUNG  ; 108	(108)		; There's a reason we're keeping Lickitung's number.
+	const DEX_KONYA 	 ;		(029)	- Route 2 + Viridian Forest
+	const DEX_MEOWTH     ; 52	(030)
+	const DEX_PERSIAN    ; 53	(031)
+	const DEX_PERSIAN_A  ;	    (032)
+	const DEX_PERRSERKER ;      (033)
+	const DEX_CATERPIE   ; 10	(034)
+	const DEX_METAPOD    ; 11	(035)
+	const DEX_BUTTERFREE ; 12	(036)
+	const DEX_WEEDLE     ; 13	(037)
+	const DEX_KAKUNA     ; 14	(038)
+	const DEX_BEEDRILL   ; 15	(039)
+	; const DEX_KOKANA	 	 ;		(040)
+	; const DEX_KASANAGI	 ;		(041)
+	; const DEX_CARAPTHOR	 ;		(042)
+	const DEX_SPEAROW    ; 21	(043)	- Route 22 + Route 3
+	const DEX_FEAROW     ; 22	(044)
+	const DEX_EKANS      ; 23	(045)
+	const DEX_ARBOK      ; 24	(046)
+	const DEX_SANDSHREW  ; 27	(047)
+	const DEX_SANDSLASH  ; 28	(048)
+	const DEX_SANDSLASH_A ;		(049)
+	const DEX_NIDORAN_F  ; 29	(050)
+	const DEX_NIDORINA   ; 30	(051)
+	const DEX_NIDOQUEEN  ; 31	(052)
+	const DEX_NIDORAN_M  ; 32	(053)
+	const DEX_NIDORINO   ; 33	(054)
+	const DEX_NIDOKING   ; 34	(055)
+	const DEX_NIDOREIGN	 ;		(056)
+	const DEX_BITTYBAT	 ;		(057)	- Mt. Moon
+	const DEX_ZUBAT      ; 41	(058)
+	const DEX_GOLBAT     ; 42	(059)
+	const DEX_CROBAT	 ;		(060)
+	const DEX_GEODUDE    ; 74	(061)
+	const DEX_GRAVELER   ; 75	(062)
+	const DEX_GOLEM      ; 76	(063)
+	const DEX_GOLEM_A    ; 	    (064)
+	const DEX_PARAS      ; 46	(065)
+	const DEX_PARASECT   ; 47	(066)
+	const DEX_CLEFAIRY   ; 35	(067)
+	const DEX_CLEFABLE   ; 36	(068)
+	const DEX_JIGGLYPUFF ; 39	(069)	- Route 4
+	const DEX_WIGGLYTUFF ; 40	(070)
+	const DEX_MIKON      ;		(071)
+	const DEX_VULPIX     ; 37	(072)
+	const DEX_NINETALES  ; 38	(073)
+	const DEX_NINETALES_A ;	    (074)
+	const DEX_PUDI		 ;		
+	const DEX_GROWLITHE  ; 58	(075)
+	const DEX_ARCANINE   ; 59	(076)
+	const DEX_ARCANINE_H ; 		(077)
+	const DEX_MANKEY     ; 56	(078)
+	const DEX_PRIMEAPE   ; 57	(079)
+	const DEX_ANNIHILAPE ;      (080)
+	const DEX_ODDISH     ; 43	(081)	- Route 24 + Route 25 + Fishing Rod 1
+	const DEX_GLOOM      ; 44	(082)
+	const DEX_VILEPLUME  ; 45	(083)
+	const DEX_BELLOSSOM	 ;		(084)
+	const DEX_BELLSPROUT ; 69	(085)
+	const DEX_WEEPINBELL ; 70	(086)
+	const DEX_VICTREEBEL ; 71	(087)
+	const DEX_TSUBOMITTO ;		(088)
+	const DEX_MAGIKARP   ; 129	(089)
+	const DEX_GYARADOS   ; 130	(090)
+	const DEX_GYOPIN	 ;		(091)
+	const DEX_GOLDEEN    ; 118	(092)
+	const DEX_SEAKING    ; 119	(093)
+	const DEX_VENONAT    ; 48	(094)
+	const DEX_VENOMOTH   ; 49	(095)
+	const DEX_CHEEP    	 ;		(096)
+	const DEX_JABETTA    ;		(097)
+	const DEX_PSYDUCK    ; 54	(098)
+	const DEX_WEIRDUCK   ;		(099)
+	const DEX_GOLDUCK    ; 55	(100)
+	const DEX_POLIWAG    ; 60	(101)
+	const DEX_POLIWHIRL  ; 61	(102)
+	const DEX_POLIWRATH  ; 62	(103)
+	const DEX_POLITOED	 ;		(104)
+	const DEX_ABRA       ; 63	(105)
+	const DEX_KADABRA    ; 64	(106)
+	const DEX_ALAKAZAM   ; 65	(107)
+	const DEX_LICKITUNG  ; 108	(108)	(There's a reason we're keeping Lickitung's number.)
 	const DEX_LICKILICKY ;		(109)
-	const DEX_ABRA       ; 63	(110)
-	const DEX_KADABRA    ; 64	(111)
-	const DEX_ALAKAZAM   ; 65	(112)
-	const DEX_DIGLETT    ; 50	(113)
-	const DEX_DUGTRIO    ; 51	(114)
-	const DEX_DUGTRIO_A  ;      (115)
-	const DEX_WIGLETT    ; 	    (116)
-	const DEX_WUGTRIO    ; 	    (117)
-	const DEX_ONIX       ; 95	(118)
-	const DEX_STEELIX	 ;		(119)
-	const DEX_KOTORA	 ;		(120)
-	const DEX_GAOTORA	 ;		(121)
-	const DEX_GOROTORA 	 ;		(122)
-	const DEX_VOLTORB    ; 100	(123)
-	const DEX_ELECTRODE  ; 101	(124)
-	const DEX_ELECTRODE_H ;		(125)
-	const DEX_TENTACOOL  ; 72	(126)
-	const DEX_TENTACRUEL ; 73	(127)
-	const DEX_TOEDSCOOL  ;      (128)
-	const DEX_TOEDSCRUEL ;      (129)
-	const DEX_MAGNEMITE  ; 81	(130)
-	const DEX_MAGNETITE	 ;		(131)
-	const DEX_MAGNETON   ; 82	(132)
-	const DEX_MAGNEZONE  ;		(133)
-	const DEX_MACHOP     ; 66	(134)
-	const DEX_MACHOKE    ; 67	(135)
-	const DEX_MACHAMP    ; 68	(136)
-	const DEX_CROCKY	 ;		(137)
-	const DEX_FARFETCHD  ; 83 	(138)
-	const DEX_MADAAMU    ;		(139)
-	const DEX_SIRFETCHD	 ;	    (140)
-	const DEX_KRABBY     ; 98	(141)
-	const DEX_KINGLER    ; 99	(142)
-	const DEX_SLOWPOKE   ; 79	(143)
-	const DEX_SLOWBRO    ; 80	(144)
-	const DEX_SLOWBRO_G  ;  	(145)
-	const DEX_SLOWKING   ;		(146)
-	const DEX_SLOWKING_G ;	    (147)
-	const DEX_PUCHIKOON  ;		(148)
-	const DEX_PONYTA     ; 77	(149)
-	const DEX_RAPIDASH   ; 78	(150)
-	const DEX_RAPIDASH_G ;  	(151)
-	const DEX_MONJA		 ;		(152)
-	const DEX_TANGELA    ; 114 	(153)
-	const DEX_TANGROWTH	 ;		(154)
-	const DEX_HINAAZU	 ;		(155)
-	const DEX_DODUO      ; 84	(156)
-	const DEX_DODRIO     ; 85 	(157)
-	const DEX_BARUNDA    ;		(158)
-	const DEX_GASTLY     ; 92	(159)
-	const DEX_HAUNTER    ; 93	(160)
-	const DEX_GENGAR     ; 94	(161)
-	const DEX_CUBONE     ; 104	(162)
-	const DEX_MAROWAK    ; 105	(163)
-	const DEX_MAROWAK_A  ;	    (164)
-	const DEX_GUARDIA 	 ;		(165)
-	const DEX_BETOBEBII  ;		(166)
+	const DEX_DROWZEE    ; 96	(110)	- Route 11 + Diglett's Cave
+	const DEX_HYPNO      ; 97	(111)
+	const DEX_DIGLETT    ; 50	(112)
+	const DEX_DUGTRIO    ; 51	(113)
+	const DEX_DUGTRIO_A  ;      (114)
+	const DEX_WIGLETT    ; 	    (115)
+	const DEX_WUGTRIO    ; 	    (116)
+	const DEX_ONIX       ; 95	(117)
+	const DEX_STEELIX	 ;		(118)
+	const DEX_KOTORA	 ;		(119)	- Route 10 + Rock Tunnel + Fishing Rod 2
+	const DEX_GAOTORA	 ;		(120)
+	const DEX_GOROTORA 	 ;		(121)
+	const DEX_VOLTORB    ; 100	(122)
+	const DEX_ELECTRODE  ; 101	(123)
+	const DEX_ELECTRODE_H ;		(124)
+	const DEX_TENTACOOL  ; 72	(125)
+	const DEX_TENTACRUEL ; 73	(126)
+	const DEX_TOEDSCOOL  ;      (127)
+	const DEX_TOEDSCRUEL ;      (128)
+	const DEX_RIBBITO    ;		(129)
+	const DEX_CROAKOZUNA ;		(130)
+	const DEX_MAGNEMITE  ; 81	(131)
+	const DEX_MAGNETITE	 ;		(132)
+	const DEX_MAGNETON   ; 82	(133)
+	const DEX_MAGNEZONE  ;		(134)
+	const DEX_MACHOP     ; 66	(135)
+	const DEX_MACHOKE    ; 67	(136)
+	const DEX_MACHAMP    ; 68	(137)
+	const DEX_CROCKY	 ;		(138)
+	const DEX_KRABBY     ; 98	(139)
+	const DEX_KINGLER    ; 99	(140)
+	const DEX_SLOWPOKE   ; 79	(141)
+	const DEX_SLOWBRO    ; 80	(142)
+	const DEX_SLOWBRO_G  ;  	(143)
+	const DEX_SLOWKING   ;		(144)
+	const DEX_SLOWKING_G ;	    (145)
+	const DEX_PUCHIKOON  ;		(146)	- Route 7 + Route 8 + Route 16
+	const DEX_PONYTA     ; 77	(147)
+	const DEX_RAPIDASH   ; 78	(148)
+	const DEX_RAPIDASH_G ;  	(149)
+	const DEX_DEER		 ;		(150)
+	const DEX_MONJA		 ;		(151)
+	const DEX_TANGELA    ; 114 	(152)
+	const DEX_TANGROWTH	 ;		(153)
+	const DEX_BARUNDA    ;		(154)
+	const DEX_GASTLY     ; 92	(155)	- Lavender Tower
+	const DEX_HAUNTER    ; 93	(156)
+	const DEX_GENGAR     ; 94	(157)
+	const DEX_CUBONE     ; 104	(158)
+	const DEX_MAROWAK    ; 105	(159)
+	const DEX_MAROWAK_A  ;	    (160)
+	const DEX_GUARDIA 	 ;		(161)
+	const DEX_FARFETCHD  ; 83 	(162)	- Routes 13-18
+	const DEX_MADAAMU    ;		(163)
+	const DEX_SIRFETCHD	 ;	    (164)
+	const DEX_HINAAZU	 ;		
+	const DEX_DODUO      ; 84	(165)
+	const DEX_DODRIO     ; 85 	(166)
+	const DEX_BETOBEBII  ;		
 	const DEX_GRIMER     ; 88	(167)
 	const DEX_MUK        ; 89	(168)
 	const DEX_MUK_A      ; 	    (169)
 	const DEX_KOFFING    ; 109	(170)
 	const DEX_WEEZING    ; 110	(171)
 	const DEX_WEEZING_G  ;  	(172)
-	const DEX_BLASTYKE   ;		(173)  
-	const DEX_BLASTOISE  ; 9	(174)
-	const DEX_DITTO      ; 132	(175)
-	const DEX_ANIMON	 ;		(176)
-	const DEX_DEER		 ;		(177)
-	const DEX_HITMONLEE  ; 106	(178)
+	const DEX_DITTO      ; 132	(173)
+	const DEX_ANIMON	 ;		(174)
+	const DEX_MR_MIME    ; 122	(175)
+	const DEX_MR_RIME	 ;      (176)
+	const DEX_CACTUS	 ;		(177)
+	const DEX_HITMONLEE  ; 106	(178)	- Saffron City
 	const DEX_HITMONCHAN ; 107	(179)
 	const DEX_HITMONTOP	 ;		(180)
-	const DEX_CACTUS	 ;		(181)
-	const DEX_SHELLDER   ; 90	(182)
-	const DEX_CLOYSTER   ; 91	(183)
-	const DEX_BLOTTLE    ;		(184)
-	const DEX_PENDRAKEN  ;		(185)
+	const DEX_BLOTTLE    ;		(181)	- Surfing + Seafoam Islands
+	const DEX_PENDRAKEN  ;		(182)
+	const DEX_SHELLDER   ; 90	(183)
+	const DEX_CLOYSTER   ; 91	(184)
+	const DEX_TAABAN	 ;		(185)
 	const DEX_STARYU     ; 120	(186)
 	const DEX_STARMIE    ; 121	(187)
 	const DEX_SEEL       ; 86	(188)
 	const DEX_DEWGONG    ; 87	(189)
-	const DEX_HORSEA     ; 116	(190)
-	const DEX_SEADRA     ; 117	(191)
-	const DEX_KINGDRA	 ;		(192)
-	const DEX_JAGG		 ;		(193)
-	const DEX_EXEGGCUTE  ; 102	(194)
-	const DEX_EXEGGUTOR  ; 103	(195)
-	const DEX_EXEGGUTOR_A ; 	(196)
-	const DEX_RHYHORN    ; 111	(197)
-	const DEX_RHYDON     ; 112	(198)
-	const DEX_RHYPERIOR	 ;		(199)
-	const DEX_SCYTHER    ; 123	(200)
-	const DEX_SCIZOR	 ;		(201)
-	const DEX_KLEAVOR	 ;		(202)
-	const DEX_PINSIR     ; 127	(203)
-	const DEX_PURAKKUSU	 ;		(204)
-	const DEX_KANGASKHAN ; 115	(205)
-	const DEX_TRAMPEL    ; 		(206)
-	const DEX_TAUROS     ; 128	(207)
-	const DEX_TAUROS_P   ; 	    (208)
-	const DEX_TAUROS_PA  ; 	    (209)
-	const DEX_TAUROS_PB  ; 	    (210)
-	const DEX_CHANSEY    ; 113	(211)
-	const DEX_BLISSEY	 ;		(212)
-	const DEX_SKIMPER    ;		(213)
-	const DEX_BAWLIGUA   ;		(214)
-	const DEX_CRYITHAN   ;		(215)
-	const DEX_MR_MIME    ; 122	(216)
-	const DEX_MR_RIME	 ;      (217)
+	const DEX_BLASTYKE	 ; 		(190)
+	const DEX_BLASTOISE	 ; 9	(191)
+	const DEX_HORSEA     ; 116	(192)
+	const DEX_SEADRA     ; 117	(193)
+	const DEX_KINGDRA	 ;		(194)
+	const DEX_JAGG		 ;		(195)
+	const DEX_EXEGGCUTE  ; 102	(196)	- Safari Zone
+	const DEX_EXEGGUTOR  ; 103	(197)
+	const DEX_EXEGGUTOR_A ; 	(198)
+	const DEX_RHYHORN    ; 111	(199)
+	const DEX_RHYDON     ; 112	(200)
+	const DEX_RHYPERIOR	 ;		(201)
+	const DEX_SCYTHER    ; 123	(202)
+	const DEX_SCIZOR	 ;		(203)
+	const DEX_KLEAVOR	 ;		(204)
+	const DEX_PINSIR     ; 127	(205)
+	const DEX_PURAKKUSU	 ;		(206)
+	const DEX_KANGASKHAN ; 115	(207)
+	const DEX_TRAMPEL    ; 		(208)
+	const DEX_TAUROS     ; 128	(209)
+	const DEX_TAUROS_P   ; 	    (210)
+	const DEX_TAUROS_PA  ; 	    (211)
+	const DEX_TAUROS_PB  ; 	    (212)
+	const DEX_CHANSEY    ; 113	(213)
+	const DEX_BLISSEY	 ;		(214)
+	const DEX_SKIMPER    ;		(215)	- Rare/Special Pokemon
+	const DEX_BAWLIGUA   ;		(216)
+	const DEX_CRYITHAN   ;		(217)
 	const DEX_JYNX       ; 124	(218)
 	const DEX_BUU		 ;		(219)
 	const DEX_ELECTABUZZ ; 125	(220)
@@ -240,7 +243,7 @@
 	const DEX_GYAOON     ;		(234)
 	const DEX_OMEGA      ;		(235)
 	const DEX_SNORLAX    ; 143	(236)
- 	const DEX_SCREAM_TAIL ;     (237)
+ 	const DEX_SCREAM_TAIL ;     (237)	- Paradoxes, Legendary and Mythical Pokemon
 	const DEX_SANDY_SHOCKS ;    (238)
 	const DEX_DRATINI    ; 147	(239)
 	const DEX_DRAGONAIR  ; 148	(240)
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 4e6034b0..314f5f7a 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -222,7 +222,7 @@
 	const SLOWKING           ; $D5
 	const ELECTIVIRE         ; $D6
 	const MAGMORTAR          ; $D7
-	const PARA               ; $D8
+	const TAABAN             ; $D8
 	const HINAAZU            ; $D9
 	const BETOBEBII          ; $DA
 	const MAGNEZONE          ; $DB
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
index a6462560..342a3f25 100644
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@@ -28,17 +28,20 @@ INCLUDE "data/pokemon/base_stats/raticatea.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/konya.asm"
+INCLUDE "data/pokemon/base_stats/meowth.asm"
+INCLUDE "data/pokemon/base_stats/persian.asm"
+INCLUDE "data/pokemon/base_stats/persiana.asm"
+INCLUDE "data/pokemon/base_stats/perrserker.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/konya.asm"
-INCLUDE "data/pokemon/base_stats/meowth.asm"
-INCLUDE "data/pokemon/base_stats/persian.asm"
-INCLUDE "data/pokemon/base_stats/persiana.asm"
-INCLUDE "data/pokemon/base_stats/perrserker.asm"
+; INCLUDE "data/pokemon/base_stats/kokana.asm"
+; INCLUDE "data/pokemon/base_stats/kasanagi.asm"
+; INCLUDE "data/pokemon/base_stats/carapthor.asm"
 INCLUDE "data/pokemon/base_stats/spearow.asm"
 INCLUDE "data/pokemon/base_stats/fearow.asm"
 INCLUDE "data/pokemon/base_stats/ekans.asm"
@@ -61,7 +64,6 @@ 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/golema.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"
@@ -103,15 +105,13 @@ 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/ribbito.asm"
-INCLUDE "data/pokemon/base_stats/croakozuna.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/abra.asm"
 INCLUDE "data/pokemon/base_stats/kadabra.asm"
 INCLUDE "data/pokemon/base_stats/alakazam.asm"
+INCLUDE "data/pokemon/base_stats/lickitung.asm"
+INCLUDE "data/pokemon/base_stats/lickilicky.asm"
+INCLUDE "data/pokemon/base_stats/drowzee.asm"
+INCLUDE "data/pokemon/base_stats/hypno.asm"
 INCLUDE "data/pokemon/base_stats/diglett.asm"
 INCLUDE "data/pokemon/base_stats/dugtrio.asm"
 INCLUDE "data/pokemon/base_stats/dugtrioa.asm"
@@ -129,6 +129,8 @@ INCLUDE "data/pokemon/base_stats/tentacool.asm"
 INCLUDE "data/pokemon/base_stats/tentacruel.asm"
 INCLUDE "data/pokemon/base_stats/toedscool.asm"
 INCLUDE "data/pokemon/base_stats/toedscruel.asm"
+INCLUDE "data/pokemon/base_stats/ribbito.asm"
+INCLUDE "data/pokemon/base_stats/croakozuna.asm"
 INCLUDE "data/pokemon/base_stats/magnemite.asm"
 INCLUDE "data/pokemon/base_stats/magnetite.asm"
 INCLUDE "data/pokemon/base_stats/magneton.asm"
@@ -137,9 +139,6 @@ 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/crocky.asm"
-INCLUDE "data/pokemon/base_stats/farfetchd.asm"
-INCLUDE "data/pokemon/base_stats/madaamu.asm"
-INCLUDE "data/pokemon/base_stats/sirfetchd.asm"
 INCLUDE "data/pokemon/base_stats/krabby.asm"
 INCLUDE "data/pokemon/base_stats/kingler.asm"
 INCLUDE "data/pokemon/base_stats/slowpoke.asm"
@@ -151,12 +150,10 @@ 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/rapidashg.asm"
+INCLUDE "data/pokemon/base_stats/deer.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/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"
@@ -165,6 +162,12 @@ INCLUDE "data/pokemon/base_stats/cubone.asm"
 INCLUDE "data/pokemon/base_stats/marowak.asm"
 INCLUDE "data/pokemon/base_stats/marowaka.asm"
 INCLUDE "data/pokemon/base_stats/guardia.asm"
+INCLUDE "data/pokemon/base_stats/farfetchd.asm"
+INCLUDE "data/pokemon/base_stats/madaamu.asm"
+INCLUDE "data/pokemon/base_stats/sirfetchd.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/betobebii.asm"
 INCLUDE "data/pokemon/base_stats/grimer.asm"
 INCLUDE "data/pokemon/base_stats/muk.asm"
@@ -172,23 +175,25 @@ INCLUDE "data/pokemon/base_stats/muka.asm"
 INCLUDE "data/pokemon/base_stats/koffing.asm"
 INCLUDE "data/pokemon/base_stats/weezing.asm"
 INCLUDE "data/pokemon/base_stats/weezingg.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/mrmime.asm"
+INCLUDE "data/pokemon/base_stats/mrrime.asm"
+INCLUDE "data/pokemon/base_stats/cactus.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/shellder.asm"
+INCLUDE "data/pokemon/base_stats/cloyster.asm"
+INCLUDE "data/pokemon/base_stats/taaban.asm"
 INCLUDE "data/pokemon/base_stats/staryu.asm"
 INCLUDE "data/pokemon/base_stats/starmie.asm"
 INCLUDE "data/pokemon/base_stats/seel.asm"
 INCLUDE "data/pokemon/base_stats/dewgong.asm"
+INCLUDE "data/pokemon/base_stats/blastyke.asm"
+INCLUDE "data/pokemon/base_stats/blastoise.asm"
 INCLUDE "data/pokemon/base_stats/horsea.asm"
 INCLUDE "data/pokemon/base_stats/seadra.asm"
 INCLUDE "data/pokemon/base_stats/kingdra.asm"
@@ -215,8 +220,6 @@ 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/mrrime.asm"
 INCLUDE "data/pokemon/base_stats/jynx.asm"
 INCLUDE "data/pokemon/base_stats/buu.asm"
 INCLUDE "data/pokemon/base_stats/electabuzz.asm"
diff --git a/data/pokemon/base_stats/taaban.asm b/data/pokemon/base_stats/taaban.asm
new file mode 100644
index 00000000..42e66437
--- /dev/null
+++ b/data/pokemon/base_stats/taaban.asm
@@ -0,0 +1,25 @@
+	db DEX_TAABAN ; pokedex id
+
+	db  70, 125, 145,  50,  70
+	;   hp  atk  def  spd  spc
+
+	db WATER, WATER ; type
+	db 60 ; catch rate
+	db 203 ; base exp
+
+	INCBIN "gfx/pokemon/front/taaban.pic", 0, 1 ; sprite dimensions
+	dw TaabanPicFront, TaabanPicBack
+
+	db TACKLE, WITHDRAW, BITE, WATER_GUN ; level 1 learnset
+	db GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   WATER_GUN,    \
+	     ICE_BEAM,     BLIZZARD,     HYPER_BEAM,   RAGE,         EARTHQUAKE,   \
+	     FISSURE,      DIG,          TELEPORT,     MIMIC,        DOUBLE_TEAM,  \
+	     REFLECT,      BIDE,         SELFDESTRUCT, SWIFT,        REST,         \
+	     EXPLOSION,    TRI_ATTACK,   SUBSTITUTE,   SURF, 	     STRENGTH
+	; end
+
+	db BANK(TaabanPicFront)
+	assert BANK(TaabanPicFront) == BANK(TaabanPicBack)
diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm
index 3857c8ca..2711bd99 100644
--- a/data/pokemon/cries.asm
+++ b/data/pokemon/cries.asm
@@ -221,7 +221,8 @@ CryData::
 	mon_cry SFX_CRY_00, $00, $00 ; Slowking
 	mon_cry SFX_CRY_00, $00, $00 ; Electivire
 	mon_cry SFX_CRY_00, $00, $00 ; Magmortar
-	mon_cry SFX_CRY_1E, $79, $40 ; Para
+	mon_cry SFX_CRY_07, $20, $FF ; Taaban
+	; mon_cry SFX_CRY_1E, $79, $40 ; Para
 	mon_cry SFX_CRY_00, $00, $00 ; Hinaazu
 	mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
 	mon_cry SFX_CRY_00, $00, $00 ; Magnezone
diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm
index f13b770d..86368913 100644
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@@ -215,7 +215,7 @@ PokedexEntryPointers:
 	dw SlowkingDexEntry
 	dw ElectivireDexEntry
 	dw MagmortarDexEntry
-	dw ParaDexEntry
+	dw TaabanDexEntry
 	dw HinaazuDexEntry
 	dw BetobebiiDexEntry
 	dw MagnezoneDexEntry
@@ -1752,11 +1752,11 @@ MagmortarDexEntry:
 	text_far _MagmortarDexEntry
 	text_end
 	
-ParaDexEntry:
-    db "MUSHROOM@"
-	db 0,8
-	dw 40
-	text_far _ParaDexEntry
+TaabanDexEntry:
+    db "SPIRAL@"
+	db 4,3
+	dw 1530
+	text_far _TaabanDexEntry
 	text_end
 	
 BetobebiiDexEntry:
diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm
index a85ec84b..aaf810e2 100644
--- a/data/pokemon/dex_order.asm
+++ b/data/pokemon/dex_order.asm
@@ -215,7 +215,7 @@ PokedexOrder:
 	db DEX_SLOWKING
 	db DEX_ELECTIVIRE
 	db DEX_MAGMORTAR
-	db DEX_PARA
+	db DEX_TAABAN
 	db DEX_HINAAZU
 	db DEX_BETOBEBII
 	db DEX_MAGNEZONE
diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm
index 3fe27a18..d894a8d5 100644
--- a/data/pokemon/dex_text.asm
+++ b/data/pokemon/dex_text.asm
@@ -73,9 +73,9 @@ _SlowbroDexEntry:: ; new entry
 	next "goes out to sea,"
 	next "it may get bit"
 	
-	page "by a spiral"
-	next "SHELLDER and"
-	next "become a SLOWBRO"
+	page "by a TAABAN and"
+	next "evolve into"
+	next "a SLOWBRO"
 	dex
 
 _IvysaurDexEntry::
diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm
index d202ad89..d1ddf599 100644
--- a/data/pokemon/evos_moves.asm
+++ b/data/pokemon/evos_moves.asm
@@ -227,7 +227,7 @@ EvosMovesPointerTable:
 	dw SlowkingEvosMoves
 	dw ElectivireEvosMoves
 	dw MagmortarEvosMoves
-	dw ParaEvosMoves
+	dw TaabanEvosMoves
 	dw HinaazuEvosMoves
 	dw BetobebiiEvosMoves
 	dw MagnezoneEvosMoves
@@ -522,7 +522,8 @@ GyaradosEvosMoves:
 
 ShellderEvosMoves:
 ; Evolutions
-	db EV_ITEM, WATER_STONE, 1, CLOYSTER
+	db EV_ITEM, WATER_STONE, 1, TAABAN
+	db EV_ITEM, ICE_STONE, 1, CLOYSTER
 	db 0
 ; Learnset
 	db 18, SUPERSONIC
@@ -2833,18 +2834,11 @@ MagmortarEvosMoves:
 	db 55, FLAMETHROWER
 	db 0
 	
-ParaEvosMoves:
+TaabanEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 12, PARAS
 	db 0
 ; Learnset
-	db 3, STUN_SPORE
-	db 6, LEECH_LIFE
-	db 10, POISONPOWDER
-	db 15, FURY_SWIPES
-	db 21, SPORE
-	db 25, GROWTH
-	db 29, SLASH
+	db 50, POISON_GAS
 	db 0
 	
 HinaazuEvosMoves:
diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm
index 7ab6f74c..368451eb 100644
--- a/data/pokemon/menu_icons.asm
+++ b/data/pokemon/menu_icons.asm
@@ -28,17 +28,20 @@ MonPartyData:
 	nybble ICON_BIRD      ; Pidgey
 	nybble ICON_BIRD      ; Pidgeotto
 	nybble ICON_BIRD      ; Pidgeot
+	nybble ICON_MON       ; Konya
+	nybble ICON_MON       ; Meowth
+	nybble ICON_MON       ; Persian
+	nybble ICON_MON       ; Persian-A
+	nybble ICON_MON       ; Perrserker
 	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_MON       ; Konya
-	nybble ICON_MON       ; Meowth
-	nybble ICON_MON       ; Persian
-	nybble ICON_MON       ; Persian-A
-	nybble ICON_MON       ; Perrserker
+	; nybble ICON_BUG       ; Kokana
+	; nybble ICON_BUG       ; Kasanagi
+	; nybble ICON_BUG       ; Carapthor
 	nybble ICON_BIRD      ; Spearow
 	nybble ICON_BIRD      ; Fearow
 	nybble ICON_SNAKE     ; Ekans
@@ -61,7 +64,6 @@ MonPartyData:
 	nybble ICON_MON       ; Graveler
 	nybble ICON_MON       ; Golem
 	nybble ICON_MON       ; Golem-A
-	nybble ICON_BUG       ; Para
 	nybble ICON_BUG       ; Paras
 	nybble ICON_BUG       ; Parasect
 	nybble ICON_FAIRY     ; Clefairy
@@ -103,15 +105,13 @@ MonPartyData:
 	nybble ICON_MON       ; Poliwhirl
 	nybble ICON_MON       ; Poliwrath
 	nybble ICON_MON       ; Politoed
-	nybble ICON_MON       ; Ribbito
-	nybble ICON_MON       ; Croakozuna
-	nybble ICON_MON       ; Drowzee
-	nybble ICON_MON       ; Hypno
-	nybble ICON_MON       ; Lickitung
-	nybble ICON_MON       ; Lickilicky
 	nybble ICON_MON       ; Abra
 	nybble ICON_MON       ; Kadabra
 	nybble ICON_MON       ; Alakazam
+	nybble ICON_MON       ; Lickitung
+	nybble ICON_MON       ; Lickilicky
+	nybble ICON_MON       ; Drowzee
+	nybble ICON_MON       ; Hypno
 	nybble ICON_MON       ; Diglett
 	nybble ICON_MON       ; Dugtrio
 	nybble ICON_MON       ; Dugtrio-A
@@ -129,6 +129,8 @@ MonPartyData:
 	nybble ICON_WATER     ; Tentacruel
 	nybble ICON_GRASS     ; Toedscool
 	nybble ICON_GRASS     ; Toedscruel
+	nybble ICON_MON       ; Ribbito
+	nybble ICON_MON       ; Croakozuna
 	nybble ICON_BALL      ; Magnemite
 	nybble ICON_BALL      ; Magnetite
 	nybble ICON_BALL      ; Magneton
@@ -137,9 +139,6 @@ MonPartyData:
 	nybble ICON_MON       ; Machoke
 	nybble ICON_MON       ; Machamp
 	nybble ICON_MON	      ; Crocky
-	nybble ICON_BIRD      ; Farfetch'd
-	nybble ICON_BIRD	  ; Madaamu
-	nybble ICON_BIRD      ; Sirfetch'd
 	nybble ICON_WATER     ; Krabby
 	nybble ICON_WATER     ; Kingler
 	nybble ICON_QUADRUPED ; Slowpoke
@@ -151,12 +150,10 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Ponyta
 	nybble ICON_QUADRUPED ; Rapidash
 	nybble ICON_QUADRUPED ; Rapidash-G
+	nybble ICON_QUADRUPED ; Deer
 	nybble ICON_GRASS     ; Monja
 	nybble ICON_GRASS     ; Tangela
 	nybble ICON_GRASS     ; Tangrowth
-	nybble ICON_BIRD      ; Hinaazu
-	nybble ICON_BIRD      ; Doduo
-	nybble ICON_BIRD      ; Dodrio
 	nybble ICON_BALL      ; Barunda
 	nybble ICON_MON       ; Gastly
 	nybble ICON_MON       ; Haunter
@@ -165,6 +162,12 @@ MonPartyData:
 	nybble ICON_MON       ; Marowak
 	nybble ICON_MON       ; Marowak-A
 	nybble ICON_MON	      ; Guardia
+	nybble ICON_BIRD      ; Farfetch'd
+	nybble ICON_BIRD	  ; Madaamu
+	nybble ICON_BIRD      ; Sirfetch'd
+	nybble ICON_BIRD      ; Hinaazu
+	nybble ICON_BIRD      ; Doduo
+	nybble ICON_BIRD      ; Dodrio
 	nybble ICON_MON       ; Betobebii
 	nybble ICON_MON       ; Grimer
 	nybble ICON_MON       ; Muk
@@ -172,23 +175,25 @@ MonPartyData:
 	nybble ICON_MON       ; Koffing
 	nybble ICON_MON       ; Weezing
 	nybble ICON_MON       ; Weezing-G
-	nybble ICON_WATER     ; Blastyke
-	nybble ICON_WATER     ; Blastoise
 	nybble ICON_MON       ; Ditto
 	nybble ICON_MON       ; Animon
-	nybble ICON_QUADRUPED ; Deer
+	nybble ICON_MON       ; Mr.Mime
+	nybble ICON_MON       ; Mr.Rime
+	nybble ICON_GRASS	  ; Cactus
 	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_HELIX     ; Shellder
+	nybble ICON_HELIX     ; Cloyster
+	nybble ICON_HELIX     ; Taaban
 	nybble ICON_HELIX     ; Staryu
 	nybble ICON_HELIX     ; Starmie
 	nybble ICON_WATER     ; Seel
 	nybble ICON_WATER     ; Dewgong
+	nybble ICON_WATER     ; Blastyke
+	nybble ICON_WATER     ; Blastoise
 	nybble ICON_WATER     ; Horsea
 	nybble ICON_WATER     ; Seadra
 	nybble ICON_WATER     ; Kingdra
@@ -215,8 +220,6 @@ MonPartyData:
 	nybble ICON_MON	      ; Skimper
 	nybble ICON_MON	      ; Bawligua
 	nybble ICON_MON	      ; Cryithan
-	nybble ICON_MON       ; Mr.Mime
-	nybble ICON_MON       ; Mr.Rime
 	nybble ICON_MON       ; Jynx
 	nybble ICON_MON       ; Buu
 	nybble ICON_MON       ; Electabuzz
diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm
index a89b1ea9..4767cb2b 100644
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@@ -215,7 +215,7 @@ MonsterNames::
 	db "SLOWKING@@"
 	db "ELECTIVIRE"
 	db "MAGMORTAR@"
-	db "PARA@@@@@@"
+	db "TAABAN@@@@"
 	db "HINAAZU@@@"
 	db "BETOBEBII@"
 	db "MAGNEZONE@"
diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm
index dc527f01..6b4e80af 100644
--- a/data/pokemon/new_dex_text.asm
+++ b/data/pokemon/new_dex_text.asm
@@ -388,14 +388,14 @@ _MonjaDexEntry::
 	next "trip and fall"
 	dex
 
-_ParaDexEntry::
-	text "It's always born"
-	next "planted inside"
-	next "of a mushroom."
+_TaabanDexEntry::
+	text "It evolved after"
+	next "biting a SLOWPOKE."
+	next "If it falls off"
 
-	page "The mushroom will"
-	next "stay with it for"
-	next "its whole life"
+	page "its host, it will"
+	next "seek out a new"
+	next "SLOWPOKE to bite"
 	dex
 
 _HinaazuDexEntry::
@@ -530,7 +530,7 @@ _PolitoedDexEntry::
 
 _SlowkingDexEntry::
 	text "Every time it"
-	next "yawns, SHELLDER"
+	next "yawns, TAABAN"
 	next "injects more"
 
 	page "poison into it,"
@@ -909,17 +909,17 @@ _RapidashGDexEntry::
 	dex
 
 _SlowbroGDexEntry::
-	text "The SHELLDER that"
+	text "The TAABAN that"
 	next "bit SLOWBRO has"
 	next "made it poisonous."
 	
-	page "SHELLDER's tongue"
+	page "TAABAN's tongue"
 	next "can be squeezed"
 	next "to spit poison"
 	dex
 
 _SlowkingGDexEntry::
-	text "The SHELLDER that"
+	text "The TAABAN that"
 	next "bit SLOWKING has"
 	next "assumed control."
 	
diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm
index 28664972..f6bfbdbd 100644
--- a/data/pokemon/palettes.asm
+++ b/data/pokemon/palettes.asm
@@ -29,17 +29,20 @@ MonsterPalettes:
 	db PAL_BROWNMON  ; PIDGEY
 	db PAL_BROWNMON  ; PIDGEOTTO
 	db PAL_BROWNMON  ; PIDGEOT
+	db PAL_YELLOWMON ; KONYA
+	db PAL_YELLOWMON ; MEOWTH
+	db PAL_YELLOWMON ; PERSIAN
+	db PAL_CYANMON   ; PERSIAN_A
+	db PAL_GREYMON   ; PERRSEKRER
 	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_YELLOWMON ; KONYA
-	db PAL_YELLOWMON ; MEOWTH
-	db PAL_YELLOWMON ; PERSIAN
-	db PAL_CYANMON   ; PERSIAN_A
-	db PAL_GREYMON   ; PERRSEKRER
+	; db PAL_YELLOWMON ; KOKANA
+	; db PAL_YELLOWMON ; KASANAGI
+	; db PAL_YELLOWMON ; CARAPTHOR
 	db PAL_BROWNMON  ; SPEAROW
 	db PAL_BROWNMON  ; FEAROW
 	db PAL_PURPLEMON ; EKANS
@@ -62,7 +65,6 @@ MonsterPalettes:
 	db PAL_GREYMON   ; GRAVELER
 	db PAL_GREYMON   ; GOLEM
 	db PAL_GREYMON   ; GOLEM_A
-	db PAL_REDMON    ; PARA
 	db PAL_REDMON    ; PARAS
 	db PAL_REDMON    ; PARASECT
 	db PAL_PINKMON   ; CLEFAIRY
@@ -104,15 +106,13 @@ MonsterPalettes:
 	db PAL_BLUEMON   ; POLIWHIRL
 	db PAL_BLUEMON   ; POLIWRATH
 	db PAL_GREENMON  ; POLITOED
-	db PAL_GREENMON  ; RIBBITO
-	db PAL_GREENMON  ; CROAKOZUNA
-	db PAL_YELLOWMON ; DROWZEE
-	db PAL_YELLOWMON ; HYPNO
-	db PAL_PINKMON   ; LICKITUNG
-	db PAL_PINKMON   ; LICKILICKY
 	db PAL_YELLOWMON ; ABRA
 	db PAL_YELLOWMON ; KADABRA
 	db PAL_YELLOWMON ; ALAKAZAM
+	db PAL_PINKMON   ; LICKITUNG
+	db PAL_PINKMON   ; LICKILICKY
+	db PAL_YELLOWMON ; DROWZEE
+	db PAL_YELLOWMON ; HYPNO
 	db PAL_BROWNMON  ; DIGLETT
 	db PAL_BROWNMON  ; DUGTRIO
 	db PAL_BROWNMON  ; DUGTRIO_A
@@ -130,6 +130,8 @@ MonsterPalettes:
 	db PAL_CYANMON   ; TENTACRUEL
 	db PAL_BROWNMON  ; TOEDSCOOL
 	db PAL_YELLOWMON ; TOEDSCRUEL
+	db PAL_GREENMON  ; RIBBITO
+	db PAL_GREENMON  ; CROAKOZUNA
 	db PAL_GREYMON   ; MAGNEMITE
 	db PAL_GREYMON   ; MAGNETITE
 	db PAL_GREYMON   ; MAGNETON
@@ -138,9 +140,6 @@ MonsterPalettes:
 	db PAL_GREYMON   ; MACHOKE
 	db PAL_GREYMON   ; MACHAMP
 	db PAL_GREENMON  ; CROCKY
-	db PAL_BROWNMON  ; FARFETCHD
-	db PAL_BROWNMON  ; MADAAMU
-	db PAL_BROWNMON  ; SIRFETCHD
 	db PAL_REDMON    ; KRABBY
 	db PAL_REDMON    ; KINGLER
 	db PAL_PINKMON   ; SLOWPOKE
@@ -152,12 +151,10 @@ MonsterPalettes:
 	db PAL_REDMON    ; PONYTA
 	db PAL_REDMON    ; RAPIDASH
 	db PAL_PURPLEMON ; RAPIDASH_G
+	db PAL_BROWNMON  ; DEER
 	db PAL_BLUEMON   ; MONJA
 	db PAL_BLUEMON   ; TANGELA
 	db PAL_CYANMON   ; TANGROWTH
-	db PAL_BROWNMON  ; HINAAZU
-	db PAL_BROWNMON  ; DODUO
-	db PAL_BROWNMON  ; DODRIO
 	db PAL_PINKMON   ; BARUNDA
 	db PAL_PURPLEMON ; GASTLY
 	db PAL_PURPLEMON ; HAUNTER
@@ -166,6 +163,12 @@ MonsterPalettes:
 	db PAL_BROWNMON  ; MAROWAK
 	db PAL_PURPLEMON ; MAROWAK_A
 	db PAL_BROWNMON  ; GUARDIA
+	db PAL_BROWNMON  ; FARFETCHD
+	db PAL_BROWNMON  ; MADAAMU
+	db PAL_BROWNMON  ; SIRFETCHD
+	db PAL_BROWNMON  ; HINAAZU
+	db PAL_BROWNMON  ; DODUO
+	db PAL_BROWNMON  ; DODRIO
 	db PAL_PURPLEMON ; BETOBEBII
 	db PAL_PURPLEMON ; GRIMER
 	db PAL_PURPLEMON ; MUK
@@ -173,23 +176,25 @@ MonsterPalettes:
 	db PAL_PURPLEMON ; KOFFING
 	db PAL_PURPLEMON ; WEEZING
 	db PAL_GREYMON   ; WEEZING_G
-	db PAL_CYANMON   ; BLASTYKE
-	db PAL_CYANMON   ; BLASTOISE
 	db PAL_PURPLEMON ; DITTO
 	db PAL_PURPLEMON ; ANIMON
-	db PAL_BROWNMON  ; DEER
+	db PAL_PINKMON   ; MR_MIME
+	db PAL_CYANMON   ; MR_RIME
+	db PAL_GREENMON  ; CACTUS
 	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_PURPLEMON ; SHELLDER
+	db PAL_PURPLEMON ; CLOYSTER
+	db PAL_GREYMON   ; TAABAN
 	db PAL_REDMON    ; STARYU
 	db PAL_PURPLEMON ; STARMIE
 	db PAL_BLUEMON   ; SEEL
 	db PAL_BLUEMON   ; DEWGONG
+	db PAL_CYANMON   ; BLASTYKE
+	db PAL_CYANMON   ; BLASTOISE
 	db PAL_CYANMON   ; HORSEA
 	db PAL_CYANMON   ; SEADRA
 	db PAL_CYANMON   ; KINGDRA
@@ -216,8 +221,6 @@ MonsterPalettes:
 	db PAL_CYANMON   ; SKIMPER
 	db PAL_CYANMON   ; BAWLIGUA
 	db PAL_CYANMON   ; CRYITHAN
-	db PAL_PINKMON   ; MR_MIME
-	db PAL_CYANMON   ; MR_RIME
 	db PAL_REDBAR    ; JYNX
 	db PAL_BLUEMON   ; BUU
 	db PAL_YELLOWMON ; ELECTABUZZ
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 2cf13de4..f45ec869 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -85,15 +85,15 @@ YoungsterData:
 BugCatcherData:
 ; Viridian Forest
 	db 6, WEEDLE, CATERPIE, 0
-	db 7, CATERPIE, KAKUNA, PARA, 0
+	db 7, CATERPIE, KAKUNA, WEEDLE, 0
 	db 9, VENONAT, 0
 ; Route 3
-	db 10, CATERPIE, WEEDLE, PARA, 0
-	db 9, WEEDLE, KAKUNA, CATERPIE, METAPOD, 0
+	db 10, CATERPIE, WEEDLE, WEEDLE, 0
+	db 9,  WEEDLE, KAKUNA, CATERPIE, METAPOD, 0
 	db 11, CATERPIE, METAPOD, 0
 ; Mt. Moon 1F
-	db 12, PARA, PARAS, 0
-	db 10, CATERPIE, METAPOD, PARA, 0
+	db 12, BEEDRILL, 0
+	db 10, METAPOD, PARAS, 0
 ; Route 24
 	db 14, CATERPIE, WEEDLE, 0
 ; Route 6
@@ -338,7 +338,7 @@ FisherData:
 	db 21, POLIWAG, SHELLDER, GOLDEEN, HORSEA, 0
 ; Route 21
 	db 28, SEAKING, GOLDEEN, SEAKING, SEAKING, 0
-	db 31, SHELLDER, CLOYSTER, 0
+	db 31, SHELLDER, TAABAN, 0
 	db 27, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, 0
 	db 33, SEAKING, GOLDEEN, 0
 ; Route 12
@@ -348,7 +348,7 @@ SwimmerData:
 ; Cerulean Gym
 	db 16, HORSEA, SHELLDER, 0
 ; Route 19
-	db 30, TENTACOOL, SHELLDER, 0
+	db 30, TENTACOOL, TAABAN, 0
 	db 29, GOLDEEN, HORSEA, STARYU, 0
 	db 30, POLIWAG, POLIWHIRL, 0
 	db 27, HORSEA, TENTACOOL, TENTACOOL, GOLDEEN, 0
@@ -402,7 +402,7 @@ BeautyData:
 	db 29, CLEFAIRY, MEOWTH, 0
 ; Route 20
 	db 35, SEAKING, 0
-	db 30, SHELLDER, SHELLDER, CLOYSTER, 0
+	db 30, SHELLDER, TAABAN, CLOYSTER, 0
 	db 31, POLIWAG, SEAKING, 0
 ; Route 15
 	db 29, PIDGEOTTO, WIGGLYTUFF, 0
diff --git a/data/wild/maps/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm
index 0ccd87e8..403094db 100644
--- a/data/wild/maps/MtMoon1F.asm
+++ b/data/wild/maps/MtMoon1F.asm
@@ -7,7 +7,7 @@ MtMoon1FWildMons:
 	db  6, BITTYBAT
 	db 10, SANDSHREW
 	db 10, GEODUDE
-	db  8, PARA
+	db  8, PARAS
 	db 11, BITTYBAT
 	db  8, CLEFAIRY
 	end_grass_wildmons
diff --git a/data/wild/maps/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm
index e5e7f947..9bf56d53 100644
--- a/data/wild/maps/MtMoonB1F.asm
+++ b/data/wild/maps/MtMoonB1F.asm
@@ -5,7 +5,7 @@ MtMoonB1FWildMons:
 	db  7, GEODUDE
 	db  8, GEODUDE
 	db  9, GEODUDE
-	db 10, PARA
+	db 10, PARAS
 	db 10, BITTYBAT
 	db 11, SANDSHREW
 	db  9, CLEFAIRY
diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm
index af464101..fdcfd806 100644
--- a/data/wild/maps/Route2.asm
+++ b/data/wild/maps/Route2.asm
@@ -4,11 +4,11 @@ Route2WildMons:
 	db  5, PIDGEY
 	db  4, CATERPIE
 	db  4, WEEDLE
-	db  5, PARA
+	db  5, KONYA
 	db  4, NIDORAN_F
-	db  3, PARA
+	db  3, KONYA
 	db  5, NIDORAN_M
-	db  5, MONJA
+	db  5, MONJA	; replace Monja with Kokana when added
 	db  6, MONJA
 	end_grass_wildmons
 
diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm
index 29020f70..a7763455 100644
--- a/data/wild/maps/ViridianForest.asm
+++ b/data/wild/maps/ViridianForest.asm
@@ -4,12 +4,12 @@ ViridianForestWildMons:
 	db  6, WEEDLE
 	db  6, CATERPIE
 	db  5, PIDGEY
-	db  6, MONJA
-	db  6, PARA
+	db  6, MONJA	; KOKANA
+	db  6, WEEDLE
 	db  8, KAKUNA
 	db  8, METAPOD
 	db  5, PIKACHU
-	db 9, PIDGEOTTO
+	db  9, PIDGEOTTO
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate
diff --git a/gfx/pics.asm b/gfx/pics.asm
index 7090e6c0..18e6167f 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -522,8 +522,8 @@ ElectivirePicFront::   INCBIN "gfx/pokemon/front/electivire.pic"
 ElectivirePicBack::    INCBIN "gfx/pokemon/back/electivireb.pic"
 MagmortarPicFront::    INCBIN "gfx/pokemon/front/magmortar.pic"
 MagmortarPicBack::     INCBIN "gfx/pokemon/back/magmortarb.pic"
-ParaPicFront::    	   INCBIN "gfx/pokemon/front/para.pic"
-ParaPicBack::     	   INCBIN "gfx/pokemon/back/parab.pic"
+TaabanPicFront::       INCBIN "gfx/pokemon/front/taaban.pic"
+TaabanPicBack::        INCBIN "gfx/pokemon/back/taabanb.pic"
 HinaazuPicFront::      INCBIN "gfx/pokemon/front/hinaazu.pic"
 HinaazuPicBack::       INCBIN "gfx/pokemon/back/hinaazub.pic"
 BetobebiiPicFront::    INCBIN "gfx/pokemon/front/betobebii.pic"
diff --git a/gfx/pokemon/front/para.png b/gfx/pokemon/unused/para.png
similarity index 100%
rename from gfx/pokemon/front/para.png
rename to gfx/pokemon/unused/para.png
diff --git a/gfx/pokemon/back/parab.png b/gfx/pokemon/unused/parab.png
similarity index 100%
rename from gfx/pokemon/back/parab.png
rename to gfx/pokemon/unused/parab.png