Charmada!

This required moving the base stat and cry files. Not tested, so someone ought to check...

constants/pokemon_constants.asm

@@ -25,6 +25,7 @@
 	const CHARMANDER ; 04
 	const CHARMELEON ; 05
 	const CHARIZARD  ; 06
+	const CHARMADA
 	const SQUIRTLE   ; 07
 	const WARTORTLE  ; 08
 	const TOTARTLE   ; 09

data/pokemon/base_stats.asm

@@ -33,6 +33,7 @@ INCLUDE "data/pokemon/base_stats/venusaur.asm"
 INCLUDE "data/pokemon/base_stats/charmander.asm"
 INCLUDE "data/pokemon/base_stats/charmeleon.asm"
 INCLUDE "data/pokemon/base_stats/charizard.asm"
+INCLUDE "data/pokemon/base_stats/charmada.asm"
 INCLUDE "data/pokemon/base_stats/squirtle.asm"
 INCLUDE "data/pokemon/base_stats/wartortle.asm"
 INCLUDE "data/pokemon/base_stats/totartle.asm"

data/pokemon/base_stats/charmada.asm

@@ -0,0 +1,21 @@
+	db 0 ; species ID placeholder
+
+	db  78,  84, 100, 68, 109,  95
+	;   hp  atk  def  spd  sat  sdf
+
+	db FIRE, STEEL ; type
+	db 45 ; catch rate
+	db 209 ; base exp
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
+	db 20 ; step cycles to hatch
+	db 5 ; unknown 2
+	INCBIN "gfx/pokemon/charmada/front.dimensions"
+	dw NULL, NULL ; unused (beta front/back pics)
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_DRAGON ; egg groups
+
+	; tm/hm learnset
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, CUT, FLY, STRENGTH, FLAMETHROWER, THUNDERBOLT, IRON_TAIL, STEEL_WING, THUNDER
+	; end

data/pokemon/cries.asm

@@ -12,6 +12,7 @@ PokemonCries::
 	mon_cry CRY_CHARMANDER,   96,  192 ; CHARMANDER
 	mon_cry CRY_CHARMANDER,   32,  192 ; CHARMELEON
 	mon_cry CRY_CHARMANDER,    0,  256 ; CHARIZARD
+	mon_cry CRY_CHARMANDER,    0,  256 ; CHARMADA (incomplete)
 	mon_cry CRY_SQUIRTLE,     96,  192 ; SQUIRTLE
 	mon_cry CRY_SQUIRTLE,     32,  192 ; WARTORTLE
 	mon_cry CRY_SQUIRTLE,      0,  256 ; TOTARTLE

data/pokemon/dex_entries.asm

@@ -6,6 +6,7 @@ VenusaurPokedexEntry::   INCLUDE "data/pokemon/dex_entries/venusaur.asm"
 CharmanderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charmander.asm"
 CharmeleonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charmeleon.asm"
 CharizardPokedexEntry::  INCLUDE "data/pokemon/dex_entries/charizard.asm"
+CharmadaPokedexEntry::  INCLUDE "data/pokemon/dex_entries/charmada.asm"
 SquirtlePokedexEntry::   INCLUDE "data/pokemon/dex_entries/squirtle.asm"
 WartortlePokedexEntry::  INCLUDE "data/pokemon/dex_entries/wartortle.asm"
 TotartlePokedexEntry::   INCLUDE "data/pokemon/dex_entries/totartle.asm"

data/pokemon/dex_entries/charmada.asm

@@ -0,0 +1,10 @@
+	db "LASER@" ; species name
+	dw 393, 595 ; height, weight - temp
+
+	db   "This #MON was"
+	next "augmented by"
+	next "SILPH CO. to"
+
+	page "battle TYRANITAR." ; Like a sequel to Omegadge vs Gawarhed!
+	next "The three heads"
+	next "work in unison.@"

data/pokemon/dex_entry_pointers.asm

@@ -7,6 +7,7 @@ PokedexDataPointerTable:
 	dba CharmanderPokedexEntry
 	dba CharmeleonPokedexEntry
 	dba CharizardPokedexEntry
+	dba CharmadaPokedexEntry
 	dba SquirtlePokedexEntry
 	dba WartortlePokedexEntry
 	dba TotartlePokedexEntry

data/pokemon/dex_order_alpha.asm

