Add Powder Snow, fix Moltres

- Adds Powder Snow; GSC stats, was cut from RBY.
- Articuno, Jynx, Buu, Glaceon, Alolan Sandslash, and Alolan Ninetales get Powder Snow at L1.
- Glaceon also gets Powder Snow over Aurora Beam at L1; a nerf that makes it more accurate to its PLA learnset. Glaceon doesn't normally get this move.
- Moltres now gets Flamethrower at L51, fixing an error that GSC fixed. Leer is off by exactly 10 spaces. Leer has been made an L1 move, making it consistent with Articuno's Powder Snow. Does not affect legality, given the Tradeback Tutor.
- Because I'm pedantic, Zapdos gets Thunderbolt as an L1 move like Articuno's Ice Beam, so they all stay the same. Does not affect legality.
This commit is contained in:
Llinos Evans 2023-11-25 18:28:36 +00:00
parent f4b5e1d2f5
commit afa5b76639
15 changed files with 24 additions and 14 deletions

View file

@ -191,6 +191,7 @@
const DISARMING_VOICE ; b7 const DISARMING_VOICE ; b7
const NASTY_PLOT ; b8 const NASTY_PLOT ; b8
const UPPERCUT ; b9 const UPPERCUT ; b9
const POWDER_SNOW ; b10
const STRUGGLE ; formerly a5, now c0 const STRUGGLE ; formerly a5, now c0
DEF NUM_ATTACKS EQU const_value - 1 DEF NUM_ATTACKS EQU const_value - 1

View file

@ -185,6 +185,7 @@ AttackAnimationPointers:
dw DisarmingVoiceAnim dw DisarmingVoiceAnim
dw NastyPlotAnim dw NastyPlotAnim
dw UppercutAnim dw UppercutAnim
dw PowderSnowAnim
dw StruggleAnim dw StruggleAnim
assert_table_length NUM_ATTACKS assert_table_length NUM_ATTACKS
dw ShowPicAnim dw ShowPicAnim
@ -565,6 +566,11 @@ IceBeamAnim:
battle_anim NO_MOVE, SUBANIM_0_ICE_RISE, 0, 16 battle_anim NO_MOVE, SUBANIM_0_ICE_RISE, 0, 16
db -1 ; end db -1 ; end
PowderSnowAnim:
battle_anim BLIZZARD, SUBANIM_0_CIRCLES_FALLING, 0, 6
battle_anim NO_MOVE, SUBANIM_0_ICE_RISE, 0, 16
db -1 ; end
BlizzardAnim: BlizzardAnim:
battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE
battle_anim BLIZZARD, SUBANIM_0_ICE_FALL, 0, 4 battle_anim BLIZZARD, SUBANIM_0_ICE_FALL, 0, 4

View file

@ -196,5 +196,6 @@ Moves:
move DISARMING_VOICE, SWIFT_EFFECT, 40, FAIRY, 100, 10 move DISARMING_VOICE, SWIFT_EFFECT, 40, FAIRY, 100, 10
move NASTY_PLOT, SPECIAL_UP2_EFFECT, 0, DARK, 100, 10 move NASTY_PLOT, SPECIAL_UP2_EFFECT, 0, DARK, 100, 10
move UPPERCUT, FLINCH_SIDE_EFFECT2, 55, FIGHTING, 80, 15 move UPPERCUT, FLINCH_SIDE_EFFECT2, 55, FIGHTING, 80, 15
move POWDER_SNOW, FREEZE_SIDE_EFFECT, 40, ICE, 100, 25
move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10 move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10
assert_table_length NUM_ATTACKS assert_table_length NUM_ATTACKS

View file

@ -185,5 +185,6 @@ MoveNames:: ; 12chr limit
li "DISARMVOICE" li "DISARMVOICE"
li "NASTY PLOT" li "NASTY PLOT"
li "UPPERCUT" li "UPPERCUT"
li "POWDER SNOW"
li "STRUGGLE" li "STRUGGLE"
assert_list_length NUM_ATTACKS assert_list_length NUM_ATTACKS

View file

