From c26920efb69b2f635b8b26aa67129d71cd1edb5e Mon Sep 17 00:00:00 2001 From: John Peterson Date: Mon, 10 Nov 2008 21:48:15 +0000 Subject: [PATCH] Oops, fixed mistake git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1114 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp | 7 ++----- Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AXWii.cpp | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp index 5c4542a8ee..bd079d4ad7 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp @@ -312,11 +312,8 @@ template void CollectPB(bool Wii, int i, ParamBlockType &P gmixer_vol6[i] = PBs[i].mixer.unknown3[2]; gmixer_vol7[i] = PBs[i].mixer.unknown3[4]; - //gmixer_d1[i] = PBs[i].mixer.unknown4[1]; - gmixer_d1[i] = PBs[i].next_pb_lo; - gmixer_d2[i] = PBs[i].next_pb_hi; - - //gmixer_d2[i] = PBs[i].mixer.unknown4[3]; + gmixer_d1[i] = PBs[i].mixer.unknown4[1]; + gmixer_d2[i] = PBs[i].mixer.unknown4[3]; gmixer_d3[i] = PBs[i].mixer.unknown4[5]; gmixer_d4[i] = PBs[i].mixer.unknown4[7]; gmixer_d5[i] = PBs[i].mixer.unknown4[1]; diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AXWii.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AXWii.cpp index ec0ab61c7d..27a0caf521 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AXWii.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AXWii.cpp @@ -85,7 +85,7 @@ int ReadOutPBsWii(u32 pbs_address, AXParamBlockWii* _pPBs, int _num) pAddr = blockAddr; // Detect the last mail by checking when next_pb = 0 - u32 next_pb = (Common::swap16(pSrc[160]) << 16 | Common::swap16(pSrc[161])); + u32 next_pb = (Common::swap16(pSrc[0]) << 16 | Common::swap16(pSrc[1])); if (pSrc != NULL && next_pb > 0) { short *pDest = (short *)&_pPBs[i];