diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2019-02-12 00:40:42 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2019-02-12 00:40:42 -0600 |
| commit | dfb896356cf46fd1679814c7d5cf8f1e31e34dee (patch) | |
| tree | 0c38e9dc94b1ef531b7a740cd1a08c4a2d5e091c /src/pokemon.c | |
| parent | 449fb25f2372c8d51fc156d0eeeffa4023ec38b8 (diff) | |
| parent | 16eff049a14be4f826edb8bc07929e6d5e4e4e0d (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
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 5f1664450..9553fdf17 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6081,7 +6081,7 @@ s32 GetBattlerMultiplayerId(u16 a1) u8 GetTrainerEncounterMusicId(u16 trainerOpponentId) { if (InBattlePyramid()) - return GetTrainerEncounterMusicIdInBattlePyramind(trainerOpponentId); + return GetBattlePyramindTrainerEncounterMusicId(trainerOpponentId); else if (sub_81D5C18()) return GetTrainerEncounterMusicIdInTrainerHill(trainerOpponentId); else |