diff options
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/sound.c b/src/sound.c index 5b41acbc6..b9756c1dc 100644 --- a/src/sound.c +++ b/src/sound.c @@ -32,15 +32,8 @@ 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 voicegroup_84537C0[]; -extern struct ToneData voicegroup_8453DC0[]; -extern struct ToneData voicegroup_84543C0[]; -extern struct ToneData voicegroup_84549C0[]; +extern struct ToneData gCryTable[]; +extern struct ToneData gCryTable2[]; static const struct Fanfare sFanfares[] = { @@ -416,19 +409,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 ? &gCryTable2[(128 * 0) + index] : &gCryTable[(128 * 0) + index]); break; case 1: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_8453DC0[index] : &voicegroup_8452B90[index]); + v0 ? &gCryTable2[(128 * 1) + index] : &gCryTable[(128 * 1) + index]); break; case 2: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_84543C0[index] : &voicegroup_8453190[index]); + v0 ? &gCryTable2[(128 * 2) + index] : &gCryTable[(128 * 2) + index]); break; case 3: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_84549C0[index] : &voicegroup_8453790[index]); + v0 ? &gCryTable2[(128 * 3) + index] : &gCryTable[(128 * 3) + index]); break; } } |