dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Sync encounter musics with encounter music types

Browse Source
This commit is contained in:
GriffinR
2020-08-20 21:03:24 -04:00
parent d356e35b64
commit ee72696b53
12 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_setup.c
View File

@@ -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);
}