204 mons

Steelix, Tsubomitto, Blissey, Crobat and Hitmontop

constants/pokedex_constants.asm

@@ -50,6 +50,7 @@
 	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
@@ -86,6 +87,7 @@
 	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
@@ -118,6 +120,7 @@
 	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
@@ -138,6 +141,7 @@
 	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
@@ -146,6 +150,7 @@
 	const DEX_RHYDON     ; 112
 	const DEX_RHYPERIOR
 	const DEX_CHANSEY    ; 113
+	const DEX_BLISSEY
 	const DEX_MONJA
 	const DEX_TANGELA    ; 114 
 	const DEX_TANGROWTH

constants/pokemon_constants.asm

@@ -209,6 +209,11 @@
 	const LICKILICKY         ; $CD	(new)
 	const TANGROWTH          ; $CE	(new)
 	const KLEAVOR            ; $CF	(new)
+	const TSUBOMITTO
+	const STEELIX
+	const BLISSEY
+	const HITMONTOP
+	const CROBAT
 
 DEF NUM_POKEMON_INDEXES EQU const_value - 1
 

data/pokemon/base_stats.asm

@@ -46,6 +46,7 @@ INCLUDE "data/pokemon/base_stats/wigglytuff.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/oddish.asm"
 INCLUDE "data/pokemon/base_stats/gloom.asm"
 INCLUDE "data/pokemon/base_stats/vileplume.asm"
@@ -82,6 +83,7 @@ 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/tentacool.asm"
 INCLUDE "data/pokemon/base_stats/tentacruel.asm"
 INCLUDE "data/pokemon/base_stats/geodude.asm"
@@ -114,6 +116,7 @@ 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"
@@ -134,6 +137,7 @@ 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"
@@ -142,6 +146,7 @@ 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/monja.asm"
 INCLUDE "data/pokemon/base_stats/tangela.asm"
 INCLUDE "data/pokemon/base_stats/tangrowth.asm"

data/pokemon/cries.asm

@@ -208,4 +208,9 @@ CryData::
 	mon_cry SFX_CRY_00, $00, $00 ; Lickilicky
 	mon_cry SFX_CRY_00, $00, $00 ; Tangrowth
 	mon_cry SFX_CRY_00, $00, $00 ; Kleavor
+	mon_cry SFX_CRY_25, $44, $20 ; Tsubomitto
+	mon_cry SFX_CRY_25, $66, $CC ; Steelix
+	mon_cry SFX_CRY_00, $00, $00 ; Blissey
+	mon_cry SFX_CRY_25, $44, $20 ; Hitmontop
+	mon_cry SFX_CRY_25, $66, $CC ; Crobat
 	assert_table_length NUM_POKEMON_INDEXES

data/pokemon/dex_entries.asm

@@ -202,6 +202,11 @@ PokedexEntryPointers:
 	dw LickilickyDexEntry
 	dw TangrowthDexEntry
 	dw KleavorDexEntry
+	dw MissingNoDexEntry ; Tsubomitto
+	dw MissingNoDexEntry ; Steelix
+	dw MissingNoDexEntry ; Blissey
+	dw MissingNoDexEntry ; Hitmontop
+	dw MissingNoDexEntry ; Crobat
 	assert_table_length NUM_POKEMON_INDEXES
 
 ; string: species name

data/pokemon/dex_order.asm

@@ -202,4 +202,9 @@ PokedexOrder:
 	db DEX_LICKILICKY
 	db DEX_TANGROWTH
 	db DEX_KLEAVOR
+	db DEX_TSUBOMITTO
+	db DEX_STEELIX
+	db DEX_BLISSEY
+	db DEX_HITMONTOP
+	db DEX_CROBAT
 	assert_table_length NUM_POKEMON_INDEXES

data/pokemon/evos_moves.asm

@@ -205,6 +205,11 @@ EvosMovesPointerTable:
 	dw LickilickyEvosMoves
 	dw TangrowthEvosMoves
 	dw KleavorEvosMoves
+	dw TsubomittoEvosMoves
+	dw SteelixEvosMoves
+	dw BlisseyEvosMoves
+	dw HitmontopEvosMoves
+	dw CrobatEvosMoves
 	assert_table_length NUM_POKEMON_INDEXES
 
 RhydonEvosMoves:
@@ -2599,3 +2604,33 @@ KleavorEvosMoves:
 	db 42, AGILITY
 	db 50, ROCK_SLIDE
 	db 0
+
+TsubomittoEvosMoves:
+; Evolutions
+	db 0
+; Learnset 
+	db 0 
+
+SteelixEvosMoves:
+; Evolutions
+	db 0 
+; Learnset 
+	db 0 
+
+BlisseyEvosMoves:
+; Evolutions
+	db 0 
+; Learnset 
+	db 0 
+
+HitmontopEvosMoves:
+; Evolutions
+	db 0 
+; Learnset 
+	db 0 
+
+CrobatEvosMoves:
+; Evolutions
+	db 0 
+; Learnset 
+	db 0 

data/pokemon/menu_icons.asm

@@ -46,6 +46,7 @@ MonPartyData:
 	nybble ICON_MON       ; Bittybat
 	nybble ICON_MON       ; Zubat
 	nybble ICON_MON       ; Golbat
+	nybble ICON_BIRD      ; Crobat 
 	nybble ICON_GRASS     ; Oddish
 	nybble ICON_GRASS     ; Gloom
 	nybble ICON_GRASS     ; Vileplume
