diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index 87b6c7246f..3c9ae40473 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -165,7 +165,7 @@ bool CBoot::BootUp() NOTICE_LOG(BOOT, "Booting %s", _StartupPara.m_strFilename.c_str()); // HLE jump to loader (homebrew) - Memory::Write_U32(((1 & 0x3f) << 26) | 10, 0x80001800); + HLE::Patch(0x80001800, "HBReload"); const u8 stubstr[] = { 'S', 'T', 'U', 'B', 'H', 'A', 'X', 'X' }; Memory::WriteBigEData(stubstr, 0x80001804, 8); diff --git a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp index f71c1ce923..a3dec1f6dc 100644 --- a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp @@ -34,6 +34,7 @@ #include "../ConfigManager.h" #include "VolumeCreator.h" #include "Boot.h" +#include "HLE/HLE.h" void CBoot::RunFunction(u32 _iAddr) { @@ -84,7 +85,7 @@ bool CBoot::EmulatedBS2_GC() // HIO checks this //Memory::Write_U16(0x8200, 0x000030e6); // Console type - Memory::Write_U32(((1 & 0x3f) << 26) | 1, 0x81300000); // HLE OSReport for Apploader + HLE::Patch(0x81300000, "OSReport"); // HLE OSReport for Apploader // Load Apploader to Memory - The apploader is hardcoded to begin at 0x2440 on the disc, // but the size can differ between discs. Compare with yagcd chap 13. @@ -312,7 +313,7 @@ bool CBoot::EmulatedBS2_Wii() Memory::Write_U32(0x4c000064, 0x80000800); // write default FPU Handler: rfi Memory::Write_U32(0x4c000064, 0x80000C00); // write default Syscall Handler: rfi - Memory::Write_U32(((1 & 0x3f) << 26) | 1, 0x81300000); // HLE OSReport for Apploader + HLE::Patch(0x81300000, "OSReport"); // HLE OSReport for Apploader PowerPC::ppcState.gpr[1] = 0x816ffff0; // StackPointer diff --git a/Source/Core/Core/Src/HLE/HLE.cpp b/Source/Core/Core/Src/HLE/HLE.cpp index db23de9142..565ccdb157 100644 --- a/Source/Core/Core/Src/HLE/HLE.cpp +++ b/Source/Core/Core/Src/HLE/HLE.cpp @@ -52,12 +52,13 @@ static const SPatch OSPatches[] = { "FAKE_TO_SKIP_0", HLE_Misc::UnimplementedFunction }, // speedup - //{ "OSProtectRange", HLE_Misc::UnimplementedFunctionFalse }, + //{ "OSProtectRange", HLE_Misc::UnimplementedFunctionFalse }, //{ "THPPlayerGetState", HLE_Misc:THPPlayerGetState }, // debug out is very nice ;) { "OSReport", HLE_OS::HLE_GeneralDebugPrint }, + { "DEBUGPrint", HLE_OS::HLE_GeneralDebugPrint }, { "OSPanic", HLE_OS::HLE_OSPanic }, { "vprintf", HLE_OS::HLE_GeneralDebugPrint }, { "printf", HLE_OS::HLE_GeneralDebugPrint },