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

Added electric puff macro

Browse Source
This commit is contained in:
Frank 2026-05-06 19:47:22 -04:00
parent edc58c881f
commit 76799d84eb
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/battle_anim_script.inc
View File

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

12
data/battle_anim_scripts.s
View File

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