diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-26 00:33:42 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-26 01:31:50 +0800 |
| commit | 1230a5c48a465d42ae7035ca9c1a6e2152c54d1a (patch) | |
| tree | 8fc6f5b6bb323f408a4f0c117f89fd66b7161440 /src/battle_setup.c | |
| parent | 2f87855072fb4fdca6ce22d60bfb1b7fdc000134 (diff) | |
clean up
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index b43f43ce2..e4b8914e5 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -850,7 +850,7 @@ u16 sub_80803D8(void) return gUnknown_20386CC; } -u16 GetTrainerFlag(void) +u16 ScrSpecial_HasTrainerBeenFought(void) { return FlagGet(GetTrainerAFlag()); } @@ -993,7 +993,7 @@ void ScrSpecial_ShowTrainerNonBattlingSpeech(void) ShowFieldMessage(GetTrainerCantBattleSpeech()); } -void SetUpTrainerEncounterMusic(void) +void PlayTrainerEncounterMusic(void) { u16 music; @@ -1003,19 +1003,19 @@ void SetUpTrainerEncounterMusic(void) { switch (GetTrainerEncounterMusicId(gTrainerBattleOpponent_A)) { - case 1: // TODO: replace these with enums - case 2: - case 9: + case TRAINER_ENCOUNTER_MUSIC_FEMALE: + case TRAINER_ENCOUNTER_MUSIC_GIRL: + case TRAINER_ENCOUNTER_MUSIC_TWINS: music = MUS_SHOUJO; break; - case 0: - case 4: - case 5: - case 8: - case 10: - case 11: - case 12: - case 13: + case TRAINER_ENCOUNTER_MUSIC_MALE: + case TRAINER_ENCOUNTER_MUSIC_INTENSE: + case TRAINER_ENCOUNTER_MUSIC_COOL: + case TRAINER_ENCOUNTER_MUSIC_SWIMMER: + case TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR: + case TRAINER_ENCOUNTER_MUSIC_HIKER: + case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER: + case TRAINER_ENCOUNTER_MUSIC_RICH: music = MUS_SHOUNEN; break; default: |