@ -186,6 +186,7 @@ MoveSoundTable:
db SFX_BATTLE_37, $10, $60 ; DISARMING_VOICE db SFX_BATTLE_37, $10, $60 ; DISARMING_VOICE
db SFX_BATTLE_09, $e8, $10 ; NASTY_PLOT db SFX_BATTLE_09, $e8, $10 ; NASTY_PLOT
db SFX_SUPER_EFFECTIVE, $00, $e0 ; UPPERCUT db SFX_SUPER_EFFECTIVE, $00, $e0 ; UPPERCUT
db SFX_BATTLE_28, $40, $80 ; POWDER_SNOW
db SFX_BATTLE_0B, $00, $80 ; STRUGGLE db SFX_BATTLE_0B, $00, $80 ; STRUGGLE
assert_table_length NUM_ATTACKS assert_table_length NUM_ATTACKS

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/articuno.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/articuno.pic", 0, 1 ; sprite dimensions
dw ArticunoPicFront, ArticunoPicBack dw ArticunoPicFront, ArticunoPicBack
db PECK, ICE_BEAM, NO_MOVE, NO_MOVE ; level 1 learnset db PECK, ICE_BEAM, POWDER_SNOW, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate db GROWTH_SLOW ; growth rate
; tm/hm learnset ; tm/hm learnset

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/buu.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/buu.pic", 0, 1 ; sprite dimensions
dw BuuPicFront, BuuPicBack dw BuuPicFront, BuuPicBack
db AURORA_BEAM, LEER, NO_MOVE, NO_MOVE ; level 1 learnset db POWDER_SNOW, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset ; tm/hm learnset

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/glaceon.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/glaceon.pic", 0, 1 ; sprite dimensions
dw GlaceonPicFront, GlaceonPicBack dw GlaceonPicFront, GlaceonPicBack
db TACKLE, SAND_ATTACK, QUICK_ATTACK, AURORA_BEAM ; level 1 learnset db TACKLE, SAND_ATTACK, QUICK_ATTACK, POWDER_SNOW ; 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/jynx.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/jynx.pic", 0, 1 ; sprite dimensions
dw JynxPicFront, JynxPicBack dw JynxPicFront, JynxPicBack
db POUND, LOVELY_KISS, NO_MOVE, NO_MOVE ; level 1 learnset db POUND, LOVELY_KISS, POWDER_SNOW, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset ; tm/hm learnset

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/moltres.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/moltres.pic", 0, 1 ; sprite dimensions
dw MoltresPicFront, MoltresPicBack dw MoltresPicFront, MoltresPicBack
db PECK, FIRE_SPIN, NO_MOVE, NO_MOVE ; level 1 learnset db PECK, FIRE_SPIN, LEER, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate db GROWTH_SLOW ; growth rate
; tm/hm learnset ; tm/hm learnset

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/ninetalesa.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/ninetalesa.pic", 0, 1 ; sprite dimensions
dw NinetalesAPicFront, NinetalesAPicBack dw NinetalesAPicFront, NinetalesAPicBack
db FAIRY_WIND, TAIL_WHIP, QUICK_ATTACK, ROAR ; level 1 learnset - used for trainers db FAIRY_WIND, TAIL_WHIP, QUICK_ATTACK, POWDER_SNOW ; level 1 learnset - used for trainers
db GROWTH_MEDIUM_FAST ; growth rate db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset ; tm/hm learnset

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/sandslasha.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/sandslasha.pic", 0, 1 ; sprite dimensions
dw SandslashAPicFront, SandslashAPicBack dw SandslashAPicFront, SandslashAPicBack
db SCRATCH, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset db SCRATCH, SAND_ATTACK, POWDER_SNOW, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset ; tm/hm learnset

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/zapdos.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/zapdos.pic", 0, 1 ; sprite dimensions
dw ZapdosPicFront, ZapdosPicBack dw ZapdosPicFront, ZapdosPicBack
db THUNDERSHOCK, DRILL_PECK, NO_MOVE, NO_MOVE ; level 1 learnset db THUNDERSHOCK, DRILL_PECK, THUNDERBOLT, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate db GROWTH_SLOW ; growth rate
; tm/hm learnset ; tm/hm learnset

View file

@ -1152,7 +1152,7 @@ MoltresEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
; Learnset ; Learnset
db 51, LEER db 51, FLAMETHROWER
db 55, AGILITY db 55, AGILITY
db 60, SKY_ATTACK db 60, SKY_ATTACK
db 0 db 0
@ -2604,7 +2604,7 @@ GlaceonEvosMoves:
db 0 db 0
; Learnset ; Learnset
db 8, SAND_ATTACK db 8, SAND_ATTACK
db 16, AURORA_BEAM db 16, POWDER_SNOW
db 23, QUICK_ATTACK db 23, QUICK_ATTACK
db 30, MIST db 30, MIST
db 32, HAZE db 32, HAZE

View file

@ -108,9 +108,9 @@ TestBattle:
ld [hl], a ld [hl], a
; Player's Pokemon. ; Player's Pokemon.
ld a, MANKEY ld a, GLACEON
ld [wcf91], a ld [wcf91], a
ld a, 10 ld a, 16
ld [wCurEnemyLVL], a ld [wCurEnemyLVL], a
xor a xor a
ld [wMonDataLocation], a ld [wMonDataLocation], a
@ -122,7 +122,7 @@ TestBattle:
ld hl, wPartyMon1Moves ld hl, wPartyMon1Moves
ld a, UPPERCUT ; Something super weak ld a, UPPERCUT ; Something super weak
ld [hli], a ld [hli], a
ld a, KARATE_CHOP ; Test new failure text ld a, POWDER_SNOW ; Test new failure text
ld [hli], a ld [hli], a
ld a, LOW_KICK ; Something that'll miss easily ld a, LOW_KICK ; Something that'll miss easily
ld [hli], a ld [hli], a
@ -130,7 +130,7 @@ TestBattle:
ld [hli], a ld [hli], a
; Opponent's Pokemon. ; Opponent's Pokemon.
ld a, MANKEY ; Test new theme ld a, BUU ; Test new theme
ld [wCurOpponent], a ld [wCurOpponent], a
ld a, 10 ; Set the level you want here. ld a, 10 ; Set the level you want here.
ld [wCurEnemyLVL], a ld [wCurEnemyLVL], a