Charmada!

This required moving the base stat and cry files. Not tested, so someone ought to check...
This commit is contained in:
Llinos Evans 2024-07-06 19:45:20 +01:00
parent 4972915076
commit b451ca81ce
35 changed files with 84 additions and 2 deletions

View file

@ -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"

View file

@ -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

View file

@ -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

View file

@ -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"

View file

@ -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.@"

View file

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

View file

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

View file

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

View file

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

View file

@ -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

View file

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

View file

@ -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

View file

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

View file

@ -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

View file

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

View file

@ -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

View file

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