diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-21 00:20:09 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-21 00:20:09 +0100 |
| commit | 3d8874d9190f8904e5fc45439aa54fdf325fad48 (patch) | |
| tree | caa1f1f0a2f86094cbaa36b77a69a1547bd4b105 /src/battle_anim.c | |
| parent | 7a072d4527387cf21a019142caf67ce516be861d (diff) | |
| parent | 2a3ba78831f2dca1ff0d3fe3f03844a993597b28 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'src/battle_anim.c')
| -rw-r--r-- | src/battle_anim.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c index 0a5395b02..590e34cb6 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1262,39 +1262,39 @@ s8 BattleAnimAdjustPanning(s8 pan) if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive) { if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) - pan = PAN_SIDE_OPPONENT; + pan = SOUND_PAN_TARGET; else - pan = PAN_SIDE_PLAYER; + pan = SOUND_PAN_ATTACKER; } else if (IsContest()) { - if (gBattleAnimAttacker != gBattleAnimTarget || gBattleAnimAttacker != 2 || pan != PAN_SIDE_OPPONENT) + if (gBattleAnimAttacker != gBattleAnimTarget || gBattleAnimAttacker != 2 || pan != SOUND_PAN_TARGET) pan *= -1; } else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) { - if (pan == PAN_SIDE_OPPONENT) - pan = PAN_SIDE_PLAYER; - else if (pan != PAN_SIDE_PLAYER) + if (pan == SOUND_PAN_TARGET) + pan = SOUND_PAN_ATTACKER; + else if (pan != SOUND_PAN_ATTACKER) pan *= -1; } } else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT) { - if (pan == PAN_SIDE_PLAYER) - pan = PAN_SIDE_OPPONENT; + if (pan == SOUND_PAN_ATTACKER) + pan = SOUND_PAN_TARGET; } else { pan *= -1; } - if (pan > PAN_SIDE_OPPONENT) - pan = PAN_SIDE_OPPONENT; - else if (pan < PAN_SIDE_PLAYER) - pan = PAN_SIDE_PLAYER; + if (pan > SOUND_PAN_TARGET) + pan = SOUND_PAN_TARGET; + else if (pan < SOUND_PAN_ATTACKER) + pan = SOUND_PAN_ATTACKER; return pan; } @@ -1304,9 +1304,9 @@ s8 BattleAnimAdjustPanning2(s8 pan) if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive) { if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) - pan = PAN_SIDE_OPPONENT; + pan = SOUND_PAN_TARGET; else - pan = PAN_SIDE_PLAYER; + pan = SOUND_PAN_ATTACKER; } else { @@ -1320,10 +1320,10 @@ s16 KeepPanInRange(s16 panArg) { s16 pan = panArg; - if (pan > PAN_SIDE_OPPONENT) - pan = PAN_SIDE_OPPONENT; - else if (pan < PAN_SIDE_PLAYER) - pan = PAN_SIDE_PLAYER; + if (pan > SOUND_PAN_TARGET) + pan = SOUND_PAN_TARGET; + else if (pan < SOUND_PAN_ATTACKER) + pan = SOUND_PAN_ATTACKER; return pan; } |