diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-15 14:45:13 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-15 14:45:13 -0600 |
| commit | 032dd251e628debd1ec7774fa42b6e7d39b3d83b (patch) | |
| tree | 92e169b7219e115c2735d367140126aebc8e1fa7 /asm/macros/battle_anim_script.inc | |
| parent | 09d09122bc27aeae337bca90d1a076a8de2f24bd (diff) | |
| parent | c6833c903ca3fafbf3b8d5afd19a53785b1633e3 (diff) | |
Merge pull request #383 from garakmon/createsprite
Update createsprite macro and rename BANK to BATTLER
Diffstat (limited to 'asm/macros/battle_anim_script.inc')
| -rw-r--r-- | asm/macros/battle_anim_script.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index 1d5b01de7..ab27bc23d 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -10,10 +10,14 @@ .2byte \param0 .endm - .macro createsprite template, priority, argv:vararg +.macro createsprite template, anim_battler, subpriority_offset, argv:vararg .byte 0x02 .4byte \template - .byte \priority + .if \anim_battler == ANIM_TARGET + .byte 0x80 | (\subpriority_offset & 0x7F) + .else + .byte (\subpriority_offset & 0x7F) + .endif .byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2 .Lsprite_\@_1: .2byte \argv |