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

Zelda HLE: Implement sample source 3. 

"Square" wave at a 0.25 duty cycle (25% up 75% down).
This commit is contained in:
Pierre Bourdon 2014-12-24 00:55:56 +01:00
parent 3c2b22bc09
commit b3a327f02b
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,10 +59,12 @@ static const std::map<u32, u32> UCODE_FLAGS = {
{ 0xD643001F, NO_ARAM | MAKE_DOLBY_LOUDER }, { 0xD643001F, NO_ARAM | MAKE_DOLBY_LOUDER },
// TODO: Other games that use this UCode (exhaustive list): // TODO: Other games that use this UCode (exhaustive list):
// * Link's Crossbow Training
// * Mario Kart: Double Dash!! (type ????, CRC ????) // * Mario Kart: Double Dash!! (type ????, CRC ????)
// * Pikmin 2 (type ????, CRC ????) // * Pikmin 2 (type ????, CRC ????)
// * Super Mario Galaxy 2 (type ????, CRC ????) // * Super Mario Galaxy 2 (type ????, CRC ????)
// * Super Mario Sunshine (type ????, CRC ????) // * Super Mario Sunshine (type ????, CRC ????)
// * The Legend of Zelda: Collector's Edition
// * The Legend of Zelda: Twilight Princess / Wii (type ????, CRC ????) // * The Legend of Zelda: Twilight Princess / Wii (type ????, CRC ????)
}; };
@ -652,6 +654,9 @@ struct ZeldaAudioRenderer::VPB
// Simple saw wave at 100% amplitude and frequency controlled via the // Simple saw wave at 100% amplitude and frequency controlled via the
// resampling ratio. // resampling ratio.
SRC_SAW_WAVE = 1, SRC_SAW_WAVE = 1,
// Same "square" wave as SRC_SQUARE_WAVE but using a 0.25 duty cycle
// instead of 0.5.
SRC_SQUARE_WAVE_25PCT = 3,
// Breaking the numerical ordering for these, but they are all related. // Breaking the numerical ordering for these, but they are all related.
// Simple pattern stored in the data downloaded by command 01. Playback // Simple pattern stored in the data downloaded by command 01. Playback
// frequency is controlled by the resampling ratio. // frequency is controlled by the resampling ratio.
@ -1175,14 +1180,22 @@ void ZeldaAudioRenderer::LoadInputSamples(MixingBuffer* buffer, VPB* vpb)
switch (vpb->samples_source_type) switch (vpb->samples_source_type)
{ {
case VPB::SRC_SQUARE_WAVE: case VPB::SRC_SQUARE_WAVE:
case VPB::SRC_SQUARE_WAVE_25PCT:
{ {
u32 pos = vpb->current_pos_frac << 1; u32 shift;
if (vpb->samples_source_type == VPB::SRC_SQUARE_WAVE)
shift = 1;
else
shift = 2;
u32 mask = (1 << shift) - 1;
u32 pos = vpb->current_pos_frac << shift;
for (size_t i = 0; i < buffer->size(); ++i) for (size_t i = 0; i < buffer->size(); ++i)
{ {
(*buffer)[i] = ((pos >> 16) & 1) ? 0x4000 : 0xC000; (*buffer)[i] = ((pos >> 16) & mask) ? 0xC000 : 0x4000;
pos += vpb->resampling_ratio; pos += vpb->resampling_ratio;
} }
vpb->current_pos_frac = (pos >> 1) & 0xFFFF; vpb->current_pos_frac = (pos >> shift) & 0xFFFF;
break; break;
} }