diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-13 20:00:20 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-13 20:00:20 +0100 |
| commit | 516a5b2219c99050153d989a65478f960b54f75a (patch) | |
| tree | 97a12007165839735210f0f777a019cf3ecc060d /src/battle_2.c | |
| parent | 19d9cff2ff582d68d5aa76fd9d2068a6407e1466 (diff) | |
| parent | d1fe93bf4adfb691ba3a9220a469e0e40483d809 (diff) | |
fix merge conflicts, review changes
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) |