Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-23 18:50:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Documented AnimThunderWave

Browse Source
This commit is contained in:
Frank
2026-07-02 22:09:57 -04:00
parent 6091baab7d
commit c43c45d140
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/battle_anim_script.inc
View File

@@ -549,6 +549,10 @@
createsprite gThunderboltOrbSpriteTemplate, \anim_battler, \subpriority_offset, \unk0, \x, \y, \unk3
.endm
.macro create_thunder_wave_sprite anim_battler:req, subpriority_offset:req, x:req, y:req
createsprite gThunderWaveSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y
.endm
@.macro create_zap_cannon_ball_sprite anim_battler:req, subpriority_offset:req
@createsprite gZapCannonBallSpriteTemplate, \anim_battler, \subpriority_offset
@.endm

6
data/battle_anim_scripts.s
View File

@@ -1132,11 +1132,11 @@ Move_THUNDER_WAVE:
playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET
delay 20
loopsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 10, 4
createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, -16
create_thunder_wave_sprite ANIM_TARGET, 2, x=-16, y=-16
delay 4
createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, 0
create_thunder_wave_sprite ANIM_TARGET, 2, x=-16, y=0
delay 4
createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, 16
create_thunder_wave_sprite ANIM_TARGET, 2, x=-16, y=16
waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 6, 0, RGB_BLACK
waitforvisualfinish

6
src/battle_anim_electric.c
View File

@@ -797,10 +797,12 @@ static void AnimElectricBoltSegment(struct Sprite *sprite)
// The horizontal bands of electricity used in Thunder Wave
static void AnimThunderWave(struct Sprite *sprite)
{
CMD_ARGS(x, y);
u8 spriteId;
sprite->x += gBattleAnimArgs[0];
sprite->y += gBattleAnimArgs[1];
sprite->x += cmd->x;
sprite->y += cmd->y;
spriteId = CreateSprite(&gThunderWaveSpriteTemplate, sprite->x + 32, sprite->y, sprite->subpriority);
gSprites[spriteId].oam.tileNum += 8;
gAnimVisualTaskCount++;