diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-09 11:33:37 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-10-09 11:34:51 -0400 |
| commit | 28de627913f04e059f995169299e41ce4c2544f0 (patch) | |
| tree | baba21a14ae6c2d0a7464851346e6217ac8a34be /src/mauville_old_man.c | |
| parent | e26f9d10d7bebee5ea512fc4729ce6adafec66a0 (diff) | |
Add TRACKS_ALL, remove BGCntrlBitfield
Diffstat (limited to 'src/mauville_old_man.c')
| -rw-r--r-- | src/mauville_old_man.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 8de9fc3c9..d3c41236c 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -502,9 +502,9 @@ static void BardSing(struct Task *task, struct BardSong *song) if (sound->var00 <= 50) { song->volume = 0x100 + sound->volume * 16; - m4aMPlayVolumeControl(&gMPlayInfo_SE2, 0xFFFF, song->volume); + m4aMPlayVolumeControl(&gMPlayInfo_SE2, TRACKS_ALL, song->volume); song->pitch = 0x200 + song->phonemes[song->currPhoneme].pitch; - m4aMPlayPitchControl(&gMPlayInfo_SE2, 0xFFFF, song->pitch); + m4aMPlayPitchControl(&gMPlayInfo_SE2, TRACKS_ALL, song->pitch); } break; case 1: @@ -514,8 +514,8 @@ static void BardSing(struct Task *task, struct BardSong *song) song->pitch += 64; else song->pitch -= 64; - m4aMPlayVolumeControl(&gMPlayInfo_SE2, 0xFFFF, song->volume); - m4aMPlayPitchControl(&gMPlayInfo_SE2, 0xFFFF, song->pitch); + m4aMPlayVolumeControl(&gMPlayInfo_SE2, TRACKS_ALL, song->volume); + m4aMPlayPitchControl(&gMPlayInfo_SE2, TRACKS_ALL, song->pitch); song->voiceInflection++; song->phonemeTimer--; if (song->phonemeTimer == 0) |