@@ -82,6 +83,7 @@ MonPartyData:
 	nybble ICON_GRASS     ; Bellsprout
 	nybble ICON_GRASS     ; Weepinbell
 	nybble ICON_GRASS     ; Victreebel
+	nybble ICON_GRASS     ; Tsubomitto
 	nybble ICON_WATER     ; Tentacool
 	nybble ICON_WATER     ; Tentacruel
 	nybble ICON_MON       ; Geodude
@@ -114,6 +116,7 @@ MonPartyData:
 	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
@@ -134,6 +137,7 @@ MonPartyData:
 	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
@@ -142,6 +146,7 @@ MonPartyData:
 	nybble ICON_MON       ; Rhydon
 	nybble ICON_MON       ; Rhyperior
 	nybble ICON_FAIRY     ; Chansey
+	nybble ICON_FAIRY     ; Blissey
 	nybble ICON_GRASS     ; Monja
 	nybble ICON_GRASS     ; Tangela
 	nybble ICON_GRASS     ; Tangrowth

data/pokemon/names.asm

@@ -202,5 +202,10 @@ MonsterNames::
 	db "LICKILICKY"
 	db "TANGROWTH@"
 	db "KLEAVOR@@@"
+	db "TSUBOMITTO"
+	db "STEELIX@@@"
+	db "BLISSEY@@@"
+	db "HITMONTOP@"
+	db "CROBAT@@@@"
 	
 	assert_table_length NUM_POKEMON_INDEXES

data/pokemon/palettes.asm

@@ -47,6 +47,7 @@ MonsterPalettes:
 	db PAL_BLUEMON   ; BITTYBAT
 	db PAL_BLUEMON   ; ZUBAT
 	db PAL_BLUEMON   ; GOLBAT
+	db PAL_PURPLEMON ; Crobat
 	db PAL_GREENMON  ; ODDISH
 	db PAL_REDMON    ; GLOOM
 	db PAL_REDMON    ; VILEPLUME
@@ -83,6 +84,7 @@ MonsterPalettes:
 	db PAL_GREENMON  ; BELLSPROUT
 	db PAL_GREENMON  ; WEEPINBELL
 	db PAL_GREENMON  ; VICTREEBEL
+	db PAL_GREENMON  ; Tsubomitto
 	db PAL_CYANMON   ; TENTACOOL
 	db PAL_CYANMON   ; TENTACRUEL
 	db PAL_GREYMON   ; GEODUDE
@@ -115,6 +117,7 @@ MonsterPalettes:
 	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
@@ -135,6 +138,7 @@ MonsterPalettes:
 	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
@@ -143,6 +147,7 @@ MonsterPalettes:
 	db PAL_GREYMON   ; RHYDON
 	db PAL_BROWNMON  ; RHYPERIOR
 	db PAL_PINKMON   ; CHANSEY
+	db PAL_PINKMON   ; Blissey
 	db PAL_BLUEMON   ; MONJA
 	db PAL_BLUEMON   ; TANGELA
 	db PAL_CYANMON   ; TANGROWTH

engine/debug/debug_party.asm

@@ -21,15 +21,15 @@ SetIshiharaTeam:
 	jr .loop
 
 IshiharaTeam:
-	db EXEGGUTOR, 90
+	db CROBAT, 90
 IF DEF(_DEBUG)
-	db MEW, 5
+	db BLISSEY, 5
 ELSE
-	db MEW, 20
+	db BLISSEY, 20
 ENDC
-	db JOLTEON, 56
+	db HITMONTOP, 56
-	db DUGTRIO, 56
+	db TSUBOMITTO, 56
-	db ARTICUNO, 57
+	db STEELIX, 57
 IF DEF(_DEBUG)
 	db KADABRA, 16 ; to test trade evos @ celadon uni - PvK
 ENDC
@@ -148,7 +148,7 @@ DebugItemsList:
 	db SECRET_KEY, 1
 	db CARD_KEY, 1
 	db S_S_TICKET, 1
-	db LIFT_KEY, 1
+	db SUPER_ROD, 1
 	db COIN_CASE, 1
 	db -1 ; end
 

gfx/pics.asm

@@ -480,3 +480,13 @@ GlaceonPicFront::      INCBIN "gfx/pokemon/front/glaceon.pic"
 GlaceonPicBack::       INCBIN "gfx/pokemon/back/glaceonb.pic"
 SylveonPicFront::      INCBIN "gfx/pokemon/front/sylveon.pic"
 SylveonPicBack::       INCBIN "gfx/pokemon/back/sylveonb.pic"
+TsubomittoPicFront::   INCBIN "gfx/pokemon/front/tsubomitto.pic"
+TsubomittoPicBack::	   INCBIN "gfx/pokemon/back/tsubomittob.pic"
+SteelixPicFront::	   INCBIN "gfx/pokemon/front/steelix.pic"
+SteelixPicBack:: 	   INCBIN "gfx/pokemon/back/steelixb.pic"
+BlisseyPicFront::	   INCBIN "gfx/pokemon/front/blissey.pic"
+BlisseyPicBack::	   INCBIN "gfx/pokemon/back/blisseyb.pic"
+HitmontopPicFront::	   INCBIN "gfx/pokemon/front/hitmontop.pic"
+HitmontopPicBack::     INCBIN "gfx/pokemon/back/hitmontopb.pic"
+CrobatPicFront::	   INCBIN "gfx/pokemon/front/crobat.pic"
+CrobatPicBack::		   INCBIN "gfx/pokemon/back/crobatb.pic"