Added support for Reset (from menu). Fixes Sam & Max.

Source/Core/Core/Src/Boot/Boot.cpp

@@ -260,13 +260,15 @@ bool CBoot::BootUp()
 		// Scan for common HLE functions
 		if (!_StartupPara.bEnableDebugging)
 		{
-			PPCAnalyst::FindFunctions(0x80000000, 0x81800000, &g_symbolDB);
+			PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB);
 			SignatureDB db;
 			if (db.Load((File::GetSysDirectory() + TOTALDB).c_str()))
 			{
 				db.Apply(&g_symbolDB);
-			}
 				HLE::PatchFunctions();
+				db.Clear();
+				g_symbolDB.Clear();
+			}
 		}
 
 		/* Try to load the symbol map if there is one, and then scan it for

Source/Core/Core/Src/HLE/HLE_Misc.cpp

@@ -29,6 +29,10 @@
 #include "../Boot/Boot_DOL.h"
 #include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
 #include "HLE.h"
+#include "PowerPC/PPCAnalyst.h"
+#include "PowerPC/SignatureDB.h"
+#include "PowerPC/PPCSymbolDB.h"
+#include "CommonPaths.h"
 
 namespace HLE_Misc
 {
@@ -295,21 +299,25 @@ void HBReload()
 	Host_Message(WM_USER_STOP);
 }
 
-void BootDOLFromDisc()
+void ExecuteDOL(u8* dolFile, u32 fileSize)
 {
-	DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str());
-	DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume);
-
-	if (dol.substr(1, 1).compare("//"))
-		dol = dol.substr(1);
-
-	u32 fileSize = (u32) pFileSystem->GetFileSize(dol.c_str());
-	u8* dolFile = new u8[fileSize];
-	if (fileSize > 0)
-	{
-		pFileSystem->ReadFile(dol.c_str(), dolFile, fileSize);
 	CDolLoader dolLoader(dolFile, fileSize);
 	dolLoader.Load();
+
+	// Scan for common HLE functions
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
+	{
+		PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB);
+		SignatureDB db;
+		if (db.Load((File::GetSysDirectory() + TOTALDB).c_str()))
+		{
+			db.Apply(&g_symbolDB);
+			HLE::PatchFunctions();
+			db.Clear();
+			g_symbolDB.Clear();
+		}
+	}
+
 	PowerPC::ppcState.iCache.Reset();
 
 	static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer();
@@ -344,6 +352,37 @@ void BootDOLFromDisc()
 
 	NPC = dolLoader.GetEntryPoint() | 0x80000000;
 }
+
+void LoadDOLFromDisc()
+{
+	DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str());
+	DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume);
+
+	if (dol.substr(1, 1).compare("//"))
+		dol = dol.substr(1);
+
+	u32 fileSize = (u32) pFileSystem->GetFileSize(dol.c_str());
+	u8* dolFile = new u8[fileSize];
+	if (fileSize > 0)
+	{
+		pFileSystem->ReadFile(dol.c_str(), dolFile, fileSize);
+		ExecuteDOL(dolFile, fileSize);
+	}
+	delete[] dolFile;
+}
+
+void LoadBootDOLFromDisc()
+{
+	DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str());
+	DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume);
+	u32 fileSize = pFileSystem->GetBootDOLSize();
+	u8* dolFile = new u8[fileSize];
+	if (fileSize > 0)
+	{
+		pFileSystem->GetBootDOL(dolFile, fileSize);
+		ExecuteDOL(dolFile, fileSize);
+	}
+	delete[] dolFile;
 }
 
 u32 GetDolFileSize()
@@ -369,8 +408,13 @@ void OSBootDol()
 
 		if ((GPR(4) >> 28) == 0x8)
 		{
-			// Reset from menu
-			PanicAlert("Reset from menu");
+			u32 resetCode = GPR(30);
+
+			// Reset game
+			Memory::Write_U32(resetCode << 3, 0xCC003024);
+			//Memory::Write_U32((resetCode << 3) | 0x80000000, 0x800030f0); // Warm reset
+			LoadBootDOLFromDisc();
+			return;
 		}
 		else if ((GPR(4) >> 28) == 0xA)
 		{
@@ -398,7 +442,7 @@ void OSBootDol()
 
 			argsPtr = Memory::Read_U32(GPR(5));
 			Memory::GetString(args, argsPtr);
-			BootDOLFromDisc();
+			LoadDOLFromDisc();
 			return;
 		}
 		else

Source/Core/Core/Src/HLE/HLE_Misc.h

@@ -40,6 +40,7 @@ namespace HLE_Misc
 	void FZ_rsqrt_internal();
 	void HBReload();
 	void OSBootDol();
+	void ExecuteDOL(u8* dolFile, u32 fileSize);
 }
 
 #endif

Source/Core/Core/Src/HW/ProcessorInterface.cpp

@@ -199,6 +199,7 @@ void Write32(const u32 _uValue, const u32 _iAddress)
 
 	case PI_RESET_CODE:
 		DEBUG_LOG(PROCESSORINTERFACE, "Write %08x to PI_RESET_CODE", _uValue);
+		m_ResetCode = _uValue;
 		break;
 
 	case PI_FLIPPER_UNK:

Source/Core/DiscIO/Src/FileSystemGCWii.cpp

@@ -159,7 +159,7 @@ bool CFileSystemGCWii::ExportApploader(const char* _rExportFolder) const
 	return false;
 }
 
-bool CFileSystemGCWii::ExportDOL(const char* _rExportFolder) const
+u32 CFileSystemGCWii::GetBootDOLSize() const
 {
 	u32 DolOffset = Read32(0x420) << m_OffsetShift;
 	u32 DolSize = 0, offset = 0, size = 0;
@@ -181,9 +181,22 @@ bool CFileSystemGCWii::ExportDOL(const char* _rExportFolder) const
 		if (offset + size > DolSize)
 			DolSize = offset + size;
 	}
+	return DolSize;
+}
 
+bool CFileSystemGCWii::GetBootDOL(u8* &buffer, u32 DolSize) const
+{
+	u32 DolOffset = Read32(0x420) << m_OffsetShift;
+	return m_rVolume->Read(DolOffset, DolSize, buffer);
+}
+
+bool CFileSystemGCWii::ExportDOL(const char* _rExportFolder) const
+{
+	u32 DolOffset = Read32(0x420) << m_OffsetShift;
+	u32 DolSize = GetBootDOLSize();
 	u8* buffer = new u8[DolSize];
-	if (m_rVolume->Read(DolOffset, DolSize, buffer))
+
+	if (GetBootDOL(buffer, DolSize))
 	{
 		char exportName[512];
 		sprintf(exportName, "%s/boot.dol", _rExportFolder);

Source/Core/DiscIO/Src/FileSystemGCWii.h

@@ -38,6 +38,8 @@ public:
 	virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename);
 	virtual bool ExportApploader(const char* _rExportFolder) const;
 	virtual bool ExportDOL(const char* _rExportFolder) const;
+	virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const;
+	virtual u32 GetBootDOLSize() const;
 
 private:
 	bool m_Initialized;

Source/Core/DiscIO/Src/Filesystem.h

@@ -57,6 +57,8 @@ public:
 	virtual bool ExportApploader(const char* _rExportFolder) const = 0;
 	virtual bool ExportDOL(const char* _rExportFolder) const = 0;
 	virtual const char* GetFileName(u64 _Address) = 0;
+	virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const = 0;
+	virtual u32 GetBootDOLSize() const = 0;
 
 	virtual const IVolume *GetVolume() const { return m_rVolume; }
 protected: