diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-06 21:31:08 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-06 21:31:08 -0400 |
commit | 07b800e593a3ac8dd1a9bcfb6cb2366cc5c27377 (patch) | |
tree | c77edf7fdacf36172bd3b6af790ad86111aef1fe /src/battle/anim/flying_path.c | |
parent | 4d3098e89b5aebf080547a99e68640138dc74599 (diff) | |
parent | be66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (diff) |
Merge branch 'master' into unk_debug_menu_3
Diffstat (limited to 'src/battle/anim/flying_path.c')
-rw-r--r-- | src/battle/anim/flying_path.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c index 70c418afc..5e9de8cb1 100644 --- a/src/battle/anim/flying_path.c +++ b/src/battle/anim/flying_path.c @@ -23,11 +23,11 @@ void sub_80CBDF4(u8 taskId) struct Task *task = &gTasks[taskId]; task->data[4] = sub_8079E90(gAnimBankTarget) - 1; - task->data[6] = GetBankPosition(gAnimBankTarget, 2); - task->data[7] = GetBankPosition(gAnimBankTarget, 3); + task->data[6] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + task->data[7] = GetBattlerSpriteCoord(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[5] = (GetBattlerSide(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]); |