diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-09-15 09:05:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-15 09:05:34 -0500 |
| commit | f5830be0b4be66480789ab9bd9c1206516b3483f (patch) | |
| tree | 7c4a12cda114671550ed2e45f13ced5656e0775a /src/sound.c | |
| parent | 918c7ca3b5a44bc4dc14a4d3c59cc64305516cfe (diff) | |
| parent | 3e80e081b5c9d44ecc2e507302f67d4fbd8c48e6 (diff) | |
Merge pull request #687 from Kermalis/master
Updated changes from #380
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/sound.c b/src/sound.c index 5b41acbc6..36afa1a8b 100644 --- a/src/sound.c +++ b/src/sound.c @@ -32,15 +32,15 @@ extern struct MusicPlayerInfo gMPlay_SE1; extern struct MusicPlayerInfo gMPlay_SE2; extern struct MusicPlayerInfo gMPlay_SE3; -extern struct ToneData voicegroup_8452590[]; -extern struct ToneData voicegroup_8452B90[]; -extern struct ToneData voicegroup_8453190[]; -extern struct ToneData voicegroup_8453790[]; +extern struct ToneData voicegroup112[]; +extern struct ToneData voicegroup113[]; +extern struct ToneData voicegroup114[]; +extern struct ToneData voicegroup115[]; -extern struct ToneData voicegroup_84537C0[]; -extern struct ToneData voicegroup_8453DC0[]; -extern struct ToneData voicegroup_84543C0[]; -extern struct ToneData voicegroup_84549C0[]; +extern struct ToneData voicegroup116[]; +extern struct ToneData voicegroup117[]; +extern struct ToneData voicegroup118[]; +extern struct ToneData voicegroup119[]; static const struct Fanfare sFanfares[] = { @@ -416,19 +416,19 @@ static void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode { case 0: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_84537C0[index] : &voicegroup_8452590[index]); + v0 ? &voicegroup116[index] : &voicegroup112[index]); break; case 1: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_8453DC0[index] : &voicegroup_8452B90[index]); + v0 ? &voicegroup117[index] : &voicegroup113[index]); break; case 2: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_84543C0[index] : &voicegroup_8453190[index]); + v0 ? &voicegroup118[index] : &voicegroup114[index]); break; case 3: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_84549C0[index] : &voicegroup_8453790[index]); + v0 ? &voicegroup119[index] : &voicegroup115[index]); break; } } |