diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2019-07-30 21:31:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 21:31:27 -0500 |
| commit | bc159dbb03735db55e6a09bb7947dccc70d0532b (patch) | |
| tree | 5b27866fe839d0f2f7ae76e0f13580ecea2dd863 /src/mauville_man.c | |
| parent | b8393b3a799f92e7064c266600607d98f6baf4d9 (diff) | |
| parent | cf0da4c3bb5658908275068591fe51fb6f2ce49d (diff) | |
Merge pull request #752 from camthesaxman/emerald_diff
resolve some Emerald differences
Diffstat (limited to 'src/mauville_man.c')
| -rw-r--r-- | src/mauville_man.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mauville_man.c b/src/mauville_man.c index bfdfe9cf1..7eab67823 100644 --- a/src/mauville_man.c +++ b/src/mauville_man.c @@ -20,7 +20,7 @@ #define MACRO1(a) (((a) % 4) + (((a) / 8) & 1)) -extern struct MusicPlayerInfo gMPlay_SE2; +extern struct MusicPlayerInfo gMPlayInfo_SE2; extern u16 gSpecialVar_Result; extern u16 gSpecialVar_0x8004; @@ -651,8 +651,8 @@ static void BardSing(struct Task *task, struct BardSong *song) song->pitch += 64; else song->pitch -= 64; - m4aMPlayVolumeControl(&gMPlay_SE2, 0xFFFF, song->volume); - m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, song->pitch); + m4aMPlayVolumeControl(&gMPlayInfo_SE2, 0xFFFF, song->volume); + m4aMPlayPitchControl(&gMPlayInfo_SE2, 0xFFFF, song->pitch); song->voiceInflection++; } song->phonemeTimer--; @@ -663,13 +663,13 @@ static void BardSing(struct Task *task, struct BardSong *song) if (phoneme->sound <= 50) { song->volume = 0x100 + phoneme->volume * 16; - m4aMPlayVolumeControl(&gMPlay_SE2, 0xFFFF, song->volume); + m4aMPlayVolumeControl(&gMPlayInfo_SE2, 0xFFFF, song->volume); song->pitch = 0x200 + phoneme->pitch; - m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, song->pitch); + m4aMPlayPitchControl(&gMPlayInfo_SE2, 0xFFFF, song->pitch); } break; case 0xFE: - m4aMPlayStop(&gMPlay_SE2); + m4aMPlayStop(&gMPlayInfo_SE2); song->state = 0xFF; break; } @@ -746,7 +746,7 @@ static void Task_BardSong(u8 taskId) if (gStringVar4[task->tCharIndex] == EOS) { FadeInNewBGM(MUS_POKECEN, 6); - m4aMPlayFadeOutTemporarily(&gMPlay_SE2, 2); + m4aMPlayFadeOutTemporarily(&gMPlayInfo_SE2, 2); EnableBothScriptContexts(); DestroyTask(taskId); } |