Kokana, Kasanagi and Carapthor!

A three-stage Bug line that mirrors the Caterpie and Weedle lines, being an old design for Weedle's evolutions. Pudi, Hinaazu and Betobebii have been removed, though.

constants/pokedex_constants.asm

@@ -43,9 +43,9 @@
 	const DEX_WEEDLE     ; 13	(037)
 	const DEX_KAKUNA     ; 14	(038)
 	const DEX_BEEDRILL   ; 15	(039)
-	; const DEX_KOKANA     ; 		(040)
+	const DEX_KOKANA     ; 		(040)
-	; const DEX_KASANAGI   ; 		(041)
+	const DEX_KASANAGI   ; 		(041)
-	; const DEX_CARAPTHOR  ; 		(042)
+	const DEX_CARAPTHOR  ; 		(042)
 	const DEX_SPEAROW    ; 21	(043)	- Route 22 + Route 3
 	const DEX_FEAROW     ; 22	(044)
 	const DEX_EKANS      ; 23	(045)
@@ -78,7 +78,6 @@
 	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)
@@ -169,10 +168,8 @@
 	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)

constants/pokemon_constants.asm

@@ -198,33 +198,33 @@
 	const WEEPINBELL         ; $BD
 	const VICTREEBEL         ; $BE
 	const MONJA              ; $BF	(new pokemon start here)
-	const PUDI               ; $C0
+	const SCIZOR             ; $C0
-	const SCIZOR             ; $C1
+	const RHYPERIOR          ; $C1
-	const RHYPERIOR          ; $C2
+	const ESPEON             ; $C2
-	const ESPEON             ; $C3
+	const UMBREON            ; $C3
-	const UMBREON            ; $C4
+	const LEAFEON            ; $C4
-	const LEAFEON            ; $C5
+	const GLACEON            ; $C5
-	const GLACEON            ; $C6
+	const SYLVEON            ; $C6
-	const SYLVEON            ; $C7
+	const LICKILICKY         ; $C7
-	const LICKILICKY         ; $C8
+	const TANGROWTH          ; $C8
-	const TANGROWTH          ; $C9
+	const KLEAVOR            ; $C9
-	const KLEAVOR            ; $CA
+	const TSUBOMITTO		 ; $CA
-	const TSUBOMITTO		 ; $CB
+	const STEELIX			 ; $CB
-	const STEELIX			 ; $CC
+	const BLISSEY			 ; $CC
-	const BLISSEY			 ; $CD
+	const HITMONTOP 		 ; $CD
-	const HITMONTOP 		 ; $CE
+	const CROBAT			 ; $CE
-	const CROBAT			 ; $CF
+	const ANIMON             ; $CF
-	const ANIMON             ; $D0
+	const BELLOSSOM          ; $D0
-	const BELLOSSOM          ; $D1
+	const PORYGON2           ; $D1
-	const PORYGON2           ; $D2
+	const KINGDRA            ; $D2
-	const KINGDRA            ; $D3
+	const POLITOED           ; $D3
-	const POLITOED           ; $D4
+	const SLOWKING           ; $D4
-	const SLOWKING           ; $D5
+	const ELECTIVIRE         ; $D5
-	const ELECTIVIRE         ; $D6
+	const MAGMORTAR          ; $D6
-	const MAGMORTAR          ; $D7
+	const TAABAN             ; $D7
-	const TAABAN             ; $D8
+	const KOKANA             ; $D8
-	const HINAAZU            ; $D9
+	const KASANAGI           ; $D9
-	const BETOBEBII          ; $DA
+	const CARAPTHOR          ; $DA
 	const MAGNEZONE          ; $DB
 	const PORYGONZ           ; $DC
 	const ANNIHILAPE         ; $DD

crysaudio/cry_headers.asm

@@ -45,9 +45,9 @@ PokemonCries::
 	mon_cry CRY_WEEDLE,      238,  129 ; WEEDLE
 	mon_cry CRY_BLASTOISE,   255,  129 ; KAKUNA
 	mon_cry CRY_BLASTOISE,    96,  256 ; BEEDRILL
