summaryrefslogtreecommitdiff
path: root/src/battle/anim/slash.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/anim/slash.c')
-rwxr-xr-xsrc/battle/anim/slash.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/battle/anim/slash.c b/src/battle/anim/slash.c
index c5869c4ab..6adcaf098 100755
--- a/src/battle/anim/slash.c
+++ b/src/battle/anim/slash.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_80CDE78(struct Sprite* sprite);
static void sub_80CDEB0(struct Sprite* sprite);
@@ -19,13 +19,13 @@ void sub_80CDD74(struct Sprite* sprite)
{
if (gBattleAnimArgs[0] == 0)
{
- sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[1];
- sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2];
+ sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
+ sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
}
else
{
- sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[1];
- sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[2];
+ sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[1];
+ sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[2];
}
sprite->data[0] = 0;
@@ -36,16 +36,16 @@ void sub_80CDD74(struct Sprite* sprite)
void sub_80CDDDC(struct Sprite* sprite)
{
- sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + 0xFFD0;
- sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3);
+ sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + 0xFFD0;
+ sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
StoreSpriteCallbackInData(sprite, sub_80CDE78);
sprite->callback = sub_8078600;
}
void sub_80CDE24(struct Sprite* sprite)
{
- sprite->pos1.x = sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0];
- sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3);
+ sprite->pos1.x = sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0];
+ sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
StartSpriteAnim(sprite, 1);
sprite->data[0] = 0;
sprite->data[1] = 0;
@@ -78,6 +78,6 @@ void sub_80CDEC0(struct Sprite* sprite)
sprite->data[0] = 0;
sprite->invisible = !sprite->invisible;
if (++sprite->data[1] > 8)
- move_anim_8072740(sprite);
+ DestroyAnimSprite(sprite);
}
}