diff --git a/constants/move_constants.asm b/constants/move_constants.asm index dc978f58..e9da8670 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -191,6 +191,7 @@ const DISARMING_VOICE ; b7 const NASTY_PLOT ; b8 const UPPERCUT ; b9 + const POWDER_SNOW ; b10 const STRUGGLE ; formerly a5, now c0 DEF NUM_ATTACKS EQU const_value - 1 diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 363725eb..4aee11f0 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -185,6 +185,7 @@ AttackAnimationPointers: dw DisarmingVoiceAnim dw NastyPlotAnim dw UppercutAnim + dw PowderSnowAnim dw StruggleAnim assert_table_length NUM_ATTACKS dw ShowPicAnim @@ -565,6 +566,11 @@ IceBeamAnim: battle_anim NO_MOVE, SUBANIM_0_ICE_RISE, 0, 16 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: battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE battle_anim BLIZZARD, SUBANIM_0_ICE_FALL, 0, 4 diff --git a/data/moves/moves.asm b/data/moves/moves.asm index 799eef53..f2217b27 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -196,5 +196,6 @@ Moves: move DISARMING_VOICE, SWIFT_EFFECT, 40, FAIRY, 100, 10 move NASTY_PLOT, SPECIAL_UP2_EFFECT, 0, DARK, 100, 10 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 assert_table_length NUM_ATTACKS diff --git a/data/moves/names.asm b/data/moves/names.asm index 6cdb1677..e683e14e 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -185,5 +185,6 @@ MoveNames:: ; 12chr limit li "DISARMVOICE" li "NASTY PLOT" li "UPPERCUT" + li "POWDER SNOW" li "STRUGGLE" assert_list_length NUM_ATTACKS diff --git a/data/moves/sfx.asm b/data/moves/sfx.asm index 018a85a3..8f735c0c 100644 --- a/data/moves/sfx.asm +++ b/data/moves/sfx.asm @@ -186,6 +186,7 @@ MoveSoundTable: db SFX_BATTLE_37, $10, $60 ; DISARMING_VOICE db SFX_BATTLE_09, $e8, $10 ; NASTY_PLOT db SFX_SUPER_EFFECTIVE, $00, $e0 ; UPPERCUT + db SFX_BATTLE_28, $40, $80 ; POWDER_SNOW db SFX_BATTLE_0B, $00, $80 ; STRUGGLE assert_table_length NUM_ATTACKS diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm index 265a7c2f..d0e397eb 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/articuno.pic", 0, 1 ; sprite dimensions 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 ; tm/hm learnset diff --git a/data/pokemon/base_stats/buu.asm b/data/pokemon/base_stats/buu.asm index da10a264..a6244768 100644 --- a/data/pokemon/base_stats/buu.asm +++ b/data/pokemon/base_stats/buu.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/buu.pic", 0, 1 ; sprite dimensions 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 ; tm/hm learnset diff --git a/data/pokemon/base_stats/glaceon.asm b/data/pokemon/base_stats/glaceon.asm index 07926198..21e4e299 100644 --- a/data/pokemon/base_stats/glaceon.asm +++ b/data/pokemon/base_stats/glaceon.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/glaceon.pic", 0, 1 ; sprite dimensions 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 ; tm/hm learnset diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm index e9e4218a..74a8a0f7 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/jynx.pic", 0, 1 ; sprite dimensions 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 ; tm/hm learnset diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index 13795ae9..3b411800 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/moltres.pic", 0, 1 ; sprite dimensions 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 ; tm/hm learnset diff --git a/data/pokemon/base_stats/ninetalesa.asm b/data/pokemon/base_stats/ninetalesa.asm index c588352b..7be5f635 100644 --- a/data/pokemon/base_stats/ninetalesa.asm +++ b/data/pokemon/base_stats/ninetalesa.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/ninetalesa.pic", 0, 1 ; sprite dimensions 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 ; tm/hm learnset diff --git a/data/pokemon/base_stats/sandslasha.asm b/data/pokemon/base_stats/sandslasha.asm index 2ddc8806..b6427cb1 100644 --- a/data/pokemon/base_stats/sandslasha.asm +++ b/data/pokemon/base_stats/sandslasha.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/sandslasha.pic", 0, 1 ; sprite dimensions 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 ; tm/hm learnset diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm index 21577754..0aa58957 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/zapdos.pic", 0, 1 ; sprite dimensions 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 ; tm/hm learnset diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index a40e1b1b..5629a741 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -1152,7 +1152,7 @@ MoltresEvosMoves: ; Evolutions db 0 ; Learnset - db 51, LEER + db 51, FLAMETHROWER db 55, AGILITY db 60, SKY_ATTACK db 0 @@ -2604,7 +2604,7 @@ GlaceonEvosMoves: db 0 ; Learnset db 8, SAND_ATTACK - db 16, AURORA_BEAM + db 16, POWDER_SNOW db 23, QUICK_ATTACK db 30, MIST db 32, HAZE diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index ad0a8eb5..e7f71967 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -108,9 +108,9 @@ TestBattle: ld [hl], a ; Player's Pokemon. - ld a, MANKEY + ld a, GLACEON ld [wcf91], a - ld a, 10 + ld a, 16 ld [wCurEnemyLVL], a xor a ld [wMonDataLocation], a @@ -122,7 +122,7 @@ TestBattle: ld hl, wPartyMon1Moves ld a, UPPERCUT ; Something super weak ld [hli], a - ld a, KARATE_CHOP ; Test new failure text + ld a, POWDER_SNOW ; Test new failure text ld [hli], a ld a, LOW_KICK ; Something that'll miss easily ld [hli], a @@ -130,7 +130,7 @@ TestBattle: ld [hli], a ; Opponent's Pokemon. - ld a, MANKEY ; Test new theme + ld a, BUU ; Test new theme ld [wCurOpponent], a ld a, 10 ; Set the level you want here. ld [wCurEnemyLVL], a