From 76799d84eb5728b7b5e094a6ea10d6d34323aa8b Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 6 May 2026 19:47:22 -0400 Subject: [PATCH] Added electric puff macro --- asm/macros/battle_anim_script.inc | 4 ++++ data/battle_anim_scripts.s | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index c4db001a81..e9cf8fa0b6 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -524,6 +524,10 @@ createsprite gFistFootSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \duration, \initPosition, 1 .endm + .macro create_electric_puff_sprite anim_battler:req, subpriority_offset:req, relative_to:req, x:req, y:req + createsprite gElectricPuffSpriteTemplate, \anim_battler, \subpriority_offset, \relative_to, \x, \y + .endm + @ createvisualtask wrappers @ The arguments are based on the CMD_ARGS of the task. diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 3d126f045a..4910b57da5 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -3586,9 +3586,9 @@ Move_CHARGE: delay 6 loopsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER, 6, 5 waitforvisualfinish - createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 16 + create_electric_puff_sprite ANIM_ATTACKER, 2, relative_to=0, x=16, y=16 delay 2 - createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -16 + create_electric_puff_sprite ANIM_ATTACKER, 2, relative_to=0, x=-16, y=-16 playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER waitforvisualfinish simple_palette_blend selector=F_PAL_BG, delay=4, initial_blend_y=4, target_blend_y=0, color=RGB_BLACK @@ -4439,17 +4439,17 @@ Move_VOLT_TACKLE: delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET - createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 1, 16, 16 + create_electric_puff_sprite ANIM_ATTACKER, 2, relative_to=1, x=16, y=16 delay 2 - createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, -16 + create_electric_puff_sprite ANIM_ATTACKER, 2, relative_to=1, x=-16, y=-16 delay 8 createvisualtask AnimTask_VoltTackleAttackerReappear, 5 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1 playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER - createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 16 + create_electric_puff_sprite ANIM_ATTACKER, 2, relative_to=0, x=16, y=16 delay 2 - createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -16 + create_electric_puff_sprite ANIM_ATTACKER, 2, relative_to=0, x=-16, y=-16 waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 8, 0, RGB_BLACK waitforvisualfinish