Starter moveset updates!

Made the Bulbasaur and Charmander line's movesets better, more closely matching Squirtle's updated moveset.
This commit is contained in:
Martha Schilling 2023-12-17 18:25:34 +00:00
parent 5305e19ca4
commit e76cb8c9e8
5 changed files with 85 additions and 55 deletions

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/ivysaur.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/ivysaur.pic", 0, 1 ; sprite dimensions
dw IvysaurPicFront, IvysaurPicBack dw IvysaurPicFront, IvysaurPicBack
db TACKLE, GROWL, LEECH_SEED, NO_MOVE ; level 1 learnset db TACKLE, GROWL, VINE_WHIP, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_SLOW ; growth rate db GROWTH_MEDIUM_SLOW ; growth rate
; tm/hm learnset ; tm/hm learnset

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/totartle.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/totartle.pic", 0, 1 ; sprite dimensions
dw TotartlePicFront, TotartlePicBack dw TotartlePicFront, TotartlePicBack
db TACKLE, TAIL_WHIP, BUBBLE, WATER_GUN ; level 1 learnset db TACKLE, TAIL_WHIP, BUBBLE, LEER ; level 1 learnset
db GROWTH_MEDIUM_SLOW ; growth rate db GROWTH_MEDIUM_SLOW ; growth rate
; tm/hm learnset ; tm/hm learnset

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/venusaur.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/venusaur.pic", 0, 1 ; sprite dimensions
dw VenusaurPicFront, VenusaurPicBack dw VenusaurPicFront, VenusaurPicBack
db TACKLE, GROWL, LEECH_SEED, VINE_WHIP ; level 1 learnset db TACKLE, GROWL, VINE_WHIP, LEECH_SEED ; level 1 learnset
db GROWTH_MEDIUM_SLOW ; growth rate db GROWTH_MEDIUM_SLOW ; growth rate
; tm/hm learnset ; tm/hm learnset

View file

