summaryrefslogtreecommitdiff
path: root/src/battle/anim/flying_path.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/flying_path.c
parentba5e6c8a32c617f0d70e62968bf13023d1e1ff5e (diff)
parent153ddde3b90c893b47d5c844b2a58c707038e6b4 (diff)
merged
Diffstat (limited to 'src/battle/anim/flying_path.c')
-rwxr-xr-xsrc/battle/anim/flying_path.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c
index 017f89858..441ac0e6d 100755
--- a/src/battle/anim/flying_path.c
+++ b/src/battle/anim/flying_path.c
@@ -5,8 +5,8 @@
#include "sound.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
extern struct SpriteTemplate gSpriteTemplate_83D6884;
@@ -22,12 +22,12 @@ void sub_80CBDF4(u8 taskId)
{
struct Task *task = &gTasks[taskId];
- task->data[4] = sub_8079E90(gBattleAnimBankTarget) - 1;
- task->data[6] = sub_8077ABC(gBattleAnimBankTarget, 2);
- task->data[7] = sub_8077ABC(gBattleAnimBankTarget, 3);
- task->data[10] = sub_807A100(gBattleAnimBankTarget, 1);
- task->data[11] = sub_807A100(gBattleAnimBankTarget, 0);
- task->data[5] = (GetBankSide(gBattleAnimBankTarget) == 1) ? 1 : -1;
+ task->data[4] = sub_8079E90(gAnimBankTarget) - 1;
+ task->data[6] = GetBankPosition(gAnimBankTarget, 2);
+ task->data[7] = GetBankPosition(gAnimBankTarget, 3);
+ task->data[10] = sub_807A100(gAnimBankTarget, 1);
+ task->data[11] = sub_807A100(gAnimBankTarget, 0);
+ task->data[5] = (GetBankSide(gAnimBankTarget) == 1) ? 1 : -1;
task->data[9] = 0x38 - (task->data[5] * 64);
task->data[8] = task->data[7] - task->data[9] + task->data[6];
task->data[2] = CreateSprite(&gSpriteTemplate_83D6884, task->data[8], task->data[9], task->data[4]);