diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-12-17 22:44:11 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-17 22:44:11 -0600 |
| commit | e8b149e80e7b1411ce7a128e36ebc5d5490133e1 (patch) | |
| tree | 003c2daccebd740c288e537216afed0265bfbc59 /include | |
| parent | 5f202c744b92dcde829c1d24ad323d824c769fec (diff) | |
| parent | 2fb6c5bb7f81c285d973d602dbbe4bbf8fc8aba1 (diff) | |
Merge pull request #708 from garakmon/createsprite
Change createsprite macro
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/battle_anim.h | 8 | ||||
| -rw-r--r-- | include/macros/battle_anim.inc | 16 |
2 files changed, 14 insertions, 10 deletions
diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index a2c3eda15..f437a08a6 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -301,10 +301,10 @@ #define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288) // battlers -#define ANIM_BANK_ATTACKER 0 -#define ANIM_BANK_TARGET 1 -#define ANIM_BANK_ATK_PARTNER 2 -#define ANIM_BANK_DEF_PARTNER 3 +#define ANIM_BATTLER_ATTACKER 0 +#define ANIM_BATTLER_TARGET 1 +#define ANIM_BATTLER_ATK_PARTNER 2 +#define ANIM_BATTLER_DEF_PARTNER 3 // stereo panning constants [0-255] // diff --git a/include/macros/battle_anim.inc b/include/macros/battle_anim.inc index bf409a848..58f1e5b24 100644 --- a/include/macros/battle_anim.inc +++ b/include/macros/battle_anim.inc @@ -8,13 +8,17 @@ .2byte \id .endm - .macro createsprite template, priority, argv:vararg - .byte 0x02 - .4byte \template - .byte \priority - .byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2 + .macro createsprite 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 + .2byte \argv .Lsprite_\@_2: .endm |