ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Zelda HLE: NTSC IPL provides the volume stepping explicitly. 

Support that through a new behavior flag. Now the only remaining known bug in
the NTSC IPL is the reverb not fading out.
This commit is contained in:
Pierre Bourdon 2014-12-23 19:14:29 +01:00
parent 43882f3e6e
commit 01ab40fc6e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
View File

@ -31,11 +31,16 @@ enum ZeldaUCodeFlag
// Handle smaller VPBs that are missing their 0x40-0x80 area. Very early // Handle smaller VPBs that are missing their 0x40-0x80 area. Very early
// versions of the Zelda UCode used 0x80 sized VPBs. // versions of the Zelda UCode used 0x80 sized VPBs.
TINY_VPB = 0x00000010, TINY_VPB = 0x00000010,
// If set, interpret non-Dolby mixing parameters as step/current volume
// instead of target/current volume.
VOLUME_EXPLICIT_STEP = 0x00000020,
}; };
static const std::map<u32, u32> UCODE_FLAGS = { static const std::map<u32, u32> UCODE_FLAGS = {
// GameCube IPL/BIOS, NTSC. // GameCube IPL/BIOS, NTSC.
{ 0x24B22038, LIGHT_PROTOCOL | FOUR_MIXING_DESTS | TINY_VPB }, { 0x24B22038, LIGHT_PROTOCOL | FOUR_MIXING_DESTS | TINY_VPB |
VOLUME_EXPLICIT_STEP },
// GameCube IPL/BIOS, PAL. // GameCube IPL/BIOS, PAL.
{ 0x6BA3B3EA, LIGHT_PROTOCOL | FOUR_MIXING_DESTS }, { 0x6BA3B3EA, LIGHT_PROTOCOL | FOUR_MIXING_DESTS },
// The Legend of Zelda: The Wind Waker. // The Legend of Zelda: The Wind Waker.
@ -1046,7 +1051,14 @@ void ZeldaAudioRenderer::AddVoice(u16 voice_id)
if (!vpb.channels[i].id) if (!vpb.channels[i].id)
continue; continue;
s16 volume_delta = vpb.channels[i].target_volume - vpb.channels[i].current_volume; // Some UCode versions provide the delta directly instead of
// providing a target volume.
s16 volume_delta;
if (m_flags & VOLUME_EXPLICIT_STEP)
volume_delta = (vpb.channels[i].target_volume << 16);
else
volume_delta = vpb.channels[i].target_volume - vpb.channels[i].current_volume;
s32 volume_step = (volume_delta << 16) / (s32)input_samples.size(); // In 1.31 format. s32 volume_step = (volume_delta << 16) / (s32)input_samples.size(); // In 1.31 format.
// TODO: The last value of each channel structure is used to // TODO: The last value of each channel structure is used to