From 79c861fd75e132b8eada140e4a0bf59bb45462ed Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 4 Jul 2026 19:04:51 -0400 Subject: [PATCH] Added macros for remaining spriteTemplates --- asm/macros/battle_anim_script.inc | 8 ++++++++ data/battle_anim_scripts.s | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index 7d73bf6dc7..212294aaa8 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -537,6 +537,10 @@ createsprite gGrowingChargeOrbSpriteTemplate, \anim_battler, \subpriority_offset, \relative_to .endm + .macro create_growing_shock_wave_orb_sprite anim_battler:req, subpriority_offset:req + createsprite gGrowingShockWaveOrbSpriteTemplate, \anim_battler, \subpriority_offset + .endm + .macro create_lightning_sprite anim_battler:req, subpriority_offset:req, x:req, y:req createsprite gLightningSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y .endm @@ -557,6 +561,10 @@ createsprite gThunderWaveSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y .endm + .macro create_volt_tackle_orb_slide_sprite anim_battler:req, subpriority_offset:req + createsprite gVoltTackleOrbSlideSpriteTemplate, \anim_battler, \subpriority_offset + .endm + .macro create_zap_cannon_ball_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, x2:req, y2:req, duration:req, location:req createsprite gZapCannonBallSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \x2, \y2, \duration, \location .endm diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 0c403f7479..f5857fd952 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -4422,7 +4422,7 @@ Move_VOLT_TACKLE: setalpha 12, 8 createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 8, RGB_BLACK waitforvisualfinish - createsprite gVoltTackleOrbSlideSpriteTemplate, ANIM_ATTACKER, 1 + create_volt_tackle_orb_slide_sprite ANIM_ATTACKER, 1 playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -4558,7 +4558,7 @@ Move_SHOCK_WAVE: electric_charging_particles relative_to=ANIM_ATTACKER, amount=20, slowness=0, compaction=2 playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 12 - createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 2 + create_growing_shock_wave_orb_sprite ANIM_ATTACKER, 2 delay 30 shock_wave_progressing_bolt delay 12