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 /src/rom_8077ABC.c | |
| parent | 5f202c744b92dcde829c1d24ad323d824c769fec (diff) | |
| parent | 2fb6c5bb7f81c285d973d602dbbe4bbf8fc8aba1 (diff) | |
Merge pull request #708 from garakmon/createsprite
Change createsprite macro
Diffstat (limited to 'src/rom_8077ABC.c')
| -rw-r--r-- | src/rom_8077ABC.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 780a37b2e..31bf4612d 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -410,7 +410,7 @@ u8 GetAnimBattlerSpriteId(u8 whichBank) { u8 *sprites; - if (whichBank == ANIM_BANK_ATTACKER) + if (whichBank == ANIM_BATTLER_ATTACKER) { if (IsBankSpritePresent(gBattleAnimAttacker)) { @@ -422,7 +422,7 @@ u8 GetAnimBattlerSpriteId(u8 whichBank) return 0xff; } } - else if (whichBank == ANIM_BANK_TARGET) + else if (whichBank == ANIM_BATTLER_TARGET) { if (IsBankSpritePresent(gBattleAnimTarget)) { @@ -434,7 +434,7 @@ u8 GetAnimBattlerSpriteId(u8 whichBank) return 0xff; } } - else if (whichBank == ANIM_BANK_ATK_PARTNER) + else if (whichBank == ANIM_BATTLER_ATK_PARTNER) { if (!IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2)) return 0xff; @@ -1883,7 +1883,7 @@ u8 GetBattlerSubpriority(u8 bank) if (IsContest()) { - if (bank == ANIM_BANK_ATK_PARTNER) + if (bank == ANIM_BATTLER_ATK_PARTNER) return 30; else return 40; |