diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-31 13:42:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 13:42:52 -0400 |
| commit | 69ce45f71f49c859ca7adc07902842503c07d405 (patch) | |
| tree | 06f27893dcbc5a32d898325df733bf33d1aabae6 /src/battle_controller_player.c | |
| parent | d7ec1d234b260df869213e195055dd75bcbe5cf3 (diff) | |
| parent | ed714f1d4910e6107f684a0f27566a0fe7c6ec6f (diff) | |
Merge pull request #799 from GriffinRichards/rename-songs
Give songs meaningful english names
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 cf816f392..772728295 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -962,7 +962,7 @@ void sub_802D148(void) { if (gReceivedRemoteLinkPlayers == 0) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = FALSE; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(c2_8011A1C); @@ -980,7 +980,7 @@ void sub_802D18C(void) } else { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = FALSE; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(gMain.savedCallback); @@ -2470,7 +2470,7 @@ void PlayerHandlecmd10(void) { ewram17810[gActiveBattler].unk4 = 0; HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, -64); + PlaySE12WithPanning(SE_FAINT, -64); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80105EC; |