diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-09 20:33:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-09 20:33:28 -0400 |
| commit | c61603fb3812011981e22478bce93aba8b7ec183 (patch) | |
| tree | 0bcf628e1f3615159cbae3e5c638825544699182 /src/battle_gfx_sfx_util.c | |
| parent | 77a6ee507fdeef8d6a3b8146c70df107e124b0b5 (diff) | |
| parent | f3bd7f06c9f260597575f60af8daf8985ce80fe1 (diff) | |
Merge pull request #113 from PikalaxALT/main_menu
Main menu and Song Constants
Diffstat (limited to 'src/battle_gfx_sfx_util.c')
| -rw-r--r-- | src/battle_gfx_sfx_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index a47baea99..d2e728d0c 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -820,7 +820,7 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId) if (!gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong) { if (!gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong) - PlaySE(SE_T_OOAME); + PlaySE(SE_HINSI); gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 1; } } @@ -828,9 +828,9 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId) { gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 0; if (!IsDoubleBattle()) - m4aSongNumStop(SE_T_OOAME); + m4aSongNumStop(SE_HINSI); else if (IsDoubleBattle() && !gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong) - m4aSongNumStop(SE_T_OOAME); + m4aSongNumStop(SE_HINSI); } } @@ -841,7 +841,7 @@ void BattleStopLowHpSound(void) gBattleSpritesDataPtr->battlerData[playerBattler].lowHpSong = 0; if (IsDoubleBattle()) gBattleSpritesDataPtr->battlerData[playerBattler ^ BIT_FLANK].lowHpSong = 0; - m4aSongNumStop(SE_T_OOAME); + m4aSongNumStop(SE_HINSI); } // not used |