diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-02-22 14:22:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-22 14:22:35 -0500 |
| commit | 3765c1e7f155ce42b5808117e97bf287e7006d6d (patch) | |
| tree | 739764006fce1eca2145af3bb3cb0704aa5cb846 | |
| parent | eca5233abe83a074ce97f9e47b30eb0c0f430a9e (diff) | |
| parent | 40efac0ddf1b6f89bcebc371e2c46b163abb6a3c (diff) | |
Merge pull request #1635 from sphericalice/battle-pyramind
Rename GetBattlePyramindTrainerEncounterMusicId to fix typo
| -rw-r--r-- | include/battle_pyramid.h | 2 | ||||
| -rw-r--r-- | src/battle_pyramid.c | 2 | ||||
| -rw-r--r-- | src/pokemon.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h index c4a72095f..62320358b 100644 --- a/include/battle_pyramid.h +++ b/include/battle_pyramid.h @@ -14,7 +14,7 @@ void SoftResetInBattlePyramid(void); void CopyPyramidTrainerSpeechBefore(u16 trainerId); void CopyPyramidTrainerWinSpeech(u16 trainerId); void CopyPyramidTrainerLoseSpeech(u16 trainerId); -u8 GetBattlePyramindTrainerEncounterMusicId(u16 trainerId); +u8 GetTrainerEncounterMusicIdInBattlePyramid(u16 trainerId); void GenerateBattlePyramidFloorLayout(u16 *mapArg, bool8 setPlayerPosition); void LoadBattlePyramidObjectEventTemplates(void); void LoadBattlePyramidFloorObjectEventScripts(void); diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 154760396..9039f60f2 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1465,7 +1465,7 @@ void CopyPyramidTrainerLoseSpeech(u16 trainerId) FrontierSpeechToString(gFacilityTrainers[trainerId].speechLose); } -u8 GetBattlePyramindTrainerEncounterMusicId(u16 trainerId) +u8 GetTrainerEncounterMusicIdInBattlePyramid(u16 trainerId) { int i; diff --git a/src/pokemon.c b/src/pokemon.c index 08a6fd0f9..61125e362 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5810,7 +5810,7 @@ s32 GetBattlerMultiplayerId(u16 a1) u8 GetTrainerEncounterMusicId(u16 trainerOpponentId) { if (InBattlePyramid()) - return GetBattlePyramindTrainerEncounterMusicId(trainerOpponentId); + return GetTrainerEncounterMusicIdInBattlePyramid(trainerOpponentId); else if (InTrainerHillChallenge()) return GetTrainerEncounterMusicIdInTrainerHill(trainerOpponentId); else |