piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

DSPHLE: LordMark's looping hack for AFC. looping isn't correct but it's good enough for Pikmin 2 and Zelda TP's missing music. Does cause weird "echoes" in the harp sound in Zelda Four Swords, but I think that's a fair sacrifice until we figure it out properly.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4111 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2009-08-30 21:57:00 +00:00
parent 69eadecc9a
commit 6b97c0b764
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda_Voice.cpp
View File

@ -272,27 +272,27 @@ void CUCode_Zelda::RenderVoice_AFC(ZeldaVoicePB &PB, s16 *_Buffer, int _Size)
restart: restart:
if (PB.ReachedEnd) if (PB.ReachedEnd)
{ {
PB.ReachedEnd = 0;
// HACK: AFC looping doesn't work. // HACK: AFC looping doesn't work.
if (true || PB.RepeatMode == 0) if (PB.RepeatMode == 0) //MKDD excluded (hack) - strange menu sounds
{ {
PB.KeyOff = 1; PB.KeyOff = 1;
PB.RemLength = 0; // PB.RemLength = 0;
PB.CurAddr = PB.StartAddr + PB.RestartPos + PB.Length; // PB.CurAddr = PB.StartAddr + PB.RestartPos + PB.Length;
while (sampleCount < _RealSize) while (sampleCount < _RealSize)
_Buffer[sampleCount++] = 0; _Buffer[sampleCount++] = 0;
return; return;
} }
else else
{ {
// This needs adjustment. It's not right for AFC, was just copied from PCM16. // The loop start pos is incorrect, so samples will loop a bit wrong. However, at least
PB.RestartPos = PB.LoopStartPos; // this fixes the intro music in ZTP, Pikmin2.
PB.RemLength = PB.Length - PB.RestartPos; // PB.RestartPos = PB.LoopStartPos;
PB.CurAddr = PB.StartAddr + (PB.RestartPos << 1); PB.RemLength = PB.Length; // - PB.RestartPos;
PB.CurAddr = PB.StartAddr; //+ (PB.LoopStartPos >> 4) * PB.Format + ;
PB.YN1 = PB.LoopYN1; PB.ReachedEnd = 0;
PB.YN2 = PB.LoopYN2; // Hmm, this shouldn't be reversed .. or should it? Is it different between versions of the ucode?
PB.YN1 = PB.LoopYN2;
PB.YN2 = PB.LoopYN1;
} }
} }