@ -381,15 +381,19 @@ IvysaurEvosMoves:
db EV_LEVEL, 32, VENUSAUR db EV_LEVEL, 32, VENUSAUR
db 0 db 0
; Learnset ; Learnset
db 7, LEECH_SEED db 8, VINE_WHIP
db 13, VINE_WHIP db 14, LEECH_SEED
db 22, POISONPOWDER db 21, POISONPOWDER
db 30, RAZOR_LEAF db 24, GROWTH
db 37, TAKE_DOWN ; Prototype db 28, RAZOR_LEAF
db 41, GROWTH db 31, TAKE_DOWN ; Prototype
db 48, SLEEP_POWDER db 34, BODY_SLAM
db 55, MEGA_DRAIN ; Prototype db 39, SLEEP_POWDER
db 59, SOLARBEAM db 43, MEGA_DRAIN ; Prototype
db 48, PETAL_DANCE
db 52, DOUBLE_EDGE
db 57, TOXIC
db 62, SOLARBEAM
db 0 db 0
ExeggutorEvosMoves: ExeggutorEvosMoves:
@ -2164,30 +2168,38 @@ BulbasaurEvosMoves:
db EV_LEVEL, 16, IVYSAUR db EV_LEVEL, 16, IVYSAUR
db 0 db 0
; Learnset ; Learnset
db 7, LEECH_SEED db 8, VINE_WHIP
db 13, VINE_WHIP db 14, LEECH_SEED
db 20, POISONPOWDER db 19, POISONPOWDER
db 27, RAZOR_LEAF db 22, GROWTH
db 34, TAKE_DOWN ; Prototype db 25, RAZOR_LEAF
db 41, GROWTH db 28, TAKE_DOWN ; Prototype
db 48, SLEEP_POWDER db 32, BODY_SLAM
db 51, MEGA_DRAIN ; Prototype db 37, SLEEP_POWDER
db 55, SOLARBEAM db 41, MEGA_DRAIN ; Prototype
db 44, PETAL_DANCE
db 48, DOUBLE_EDGE
db 52, TOXIC
db 58, SOLARBEAM
db 0 db 0
VenusaurEvosMoves: VenusaurEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
; Learnset ; Learnset
db 7, LEECH_SEED db 8, VINE_WHIP
db 13, VINE_WHIP db 14, LEECH_SEED
db 22, POISONPOWDER db 21, POISONPOWDER
db 30, RAZOR_LEAF db 24, GROWTH
db 41, TAKE_DOWN ; Prototype db 28, RAZOR_LEAF
db 47, GROWTH db 31, TAKE_DOWN ; Prototype
db 55, SLEEP_POWDER db 36, BODY_SLAM
db 60, MEGA_DRAIN ; Prototype db 41, SLEEP_POWDER
db 65, SOLARBEAM db 45, MEGA_DRAIN ; Prototype
db 53, PETAL_DANCE
db 56, DOUBLE_EDGE
db 62, TOXIC
db 66, SOLARBEAM
db 0 db 0
TentacruelEvosMoves: TentacruelEvosMoves:
@ -2470,13 +2482,19 @@ CharmanderEvosMoves:
; Learnset ; Learnset
db 9, EMBER db 9, EMBER
db 15, LEER db 15, LEER
db 22, RAGE db 19, RAGE
db 30, SLASH db 22, HEADBUTT
db 38, FLAMETHROWER db 25, FIRE_SPIN
db 46, FIRE_SPIN db 29, TAKE_DOWN
db 33, SEISMIC_TOSS
db 37, FLAMETHROWER
db 41, MEGA_PUNCH
db 44, SLASH
db 48, DOUBLE_EDGE
db 51, MEGA_KICK
db 57, FIRE_BLAST
db 0 db 0
; Needs Mega Punch, Body Slam, Take Down, Mega Kick, Double-Edge, Bubblebeam
SquirtleEvosMoves: SquirtleEvosMoves:
; Evolutions ; Evolutions
db EV_LEVEL, 16, WARTORTLE db EV_LEVEL, 16, WARTORTLE
@ -2491,7 +2509,7 @@ SquirtleEvosMoves:
db 31, BODY_SLAM db 31, BODY_SLAM
db 35, SKULL_BASH db 35, SKULL_BASH
db 39, MEGA_PUNCH db 39, MEGA_PUNCH
db 42, HYDRO_PUMP db 43, HYDRO_PUMP
db 47, DOUBLE_EDGE db 47, DOUBLE_EDGE
db 52, MEGA_KICK db 52, MEGA_KICK
db 0 db 0
@ -2503,10 +2521,17 @@ CharmeleonEvosMoves:
; Learnset ; Learnset
db 9, EMBER db 9, EMBER
db 15, LEER db 15, LEER
db 24, RAGE db 21, RAGE
db 33, SLASH db 24, HEADBUTT
db 42, FLAMETHROWER db 28, FIRE_SPIN
db 56, FIRE_SPIN db 32, TAKE_DOWN
db 37, SEISMIC_TOSS
db 41, FLAMETHROWER
db 45, MEGA_PUNCH
db 49, SLASH
db 53, DOUBLE_EDGE
db 57, MEGA_KICK
db 63, FIRE_BLAST
db 0 db 0
WartortleEvosMoves: WartortleEvosMoves:
@ -2523,7 +2548,7 @@ WartortleEvosMoves:
db 35, BODY_SLAM db 35, BODY_SLAM
db 39, SKULL_BASH db 39, SKULL_BASH
db 44, MEGA_PUNCH db 44, MEGA_PUNCH
db 47, HYDRO_PUMP db 48, HYDRO_PUMP
db 53, DOUBLE_EDGE db 53, DOUBLE_EDGE
db 58, MEGA_KICK db 58, MEGA_KICK
db 0 db 0
@ -2534,10 +2559,19 @@ CharizardEvosMoves:
; Learnset ; Learnset
db 9, EMBER db 9, EMBER
db 15, LEER db 15, LEER
db 24, RAGE db 21, RAGE
db 36, SLASH db 24, HEADBUTT
db 46, FLAMETHROWER db 28, FIRE_SPIN
db 55, FIRE_SPIN db 32, TAKE_DOWN
db 36, WING_ATTACK
db 41, SEISMIC_TOSS
db 45, FLAMETHROWER
db 49, MEGA_PUNCH
db 53, SLASH
db 57, DOUBLE_EDGE
db 62, MEGA_KICK
db 66, FIRE_BLAST
db 70, DRAGON_RAGE
db 0 db 0
TotartleEvosMoves: TotartleEvosMoves:
@ -2551,14 +2585,13 @@ TotartleEvosMoves:
db 28, BUBBLEBEAM db 28, BUBBLEBEAM
db 31, TAKE_DOWN db 31, TAKE_DOWN
db 35, BODY_SLAM db 35, BODY_SLAM
db 39, LEER
db 42, SKULL_BASH db 42, SKULL_BASH
db 47, MEGA_PUNCH db 45, COMET_PUNCH
db 50, HYDRO_PUMP db 49, MEGA_PUNCH
db 53, COMET_PUNCH db 53, HYDRO_PUMP
db 56, DOUBLE_EDGE db 57, DOUBLE_EDGE
db 62, MEGA_KICK db 62, MEGA_KICK
db 65, PETAL_DANCE db 66, PETAL_DANCE
db 70, BLIZZARD db 70, BLIZZARD
db 0 db 0

View file

@ -904,10 +904,7 @@ SpecialTrainerMoves:
db 2, 1, EARTHQUAKE db 2, 1, EARTHQUAKE
db 2, 2, ROCK_SLIDE db 2, 2, ROCK_SLIDE
db 2, 4, EXPLOSION db 2, 4, EXPLOSION
db 3, 1, SWORDS_DANCE db 3, 1, THUNDERBOLT
db 3, 2, SMART_STRIKE
db 3, 3, HYPER_BEAM
db 3, 4, BODY_SLAM
db 4, 1, SUBMISSION db 4, 1, SUBMISSION
db 5, 1, BODY_SLAM db 5, 1, BODY_SLAM
db 5, 2, MEDITATE db 5, 2, MEDITATE