diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:16:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:16:00 -0400 |
| commit | c8307317344f0ca6d176882cf8b55d3bf82dc680 (patch) | |
| tree | 393b23af98581a7dec2e0731732a23ece4b23007 /src/battle_gfx_sfx_util.c | |
| parent | e9b734c1efd9ad8a079d9ca7c9ed65cff801be1c (diff) | |
| parent | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (diff) | |
Merge branch 'master' into doc-blender
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 1638e2f57..b1bb61aaf 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -1055,7 +1055,7 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId) if (!gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong) { if (!gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong) - PlaySE(SE_HINSI); + PlaySE(SE_LOW_HEALTH); gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 1; } } @@ -1064,12 +1064,12 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId) gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 0; if (!IsDoubleBattle()) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); return; } if (IsDoubleBattle() && !gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); return; } } @@ -1083,7 +1083,7 @@ void BattleStopLowHpSound(void) if (IsDoubleBattle()) gBattleSpritesDataPtr->battlerData[playerBattler ^ BIT_FLANK].lowHpSong = 0; - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); } u8 GetMonHPBarLevel(struct Pokemon *mon) |