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/cutter.c | |
parent | 18a6fb5c3fcdc852a8ee805ba02b2807938e1de8 (diff) | |
parent | 3571cb1d142090b59a9161a6bada11f0caf53b8c (diff) |
Merge pull request #590 from huderlem/battle_9
Decompile battle_9
Diffstat (limited to 'src/battle/anim/cutter.c')
-rw-r--r-- | src/battle/anim/cutter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/cutter.c b/src/battle/anim/cutter.c index fed3598fc..bc7478053 100644 --- a/src/battle/anim/cutter.c +++ b/src/battle/anim/cutter.c @@ -24,7 +24,7 @@ static void AnimMoveTwisterParticleStep(struct Sprite* sprite); void AnimTranslateLinearSingleSineWave(struct Sprite* sprite) { InitAnimSpritePos(sprite, 1); - if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER) + if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } @@ -32,8 +32,8 @@ void AnimTranslateLinearSingleSineWave(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[4]; if (!gBattleAnimArgs[6]) { - sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; } else { @@ -44,7 +44,7 @@ void AnimTranslateLinearSingleSineWave(struct Sprite* sprite) sprite->data[5] = gBattleAnimArgs[5]; InitAnimSpriteTranslationOverDuration(sprite); - if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)) + if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget)) { sprite->data[0] = 1; } |