diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-22 03:10:09 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-22 03:10:09 -0600 |
| commit | 4a4a10a990fe2fa29a4c4470de31337ed42f280e (patch) | |
| tree | 75613ec1e48825a2506ccf79bbe45b80fbbeac64 /src/battle_2.c | |
| parent | 8278583e7b6fac7329132c774f7f64d7fc5d0b86 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'src/battle_2.c')
| -rw-r--r-- | src/battle_2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index f8b4113f0..6752c4d4f 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -4738,9 +4738,9 @@ static void HandleEndTurn_BattleWon(void) gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon; if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE) - PlayBGM(BGM_KACHI3); + PlayBGM(MUS_KACHI3); else - PlayBGM(BGM_KACHI1); + PlayBGM(MUS_KACHI1); } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK)) { @@ -4751,7 +4751,7 @@ static void HandleEndTurn_BattleWon(void) { case TRAINER_CLASS_ELITE_FOUR: case TRAINER_CLASS_CHAMPION: - PlayBGM(BGM_KACHI5); + PlayBGM(MUS_KACHI5); break; case TRAINER_CLASS_TEAM_AQUA: case TRAINER_CLASS_TEAM_MAGMA: @@ -4759,13 +4759,13 @@ static void HandleEndTurn_BattleWon(void) case TRAINER_CLASS_AQUA_LEADER: case TRAINER_CLASS_MAGMA_ADMIN: case TRAINER_CLASS_MAGMA_LEADER: - PlayBGM(BGM_KACHI4); + PlayBGM(MUS_KACHI4); break; case TRAINER_CLASS_LEADER: - PlayBGM(BGM_KACHI3); + PlayBGM(MUS_KACHI3); break; default: - PlayBGM(BGM_KACHI1); + PlayBGM(MUS_KACHI1); break; } } |