diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-14 19:25:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-14 19:25:10 -0400 |
| commit | 928cdf2531e74df2432ec8d602c4c2d2fee14eb1 (patch) | |
| tree | 9a520de5b4790f14175a28eb70665a4f60ade486 /src/pokemon.c | |
| parent | 30ef49416391d036286661a8e1225b4ba03e3109 (diff) | |
| parent | 26962b7725ffc5df719a0eea9442735b9dc04b5c (diff) | |
Merge branch 'master' into doc-inc2
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 55f9a93f3..c555ca3d7 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5704,7 +5704,7 @@ u8 GetTrainerEncounterMusicId(u16 trainerOpponentId) { if (InBattlePyramid()) return GetBattlePyramindTrainerEncounterMusicId(trainerOpponentId); - else if (sub_81D5C18()) + else if (InTrainerHillChallenge()) return GetTrainerEncounterMusicIdInTrainerHill(trainerOpponentId); else return TRAINER_ENCOUNTER_MUSIC(trainerOpponentId); |