(hopefully) fixes

This commit is contained in:
MementoMartha 2022-12-05 22:40:59 +00:00
parent 59e1bc2fc5
commit c678a329a4
5 changed files with 61 additions and 12 deletions

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/sandyshocks.pic", 0, 1 ; sprite dimensions
dw SandyShocksPicFront, SandyShocksPicBack
db TACKLE, SONIC_BOOM, THUNDERSHOCK, MAGNET_BOMB ; level 1 learnset
db TACKLE, SONICBOOM, THUNDERSHOCK, MAGNET_BOMB ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

View file

@ -3,14 +3,14 @@
db 115, 65, 99, 111, 65
; hp atk def spd spc
db FAIRY, PSYCHIC ; type
db FAIRY, PSYCHIC_TYPE ; type
db 50 ; catch rate
db 210 ; base exp
INCBIN "gfx/pokemon/front/screamtail.pic", 0, 1 ; sprite dimensions
dw ScreamTailPicFront, ScreamTailPicBack
db SING, POUND, DISABLE, NO_MOVE ; level 1 learnset
db SING, FAIRY_WIND, DISABLE, BITE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

View file

@ -223,6 +223,10 @@ EvosMovesPointerTable:
dw BetobebiiEvosMoves
dw MagnezoneEvosMoves
dw PorygonZEvosMoves
dw AnnihilapeEvosMoves
dw ScreamTailEvosMoves
dw SandyShocksEvosMoves
dw WugtrioEvosMoves
dw MissingNoEvosMoves
assert_table_length NUM_POKEMON_INDEXES
@ -1620,6 +1624,7 @@ DodrioEvosMoves:
PrimeapeEvosMoves:
; Evolutions
db EV_TRADE, 1, ANNIHILAPE
db 0
; Learnset
db 9, LOW_KICK
@ -2825,6 +2830,50 @@ PorygonZEvosMoves:
db 50, AMNESIA ; will replace with nasty plot
db 0
AnnihilapeEvosMoves:
; Evolutions
db 0
; Learnset
db 9, LOW_KICK
db 15, KARATE_CHOP
db 21, FURY_SWIPES
db 27, FOCUS_ENERGY
db 28, RAGE
db 37, SEISMIC_TOSS
db 45, SCREECH
db 46, THRASH
db 50, NIGHT_SHADE
db 0
ScreamTailEvosMoves:
; Evolutions
db 0
; Learnset
db 51, SCREECH
db 55, DAZZLE_GLEAM
db 55, DRAININGKISS
db 0
SandyShocksEvosMoves:
; Evolutions
db 0
; Learnset
db 51, SUPERSONIC
db 55, SCREECH
db 55, METAL_SOUND
db 0
WugtrioEvosMoves:
; Evolutions
db 0
; Learnset
db 15, SAND_ATTACK
db 19, WRAP
db 24, HEADBUTT
db 31, DIG
db 37, HYDRO_PUMP
db 0
MissingNoEvosMoves:
; Evolutions
db 0