-	; mon_cry CRY_NIDORAN_M,     0,    0 ; KOKANA	(incomplete)
+	mon_cry CRY_NIDORAN_M,     0,    0 ; KOKANA	(incomplete)
-	; mon_cry CRY_NIDORAN_M,     0,    0 ; KASANAGI	(incomplete)
+	mon_cry CRY_NIDORAN_M,     0,    0 ; KASANAGI	(incomplete)
-	; mon_cry CRY_NIDORAN_M,     0,    0 ; CARAPTHOR(incomplete)
+	mon_cry CRY_NIDORAN_M,     0,    0 ; CARAPTHOR	(incomplete)
 	mon_cry CRY_SPEAROW,       0,  256 ; SPEAROW
 	mon_cry CRY_FEAROW,       64,  288 ; FEAROW
 	mon_cry CRY_EKANS,        18,  192 ; EKANS
@@ -80,7 +80,7 @@ PokemonCries::
 	mon_cry CRY_VULPIX,       79,  144 ; VULPIX
 	mon_cry CRY_VULPIX,      136,  224 ; NINETALES
 	mon_cry CRY_VULPIX,      136,  224 ; NINETALES_A
-	mon_cry CRY_GROWLITHE,    64,  129 ; PUDI
+	; mon_cry CRY_GROWLITHE,    64,  129 ; PUDI
 	mon_cry CRY_GROWLITHE,    32,  192 ; GROWLITHE
 	mon_cry CRY_WEEDLE,        0,  256 ; ARCANINE
 	mon_cry CRY_WEEDLE,        0,  256 ; ARCANINE_H
@@ -172,10 +172,9 @@ PokemonCries::
 	mon_cry CRY_SPEAROW,     221,  129 ; FARFETCHD
 	mon_cry CRY_FEAROW,       25,  383 ; MADAAMU
 	mon_cry CRY_SPEAROW,    -112,  192 ; SIRFETCHD
-	mon_cry CRY_NIDORAN_M,     0,    0 ; HINAAZU
 	mon_cry CRY_DIGLETT,     187,  129 ; DODUO
 	mon_cry CRY_DIGLETT,     153,  160 ; DODRIO
-	mon_cry CRY_GRIMER,      255,  192 ; BETOBEBII
+	; mon_cry CRY_GRIMER,      255,  192 ; BETOBEBII
 	mon_cry CRY_GRIMER,        0,  256 ; GRIMER
 	mon_cry CRY_MUK,         239,  383 ; MUK
 	mon_cry CRY_MUK,         239,  383 ; MUK_A

data/pokemon/base_stats.asm

@@ -39,9 +39,9 @@ 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/kokana.asm"
+INCLUDE "data/pokemon/base_stats/kokana.asm"
-; INCLUDE "data/pokemon/base_stats/kasanagi.asm"
+INCLUDE "data/pokemon/base_stats/kasanagi.asm"
-; INCLUDE "data/pokemon/base_stats/carapthor.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"
@@ -74,7 +74,6 @@ 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/ninetalesa.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/arcanineh.asm"
@@ -165,10 +164,8 @@ 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"
 INCLUDE "data/pokemon/base_stats/muka.asm"

data/pokemon/dex_entries.asm

@@ -191,7 +191,6 @@ PokedexEntryPointers:
 	dw WeepinbellDexEntry
 	dw VictreebelDexEntry
 	dw MonjaDexEntry
-	dw PudiDexEntry
 	dw ScizorDexEntry
 	dw RhyperiorDexEntry
 	dw EspeonDexEntry
@@ -216,8 +215,9 @@ PokedexEntryPointers:
 	dw ElectivireDexEntry
 	dw MagmortarDexEntry
 	dw TaabanDexEntry
-	dw HinaazuDexEntry
+	dw KokanaDexEntry
-	dw BetobebiiDexEntry
+	dw KasanagiDexEntry
+	dw CarapthorDexEntry
 	dw MagnezoneDexEntry
 	dw PorygonZDexEntry
 	dw AnnihilapeDexEntry
@@ -1668,13 +1668,6 @@ KleavorDexEntry:
 	text_far _KleavorDexEntry
 	text_end
 
-PudiDexEntry:
-    db "PUPPY@"
-	db 1,0
-	dw 270
-	text_far _PudiDexEntry
-	text_end
-
 MonjaDexEntry:
     db "VINE@"
 	db 1,4
@@ -1759,18 +1752,25 @@ TaabanDexEntry:
 	text_far _TaabanDexEntry
 	text_end
 	
