diff options
| author | garak <garakmon@gmail.com> | 2018-11-13 16:19:52 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-13 16:19:52 -0500 |
| commit | c6833c903ca3fafbf3b8d5afd19a53785b1633e3 (patch) | |
| tree | 4bf59dabe0c1ec84d0e4ce72e54656bf457bc950 /asm/macros | |
| parent | 269aebaca762b91f7b455dba2534d26b54187ec5 (diff) | |
remove extra macro and shorten names
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/battle_anim_script.inc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index 78cbf1725..ab27bc23d 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -10,20 +10,10 @@ .2byte \param0 .endm - .macro createsprite template, priority, argv:vararg +.macro createsprite template, anim_battler, subpriority_offset, argv:vararg .byte 0x02 .4byte \template - .byte \priority - .byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2 -.Lsprite_\@_1: - .2byte \argv -.Lsprite_\@_2: - .endm - -.macro createsprite2 template, anim_battler, subpriority_offset, argv:vararg - .byte 0x02 - .4byte \template - .if \anim_battler == ANIM_BATTLER_TARGET + .if \anim_battler == ANIM_TARGET .byte 0x80 | (\subpriority_offset & 0x7F) .else .byte (\subpriority_offset & 0x7F) |