diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 18:18:35 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-06 18:18:35 -0700 |
commit | be66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (patch) | |
tree | 137e905d499c0b3cabae75db88df52233604adc0 /src/battle/anim/orbit.c | |
parent | 18a6fb5c3fcdc852a8ee805ba02b2807938e1de8 (diff) | |
parent | 3571cb1d142090b59a9161a6bada11f0caf53b8c (diff) |
Merge pull request #590 from huderlem/battle_9
Decompile battle_9
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; |