summaryrefslogtreecommitdiff
path: root/src/battle_controller_opponent.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-10-26 23:55:36 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-10-26 23:55:36 +0200
commit52be8eeaf15da7b281d48c51b1f4d06740a86c76 (patch)
treeac1c7d0a092f4d16c9ebef0b2538ef46b80c44d5 /src/battle_controller_opponent.c
parentdc273cc19d842e8831548a1342af857aae2886c9 (diff)
parent2778e9ad3dc249eb4cce84be3ac1dfcc7ab850d5 (diff)
Merge branch 'master' into battle_tower
Diffstat (limited to 'src/battle_controller_opponent.c')
-rw-r--r--src/battle_controller_opponent.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index c490ad314..b8b5bd3b8 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -1402,7 +1402,7 @@ static void OpponentHandleFaintAnimation(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_805FAC4;
}
@@ -1810,9 +1810,9 @@ static void OpponentHandlePlaySE(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);
OpponentBufferExecCompleted();