summaryrefslogtreecommitdiff
path: root/src/battle/anim/sonic_task.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-04-06 21:31:08 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2018-04-06 21:31:08 -0400
commit07b800e593a3ac8dd1a9bcfb6cb2366cc5c27377 (patch)
treec77edf7fdacf36172bd3b6af790ad86111aef1fe /src/battle/anim/sonic_task.c
parent4d3098e89b5aebf080547a99e68640138dc74599 (diff)
parentbe66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (diff)
Merge branch 'master' into unk_debug_menu_3
Diffstat (limited to 'src/battle/anim/sonic_task.c')
-rw-r--r--src/battle/anim/sonic_task.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/sonic_task.c b/src/battle/anim/sonic_task.c
index 260ae544c..dc5d60efa 100644
--- a/src/battle/anim/sonic_task.c
+++ b/src/battle/anim/sonic_task.c
@@ -82,8 +82,8 @@ void sub_80CFB04(u8 taskId)
gBattleAnimArgs[2] |= 1;
}
}
- r6 = gTasks[taskId].data[9] = GetBankPosition(gAnimBankAttacker, 0);
- r9 = gTasks[taskId].data[10] = GetBankPosition(gAnimBankAttacker, 1);
+ r6 = gTasks[taskId].data[9] = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
+ r9 = gTasks[taskId].data[10] = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
&& IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
{
@@ -91,8 +91,8 @@ void sub_80CFB04(u8 taskId)
}
else
{
- sp1 = GetBankPosition(gAnimBankTarget, 0);
- sp2 = GetBankPosition(gAnimBankTarget, 1);
+ sp1 = GetBattlerSpriteCoord(gAnimBankTarget, 0);
+ sp2 = GetBattlerSpriteCoord(gAnimBankTarget, 1);
}
sp1 = gTasks[taskId].data[11] = sp1 + gBattleAnimArgs[0];