diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-19 20:27:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-19 20:27:54 -0500 |
| commit | 2a3ba78831f2dca1ff0d3fe3f03844a993597b28 (patch) | |
| tree | f0f335caee0bef1b1b141ed3d2f3001dc91a8bda /src/battle_controller_player.c | |
| parent | bf8fa23462990b36ff40ac4a863380a9d979bfdd (diff) | |
| parent | ecd482fa2cda82887893f9eb9e02196537bc414f (diff) | |
Merge pull request #369 from garakmon/pan-constants
Use sound pan constants in data/battle_anim_scripts.s
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 02479a1be..6bc6c6f49 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -2407,7 +2407,7 @@ static void PlayerHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER); + PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00; @@ -2882,9 +2882,9 @@ static void PlayerHandlePlaySE(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); PlayerBufferExecCompleted(); |