-BetobebiiDexEntry:
+KokanaDexEntry:
-	db "SLUDGE@"
+	db "GRUB@"
 	db 1,0
-	dw 200
+	dw 80
-	text_far _BetobebiiDexEntry
+	text_far _KokanaDexEntry
 	text_end
 
-HinaazuDexEntry:
+KasanagiDexEntry:
-	db "BIRD NEST@"
+	db "PUPA@"
-	db 1,4
+	db 2,7
-	dw 200
+	dw 220
-	text_far _HinaazuDexEntry
+	text_far _KasanagiDexEntry
+	text_end
+
+CarapthorDexEntry:
+	db "DAPPER@"
+	db 3,11
+	dw 760
+	text_far _CarapthorDexEntry
 	text_end
 
 MagnezoneDexEntry:

data/pokemon/dex_order.asm

@@ -191,7 +191,6 @@ PokedexOrder:
 	db DEX_WEEPINBELL
 	db DEX_VICTREEBEL
 	db DEX_MONJA
-	db DEX_PUDI
 	db DEX_SCIZOR
 	db DEX_RHYPERIOR
 	db DEX_ESPEON
@@ -216,8 +215,9 @@ PokedexOrder:
 	db DEX_ELECTIVIRE
 	db DEX_MAGMORTAR
 	db DEX_TAABAN
-	db DEX_HINAAZU
+	db DEX_KOKANA
-	db DEX_BETOBEBII
+	db DEX_KASANAGI
+	db DEX_CARAPTHOR
 	db DEX_MAGNEZONE
 	db DEX_PORYGONZ
 	db DEX_ANNIHILAPE

data/pokemon/evos_moves.asm

@@ -203,7 +203,6 @@ EvosMovesPointerTable:
 	dw WeepinbellEvosMoves
 	dw VictreebelEvosMoves
 	dw MonjaEvosMoves
-	dw PudiEvosMoves
 	dw ScizorEvosMoves
 	dw RhyperiorEvosMoves
 	dw EspeonEvosMoves
@@ -228,8 +227,9 @@ EvosMovesPointerTable:
 	dw ElectivireEvosMoves
 	dw MagmortarEvosMoves
 	dw TaabanEvosMoves
-	dw HinaazuEvosMoves
+	dw KokanaEvosMoves
-	dw BetobebiiEvosMoves
+	dw KasanagiEvosMoves
+	dw CarapthorEvosMoves
 	dw MagnezoneEvosMoves
 	dw PorygonZEvosMoves
 	dw AnnihilapeEvosMoves
@@ -2547,17 +2547,17 @@ MonjaEvosMoves:
 	db 40, NIGHT_SHADE
 	db 0
 
-PudiEvosMoves:
+;PudiEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 16, GROWLITHE
+;	db EV_LEVEL, 16, GROWLITHE
-	db 0
+;	db 0
 ; Learnset
-	db 9, EMBER
+;	db 9, EMBER
-	db 12, LEER
+;	db 12, LEER
-	db 15, TAKE_DOWN
+;	db 15, TAKE_DOWN
-	db 21, AGILITY
+;	db 21, AGILITY
-	db 30, FLAMETHROWER
+;	db 30, FLAMETHROWER
-	db 0
+;	db 0
 
 ScizorEvosMoves:
 ; Evolutions
@@ -2841,33 +2841,59 @@ TaabanEvosMoves:
 	db 50, POISON_GAS
 	db 0
 	
-HinaazuEvosMoves:
+KokanaEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 18, DODUO
+	db EV_LEVEL, 7, KASANAGI
 	db 0
 ; Learnset
-	db 5, QUICK_ATTACK
-	db 11, FURY_ATTACK
-	db 20, DRILL_PECK
-	db 23, RAGE
-	db 27, TRI_ATTACK
-	db 32, AGILITY
 	db 0
 
-BetobebiiEvosMoves:
+KasanagiEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 20, GRIMER
+	db EV_LEVEL, 10, CARAPTHOR
 	db 0
 ; Learnset
-	db 13, POISON_GAS
-	db 16, ACID
-	db 19, MINIMIZE
-	db 22, SLUDGE
-	db 28, HARDEN
-	db 33, SCREECH
-	db 37, ACID_ARMOR
 	db 0
 
+CarapthorEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 12, COMET_PUNCH
+	db 16, PIN_MISSILE
+	db 20, DEFENSE_CURL
+	db 25, SWIFT
+	db 30, MEGA_PUNCH
+	db 35, SUBSTITUTE
+	db 0
+	
+;HinaazuEvosMoves:
+; Evolutions
+;	db EV_LEVEL, 18, DODUO
+;	db 0
+; Learnset
+;	db 5, QUICK_ATTACK
+;	db 11, FURY_ATTACK
+;	db 20, DRILL_PECK
+;	db 23, RAGE
+;	db 27, TRI_ATTACK
+;	db 32, AGILITY
+;	db 0
+
+;BetobebiiEvosMoves:
+; Evolutions
+;	db EV_LEVEL, 20, GRIMER
+;	db 0
+; Learnset
+;	db 13, POISON_GAS
+;	db 16, ACID
+;	db 19, MINIMIZE
+;	db 22, SLUDGE
+;	db 28, HARDEN
+;	db 33, SCREECH
+;	db 37, ACID_ARMOR
+;	db 0
+	
 MagnezoneEvosMoves:
 ; Evolutions
 	db 0

data/pokemon/menu_icons.asm

@@ -39,9 +39,9 @@ MonPartyData:
 	nybble ICON_BUG       ; Weedle
 	nybble ICON_BUG       ; Kakuna
 	nybble ICON_BUG       ; Beedrill
-	; nybble ICON_BUG       ; Kokana
+	nybble ICON_BUG       ; Kokana
-	; nybble ICON_BUG       ; Kasanagi
+	nybble ICON_BUG       ; Kasanagi
-	; nybble ICON_BUG       ; Carapthor
+	nybble ICON_BUG       ; Carapthor
 	nybble ICON_BIRD      ; Spearow
 	nybble ICON_BIRD      ; Fearow
 	nybble ICON_SNAKE     ; Ekans
@@ -74,7 +74,6 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Vulpix
 	nybble ICON_QUADRUPED ; Ninetales
 	nybble ICON_QUADRUPED ; Ninetales-A
-	nybble ICON_QUADRUPED ; Pudi
 	nybble ICON_QUADRUPED ; Growlithe
 	nybble ICON_QUADRUPED ; Arcanine
 	nybble ICON_QUADRUPED ; Arcanine-H
@@ -165,10 +164,8 @@ MonPartyData:
 	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
 	nybble ICON_MON       ; Muk-A

data/pokemon/names.asm

@@ -191,7 +191,6 @@ MonsterNames::
 	db "WEEPINBELL"
 	db "VICTREEBEL"
 	db "MONJA@@@@@"
-	db "PUDI@@@@@@"
 	db "SCIZOR@@@@"
 	db "RHYPERIOR@"
 	db "ESPEON@@@@"
@@ -216,8 +215,9 @@ MonsterNames::
 	db "ELECTIVIRE"
 	db "MAGMORTAR@"
 	db "TAABAN@@@@"
-	db "HINAAZU@@@"
+	db "KOKANA@@@@"
-	db "BETOBEBII@"
+	db "KASANAGI@@"
+	db "CARAPTHOR@"
 	db "MAGNEZONE@"
 	db "PORYGON-Z@"
 	db "ANNIHILAPE"

data/pokemon/new_dex_text.asm

@@ -398,34 +398,34 @@ _TaabanDexEntry::
 	next "with potent venom"
 	dex
 
-_HinaazuDexEntry::
+_KokanaDexEntry::
-	text "One of the three"
+	text "Closely related to"
-	next "heads is withdrawn"
+	next "WEEDLE. Due to the"
-	next "upon evolution."
+	next "lack of a horn,"
 
-	page "It grows back in"
+	para "it hides under"
-	next "as the angriest"
+	next "trees, gnawing"
-	next "head of DODRIO"
+	next "their roots"
 	dex
 
-_PudiDexEntry::
+_KasanagiDexEntry::
-	text "A very popular"
+	text "While awaiting"
-	next "family pet, this"
+	next "evolution, it"
-	next "affectionate"
+	next "barely moves. If"
 
-	page "#MON shoots"
+	page "threatened, it"
-	next "out tiny embers"
+	next "shudders while"
-	next "whenever it barks"
+	next "throwing punches"
 	dex
 
