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_controller_recorded_opponent.c | |
parent | 7a072d4527387cf21a019142caf67ce516be861d (diff) | |
parent | 2a3ba78831f2dca1ff0d3fe3f03844a993597b28 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'src/battle_controller_recorded_opponent.c')
-rw-r--r-- | src/battle_controller_recorded_opponent.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 963c535db..57eb6842e 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -1295,7 +1295,7 @@ static void RecordedOpponentHandleFaintAnimation(void) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; - PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT); + PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET); gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gBattlerControllerFuncs[gActiveBattler] = sub_8186D58; } @@ -1603,9 +1603,9 @@ static void RecordedOpponentHandlePlaySE(void) s8 pan; if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) - pan = PAN_SIDE_PLAYER; + pan = SOUND_PAN_ATTACKER; else - pan = PAN_SIDE_OPPONENT; + pan = SOUND_PAN_TARGET; PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan); RecordedOpponentBufferExecCompleted(); |