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

Added macros for remaining spriteTemplates

Browse Source
This commit is contained in:
Frank
2026-07-04 19:04:51 -04:00
parent e6d9f83f89
commit 79c861fd75
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
asm/macros/battle_anim_script.inc
View File

@@ -537,6 +537,10 @@
createsprite gGrowingChargeOrbSpriteTemplate, \anim_battler, \subpriority_offset, \relative_to
.endm
.macro create_growing_shock_wave_orb_sprite anim_battler:req, subpriority_offset:req
createsprite gGrowingShockWaveOrbSpriteTemplate, \anim_battler, \subpriority_offset
.endm
.macro create_lightning_sprite anim_battler:req, subpriority_offset:req, x:req, y:req
createsprite gLightningSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y
.endm
@@ -557,6 +561,10 @@
createsprite gThunderWaveSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y
.endm
.macro create_volt_tackle_orb_slide_sprite anim_battler:req, subpriority_offset:req
createsprite gVoltTackleOrbSlideSpriteTemplate, \anim_battler, \subpriority_offset
.endm
.macro create_zap_cannon_ball_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, x2:req, y2:req, duration:req, location:req
createsprite gZapCannonBallSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \x2, \y2, \duration, \location
.endm

4
data/battle_anim_scripts.s
View File

@@ -4422,7 +4422,7 @@ Move_VOLT_TACKLE:
setalpha 12, 8
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 8, RGB_BLACK
waitforvisualfinish
createsprite gVoltTackleOrbSlideSpriteTemplate, ANIM_ATTACKER, 1
create_volt_tackle_orb_slide_sprite ANIM_ATTACKER, 1
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
waitforvisualfinish
clearmonbg ANIM_ATTACKER
@@ -4558,7 +4558,7 @@ Move_SHOCK_WAVE:
electric_charging_particles relative_to=ANIM_ATTACKER, amount=20, slowness=0, compaction=2
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
delay 12
createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 2
create_growing_shock_wave_orb_sprite ANIM_ATTACKER, 2
delay 30
shock_wave_progressing_bolt
delay 12