summaryrefslogtreecommitdiff
path: root/src/battle/anim/bottle.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/bottle.c
parentba5e6c8a32c617f0d70e62968bf13023d1e1ff5e (diff)
parent153ddde3b90c893b47d5c844b2a58c707038e6b4 (diff)
merged
Diffstat (limited to 'src/battle/anim/bottle.c')
-rwxr-xr-xsrc/battle/anim/bottle.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/bottle.c b/src/battle/anim/bottle.c
index ac5e51881..5485bcf5d 100755
--- a/src/battle/anim/bottle.c
+++ b/src/battle/anim/bottle.c
@@ -5,8 +5,8 @@
#include "sound.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
static void sub_80CCF70(struct Sprite* sprite);
static void sub_80CD0CC(struct Sprite* sprite, int unk1, int unk2);
@@ -16,8 +16,8 @@ static void sub_80CD0CC(struct Sprite* sprite, int unk1, int unk2);
void sub_80CCF04(struct Sprite* sprite)
{
- sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2);
- sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + 0xFFE8;
+ sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
+ sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + 0xFFE8;
sprite->data[0] = 0;
sprite->data[1] = 0;
sprite->data[2] = 0;
@@ -98,7 +98,7 @@ void sub_80CCF70(struct Sprite* sprite)
case 4:
REG_BLDCNT = 0;
REG_BLDALPHA = 0;
- move_anim_8072740(sprite);
+ DestroyAnimSprite(sprite);
break;
}
}