summaryrefslogtreecommitdiff
path: root/src/battle/anim/drum.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-04 18:50:53 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-04 18:50:53 -0500
commiteff6795887cc27f2c5139df9a6da70f4f02338b4 (patch)
treef91be2b0b7194b4ddff13f4935a0edafc4284a43 /src/battle/anim/drum.c
parent3ea9cff2c67b3db195c3326afc56fa0662c2327a (diff)
parentb1a7733c1cead8ed3d4a58c42d638afd0ead8ab0 (diff)
Merge branch 'master' into unk_text_8095904
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);
}