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/orbit.c | |
parent | 4d3098e89b5aebf080547a99e68640138dc74599 (diff) | |
parent | be66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (diff) |
Merge branch 'master' into unk_debug_menu_3
Diffstat (limited to 'src/battle/anim/orbit.c')
-rw-r--r-- | src/battle/anim/orbit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c index e7dd0df49..b4a641cc2 100644 --- a/src/battle/anim/orbit.c +++ b/src/battle/anim/orbit.c @@ -64,7 +64,7 @@ void sub_80CACEC(u8 taskId) } else { - if (GetBankIdentity_permutated(gAnimBankTarget) == 1) + if (GetBattlerPosition_permutated(gAnimBankTarget) == 1) { REG_BG2CNT_BITFIELD.priority = 3; } @@ -84,7 +84,7 @@ void sub_80CAD54(struct Sprite* sprite) sprite->data[1] = sprite->pos1.x; sprite->data[2] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; InitAnimSpriteTranslationDeltas(sprite); sprite->data[5] = 0x40; sprite->callback = sub_80CADA8; @@ -121,7 +121,7 @@ void sub_80CAE20(struct Sprite* sprite) sprite->data[1] = sprite->pos1.x; sprite->data[2] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; InitAnimSpriteTranslationDeltas(sprite); sprite->data[5] = 0x40; sprite->callback = sub_80CAE74; |