-_BetobebiiDexEntry::
+_CarapthorDexEntry::
-	text "Though it has a"
+	text "Often called the"
-	next "cute appearance,"
+	next "Forest Gent,"
-	next "it constantly"
+	next "CARAPTHOR strolls"
 
-	page "emits an foul"
+	page "around forests"
-	next "odor that deters"
+	next "with swagger, to"
-	next "anyone around it"
+	next "BEEDRILL's ire"
 	dex
 
 _ScizorDexEntry::
@@ -998,36 +998,6 @@ _TaurosPADexEntry::
 	next "its horns"
 	dex
 
-_KokanaDexEntry::
-	text "Closely related to"
-	next "WEEDLE. Due to the"
-	next "lack of a horn,"
-	
-	para "it hides under"
-	next "trees, gnawing"
-	next "their roots"
-	dex
-
-_KasanagiDexEntry::
-	text "While awaiting"
-	next "evolution, it"
-	next "barely moves. If"
-
-	page "threatened, it"
-	next "shudders while"
-	next "throwing punches"
-	dex
-
-_CarapthorDexEntry::
-	text "Often called the"
-	next "'Forest Gent',"
-	next "CARAPTHOR strolls"
-
-	page "around forests"
-	next "with swagger, to"
-	next "BEEDRILL's ire"
-	dex
-
 _MissingNoDexEntry::
 	text "This is a newly"
 	next "discovered"

data/pokemon/palettes.asm

@@ -40,9 +40,9 @@ MonsterPalettes:
 	db PAL_YELLOWMON ; WEEDLE
 	db PAL_YELLOWMON ; KAKUNA
 	db PAL_YELLOWMON ; BEEDRILL
-	; db PAL_YELLOWMON ; KOKANA
+	db PAL_YELLOWMON ; KOKANA
-	; db PAL_YELLOWMON ; KASANAGI
+	db PAL_YELLOWMON ; KASANAGI
-	; db PAL_YELLOWMON ; CARAPTHOR
+	db PAL_YELLOWMON ; CARAPTHOR
 	db PAL_BROWNMON  ; SPEAROW
 	db PAL_BROWNMON  ; FEAROW
 	db PAL_PURPLEMON ; EKANS
@@ -75,7 +75,6 @@ MonsterPalettes:
 	db PAL_REDMON    ; VULPIX
 	db PAL_YELLOWMON ; NINETALES
 	db PAL_CYANMON   ; NINETALES_A
-	db PAL_REDMON    ; PUDI
 	db PAL_REDMON    ; GROWLITHE
 	db PAL_REDMON    ; ARCANINE
 	db PAL_REDMON    ; ARCANINE_A
@@ -166,10 +165,8 @@ MonsterPalettes:
 	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
 	db PAL_GREENMON  ; MUK_A

data/trainers/parties.asm

@@ -87,25 +87,25 @@ YoungsterData:
 BugCatcherData:
 ; Viridian Forest
 	db 6, WEEDLE, CATERPIE, 0
-	db 7, CATERPIE, KAKUNA, WEEDLE, 0
+	db 7, CATERPIE, KAKUNA, KOKANA, 0
 	db 9, VENONAT, 0
 ; Route 3
-	db 10, CATERPIE, WEEDLE, WEEDLE, 0
+	db 10, CATERPIE, WEEDLE, KOKANA, 0
 	db 9,  WEEDLE, KAKUNA, CATERPIE, METAPOD, 0
 	db 11, CATERPIE, METAPOD, 0
 ; Mt. Moon 1F
-	db 12, BEEDRILL, 0
+	db 12, PARAS, 0 
-	db 10, METAPOD, PARAS, 0
+	db 10, KASANAGI, PARAS, 0
 ; Route 24
-	db 14, CATERPIE, WEEDLE, 0
+	db 14, KOKANA, WEEDLE, 0
 ; Route 6
-	db 16, WEEDLE, CATERPIE, WEEDLE, 0
+	db 16, KOKANA, CATERPIE, WEEDLE, 0
 	db 17, BUTTERFREE, 0 ; this is that one boss fight-like one, levelled down for learnset reasons
 ; Unused - this will be used in the Silph Gauntlet
