summaryrefslogtreecommitdiff
path: root/src/battle/anim/drum.c
diff options
context:
space:
mode:
authorMarco Willems (M17.1) <progreon@gmail.com>2017-12-31 13:16:44 +0100
committerMarco Willems (M17.1) <progreon@gmail.com>2017-12-31 13:16:44 +0100
commitd0ae8995292ce6483dc3fb656090425c4638bd4f (patch)
tree91015855cd1bc71bdf03b2806effae82ded2e0a3 /src/battle/anim/drum.c
parentba5e6c8a32c617f0d70e62968bf13023d1e1ff5e (diff)
parent153ddde3b90c893b47d5c844b2a58c707038e6b4 (diff)
merged
Diffstat (limited to 'src/battle/anim/drum.c')
-rwxr-xr-xsrc/battle/anim/drum.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/drum.c b/src/battle/anim/drum.c
index 60cb2acc1..6306778ae 100755
--- a/src/battle/anim/drum.c
+++ b/src/battle/anim/drum.c
@@ -5,8 +5,8 @@
#include "sound.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
// drum (using hands to slap the Pokemon's belly in a rhythm.)
// Used in Belly Drum.
@@ -24,9 +24,9 @@ void sub_80CEDF0(struct Sprite* sprite)
a = -16;
}
- sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + a;
- sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + 8;
+ sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + a;
+ sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + 8;
sprite->data[0] = 8;
sprite->callback = sub_80782D8;
- StoreSpriteCallbackInData(sprite, move_anim_8072740);
+ StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
}