diff options
| author | garak <garakmon@gmail.com> | 2018-11-13 13:49:27 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-13 13:49:27 -0500 |
| commit | 32c7ec313deaccb4e3dcef5f9da7d9062d09fc27 (patch) | |
| tree | 61e1ac55fc5d59511fbb05bfbc416c74698ace2e /include | |
| parent | c31185bdbf6205b03c778f8a225b2102afd401c9 (diff) | |
ANIM_BANK -> ANIM_BATTLER and some newlines
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/battle_anim.h | 8 | ||||
| -rw-r--r-- | include/macros/battle_anim.inc | 2 |
2 files changed, 5 insertions, 5 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 693e428e6..58f1e5b24 100644 --- a/include/macros/battle_anim.inc +++ b/include/macros/battle_anim.inc @@ -11,7 +11,7 @@ .macro createsprite template, anim_battler, subpriority_offset, argv:vararg .byte 0x02 .4byte \template - .if \anim_battler == ANIM_BANK_TARGET + .if \anim_battler == ANIM_BATTLER_TARGET .byte 0x80 | (\subpriority_offset & 0x7F) .else .byte (\subpriority_offset & 0x7F) |