@@ -41,6 +41,7 @@ AlphabeticalPokedexOrder:
 	dw CELEBI
 	dw CHANSEY
 	dw CHARIZARD
+	dw CHARMADA
 	dw CHARMANDER
 	dw CHARMELEON
 	dw CHEEP

data/pokemon/dex_order_new.asm

@@ -331,6 +331,7 @@ NewPokedexOrder:
 	dw CHARMANDER
 	dw CHARMELEON
 	dw CHARIZARD
+	dw CHARMADA
 	dw SQUIRTLE
 	dw WARTORTLE
 	dw TOTARTLE

data/pokemon/egg_moves_kanto.asm

@@ -7,6 +7,7 @@ EggMovePointers1:
 	dw CharmanderEggMoves
 	dw NoEggMoves1
 	dw NoEggMoves1
+	dw NoEggMoves1
 	dw SquirtleEggMoves
 	dw NoEggMoves1
 	dw NoEggMoves1 ; Totartle

data/pokemon/evos_attacks_kanto.asm

@@ -7,6 +7,7 @@ EvosAttacksPointers1::
 	dw CharmanderEvosAttacks
 	dw CharmeleonEvosAttacks
 	dw CharizardEvosAttacks
+	dw CharmadaEvosAttacks
 	dw SquirtleEvosAttacks
 	dw WartortleEvosAttacks
 	dw TotartleEvosAttacks
@@ -258,6 +259,7 @@ CharmanderEvosAttacks:
 
 CharmeleonEvosAttacks:
 	dbbw EVOLVE_LEVEL, 36, CHARIZARD
+	dbbw EVOLVE_TRADE, METAL_COAT, CHARMADA
 	db 0 ; no more evolutions
 	dbw 1, SCRATCH
 	dbw 1, GROWL
@@ -288,6 +290,23 @@ CharizardEvosAttacks:
 	dbw 54, DRAGON_RAGE
 	dbw 64, FIRE_SPIN
 	db 0 ; no more level-up moves
+	
+CharmadaEvosAttacks:
+	db 0 ; no more evolutions
+	dbw 1, METAL_CLAW
+	dbw 1, GROWL
+	dbw 1, EMBER
+	dbw 1, SMOKESCREEN
+	dbw 7, EMBER
+	dbw 13, SMOKESCREEN
+	dbw 20, RAGE
+	dbw 27, SCARY_FACE
+	dbw 34, FLAMETHROWER
+	dbw 36, IRON_TAIL
+	dbw 44, SPARK
+	dbw 54, DRAGON_RAGE
+	dbw 64, FIRE_SPIN
+	db 0 ; no more level-up moves
 
 SquirtleEvosAttacks:
 	dbbw EVOLVE_LEVEL, 16, WARTORTLE

data/pokemon/first_stages.asm

@@ -7,6 +7,7 @@ FirstEvoStages::
 	dw CHARMANDER
 	dw CHARMANDER
 	dw CHARMANDER
+	dw CHARMANDER
 	dw SQUIRTLE
 	dw SQUIRTLE   ;08
 	dw SQUIRTLE

data/pokemon/gen1_base_special.asm

@@ -8,6 +8,7 @@ KantoMonSpecials:
 	db  50 ; CHARMANDER
 	db  65 ; CHARMELEON
 	db  85 ; CHARIZARD
+	db  95 ; CHARMADA
 	db  50 ; SQUIRTLE
 	db  65 ; WARTORTLE
 	db 100 ; BLASTOISE

data/pokemon/gen1_order.asm

@@ -360,4 +360,5 @@ Pokered_MonIndices:
 	db MANTYKE
 	db WEIRDUCK
 	db LUXWAN
+	db CHARMADA
 	assert_table_length NUM_POKEMON - 1

data/pokemon/menu_icons.asm

@@ -8,6 +8,7 @@ MonMenuIcons:
 	db ICON_CHARMANDER  ; CHARMANDER
 	db ICON_CHARMANDER  ; CHARMELEON
 	db ICON_BIGMON      ; CHARIZARD
+	db ICON_BIGMON      ; CHARMADA
 	db ICON_SQUIRTLE    ; SQUIRTLE
 	db ICON_SQUIRTLE    ; WARTORTLE
 	db ICON_SQUIRTLE    ; TOTARTLE

data/pokemon/names.asm

@@ -10,6 +10,7 @@ PokemonNames::
 	db "CHARMANDER"
 	db "CHARMELEON"
 	db "CHARIZARD@"
