Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1425cf4
Added documentation for AnimSparkElectricity
fdeblasio Jul 3, 2026
3192e19
Documented gLightningSpriteTemplate
fdeblasio Jul 3, 2026
b3889f8
Documented unused functions
fdeblasio Jul 3, 2026
37e99d6
Documented? AnimZapCannonSpark
fdeblasio Jul 3, 2026
422906d
Documented AnimThunderboltOrb
fdeblasio Jul 3, 2026
0b0481a
Documented AnimSparkElectricityFlashing
fdeblasio Jul 3, 2026
8c33208
Documented AnimElectricity
fdeblasio Jul 3, 2026
6091baa
Documented AnimTask_ElectricBolt
fdeblasio Jul 3, 2026
c43c45d
Documented AnimThunderWave
fdeblasio Jul 3, 2026
e0698e9
Documented AnimTask_ElectricChargingParticles
fdeblasio Jul 3, 2026
14eaca7
Documented AnimGrowingChargeOrb and AnimElectricPuff
fdeblasio Jul 3, 2026
5967c4c
Documented AnimTask_VoltTackleBolt
fdeblasio Jul 3, 2026
07b0dc6
Documented gZapCannonBallSpriteTemplate
fdeblasio Jul 3, 2026
213777f
Changed comments to match file instead of type
fdeblasio Jul 4, 2026
ed3a0a6
Documented some unknown values
fdeblasio Jul 4, 2026
c61e5f8
Documented more unknown values
fdeblasio Jul 4, 2026
b330cb3
Documented more of ZapCannonSpark
fdeblasio Jul 4, 2026
e6d9f83
Added macros for remaining AnimTasks
fdeblasio Jul 4, 2026
79c861f
Added macros for remaining spriteTemplates
fdeblasio Jul 4, 2026
b6066e6
Renamed slowness to duration for consistency
fdeblasio Jul 5, 2026
d92ab97
Replaced radius with wave_amplitude
fdeblasio Jul 7, 2026
4490735
Figured out most remaining unknown values
fdeblasio Jul 7, 2026
6d390b8
Updated Zap Cannon ball names
fdeblasio Jul 7, 2026
3358091
Further documented AnimTask_ElectricBolt_Step
fdeblasio Jul 8, 2026
e406815
Documented Thunderbolt's unk3
fdeblasio Jul 8, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions asm/macros/battle_anim_script.inc
Original file line number Diff line number Diff line change
Expand Up @@ -524,10 +524,59 @@
createsprite gFistFootSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \duration, \initPosition, 1
.endm

@ battle_anim_electric
.macro create_electricity_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, duration:req, tile_offset:req
createsprite gElectricitySpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \duration, \tile_offset
.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

.macro create_growing_charge_orb_sprite anim_battler:req, subpriority_offset:req, relative_to:req
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

.macro create_spark_electricity_sprite anim_battler:req, subpriority_offset:req, sine1:req, wave_amplitude:req, sine2:req, duration:req, relative_to:req, useAltCoords=TRUE, priority:req
createsprite gSparkElectricitySpriteTemplate, \anim_battler, \subpriority_offset, \sine1, \wave_amplitude, \sine2, \duration, \relative_to, \useAltCoords, \priority
.endm

.macro create_spark_electricity_flashing_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, wave_amplitude:req, duration:req, wave_offset:req, wave_period:req, tile_offset:req, unk7:req
createsprite gSparkElectricityFlashingSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \wave_amplitude, \duration, \wave_offset, \wave_period, \tile_offset, \unk7
.endm

.macro create_thunderbolt_orb_sprite anim_battler:req, subpriority_offset:req, duration:req, x:req, y:req, visibility_duration:req
createsprite gThunderboltOrbSpriteTemplate, \anim_battler, \subpriority_offset, \duration, \x, \y, \visibility_duration
.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_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, initial_x:req, initial_y:req, target_x:req, target_y:req, duration:req, location:req
createsprite gZapCannonBallSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \target_x, \target_y, \duration, \location
.endm

.macro create_zap_cannon_spark_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, wave_amplitude:req, duration:req, wave_offset:req, wave_period:req, tile_offset:req
createsprite gZapCannonSparkSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \wave_amplitude, \duration, \wave_offset, \wave_period, \tile_offset
.endm

@.macro create_sprite anim_battler:req, subpriority_offset:req
@createsprite gSpriteTemplate, \anim_battler, \subpriority_offset
@.endm

@ createvisualtask wrappers
@ The arguments are based on the CMD_ARGS of the task.

Expand Down Expand Up @@ -595,3 +644,28 @@
.macro create_surf_wave priority=2, palette:req
createvisualtask AnimTask_CreateSurfWave, \priority, \palette
.endm

@ battle_anim_electric
.macro electric_bolt priority=5, x:req, y:req, big_bolt:req
createvisualtask AnimTask_ElectricBolt, \priority, \x, \y, \big_bolt
.endm

.macro electric_charging_particles priority=2, relative_to:req, amount:req, duration:req, compaction:req
createvisualtask AnimTask_ElectricChargingParticles, \priority, \relative_to, \amount, \duration, \compaction
.endm

.macro shock_wave_lightning priority=5
createvisualtask AnimTask_ShockWaveLightning, \priority
.endm

.macro shock_wave_progressing_bolt priority=5
createvisualtask AnimTask_ShockWaveProgressingBolt, \priority
.endm

.macro volt_tackle_attacker_reappear priority=5
createvisualtask AnimTask_VoltTackleAttackerReappear, \priority
.endm

.macro volt_tackle_bolt priority=5, y:req
createvisualtask AnimTask_VoltTackleBolt, \priority, \y
.endm
Loading