diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index ef838d2832..c3317d4cc8 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -561,8 +561,8 @@ createsprite gZapCannonBallSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \x2, \y2, \duration, \location .endm - .macro create_zap_cannon_spark_sprite anim_battler:req, subpriority_offset:req, unk0=10, unk1=0, radius:req, unk3=30, unk4:req, unk5=40, unk6:req - createsprite gZapCannonSparkSpriteTemplate, \anim_battler, \subpriority_offset, \unk0, \unk1, \radius, \unk3, \unk4, \unk5, \unk6 + .macro create_zap_cannon_spark_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, radius:req, duration:req, unk4:req, unk5:req, unk6:req + createsprite gZapCannonSparkSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \radius, \duration, \unk4, \unk5, \unk6 .endm @.macro create_sprite anim_battler:req, subpriority_offset:req diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 9d73547134..682dcf8880 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -7205,14 +7205,14 @@ Move_ZAP_CANNON: loadspritegfx ANIM_TAG_SPARK_2 playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_ATTACKER create_zap_cannon_ball_sprite ANIM_TARGET, 3, x=10, y=0, x2=0, y2=0, duration=30, location=0 - create_zap_cannon_spark_sprite ANIM_TARGET, 4, radius=16, unk4=0, unk6=0 - create_zap_cannon_spark_sprite ANIM_TARGET, 4, radius=16, unk4=64, unk6=1 - create_zap_cannon_spark_sprite ANIM_TARGET, 4, radius=16, unk4=128, unk6=0 - create_zap_cannon_spark_sprite ANIM_TARGET, 4, radius=16, unk4=192, unk6=2 - create_zap_cannon_spark_sprite ANIM_TARGET, 4, radius=8, unk4=32, unk6=0 - create_zap_cannon_spark_sprite ANIM_TARGET, 4, radius=8, unk4=96, unk6=1 - create_zap_cannon_spark_sprite ANIM_TARGET, 4, radius=8, unk4=160, unk6=0 - create_zap_cannon_spark_sprite ANIM_TARGET, 4, radius=8, unk4=224, unk6=2 + create_zap_cannon_spark_sprite ANIM_TARGET, 4, x=10, y=0, radius=16, duration=30, unk4=0, unk5=40, unk6=0 + create_zap_cannon_spark_sprite ANIM_TARGET, 4, x=10, y=0, radius=16, duration=30, unk4=64, unk5=40, unk6=1 + create_zap_cannon_spark_sprite ANIM_TARGET, 4, x=10, y=0, radius=16, duration=30, unk4=128, unk5=40, unk6=0 + create_zap_cannon_spark_sprite ANIM_TARGET, 4, x=10, y=0, radius=16, duration=30, unk4=192, unk5=40, unk6=2 + create_zap_cannon_spark_sprite ANIM_TARGET, 4, x=10, y=0, radius=8, duration=30, unk4=32, unk5=40, unk6=0 + create_zap_cannon_spark_sprite ANIM_TARGET, 4, x=10, y=0, radius=8, duration=30, unk4=96, unk5=40, unk6=1 + create_zap_cannon_spark_sprite ANIM_TARGET, 4, x=10, y=0, radius=8, duration=30, unk4=160, unk5=40, unk6=0 + create_zap_cannon_spark_sprite ANIM_TARGET, 4, x=10, y=0, radius=8, duration=30, unk4=224, unk5=40, unk6=2 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 delay 15 diff --git a/src/battle_anim_electric.c b/src/battle_anim_electric.c index 29015ddaad..bd75194f8a 100644 --- a/src/battle_anim_electric.c +++ b/src/battle_anim_electric.c @@ -580,10 +580,10 @@ static void AnimSparkElectricity(struct Sprite *sprite) static void AnimZapCannonSpark(struct Sprite *sprite) { - CMD_ARGS(unk0, unk1, radius, unk3, unk4, unk5, unk6); + CMD_ARGS(x, y, radius, duration, unk4, unk5, unk6); InitSpritePosToAnimAttacker(sprite, TRUE); - sprite->data[0] = cmd->unk3; + sprite->data[0] = cmd->duration; sprite->data[1] = sprite->x; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); sprite->data[3] = sprite->y;