diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:17:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:17:11 -0400 |
| commit | 0cfc279af54aa1f21f08acd4043cf82be771c8a4 (patch) | |
| tree | 464418e98106f5a4ac5a7db31415d8393e40aced /src/battle_controller_player.c | |
| parent | 38d4fc9c17467bfbb206116e4bef4648cedfe3d4 (diff) | |
| parent | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (diff) | |
Merge branch 'master' into doc-rayscene
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 08ce9f09c..259b20035 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -853,7 +853,7 @@ static void sub_80586F8(void) { if (gReceivedRemoteLinkPlayers == 0) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = 0; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(sub_8038D64); @@ -866,7 +866,7 @@ static void sub_80586F8(void) { if (IsLinkTaskFinished()) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = 0; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(sub_8038D64); @@ -895,7 +895,7 @@ void sub_80587B0(void) } else { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = 0; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(gMain.savedCallback); @@ -2392,7 +2392,7 @@ static void PlayerHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER); + PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00; |