diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:17:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:17:48 -0400 |
| commit | 08a8aad65a16d7846c06f669218b5190a31b6b33 (patch) | |
| tree | b9e38f5284d16732e467fdfd9e891d1535f387fd /src/cable_club.c | |
| parent | 71a066f9457416581a22ddc82d81984e45d06dca (diff) | |
| parent | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (diff) | |
Merge branch 'master' into doc-cablecar
Diffstat (limited to 'src/cable_club.c')
| -rw-r--r-- | src/cable_club.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cable_club.c b/src/cable_club.c index 982bd9fd3..93f87ec9b 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -865,9 +865,9 @@ static void Task_StartWiredCableClubBattle(u8 taskId) break; case 5: if (gLinkPlayers[0].trainerId & 1) - PlayMapChosenOrBattleBGM(MUS_BATTLE32); + PlayMapChosenOrBattleBGM(MUS_VS_GYM_LEADER); else - PlayMapChosenOrBattleBGM(MUS_BATTLE20); + PlayMapChosenOrBattleBGM(MUS_VS_TRAINER); SetLinkBattleTypeFlags(gSpecialVar_0x8004); CleanupOverworldWindowsAndTilemaps(); @@ -930,9 +930,9 @@ static void Task_StartWirelessCableClubBattle(u8 taskId) break; case 7: if (gLinkPlayers[0].trainerId & 1) - PlayMapChosenOrBattleBGM(MUS_BATTLE32); + PlayMapChosenOrBattleBGM(MUS_VS_GYM_LEADER); else - PlayMapChosenOrBattleBGM(MUS_BATTLE20); + PlayMapChosenOrBattleBGM(MUS_VS_TRAINER); gLinkPlayers[0].linkType = LINKTYPE_BATTLE; SetLinkBattleTypeFlags(gSpecialVar_0x8004); |