From ee72696b5340b5578941aeb5d03bca6099e26538 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 20 Aug 2020 21:03:24 -0400 Subject: Sync encounter musics with encounter music types --- src/battle_setup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/battle_setup.c b/src/battle_setup.c index 81c7295bc..3c20d9ffe 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1463,10 +1463,10 @@ void SetUpTrainerEncounterMusic(void) music = MUS_ENCOUNTER_GIRL; break; case TRAINER_ENCOUNTER_MUSIC_INTENSE: - music = MUS_ENCOUNTER_PSYCHIC; + music = MUS_ENCOUNTER_INTENSE; break; case TRAINER_ENCOUNTER_MUSIC_COOL: - music = MUS_ENCOUNTER_COOLTRAINER; + music = MUS_ENCOUNTER_COOL; break; case TRAINER_ENCOUNTER_MUSIC_AQUA: music = MUS_ENCOUNTER_AQUA; @@ -1490,10 +1490,10 @@ void SetUpTrainerEncounterMusic(void) music = MUS_ENCOUNTER_INTERVIEWER; break; case TRAINER_ENCOUNTER_MUSIC_RICH: - music = MUS_ENCOUNTER_GENTLEMAN; + music = MUS_ENCOUNTER_RICH; break; default: - music = MUS_ENCOUNTER_HEX_MANIAC; + music = MUS_ENCOUNTER_SUSPICIOUS; } PlayNewMapMusic(music); } -- cgit v1.2.3