From 269aebaca762b91f7b455dba2534d26b54187ec5 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 13 Nov 2018 15:35:46 -0500 Subject: update createsprite macro and rename BANK to BATTLER --- asm/macros/battle_anim_script.inc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'asm/macros/battle_anim_script.inc') diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index 1d5b01de7..78cbf1725 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -20,6 +20,20 @@ .Lsprite_\@_2: .endm +.macro createsprite2 template, anim_battler, subpriority_offset, argv:vararg + .byte 0x02 + .4byte \template + .if \anim_battler == ANIM_BATTLER_TARGET + .byte 0x80 | (\subpriority_offset & 0x7F) + .else + .byte (\subpriority_offset & 0x7F) + .endif + .byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2 +.Lsprite_\@_1: + .2byte \argv +.Lsprite_\@_2: + .endm + .macro createvisualtask addr, priority, argv:vararg .byte 0x03 .4byte \addr -- cgit v1.2.3 From c6833c903ca3fafbf3b8d5afd19a53785b1633e3 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 13 Nov 2018 16:19:52 -0500 Subject: remove extra macro and shorten names --- asm/macros/battle_anim_script.inc | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'asm/macros/battle_anim_script.inc') 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) -- cgit v1.2.3