diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-31 13:42:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 13:42:41 -0400 |
| commit | 4cf09577950db22d7f0acf6ede45b8dca1c97156 (patch) | |
| tree | cb094078122b217fc67e2285614b79c6e83eaf88 /src/trainer_tower.c | |
| parent | c5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff) | |
| parent | bb56d4a3f4cab33f899646e0630282fc6176a9c9 (diff) | |
Merge pull request #356 from GriffinRichards/rename-songs
Give songs meaningful english names
Diffstat (limited to 'src/trainer_tower.c')
| -rw-r--r-- | src/trainer_tower.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 60f096cda..0d6f0f93e 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -376,20 +376,20 @@ static const u16 sPrizeList[] = { }; static const u16 sTrainerTowerEncounterMusic[] = { - [TRAINER_ENCOUNTER_MUSIC_MALE] = MUS_SHOUNEN, - [TRAINER_ENCOUNTER_MUSIC_FEMALE] = MUS_SHOUJO, - [TRAINER_ENCOUNTER_MUSIC_GIRL] = MUS_SHOUJO, - [TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS] = MUS_ROCKET, - [TRAINER_ENCOUNTER_MUSIC_INTENSE] = MUS_SHOUNEN, - [TRAINER_ENCOUNTER_MUSIC_COOL] = MUS_SHOUNEN, - [TRAINER_ENCOUNTER_MUSIC_AQUA] = MUS_ROCKET, - [TRAINER_ENCOUNTER_MUSIC_MAGMA] = MUS_ROCKET, - [TRAINER_ENCOUNTER_MUSIC_SWIMMER] = MUS_SHOUNEN, - [TRAINER_ENCOUNTER_MUSIC_TWINS] = MUS_SHOUJO, - [TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR] = MUS_SHOUNEN, - [TRAINER_ENCOUNTER_MUSIC_HIKER] = MUS_SHOUNEN, - [TRAINER_ENCOUNTER_MUSIC_INTERVIEWER] = MUS_SHOUNEN, - [TRAINER_ENCOUNTER_MUSIC_RICH] = MUS_SHOUNEN + [TRAINER_ENCOUNTER_MUSIC_MALE] = MUS_ENCOUNTER_BOY, + [TRAINER_ENCOUNTER_MUSIC_FEMALE] = MUS_ENCOUNTER_GIRL, + [TRAINER_ENCOUNTER_MUSIC_GIRL] = MUS_ENCOUNTER_GIRL, + [TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS] = MUS_ENCOUNTER_ROCKET, + [TRAINER_ENCOUNTER_MUSIC_INTENSE] = MUS_ENCOUNTER_BOY, + [TRAINER_ENCOUNTER_MUSIC_COOL] = MUS_ENCOUNTER_BOY, + [TRAINER_ENCOUNTER_MUSIC_AQUA] = MUS_ENCOUNTER_ROCKET, + [TRAINER_ENCOUNTER_MUSIC_MAGMA] = MUS_ENCOUNTER_ROCKET, + [TRAINER_ENCOUNTER_MUSIC_SWIMMER] = MUS_ENCOUNTER_BOY, + [TRAINER_ENCOUNTER_MUSIC_TWINS] = MUS_ENCOUNTER_GIRL, + [TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR] = MUS_ENCOUNTER_BOY, + [TRAINER_ENCOUNTER_MUSIC_HIKER] = MUS_ENCOUNTER_BOY, + [TRAINER_ENCOUNTER_MUSIC_INTERVIEWER] = MUS_ENCOUNTER_BOY, + [TRAINER_ENCOUNTER_MUSIC_RICH] = MUS_ENCOUNTER_BOY }; static const u8 sSingleBattleChallengeMonIdxs[][2] = { |