+	db "CHARMADA@@"
 	db "SQUIRTLE@@"
 	db "WARTORTLE@"
 	db "TOTARTLE@@"

data/pokemon/palettes.asm

@@ -45,6 +45,8 @@ INCBIN "gfx/pokemon/charmeleon/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/charmeleon/shiny.pal"
 INCBIN "gfx/pokemon/charizard/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/charizard/shiny.pal"
+INCBIN "gfx/pokemon/charmada/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/charmada/shiny.pal"
 INCBIN "gfx/pokemon/squirtle/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/squirtle/shiny.pal"
 INCBIN "gfx/pokemon/wartortle/front.gbcpal", middle_colors

data/pokemon/pic_pointers.asm

@@ -25,6 +25,8 @@ PokemonPicPointers::
 	dba CharmeleonBackpic
 	dba CharizardFrontpic
 	dba CharizardBackpic
+	dba CharmadaFrontpic
+	dba CharmadaBackpic
 	dba SquirtleFrontpic
 	dba SquirtleBackpic
 	dba WartortleFrontpic

gfx/footprints.asm

@@ -7,6 +7,7 @@ INCBIN "gfx/footprints/venusaur.1bpp"
 INCBIN "gfx/footprints/charmander.1bpp"
 INCBIN "gfx/footprints/charmeleon.1bpp"
 INCBIN "gfx/footprints/charizard.1bpp"
+INCBIN "gfx/footprints/charmada.1bpp"
 INCBIN "gfx/footprints/squirtle.1bpp"
 INCBIN "gfx/footprints/wartortle.1bpp"
 INCBIN "gfx/footprints/totartle.1bpp"

gfx/pics.asm

@@ -944,3 +944,5 @@ WeirduckFrontpic:     INCBIN "gfx/pokemon/weirduck/front.animated.2bpp.lz"
 WeirduckBackpic:      INCBIN "gfx/pokemon/weirduck/back.2bpp.lz"
 LuxwanFrontpic:     INCBIN "gfx/pokemon/luxwan/front.animated.2bpp.lz"
 LuxwanBackpic:      INCBIN "gfx/pokemon/luxwan/back.2bpp.lz"
+CharmadaFrontpic:     INCBIN "gfx/pokemon/luxwan/front.animated.2bpp.lz"
+CharmadaBackpic:      INCBIN "gfx/pokemon/luxwan/back.2bpp.lz"

gfx/pokemon/anim_pointers.asm

@@ -6,6 +6,7 @@ AnimationPointers:
 	dw CharmanderAnimation
 	dw CharmeleonAnimation
 	dw CharizardAnimation
+	dw CharmadaAnimation
 	dw SquirtleAnimation
 	dw WartortleAnimation
 	dw TotartleAnimation

gfx/pokemon/anims.asm

@@ -4,6 +4,7 @@ VenusaurAnimation:   INCLUDE "gfx/pokemon/venusaur/anim.asm"
 CharmanderAnimation: INCLUDE "gfx/pokemon/charmander/anim.asm"
 CharmeleonAnimation: INCLUDE "gfx/pokemon/charmeleon/anim.asm"
 CharizardAnimation:  INCLUDE "gfx/pokemon/charizard/anim.asm"
+CharmadaAnimation:  INCLUDE "gfx/pokemon/charmada/anim.asm"
 SquirtleAnimation:   INCLUDE "gfx/pokemon/squirtle/anim.asm"
 WartortleAnimation:  INCLUDE "gfx/pokemon/wartortle/anim.asm"
 TotartleAnimation:   INCLUDE "gfx/pokemon/totartle/anim.asm"

gfx/pokemon/bitmask_pointers.asm

@@ -6,6 +6,7 @@ BitmasksPointers:
 	dw CharmanderBitmasks
 	dw CharmeleonBitmasks
 	dw CharizardBitmasks
+	dw CharmadaBitmasks
 	dw SquirtleBitmasks
 	dw WartortleBitmasks
 	dw TotartleBitmasks

gfx/pokemon/bitmasks.asm

@@ -4,6 +4,7 @@ VenusaurBitmasks:   INCLUDE "gfx/pokemon/venusaur/bitmask.asm"
 CharmanderBitmasks: INCLUDE "gfx/pokemon/charmander/bitmask.asm"
 CharmeleonBitmasks: INCLUDE "gfx/pokemon/charmeleon/bitmask.asm"
 CharizardBitmasks:  INCLUDE "gfx/pokemon/charizard/bitmask.asm"
