Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-28 13:41:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Documented more of ZapCannonSpark

Browse Source
This commit is contained in:
Frank
2026-07-04 18:54:26 -04:00
parent c61e5f8325
commit b330cb3023
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/battle_anim_script.inc
View File

@@ -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

16
data/battle_anim_scripts.s
View File

@@ -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

4
src/battle_anim_electric.c
View File

@@ -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;