diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-12 00:17:38 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-12 00:17:38 +0100 |
| commit | b7fa10d01e379c4f7d8d30fecb2a7c6413191b88 (patch) | |
| tree | d492427c4aedb95c3e6000b25c8a01ec9de62d10 /src/battle_2.c | |
| parent | c3f6f528e865155f359ca2ff10b68ace1cc99edb (diff) | |
| parent | 558bf2f7d0c9be70ec0da4b9ef28c105c5d11622 (diff) | |
Merge branch 'master' into battle4_fixes
Diffstat (limited to 'src/battle_2.c')
| -rw-r--r-- | src/battle_2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index 24b43bdbd..e4ee624fb 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -4767,7 +4767,7 @@ static void HandleEndTurn_BattleWon(void) else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000 | BATTLE_TYPE_EREADER_TRAINER)) { - BattleMusicStop(); + BattleStopLowHpSound(); gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon; if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE) @@ -4777,7 +4777,7 @@ static void HandleEndTurn_BattleWon(void) } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK)) { - BattleMusicStop(); + BattleStopLowHpSound(); gBattlescriptCurrInstr = BattleScript_LocalTrainerBattleWon; switch (gTrainers[gTrainerBattleOpponent_A].trainerClass) |