+CharmadaBitmasks:  INCLUDE "gfx/pokemon/charmada/bitmask.asm"
 SquirtleBitmasks:   INCLUDE "gfx/pokemon/squirtle/bitmask.asm"
 WartortleBitmasks:  INCLUDE "gfx/pokemon/wartortle/bitmask.asm"
 TotartleBitmasks:   INCLUDE "gfx/pokemon/totartle/bitmask.asm"

gfx/pokemon/charmada/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/charmada/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/charmada/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 22, 22, 12
+	RGB 07, 15, 25

gfx/pokemon/frame_pointers.asm

@@ -6,6 +6,7 @@ FramesPointers:
 	dba CharmanderFrames
 	dba CharmeleonFrames
 	dba CharizardFrames
+	dba CharmadaFrames
 	dba SquirtleFrames
 	dba WartortleFrames
 	dba TotartleFrames

gfx/pokemon/idle_pointers.asm

@@ -6,6 +6,7 @@ AnimationIdlePointers:
 	dw CharmanderAnimationIdle
 	dw CharmeleonAnimationIdle
 	dw CharizardAnimationIdle
+	dw CharmadaAnimationIdle
 	dw SquirtleAnimationIdle
 	dw WartortleAnimationIdle
 	dw TotartleAnimationIdle

gfx/pokemon/idles.asm

@@ -4,6 +4,7 @@ VenusaurAnimationIdle:   INCLUDE "gfx/pokemon/venusaur/anim_idle.asm"
 CharmanderAnimationIdle: INCLUDE "gfx/pokemon/charmander/anim_idle.asm"
 CharmeleonAnimationIdle: INCLUDE "gfx/pokemon/charmeleon/anim_idle.asm"
 CharizardAnimationIdle:  INCLUDE "gfx/pokemon/charizard/anim_idle.asm"
+CharmadaAnimationIdle:  INCLUDE "gfx/pokemon/charmada/anim_idle.asm"
 SquirtleAnimationIdle:   INCLUDE "gfx/pokemon/squirtle/anim_idle.asm"
 WartortleAnimationIdle:  INCLUDE "gfx/pokemon/wartortle/anim_idle.asm"
 TotartleAnimationIdle:   INCLUDE "gfx/pokemon/totartle/anim_idle.asm"

gfx/pokemon/kanto_frames.asm

@@ -6,6 +6,7 @@ VenusaurFrames:   INCLUDE "gfx/pokemon/venusaur/frames.asm"
 CharmanderFrames: INCLUDE "gfx/pokemon/charmander/frames.asm"
 CharmeleonFrames: INCLUDE "gfx/pokemon/charmeleon/frames.asm"
 CharizardFrames:  INCLUDE "gfx/pokemon/charizard/frames.asm"
+CharmadaFrames:  INCLUDE "gfx/pokemon/charmada/frames.asm"
 SquirtleFrames:   INCLUDE "gfx/pokemon/squirtle/frames.asm"
 WartortleFrames:  INCLUDE "gfx/pokemon/wartortle/frames.asm"
 TotartleFrames:   INCLUDE "gfx/pokemon/totartle/frames.asm"

main.asm

@@ -240,10 +240,10 @@ INCLUDE "engine/pokemon/experience.asm"
 INCLUDE "engine/pokemon/switchpartymons.asm"
 INCLUDE "engine/gfx/load_pics.asm"
 INCLUDE "engine/pokemon/move_mon_wo_mail.asm"
-INCLUDE "data/pokemon/base_stats.asm"
 
 SECTION "Pokemon Names", ROMX
 
+INCLUDE "data/pokemon/base_stats.asm" ; If moving pokemon becomes a problem, it's because of this.
 INCLUDE "data/pokemon/names.asm"
 
 
@@ -468,10 +468,10 @@ SECTION "bank3E", ROMX
 
 INCLUDE "engine/gfx/load_font.asm"
 INCLUDE "engine/events/name_rater.asm"
-INCLUDE "engine/events/play_slow_cry.asm"
 
 SECTION "bank3Econt", ROMX
 
+INCLUDE "engine/events/play_slow_cry.asm"
 INCLUDE "engine/link/time_capsule.asm"
 INCLUDE "engine/link/time_capsule_2.asm"
 INCLUDE "engine/events/magikarp.asm"