Pikmin 2 for the Wii also boots, with corrupt sound this time. Included its UCode, since it's so different from Pikmin 1's and contains the mysterious UnkZelda address. Also, potential run-stop-run bug has been fixed.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3965 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 10 insertions, 3 deletions

diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCodes.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCodes.cpp
index b66e663da5..b313f5422f 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCodes.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCodes.cpp
@@ -70,7 +70,8 @@ IUCode* UCodeFactory(u32 _CRC, CMailHandler& _rMailHandler)
 		return new CUCode_Zelda(_rMailHandler, _CRC);
 
       // WII CRCs
-	case 0xb7eb9a9c: // Wii Pikmin - JAP
+	case 0xb7eb9a9c: // Wii Pikmin - PAL
+	case 0xeaeb38cc: // Wii Pikmin 2 - PAL
 	case 0x6c3f6f94: // zelda - PAL
 	case 0xd643001f: // mario galaxy - PAL    
 		INFO_LOG(DSPHLE, "CRC %08x: Zelda Wii ucode chosen\n", _CRC);
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
index 3b06ef5b44..d8656e6575 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
@@ -54,8 +54,7 @@ struct DSPState
 	u32 DSPMailbox;
 	bool DSPMailbox_Read[2];
 
-	DSPState()
-	{
+	void Reset() {
 		CPUMailbox = 0x00000000;
 		CPUMailbox_Written[0] = false;
 		CPUMailbox_Written[1] = false;
@@ -64,6 +63,11 @@ struct DSPState
 		DSPMailbox_Read[0] = true;
 		DSPMailbox_Read[1] = true;
 	}
+
+	DSPState()
+	{
+		Reset();
+	}
 };
 DSPState g_dspState;
 
@@ -203,6 +207,8 @@ void Initialize(void *init)
 	g_Config.Load();
 	g_pMemory = g_dspInitialize.pGetMemoryPointer(0);
 
+	g_dspState.Reset();
+
 	CDSPHandler::CreateInstance();
 
 	soundStream = AudioCommon::InitSoundStream(new HLEMixer());