summaryrefslogtreecommitdiff
path: root/src/battle/anim/anger.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/anim/anger.c')
-rwxr-xr-xsrc/battle/anim/anger.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c
index 8962e0855..011aa68ce 100755
--- a/src/battle/anim/anger.c
+++ b/src/battle/anim/anger.c
@@ -5,8 +5,8 @@
#include "sound.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
// anger (anger emotes, usually above the Pokemon's head, indicating annoyed emotions.)
// Used in Frustration, Rage, Swagger, Torment, and Taunt.
@@ -15,17 +15,17 @@ void sub_80D09C0(struct Sprite* sprite)
{
u8 bank;
if (gBattleAnimArgs[0] == 0)
- bank = gBattleAnimBankAttacker;
+ bank = gAnimBankAttacker;
else
- bank = gBattleAnimBankTarget;
+ bank = gAnimBankTarget;
if (GetBankSide(bank) == 1)
{
gBattleAnimArgs[1] *= -1;
}
- sprite->pos1.x = sub_8077ABC(bank, 2) + gBattleAnimArgs[1];
- sprite->pos1.y = sub_8077ABC(bank, 3) + gBattleAnimArgs[2];
+ sprite->pos1.x = GetBankPosition(bank, 2) + gBattleAnimArgs[1];
+ sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[2];
if (sprite->pos1.y <= 7)
sprite->pos1.y = 8;