A few minor changes

Reworks the Pokedex to accommodate for the regional forms, changes a title screen graphic, and cleans up a few base stat files (will do the rest later). Also revised a few dex entries (special thanks to my girlfriend for Gyopin's!)
This commit is contained in:
MementoMartha 2023-03-29 11:35:41 +01:00
parent 492a410235
commit c9b01f2c64
14 changed files with 439 additions and 378 deletions

View file

@ -1,6 +1,6 @@
db DEX_ARCANINE_H ; pokedex id
db 95, 115, 80, 90, 80
db 95, 115, 80, 90, 80
; hp atk def spd spc
db FIRE, ROCK ; type
@ -14,9 +14,10 @@
db GROWTH_SLOW ; growth rate
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, DOUBLE_EDGE, RAGE, DRAGON_RAGE, \
DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \
RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \
REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \
REST, ROCK_SLIDE, SUBSTITUTE
; end
db BANK(ArcanineHPicFront)

View file

@ -1,11 +1,11 @@
db DEX_MELMETAL ; pokedex id
db 135, 143, 143, 34, 65
db 135, 143, 143, 34, 65
; hp atk def spd spc
db STEEL, STEEL ; type
db 75 ; catch rate
db 213 ; base exp
db 3 ; catch rate
db 243 ; base exp
INCBIN "gfx/pokemon/front/melmetal.pic", 0, 1 ; sprite dimensions
dw MelmetalPicFront, MelmetalPicBack
@ -14,10 +14,10 @@
db GROWTH_SLOW ; growth rate
; tm/hm learnset
tmhm TOXIC, RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, THUNDER_WAVE, \
MEGA_PUNCH, SUBMISSION, HYPER_BEAM, MEGA_KICK, BODY_SLAM, ICE_BEAM, \
SOLAR_BEAM, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, ROCK_SLIDE, \
SUBSTITUTE
tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, ICE_BEAM, \
HYPER_BEAM, SUBMISSION, RAGE, SOLARBEAM, THUNDERBOLT, \
THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \
BIDE, REST, THUNDER_WAVE, ROCK_SLIDE, SUBSTITUTE
; end
db BANK(MelmetalPicFront)

View file

@ -4,8 +4,8 @@
; hp atk def spd spc
db STEEL, STEEL ; type
db 75 ; catch rate
db 213 ; base exp
db 3 ; catch rate
db 131 ; base exp
INCBIN "gfx/pokemon/front/meltan.pic", 0, 1 ; sprite dimensions
dw MeltanPicFront, MeltanPicBack
@ -14,7 +14,8 @@
db GROWTH_SLOW ; growth rate
; tm/hm learnset
tmhm TOXIC, RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, THUNDER_WAVE
tmhm TOXIC, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \
REST, THUNDER_WAVE, SUBSTITUTE
; end
db BANK(MeltanPicFront)

View file

@ -1,6 +1,6 @@
db DEX_SCREAM_TAIL ; pokedex id
db 115, 65, 99, 111, 65
db 115, 65, 99, 111, 115
; hp atk def spd spc
db FAIRY, PSYCHIC_TYPE ; type

View file

@ -1,6 +1,6 @@
db DEX_TAUROS_P ; pokedex id
db 75, 110, 105, 100, 70
db 75, 110, 105, 100, 70
; hp atk def spd spc
db FIGHTING, FIGHTING ; type
@ -15,10 +15,10 @@
; tm/hm learnset
tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \
ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \
THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \
BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \
STRENGTH, SUBMISSION, COUNTER
ICE_BEAM, BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, \
RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \
MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \
REST, SUBSTITUTE, STRENGTH
; end
db BANK(TaurosPPicFront)

View file

@ -7,19 +7,20 @@
db 45 ; catch rate
db 211 ; base exp
INCBIN "gfx/pokemon/front/taurospw.pic", 0, 1 ; sprite dimensions
dw TaurosPWPicFront, TaurosPWPicBack
INCBIN "gfx/pokemon/front/taurospa.pic", 0, 1 ; sprite dimensions
dw TaurosPAPicFront, TaurosPAPicBack
db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset
tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \
ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \
THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \
BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \
STRENGTH, SUBMISSION, COUNTER, BUBBLE_BEAM, WATER_GUN, SURF
BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \
SUBMISSION, COUNTER, RAGE, THUNDERBOLT, THUNDER, \
EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, BIDE, \
FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, SURF, \
STRENGTH
; end
db BANK(TaurosPWPicFront)
assert BANK(TaurosPWPicFront) == BANK(TaurosPWPicBack)
db BANK(TaurosPAPicFront)
assert BANK(TaurosPAPicFront) == BANK(TaurosPAPicBack)

View file

@ -15,10 +15,10 @@
; tm/hm learnset
tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \
ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \
THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \
BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \
STRENGTH, SUBMISSION, COUNTER
ICE_BEAM, BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, \
RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \
MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \
REST, SUBSTITUTE, STRENGTH
; end
db BANK(TaurosPBPicFront)