-	db 62, SCIZOR, BEEDRILL, PARASECT, VENOMOTH, PURAKKUSU, KLEAVOR, 0
+	db 62, SCIZOR, CARAPTHOR, PARASECT, VENOMOTH, PURAKKUSU, KLEAVOR, 0
 ; Route 9
 	db 19, BUTTERFREE, BEEDRILL, 0
-	db 20, WEEDLE, VENONAT, BEEDRILL, 0 ; holy shit why did they have an L20 Caterpie you psycho, weedle is barely acceptable...
+	db 20, KASANAGI, VENONAT, BEEDRILL, 0 ; holy shit why did they have an L20 Caterpie you psycho, weedle is barely acceptable...
 
 LassData:
 ; Route 3
@@ -325,7 +325,7 @@ EngineerData:
 ; Unused - used in celadon university
 	db 36, GOLEM, 0
 ; Route 11
-	db 21, MAGNEMITE, 0
+	db 21, MAGNETITE, 0
 	db 18, MAGNEMITE, MAGNEMITE, MAGNETITE, 0
 
 FisherData:
@@ -665,8 +665,8 @@ ChannelerData:
 	db 33, JYNX, EXEGGCUTE, KADABRA, 0
 
 StudentData:
-	db 6, PIDGEY, HINAAZU, 0
+	db 6, PIDGEY, RATTATA, 0
-	db 4, CLEFAIRY, 0
+	db 6, CLEFAIRY, 0
 
 FirefighterData:
 ; For Cerulean Gym

data/trainers/scaled_parties.asm

@@ -82,7 +82,7 @@ GiovanniData: ; is not scaled as he is always fought last
 ; Silph Co. 11F
 	db $FF, 37, KANGASKHAN, 36, NIDOKING, 37, NIDOQUEEN, 40, PERSIAN, 42, RHYDON, 0
 ; Viridian Gym
-	db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, PERSIAN, 48, NIDOKING, 50, RHYPERIOR, 0
+	db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, GUARDIA, 48, NIDOKING, 50, RHYPERIOR, 0
 
 LoreleiData:
 	db $FF, 54, DEWGONG, 53, CLOYSTER, 54, GLACEON, 55, NINETALES_A, 55, BUU, 56, LAPRAS, 0
@@ -113,13 +113,13 @@ BlackbeltData:
 ; Koichi parties - unused to make space for rival teams
 	db 12, MACHOP, HITMONLEE, HITMONCHAN, 0										; 0 badges
 	db 20, MACHOP, MANKEY, HITMONLEE, HITMONCHAN, 0								; 1
-	db 24, MACHOKE, MANKEY, POLIWHIRL, HITMONLEE, HITMONCHAN, 0					; 2
+	db 24, MACHOKE, MANKEY, CARAPTHOR, HITMONLEE, HITMONCHAN, 0					; 2
-	db 30, MACHOKE, PRIMEAPE, POLIWHIRL, HITMONLEE, HITMONCHAN, 0				; 3
+	db 30, MACHOKE, PRIMEAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0				; 3
-	db 40, MACHOKE, PRIMEAPE, POLIWHIRL, HITMONLEE, HITMONCHAN, 0				; 4
+	db 40, MACHOKE, PRIMEAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0				; 4
-	db 42, MACHAMP, PRIMEAPE, POLIWRATH, HITMONLEE, HITMONCHAN, 0				; 5
+	db 42, MACHAMP, PRIMEAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0				; 5
-	db 46, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, 0				; 6
+	db 46, MACHAMP, ANNIHILAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0				; 6
-	db 49, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0	; 7
+	db 49, MACHAMP, ANNIHILAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, HITMONTOP, 0	; 7
-	db 53, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0	; 8
+	db 53, MACHAMP, ANNIHILAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, HITMONTOP, 0	; 8
 	db 67, MACHAMP, ANNIHILAPE, TAUROS_P, HITMONLEE, HITMONCHAN, HITMONTOP, 0   ; Silph Gauntlet
 ; Fighting Dojo Trainers
 	db 31, CHEEP, CHEEP, JABETTA, 0

data/wild/maps/Route2.asm

@@ -7,9 +7,9 @@ Route2WildMons:
 	db  5, KONYA
 	db  4, NIDORAN_F
 	db  3, KONYA
