diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-01 11:34:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-01 11:34:34 -0800 |
| commit | ed6210dd257068df380ccec9851fb98fbb181f4c (patch) | |
| tree | 687698d3bada5d1430a6dcb4362e5ade32028e73 /asm/macros/battle_anim.inc | |
| parent | 84c5030e2020324b701ca6b3349929d6124d16e1 (diff) | |
| parent | b33f098d6e23b359236591c05e01632385860470 (diff) | |
Merge pull request #143 from yenatch/battle-anim
Decompile battle_anim_80A7E7C
Diffstat (limited to 'asm/macros/battle_anim.inc')
| -rw-r--r-- | asm/macros/battle_anim.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/asm/macros/battle_anim.inc b/asm/macros/battle_anim.inc index fc2777326..4ff845032 100644 --- a/asm/macros/battle_anim.inc +++ b/asm/macros/battle_anim.inc @@ -8,24 +8,24 @@ .2byte \id .endm - .macro sprite template, priority, argc=0, argv:vararg + .macro sprite template, priority, argv:vararg .byte 0x02 .4byte \template .byte \priority - .byte \argc - .if \argc > 0 + .byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2 +.Lsprite_\@_1: .2byte \argv - .endif +.Lsprite_\@_2: .endm - .macro createtask addr, priority, argc=0, argv:vararg + .macro createtask addr, priority, argv:vararg .byte 0x03 .4byte \addr .byte \priority - .byte \argc - .if \argc > 0 + .byte (.Lcreatetask_\@_2 - .Lcreatetask_\@_1) / 2 +.Lcreatetask_\@_1: .2byte \argv - .endif +.Lcreatetask_\@_2: .endm .macro pause delay @@ -167,13 +167,13 @@ .2byte \bldcnt .endm - .macro createtask_1F addr, argc=0, argv:vararg + .macro createtask_1F addr, argv:vararg .byte 0x1F .4byte \addr - .byte \argc - .if \argc > 0 + .byte (.Lcreatetask_1F_\@_2 - .Lcreatetask_1F_\@_1) / 2 +.Lcreatetask_1F_\@_1: .2byte \argv - .endif +.Lcreatetask_1F_\@_2: .endm .macro waitsound |