summaryrefslogtreecommitdiff
path: root/src/battle/anim/orbit_fast.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/orbit_fast.c
parentba5e6c8a32c617f0d70e62968bf13023d1e1ff5e (diff)
parent153ddde3b90c893b47d5c844b2a58c707038e6b4 (diff)
merged
Diffstat (limited to 'src/battle/anim/orbit_fast.c')
-rwxr-xr-xsrc/battle/anim/orbit_fast.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/anim/orbit_fast.c b/src/battle/anim/orbit_fast.c
index 30396f398..92b67672b 100755
--- a/src/battle/anim/orbit_fast.c
+++ b/src/battle/anim/orbit_fast.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_80D2704(struct Sprite* sprite);
@@ -15,12 +15,12 @@ static void sub_80D2704(struct Sprite* sprite);
void sub_80D26A4(struct Sprite* sprite)
{
- sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
- sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
+ sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+ sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
sprite->affineAnimPaused = 1;
sprite->data[0] = gBattleAnimArgs[0];
sprite->data[1] = gBattleAnimArgs[1];
- sprite->data[7] = sub_8079E90(gBattleAnimBankAttacker);
+ sprite->data[7] = sub_8079E90(gAnimBankAttacker);
sprite->callback = sub_80D2704;
sub_80D2704(sprite);
}
@@ -58,5 +58,5 @@ void sub_80D2704(struct Sprite* sprite)
}
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
- move_anim_8072740(sprite);
+ DestroyAnimSprite(sprite);
}