-	db  5, NIDORAN_M
+	db  4, NIDORAN_M
-	db  5, MONJA	; replace Monja with Kokana when added
+	db  5, KOKANA
-	db  6, MONJA
+	db  6, KOKANA
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route22.asm

@@ -1,15 +1,15 @@
 Route22WildMons:
 	def_grass_wildmons 25 ; encounter rate
 	db  5, RATTATA
-	db  3, NIDORAN_M
-	db  4, PUDI
 	db  4, NIDORAN_M
-	db  2, RATTATA
+	db  4, SPEAROW
-	db  4, MANKEY
-	db  3, SPEAROW
-	db  5, MIKON
-	db  3, NIDORAN_F
 	db  4, NIDORAN_F
+	db  3, RATTATA
+	db  4, MANKEY
+	db  4, MIKON
+	db  5, MIKON
+	db  5, NIDORAN_F
+	db  5, NIDORAN_M
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route4.asm

@@ -3,11 +3,11 @@ Route4WildMons:
 	db 10, RATTATA
 	db 10, PIDGEY
 	db  8, KONYA
-	db  6, EKANS
+	db 10, EKANS
 	db  8, SPEAROW
 	db 10, EKANS
-	db 12, SANDSHREW
+	db 12, MIKON
-	db 12, PUDI
+	db 12, MANKEY
 	db 12, MIKON
 	db  8, MANKEY
 

data/wild/maps/ViridianForest.asm

@@ -4,7 +4,7 @@ ViridianForestWildMons:
 	db  6, WEEDLE
 	db  6, CATERPIE
 	db  5, PIDGEY
-	db  6, MONJA	; KOKANA
+	db  6, KOKANA
 	db  6, WEEDLE
 	db  8, KAKUNA
 	db  8, METAPOD

gfx/pics.asm

@@ -459,8 +459,8 @@ GyaoonPicFront::       INCBIN "gfx/pokemon/front/gyaoon.pic"
 GyaoonPicBack::        INCBIN "gfx/pokemon/back/gyaoonb.pic"
 OmegaPicFront::        INCBIN "gfx/pokemon/front/omega.pic"
 OmegaPicBack::         INCBIN "gfx/pokemon/back/omegab.pic"
-PudiPicFront::         INCBIN "gfx/pokemon/front/pudi.pic"
+KokanaPicFront::       INCBIN "gfx/pokemon/front/kokana.pic"
-PudiPicBack::          INCBIN "gfx/pokemon/back/pudib.pic"
+KokanaPicBack::        INCBIN "gfx/pokemon/back/kokanab.pic"
 ScizorPicFront::       INCBIN "gfx/pokemon/front/scizor.pic"
 ScizorPicBack::        INCBIN "gfx/pokemon/back/scizorb.pic"
 RhyperiorPicFront::    INCBIN "gfx/pokemon/front/rhyperior.pic"
@@ -524,10 +524,10 @@ MagmortarPicFront::    INCBIN "gfx/pokemon/front/magmortar.pic"
 MagmortarPicBack::     INCBIN "gfx/pokemon/back/magmortarb.pic"
 TaabanPicFront::       INCBIN "gfx/pokemon/front/taaban.pic"
 TaabanPicBack::        INCBIN "gfx/pokemon/back/taabanb.pic"
-HinaazuPicFront::      INCBIN "gfx/pokemon/front/hinaazu.pic"
+KasanagiPicFront::     INCBIN "gfx/pokemon/front/kasanagi.pic"
-HinaazuPicBack::       INCBIN "gfx/pokemon/back/hinaazub.pic"
+KasanagiPicBack::      INCBIN "gfx/pokemon/back/kasanagib.pic"
-BetobebiiPicFront::    INCBIN "gfx/pokemon/front/betobebii.pic"
+CarapthorPicFront::    INCBIN "gfx/pokemon/front/carapthor.pic"
-BetobebiiPicBack::     INCBIN "gfx/pokemon/back/betobebiib.pic"
+CarapthorPicBack::     INCBIN "gfx/pokemon/back/carapthorb.pic"
 MagnezonePicFront::    INCBIN "gfx/pokemon/front/magnezone.pic"
 MagnezonePicBack::     INCBIN "gfx/pokemon/back/magnezoneb.pic"
 PorygonZPicFront::     INCBIN "gfx/pokemon/front/porygonz.pic"