summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-20 21:03:24 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-08-20 21:03:24 -0400
commitee72696b5340b5578941aeb5d03bca6099e26538 (patch)
treeb74eaac85f4a63addeffecf5f061a86f964fa863 /src
parentd356e35b648c6689155c9cbd2d23ea8bede8f097 (diff)
Sync encounter musics with encounter music types
Diffstat (limited to 'src')
-rw-r--r--src/battle_setup.c8
1 files changed, 4 insertions, 4 deletions
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);
}