Pass function arguments and return values in physical registers

[yume-chan]

Just a random idea, if games typically follow the PPC ABI, why not passing function parameters in x64 registers, because even PPCContext should always be cached, read/write CPU registers should still be faster.

So I tried this:

XenonRecomp.diff

diff --git a/XenonRecomp/recompiler.cpp b/XenonRecomp/recompiler.cpp
index 5374797..40db406 100644
--- a/XenonRecomp/recompiler.cpp
+++ b/XenonRecomp/recompiler.cpp
@@ -268,7 +268,11 @@ bool Recompiler::Recompile(
     // TODO: we could cache these formats in an array
     auto r = [&](size_t index)
         {
-            if ((config.nonArgumentRegistersAsLocalVariables && (index == 0 || index == 2 || index == 11 || index == 12)) || 
+            if (index >= 3 && index <= 6) {
+                return fmt::format("r{}", index);
+            }
+
+            if ((config.nonArgumentRegistersAsLocalVariables && (index == 0 || index == 2 || index == 11 || index == 12)) ||
                 (config.nonVolatileRegistersAsLocalVariables && index >= 14))
             {
                 localVariables.r[index] = true;
@@ -393,7 +397,7 @@ bool Recompiler::Recompile(
                     }
                     else
                     {
-                        println("\t{}(ctx, base);", targetSymbol->name);
+                        println("\tPPC_SET_RESULT({}(ctx, base, r3, r4, r5, r6));", targetSymbol->name);
                     }
                 }
                 else
@@ -410,7 +414,7 @@ bool Recompiler::Recompile(
                 println("\tif ({}{}.{}) {{", not_ ? "!" : "", cr(insn.operands[0]), cond);
                 print("\t");
                 printFunctionCall(insn.operands[1]);
-                println("\t\treturn;");
+                println("\t\tPPC_FUNC_RETURN();");
                 println("\t}}");
             }
             else
@@ -487,7 +491,7 @@ bool Recompiler::Recompile(
                 println(")) {{");
 
                 if (midAsmHook->second.returnOnTrue)
-                    println("\t\treturn;");
+                    println("\t\tPPC_FUNC_RETURN();");
                 else if (midAsmHook->second.jumpAddressOnTrue != NULL)
                     println("\t\tgoto loc_{:X};", midAsmHook->second.jumpAddressOnTrue);
 
@@ -496,7 +500,7 @@ bool Recompiler::Recompile(
                 println("\telse {{");
 
                 if (midAsmHook->second.returnOnFalse)
-                    println("\t\treturn;");
+                    println("\t\tPPC_FUNC_RETURN();");
                 else if (midAsmHook->second.jumpAddressOnFalse != NULL)
                     println("\t\tgoto loc_{:X};", midAsmHook->second.jumpAddressOnFalse);
 
@@ -507,7 +511,7 @@ bool Recompiler::Recompile(
                 println(");");
 
                 if (midAsmHook->second.ret)
-                    println("\treturn;");
+                    println("\tPPC_FUNC_RETURN();");
                 else if (midAsmHook->second.jumpAddress != NULL)
                     println("\tgoto loc_{:X};", midAsmHook->second.jumpAddress);
             }
@@ -597,7 +601,7 @@ bool Recompiler::Recompile(
         if (insn.operands[0] < fn.base || insn.operands[0] >= fn.base + fn.size)
         {
             printFunctionCall(insn.operands[0]);
-            println("\treturn;");
+            println("\tPPC_FUNC_RETURN();");
         }
         else
         {
@@ -618,7 +622,7 @@ bool Recompiler::Recompile(
                 {
                     println("\t\t// ERROR: 0x{:X}", label);
                     fmt::println("ERROR: Switch case at {:X} is trying to jump outside function: {:X}", base, label);
-                    println("\t\treturn;");
+                    println("\t\tPPC_FUNC_RETURN();");
                 }
                 else
                 {
@@ -634,15 +638,15 @@ bool Recompiler::Recompile(
         }
         else
         {
-            println("\tPPC_CALL_INDIRECT_FUNC({}.u32);", ctr());
-            println("\treturn;");
+            println("\tPPC_SET_RESULT(PPC_CALL_INDIRECT_FUNC({}.u32));", ctr());
+            println("\tPPC_FUNC_RETURN();");
         }
         break;
 
     case PPC_INST_BCTRL:
         if (!config.skipLr)
             println("\tctx.lr = 0x{:X};", base + 4);
-        println("\tPPC_CALL_INDIRECT_FUNC({}.u32);", ctr());
+        println("\tPPC_SET_RESULT(PPC_CALL_INDIRECT_FUNC({}.u32));", ctr());
         csrState = CSRState::Unknown; // the call could change it
         break;
 
@@ -653,7 +657,7 @@ bool Recompiler::Recompile(
 
     case PPC_INST_BDZLR:
         println("\t--{}.u64;", ctr());
-        println("\tif ({}.u32 == 0) return;", ctr(), insn.operands[0]);
+        println("\tif ({}.u32 == 0) PPC_FUNC_RETURN();", ctr(), insn.operands[0]);
         break;
 
     case PPC_INST_BDNZ:
@@ -672,7 +676,7 @@ bool Recompiler::Recompile(
         break;
 
     case PPC_INST_BEQLR:
-        println("\tif ({}.eq) return;", cr(insn.operands[0]));
+        println("\tif ({}.eq) PPC_FUNC_RETURN();", cr(insn.operands[0]));
         break;
 
     case PPC_INST_BGE:
@@ -680,7 +684,7 @@ bool Recompiler::Recompile(
         break;
 
     case PPC_INST_BGELR:
-        println("\tif (!{}.lt) return;", cr(insn.operands[0]));
+        println("\tif (!{}.lt) PPC_FUNC_RETURN();", cr(insn.operands[0]));
         break;
 
     case PPC_INST_BGT:
@@ -688,7 +692,7 @@ bool Recompiler::Recompile(
         break;
 
     case PPC_INST_BGTLR:
-        println("\tif ({}.gt) return;", cr(insn.operands[0]));
+        println("\tif ({}.gt) PPC_FUNC_RETURN();", cr(insn.operands[0]));
         break;
 
     case PPC_INST_BL:
@@ -703,11 +707,11 @@ bool Recompiler::Recompile(
         break;
 
     case PPC_INST_BLELR:
-        println("\tif (!{}.gt) return;", cr(insn.operands[0]));
+        println("\tif (!{}.gt) PPC_FUNC_RETURN();", cr(insn.operands[0]));
         break;
 
     case PPC_INST_BLR:
-        println("\treturn;");
+        println("\tPPC_FUNC_RETURN();");
         break;
 
     case PPC_INST_BLRL:
@@ -719,7 +723,7 @@ bool Recompiler::Recompile(
         break;
 
     case PPC_INST_BLTLR:
-        println("\tif ({}.lt) return;", cr(insn.operands[0]));
+        println("\tif ({}.lt) PPC_FUNC_RETURN();", cr(insn.operands[0]));
         break;
 
     case PPC_INST_BNE:
@@ -728,13 +732,13 @@ bool Recompiler::Recompile(
 
     case PPC_INST_BNECTR:
         println("\tif (!{}.eq) {{", cr(insn.operands[0]));
-        println("\t\tPPC_CALL_INDIRECT_FUNC({}.u32);", ctr());
-        println("\t\treturn;");
+        println("\t\tPPC_SET_RESULT(PPC_CALL_INDIRECT_FUNC({}.u32));", ctr());
+        println("\t\tPPC_FUNC_RETURN();");
         println("\t}}");
         break;
 
     case PPC_INST_BNELR:
-        println("\tif (!{}.eq) return;", cr(insn.operands[0]));
+        println("\tif (!{}.eq) PPC_FUNC_RETURN();", cr(insn.operands[0]));
         break;
 
     case PPC_INST_CCTPL:
@@ -2420,11 +2424,12 @@ bool Recompiler::Recompile(const Function& fn)
         fmt::println("Function at {:X} ends prematurely with instruction {} at {:X}", fn.base, insn.opcode != nullptr ? insn.opcode->name : "INVALID", base - 4);
 #endif
 
+    println("\tPPC_FUNC_RETURN();");
     println("}}\n");
 
 #ifndef XENON_RECOMP_USE_ALIAS
     println("PPC_WEAK_FUNC({}) {{", name);
-    println("\t__imp__{}(ctx, base);", name);
+    println("\treturn __imp__{}(ctx, base, r3, r4, r5, r6);", name);
     println("}}\n");
 #endif
 
diff --git a/XenonUtils/ppc_context.h b/XenonUtils/ppc_context.h
index 0ed3fcf..eb9bb08 100644
--- a/XenonUtils/ppc_context.h
+++ b/XenonUtils/ppc_context.h
@@ -24,12 +24,16 @@
 #define PPC_JOIN(x, y) x##y
 #define PPC_XSTRINGIFY(x) #x
 #define PPC_STRINGIFY(x) PPC_XSTRINGIFY(x)
-#define PPC_FUNC(x) void x(PPCContext& __restrict ctx, uint8_t* base)
+#define PPC_FUNC(x) __attribute__((sysv_abi)) struct PPCReturn x(PPCContext& __restrict ctx, uint8_t* base, struct PPCRegister r3, struct PPCRegister r4, struct PPCRegister r5, struct PPCRegister r6)
 #define PPC_FUNC_IMPL(x) extern "C" PPC_FUNC(x)
 #define PPC_EXTERN_FUNC(x) extern PPC_FUNC(x)
 #define PPC_WEAK_FUNC(x) __attribute__((weak,noinline)) PPC_FUNC(x)
 
 #define PPC_FUNC_PROLOGUE() __builtin_assume(((size_t)base & 0x1F) == 0)
+#define PPC_FUNC_RETURN() return { r3.u64, r4.u64 }
+#define PPC_SET_RESULT(x) { PPCReturn result = (x); r3.u64 = result.r3; r4.u64 = result.r4; }
+#define PPC_FUNC_CALL_DISCARD(x) (x)(ctx, base, r3, r4, r5, r6)
+#define PPC_FUNC_CALL(x) PPC_SET_RESULT(PPC_FUNC_CALL_DISCARD(x))
 
 #ifndef PPC_LOAD_U8
 #define PPC_LOAD_U8(x) *(volatile uint8_t*)(base + (x))
@@ -110,10 +114,10 @@
 #define PPC_LOOKUP_FUNC(x, y) *(PPCFunc**)(x + PPC_IMAGE_BASE + PPC_IMAGE_SIZE + (uint64_t(uint32_t(y) - PPC_CODE_BASE) * 2))
 
 #ifndef PPC_CALL_INDIRECT_FUNC
-#define PPC_CALL_INDIRECT_FUNC(x) (PPC_LOOKUP_FUNC(base, x))(ctx, base)
+#define PPC_CALL_INDIRECT_FUNC(x) (PPC_LOOKUP_FUNC(base, x))(ctx, base, r3, r4, r5, r6)
 #endif
 
-typedef void PPCFunc(struct PPCContext& __restrict__ ctx, uint8_t* base);
+typedef struct PPCReturn PPCFunc(struct PPCContext& __restrict__ ctx, uint8_t* base, struct PPCRegister r3, struct PPCRegister r4, struct PPCRegister r5, struct PPCRegister r6) __attribute__((sysv_abi));
 
 struct PPCFuncMapping
 {
@@ -138,6 +142,21 @@ struct PPCRegister
         float f32;
         double f64;
     };
+
+    constexpr PPCRegister() : s64(0) {}
+    constexpr PPCRegister(int32_t value) : s64(value) {}
+    constexpr PPCRegister(uint32_t value) : u64(value) {}
+    constexpr PPCRegister(int64_t value) : s64(value) {}
+    constexpr PPCRegister(uint64_t value) : u64(value) {}
+    constexpr PPCRegister(float value) : f32(value) {}
+    constexpr PPCRegister(double value) : f64(value) {}
+
+    constexpr operator uint64_t() const { return this->u64; }
+};
+
+struct PPCReturn {
+    uint64_t r3;
+    uint64_t r4;
 };
 
 struct PPCXERRegister

UnleashedRecomp.diff

diff --git a/UnleashedRecomp/app.cpp b/UnleashedRecomp/app.cpp
index b298ebc..6dcb5d0 100644
--- a/UnleashedRecomp/app.cpp
+++ b/UnleashedRecomp/app.cpp
@@ -39,7 +39,7 @@ PPC_FUNC(sub_824EB490)
     SWA::SGlobals::Init();
     Registry::Save();
 
-    __imp__sub_824EB490(ctx, base);
+    return __imp__sub_824EB490(ctx, base, r3, r4, r5, r6);
 }
 
 static std::thread::id g_mainThreadId = std::this_thread::get_id();
@@ -92,6 +92,6 @@ PPC_FUNC(sub_822C1130)
     if (Config::EnableStageCollisionDebugView)
         *SWA::SGlobals::ms_IsCollisionRender = true;
 
-    __imp__sub_822C1130(ctx, base);
+    return __imp__sub_822C1130(ctx, base, r3, r4, r5, r6);
 }
 
diff --git a/UnleashedRecomp/apu/driver/sdl2_driver.cpp b/UnleashedRecomp/apu/driver/sdl2_driver.cpp
index 787fab3..ebbf235 100644
--- a/UnleashedRecomp/apu/driver/sdl2_driver.cpp
+++ b/UnleashedRecomp/apu/driver/sdl2_driver.cpp
@@ -74,8 +74,14 @@ static void AudioThread()
 
         if ((queuedAudioSize / callbackAudioSize) <= MAX_LATENCY)
         {
-            ctx.ppcContext.r3.u32 = g_clientCallbackParam;
-            g_clientCallback(ctx.ppcContext, g_memory.base);
+            g_clientCallback(
+              ctx.ppcContext,
+              g_memory.base,
+              g_clientCallbackParam,
+              0,
+              0,
+              0
+            );
         }
 
         auto now = std::chrono::steady_clock::now();
diff --git a/UnleashedRecomp/cpu/guest_thread.cpp b/UnleashedRecomp/cpu/guest_thread.cpp
index 4249c58..ae520bf 100644
--- a/UnleashedRecomp/cpu/guest_thread.cpp
+++ b/UnleashedRecomp/cpu/guest_thread.cpp
@@ -73,9 +73,15 @@ uint32_t GuestThread::Start(const GuestThreadParams& params)
     const auto cpuNumber = procMask == 0 ? 0 : 7 - std::countl_zero(procMask);
 
     GuestThreadContext ctx(cpuNumber);
-    ctx.ppcContext.r3.u64 = params.value;
 
-    g_memory.FindFunction(params.function)(ctx.ppcContext, g_memory.base);
+    g_memory.FindFunction(params.function)(
+        ctx.ppcContext,
+        g_memory.base,
+        params.value,
+        0,
+        0,
+        0
+    );
 
     return ctx.ppcContext.r3.u32;
 }
diff --git a/UnleashedRecomp/gpu/video.cpp b/UnleashedRecomp/gpu/video.cpp
index e24ce4d..6dc2cf3 100644
--- a/UnleashedRecomp/gpu/video.cpp
+++ b/UnleashedRecomp/gpu/video.cpp
@@ -734,7 +734,7 @@ PPC_FUNC_IMPL(__imp__sub_824ECA00);
 PPC_FUNC(sub_824ECA00)
 {
     g_presentThreadId = std::this_thread::get_id();
-    __imp__sub_824ECA00(ctx, base);
+    return __imp__sub_824ECA00(ctx, base, r3, r4, r5, r6);
 }
 
 static ankerl::unordered_dense::map<RenderTexture*, RenderTextureLayout> g_barrierMap;
@@ -5723,9 +5723,10 @@ static void SetResolution(be<uint32_t>* device)
 // 1024x1024 resolution, setting this bool at address 20 seems to avoid all that.
 PPC_FUNC(sub_82E9F048)
 {
-    PPC_STORE_U8(ctx.r4.u32 + 20, 1);
-    PPC_STORE_U32(ctx.r4.u32 + 44, PPC_LOAD_U32(ctx.r4.u32 + 8)); // Width
-    PPC_STORE_U32(ctx.r4.u32 + 48, PPC_LOAD_U32(ctx.r4.u32 + 12)); // Height
+    PPC_STORE_U8(r4.u32 + 20, 1);
+    PPC_STORE_U32(r4.u32 + 44, PPC_LOAD_U32(r4.u32 + 8)); // Width
+    PPC_STORE_U32(r4.u32 + 48, PPC_LOAD_U32(r4.u32 + 12)); // Height
+    return { r3, r4 };
 }
 
 static GuestShader* g_movieVertexShader;
@@ -5779,9 +5780,9 @@ static PPCRegister g_r5;
 PPC_FUNC_IMPL(__imp__sub_8258C8A0);
 PPC_FUNC(sub_8258C8A0)
 {
-    g_r4 = ctx.r4;
-    g_r5 = ctx.r5;
-    __imp__sub_8258C8A0(ctx, base);
+    g_r4 = r4;
+    g_r5 = r5;
+    return __imp__sub_8258C8A0(ctx, base, r3, r4, r5, r6);
 }
 
 // CRenderDirectorFxPipeline::Update
@@ -5794,7 +5795,7 @@ PPC_FUNC(sub_8258CAE0)
         // and resizing will cause the values to be forgotten.
         auto traverseFxJobs = [&]<typename TCallback>(const TCallback& callback)
         {
-            uint32_t scheduler = PPC_LOAD_U32(ctx.r3.u32 + 0xE0);
+            uint32_t scheduler = PPC_LOAD_U32(r3.u32 + 0xE0);
             if (scheduler != NULL)
             {
                 uint32_t member = PPC_LOAD_U32(scheduler + 0x8);
@@ -5862,11 +5863,7 @@ PPC_FUNC(sub_8258CAE0)
                 }
             });
 
-        auto r3 = ctx.r3;
-        ctx.r4 = g_r4;
-        ctx.r5 = g_r5;
-        __imp__sub_8258C8A0(ctx, base);
-        ctx.r3 = r3;
+        __imp__sub_8258C8A0(ctx, base, r3, g_r4, g_r5, r6);
 
         // Restore job values.
         traverseFxJobs([&](uint32_t job)
@@ -5906,23 +5903,25 @@ PPC_FUNC(sub_8258CAE0)
         g_needsResize = false;
     }
 
-    __imp__sub_8258CAE0(ctx, base);
+    return __imp__sub_8258CAE0(ctx, base, r3, r4, r5, r6);
 }
 
 PPC_FUNC_IMPL(__imp__sub_824EB5B0);
 PPC_FUNC(sub_824EB5B0)
 {
     g_updateDirectorProfiler.Begin();
-    __imp__sub_824EB5B0(ctx, base);
+    PPC_SET_RESULT(__imp__sub_824EB5B0(ctx, base, r3, r4, r5, r6));
     g_updateDirectorProfiler.End();
+    return { r3, r4 };
 }
 
 PPC_FUNC_IMPL(__imp__sub_824EB290);
 PPC_FUNC(sub_824EB290)
 {
     g_renderDirectorProfiler.Begin();
-    __imp__sub_824EB290(ctx, base);
+    PPC_SET_RESULT(__imp__sub_824EB290(ctx, base, r3, r4, r5, r6));
     g_renderDirectorProfiler.End();
+    return { r3, r4 };
 }
 
 // World map disables VERT+, so scaling by width does not work for it.
@@ -5933,17 +5932,17 @@ PPC_FUNC_IMPL(__imp__sub_824860E0);
 PPC_FUNC(sub_824860E0)
 {
     ++g_forceCheckHeightForPostProcessFix;
-    __imp__sub_824860E0(ctx, base);
+    return __imp__sub_824860E0(ctx, base, r3, r4, r5, r6);
 }
 
 // SWA::CCameraController::~CCameraController
 PPC_FUNC_IMPL(__imp__sub_824831D0);
 PPC_FUNC(sub_824831D0)
 {
-    if (PPC_LOAD_U32(ctx.r3.u32) == 0x8202BF1C) // SWA::CWorldMapCamera
+    if (PPC_LOAD_U32(r3.u32) == 0x8202BF1C) // SWA::CWorldMapCamera
         --g_forceCheckHeightForPostProcessFix;
 
-    __imp__sub_824831D0(ctx, base);
+    return __imp__sub_824831D0(ctx, base, r3, r4, r5, r6);
 }
 
 void PostProcessResolutionFix(PPCRegister& r4, PPCRegister& f1, PPCRegister& f2)
@@ -6774,20 +6773,20 @@ PPC_FUNC(sub_825369A0)
         g_compilingPipelineTaskCount.wait(value);
     }
 
-    __imp__sub_825369A0(ctx, base);
+    return __imp__sub_825369A0(ctx, base, r3, r4, r5, r6);
 }
 
 // CModelData::CheckMadeAll
 PPC_FUNC_IMPL(__imp__sub_82E2EFB0);
 PPC_FUNC(sub_82E2EFB0)
 {
-    if (reinterpret_cast<Hedgehog::Database::CDatabaseData*>(base + ctx.r3.u32)->m_Flags & eDatabaseDataFlags_CompilingPipelines)
+    if (reinterpret_cast<Hedgehog::Database::CDatabaseData*>(base + r3.u32)->m_Flags & eDatabaseDataFlags_CompilingPipelines)
     {
-        ctx.r3.u64 = 0;
+        return { 0, r4 };
     }
     else
     {
-        __imp__sub_82E2EFB0(ctx, base);
+        return __imp__sub_82E2EFB0(ctx, base, r3, r4, r5, r6);
     }
 }
 
@@ -6795,13 +6794,13 @@ PPC_FUNC(sub_82E2EFB0)
 PPC_FUNC_IMPL(__imp__sub_82E243D8);
 PPC_FUNC(sub_82E243D8)
 {
-    if (reinterpret_cast<Hedgehog::Database::CDatabaseData*>(base + ctx.r3.u32)->m_Flags & eDatabaseDataFlags_CompilingPipelines)
+    if (reinterpret_cast<Hedgehog::Database::CDatabaseData*>(base + r3.u32)->m_Flags & eDatabaseDataFlags_CompilingPipelines)
     {
-        ctx.r3.u64 = 0;
+        return { 0, r4 };
     }
     else
     {
-        __imp__sub_82E243D8(ctx, base);
+        return __imp__sub_82E243D8(ctx, base, r3, r4, r5, r6);
     }
 }
 
@@ -6809,13 +6808,13 @@ PPC_FUNC(sub_82E243D8)
 PPC_FUNC_IMPL(__imp__sub_82E87598);
 PPC_FUNC(sub_82E87598)
 {
-    if (reinterpret_cast<Hedgehog::Database::CDatabaseData*>(base + ctx.r3.u32)->m_Flags & eDatabaseDataFlags_CompilingPipelines)
+    if (reinterpret_cast<Hedgehog::Database::CDatabaseData*>(base + r3.u32)->m_Flags & eDatabaseDataFlags_CompilingPipelines)
     {
-        ctx.r3.u64 = 0;
+        return { 0, r4 };
     }
     else
     {
-        __imp__sub_82E87598(ctx, base);
+        return __imp__sub_82E87598(ctx, base, r3, r4, r5, r6);
     }
 }
 
@@ -7197,7 +7196,7 @@ static std::thread g_pipelineTaskConsumerThread(PipelineTaskConsumerThread);
 PPC_FUNC_IMPL(__imp__sub_82E33330);
 PPC_FUNC(sub_82E33330)
 {
-    auto vertexShaderCode = reinterpret_cast<Hedgehog::Mirage::CVertexShaderCodeData*>(g_memory.Translate(ctx.r4.u32));
+    auto vertexShaderCode = reinterpret_cast<Hedgehog::Mirage::CVertexShaderCodeData*>(g_memory.Translate(r4.u32));
     __imp__sub_82E33330(ctx, base);
     reinterpret_cast<GuestShader*>(vertexShaderCode->m_pD3DVertexShader.get())->name = vertexShaderCode->m_TypeAndName.c_str() + 3;
 }
@@ -7205,7 +7204,7 @@ PPC_FUNC(sub_82E33330)
 PPC_FUNC_IMPL(__imp__sub_82E328D8);
 PPC_FUNC(sub_82E328D8)
 {
-    auto pixelShaderCode = reinterpret_cast<Hedgehog::Mirage::CPixelShaderCodeData*>(g_memory.Translate(ctx.r4.u32));
+    auto pixelShaderCode = reinterpret_cast<Hedgehog::Mirage::CPixelShaderCodeData*>(g_memory.Translate(r4.u32));
     __imp__sub_82E328D8(ctx, base);
     reinterpret_cast<GuestShader*>(pixelShaderCode->m_pD3DPixelShader.get())->name = pixelShaderCode->m_TypeAndName.c_str() + 2;
 }
@@ -7371,9 +7370,8 @@ void VideoConfigValueChangedCallback(IConfigDef* config)
 PPC_FUNC_IMPL(__imp__sub_825E4300);
 PPC_FUNC(sub_825E4300)
 {
-    g_csdFilterState = ctx.r5.u32 == 0 ? CsdFilterState::On : CsdFilterState::Off;
-    ctx.r5.u32 = 1;
-    __imp__sub_825E4300(ctx, base);
+    g_csdFilterState = r5.u32 == 0 ? CsdFilterState::On : CsdFilterState::Off;
+    return __imp__sub_825E4300(ctx, base, r3, r4, 1, r6);
 }
 
 // SWA::CCsdPlatformMirage::EndScene
@@ -7381,7 +7379,7 @@ PPC_FUNC_IMPL(__imp__sub_825E2F78);
 PPC_FUNC(sub_825E2F78)
 {
     g_csdFilterState = CsdFilterState::Unknown;
-    __imp__sub_825E2F78(ctx, base);
+    return __imp__sub_825E2F78(ctx, base, r3, r4, r5, r6);
 }
 
 // Game shares surfaces with identical descriptions. We don't want to share shadow maps,
@@ -7483,10 +7481,10 @@ PPC_FUNC(sub_82E44AF8)
 {
     uint16_t* newIndicesToFree = nullptr;
 
-    auto databaseData = reinterpret_cast<Hedgehog::Database::CDatabaseData*>(base + ctx.r3.u32);
+    auto databaseData = reinterpret_cast<Hedgehog::Database::CDatabaseData*>(base + r3.u32);
     if (g_triangleStripWorkaround && !databaseData->IsMadeOne())
     {
-        auto meshResource = reinterpret_cast<MeshResource*>(base + ctx.r4.u32);
+        auto meshResource = reinterpret_cast<MeshResource*>(base + r4.u32);
 
         if (meshResource->indexCount != 0)
         {
@@ -7515,22 +7513,26 @@ PPC_FUNC(sub_82E44AF8)
         }
     }
 
-    __imp__sub_82E44AF8(ctx, base);
+    PPC_SET_RESULT(__imp__sub_82E44AF8(ctx, base, r3, r4, r5, r6));
 
     if (newIndicesToFree != nullptr)
         g_userHeap.Free(newIndicesToFree);
+
+    return { r3, r4 };
 }
 
 // Hedgehog::Mirage::CShareVertexBuffer::Reset
 PPC_FUNC_IMPL(__imp__sub_82E250D0);
 PPC_FUNC(sub_82E250D0)
 {
-    __imp__sub_82E250D0(ctx, base);
+    PPC_SET_RESULT(__imp__sub_82E250D0(ctx, base, r3, r4, r5, r6));
 
     for (auto newIndicesToFree : g_newIndicesToFree)
         g_userHeap.Free(newIndicesToFree);
 
     g_newIndicesToFree.clear();
+
+    return { r3,r4 };
 }
 
 struct LightAndIndexBufferResourceV1
@@ -7546,10 +7548,10 @@ PPC_FUNC(sub_82E3AFC8)
 {
     uint16_t* newIndices = nullptr;
 
-    auto databaseData = reinterpret_cast<Hedgehog::Database::CDatabaseData*>(base + ctx.r3.u32);
+    auto databaseData = reinterpret_cast<Hedgehog::Database::CDatabaseData*>(base + r3.u32);
     if (g_triangleStripWorkaround && !databaseData->IsMadeOne())
     {
-        auto lightAndIndexBufferResource = reinterpret_cast<LightAndIndexBufferResourceV1*>(base + ctx.r4.u32);
+        auto lightAndIndexBufferResource = reinterpret_cast<LightAndIndexBufferResourceV1*>(base + r4.u32);
 
         if (lightAndIndexBufferResource->indexCount != 0)
         {
@@ -7566,10 +7568,12 @@ PPC_FUNC(sub_82E3AFC8)
         }
     }
 
-    __imp__sub_82E3AFC8(ctx, base);
+    PPC_SET_RESULT(__imp__sub_82E3AFC8(ctx, base, r3, r4, r5, r6));
 
     if (newIndices != nullptr)
         g_userHeap.Free(newIndices);
+
+    return { r3, r4 };
 }
 
 struct LightAndIndexBufferResourceV5
@@ -7585,10 +7589,10 @@ PPC_FUNC(sub_82E3B1C0)
 {
     uint16_t* newIndices = nullptr;
 
-    auto databaseData = reinterpret_cast<Hedgehog::Database::CDatabaseData*>(base + ctx.r3.u32);
+    auto databaseData = reinterpret_cast<Hedgehog::Database::CDatabaseData*>(base + r3.u32);
     if (g_triangleStripWorkaround && !databaseData->IsMadeOne())
     {
-        auto lightAndIndexBufferResource = reinterpret_cast<LightAndIndexBufferResourceV5*>(base + ctx.r4.u32);
+        auto lightAndIndexBufferResource = reinterpret_cast<LightAndIndexBufferResourceV5*>(base + r4.u32);
 
         if (lightAndIndexBufferResource->indexCount != 0)
         {
@@ -7605,10 +7609,12 @@ PPC_FUNC(sub_82E3B1C0)
         }
     }
 
-    __imp__sub_82E3B1C0(ctx, base);
+    PPC_SET_RESULT(__imp__sub_82E3B1C0(ctx, base, r3, r4, r5, r6));
 
     if (newIndices != nullptr)
         g_userHeap.Free(newIndices);
+
+    return { r3, r4 };
 }
 
 GUEST_FUNCTION_HOOK(sub_82BD99B0, CreateDevice);
diff --git a/UnleashedRecomp/kernel/function.h b/UnleashedRecomp/kernel/function.h
index 7c6beee..7758f25 100644
--- a/UnleashedRecomp/kernel/function.h
+++ b/UnleashedRecomp/kernel/function.h
@@ -39,16 +39,16 @@ std::enable_if_t<(I < sizeof...(TArgs)), void> _tuple_for(std::tuple<TArgs...>&
 
 struct ArgTranslator
 {
-    constexpr static uint64_t GetIntegerArgumentValue(const PPCContext& ctx, uint8_t* base, size_t arg) noexcept
+    constexpr static uint64_t GetIntegerArgumentValue(const PPCContext& ctx, uint8_t* base, PPCRegister r3, PPCRegister r4, PPCRegister r5, PPCRegister r6, size_t arg) noexcept
     {
         if (arg <= 7)
         {
             switch (arg)
             {
-                case 0: return ctx.r3.u32;
-                case 1: return ctx.r4.u32;
-                case 2: return ctx.r5.u32;
-                case 3: return ctx.r6.u32;
+                case 0: return r3.u32;
+                case 1: return r4.u32;
+                case 2: return r5.u32;
+                case 3: return r6.u32;
                 case 4: return ctx.r7.u32;
                 case 5: return ctx.r8.u32;
                 case 6: return ctx.r9.u32;
@@ -129,7 +129,7 @@ struct ArgTranslator
     }
 
     template<typename T>
-    constexpr static std::enable_if_t<!std::is_pointer_v<T>, T> GetValue(PPCContext& ctx, uint8_t* base, size_t idx) noexcept
+    constexpr static std::enable_if_t<!std::is_pointer_v<T>, T> GetValue(PPCContext& ctx, uint8_t* base, PPCRegister r3, PPCRegister r4, PPCRegister r5, PPCRegister r6, size_t idx) noexcept
     {
         if constexpr (is_precise_v<T>)
         {
@@ -137,14 +137,14 @@ struct ArgTranslator
         }
         else
         {
-            return static_cast<T>(GetIntegerArgumentValue(ctx, base, idx));
+            return static_cast<T>(GetIntegerArgumentValue(ctx, base, r3, r4, r5, r6, idx));
         }
     }
 
     template<typename T>
-    constexpr static std::enable_if_t<std::is_pointer_v<T>, T> GetValue(PPCContext& ctx, uint8_t* base, size_t idx) noexcept
+    constexpr static std::enable_if_t<std::is_pointer_v<T>, T> GetValue(PPCContext& ctx, uint8_t* base, PPCRegister r3, PPCRegister r4, PPCRegister r5, PPCRegister r6, size_t idx) noexcept
     {
-        const auto v = GetIntegerArgumentValue(ctx, base, idx);
+        const auto v = GetIntegerArgumentValue(ctx, base, r3, r4, r5, r6, idx);
         if (!v)
         {
             return nullptr;
@@ -240,18 +240,18 @@ struct arg_ordinal_t
 };
 
 template<auto Func, int I = 0, typename ...TArgs>
-void _translate_args_to_host(PPCContext& ctx, uint8_t* base, std::tuple<TArgs...>&) noexcept
+void _translate_args_to_host(PPCContext& ctx, uint8_t* base, PPCRegister r3, PPCRegister r4, PPCRegister r5, PPCRegister r6, std::tuple<TArgs...>&) noexcept
     requires (I >= sizeof...(TArgs))
 {
 }
 
 template <auto Func, int I = 0, typename ...TArgs>
-std::enable_if_t<(I < sizeof...(TArgs)), void> _translate_args_to_host(PPCContext& ctx, uint8_t* base, std::tuple<TArgs...>& tpl) noexcept
+std::enable_if_t<(I < sizeof...(TArgs)), void> _translate_args_to_host(PPCContext& ctx, uint8_t* base, PPCRegister r3, PPCRegister r4, PPCRegister r5, PPCRegister r6, std::tuple<TArgs...>& tpl) noexcept
 {
     using T = std::tuple_element_t<I, std::remove_reference_t<decltype(tpl)>>;
-    std::get<I>(tpl) = ArgTranslator::GetValue<T>(ctx, base, arg_ordinal_t<Func, I>::value);
+    std::get<I>(tpl) = ArgTranslator::GetValue<T>(ctx, base, r3, r4, r5, r6, arg_ordinal_t<Func, I>::value);
 
-    _translate_args_to_host<Func, I + 1>(ctx, base, tpl);
+    _translate_args_to_host<Func, I + 1>(ctx, base, r3, r4, r5, r6, tpl);
 }
 
 template<int I = 0, typename ...TArgs>
@@ -275,7 +275,7 @@ PPC_FUNC(HostToGuestFunction)
     using ret_t = decltype(std::apply(Func, function_args(Func)));
 
     auto args = function_args(Func);
-    _translate_args_to_host<Func>(ctx, base, args);
+    _translate_args_to_host<Func>(ctx, base, r3, r4, r5, r6, args);
 
     if constexpr (std::is_same_v<ret_t, void>)
     {
@@ -289,11 +289,11 @@ PPC_FUNC(HostToGuestFunction)
         {
             if (v != nullptr)
             {
-                ctx.r3.u64 = static_cast<uint32_t>(reinterpret_cast<size_t>(v) - reinterpret_cast<size_t>(base));
+                r3.u64 = static_cast<uint32_t>(reinterpret_cast<size_t>(v) - reinterpret_cast<size_t>(base));
             }
             else
             {
-                ctx.r3.u64 = 0;
+                r3.u64 = 0;
             }
         }
         else if constexpr (is_precise_v<ret_t>)
@@ -302,9 +302,11 @@ PPC_FUNC(HostToGuestFunction)
         }
         else
         {
-            ctx.r3.u64 = (uint64_t)v;
+            r3.u64 = (uint64_t)v;
         }
     }
+
+    return { r3, r4 };
 }
 
 template<typename T, typename TFunction, typename... TArgs>
@@ -322,17 +324,23 @@ T GuestToHostFunction(const TFunction& func, TArgs&&... argv)
 
     SetPPCContext(newCtx);
 
+    PPCRegister r3;
+    PPCRegister r4;
     if constexpr (std::is_function_v<TFunction>)
-        func(newCtx, g_memory.base);
+    {
+        PPC_SET_RESULT(func(newCtx, g_memory.base, newCtx.r3, newCtx.r4, newCtx.r5, newCtx.r6));
+    }
     else 
-        g_memory.FindFunction(func)(newCtx, g_memory.base);
+    {
+        PPC_SET_RESULT(g_memory.FindFunction(func)(newCtx, g_memory.base, newCtx.r3, newCtx.r4, newCtx.r5, newCtx.r6));
+    }
 
     currentCtx.fpscr = newCtx.fpscr;
     SetPPCContext(currentCtx);
 
     if constexpr (std::is_pointer_v<T>)
     {
-        return reinterpret_cast<T>((uint64_t)g_memory.Translate(newCtx.r3.u32));
+        return reinterpret_cast<T>((uint64_t)g_memory.Translate(r3.u32));
     }
     else if constexpr (is_precise_v<T>)
     {
@@ -340,7 +348,7 @@ T GuestToHostFunction(const TFunction& func, TArgs&&... argv)
     }
     else if constexpr (std::is_integral_v<T>)
     {
-        return static_cast<T>(newCtx.r3.u64);
+        return static_cast<T>(r3.u64);
     }
     else
     {
@@ -349,7 +357,7 @@ T GuestToHostFunction(const TFunction& func, TArgs&&... argv)
 }
 
 #define GUEST_FUNCTION_HOOK(subroutine, function) \
-    PPC_FUNC(subroutine) { HostToGuestFunction<function>(ctx, base); }
+    PPC_FUNC(subroutine) { return HostToGuestFunction<function>(ctx, base, r3, r4, r5, r6); }
 
 #define GUEST_FUNCTION_STUB(subroutine) \
-    PPC_FUNC(subroutine) { }
+    PPC_FUNC(subroutine) { return {r3, r4}; }
diff --git a/UnleashedRecomp/misc_impl.cpp b/UnleashedRecomp/misc_impl.cpp
index a58b58f..d112473 100644
--- a/UnleashedRecomp/misc_impl.cpp
+++ b/UnleashedRecomp/misc_impl.cpp
@@ -58,5 +58,5 @@ GUEST_FUNCTION_HOOK(sub_82BD4BC0, GlobalMemoryStatusImpl);
 // sprintf
 PPC_FUNC(sub_82BD4AE8)
 {
-    sub_831B1630(ctx, base);
+    return sub_831B1630(ctx, base, r3, r4, r5, r6);
 }
diff --git a/UnleashedRecomp/mod/mod_loader.cpp b/UnleashedRecomp/mod/mod_loader.cpp
index dd33c56..c86fecc 100644
--- a/UnleashedRecomp/mod/mod_loader.cpp
+++ b/UnleashedRecomp/mod/mod_loader.cpp
@@ -265,11 +265,14 @@ static std::span<uint8_t> decompressLzx(PPCContext& ctx, uint8_t* base, const ui
     }
 
     // Initialize decompressor
-    ctx.r3.u32 = 1;
-    ctx.r4.u32 = uint32_t((compressedData + 0xC) - base);
-    ctx.r5.u32 = *reinterpret_cast<const be<uint32_t>*>(compressedData + 0x8);
-    ctx.r6.u32 = uint32_t(reinterpret_cast<uint8_t*>(scratchSpace) - base);
-    sub_831CE1A0(ctx, base);
+    sub_831CE1A0(
+        ctx,
+        base,
+        1,
+        uint32_t((compressedData + 0xC) - base),
+        uint32_t(*reinterpret_cast<const be<uint32_t>*>(compressedData + 0x8)),
+        uint32_t(reinterpret_cast<uint8_t*>(scratchSpace) - base)
+    );
 
     uint64_t decompressedDataSize = *reinterpret_cast<const be<uint64_t>*>(compressedData + 0x18);
     uint8_t* decompressedData = reinterpret_cast<uint8_t*>(g_userHeap.Alloc(decompressedDataSize));
@@ -290,20 +293,22 @@ static std::span<uint8_t> decompressLzx(PPCContext& ctx, uint8_t* base, const ui
         uint32_t compressedBlockSize = *reinterpret_cast<const be<uint32_t>*>(compressedData + compressedDataOffset);
 
         // Decompress
-        ctx.r3.u32 = *scratchSpace;
-        ctx.r4.u32 = uint32_t((decompressedData + decompressedDataOffset) - base);
-        ctx.r5.u32 = uint32_t(reinterpret_cast<uint8_t*>(scratchSpace + 1) - base);
-        ctx.r6.u32 = uint32_t((compressedData + compressedDataOffset + 0x4) - base);
         ctx.r7.u32 = compressedBlockSize;
-        sub_831CE0D0(ctx, base);
+        sub_831CE0D0(
+            ctx,
+            base,
+            uint32_t(*scratchSpace),
+            uint32_t((decompressedData + decompressedDataOffset) - base),
+            uint32_t(reinterpret_cast<uint8_t*>(scratchSpace + 1) - base),
+            uint32_t((compressedData + compressedDataOffset + 0x4) - base)
+        );
 
         decompressedDataOffset += *(scratchSpace + 1);
         compressedDataOffset += 0x4 + compressedBlockSize;
     }
 
     // Deinitialize decompressor
-    ctx.r3.u32 = *scratchSpace;
-    sub_831CE150(ctx, base);
+    sub_831CE150(ctx, base, uint32_t(*scratchSpace), 0, 0, 0);
 
     if (shouldFreeScratchSpace)
         g_userHeap.Free(scratchSpace);
@@ -317,8 +322,7 @@ PPC_FUNC(sub_82E0D3E8)
 {
     if (g_mods.empty())
     {
-        __imp__sub_82E0D3E8(ctx, base);
-        return;
+        return __imp__sub_82E0D3E8(ctx, base, r3, r4, r5, r6);
     }
 
     thread_local ankerl::unordered_dense::set<std::string> s_fileNames;
@@ -368,11 +372,6 @@ PPC_FUNC(sub_82E0D3E8)
             }
         };
 
-    auto r3 = ctx.r3;
-    auto r4 = ctx.r4;
-    auto r5 = ctx.r5;
-    auto r6 = ctx.r6;
-
     auto loadFile = [&]<typename TFunction>(const std::filesystem::path& filePath, const TFunction& function)
     {
         std::ifstream stream(filePath, std::ios::binary);
@@ -421,7 +420,7 @@ PPC_FUNC(sub_82E0D3E8)
 
     thread_local xxHashMap<std::vector<std::pair<std::filesystem::path, bool>>> s_cache;
 
-    std::u8string_view arlFilePathU8(reinterpret_cast<const char8_t*>(base + PPC_LOAD_U32(ctx.r4.u32)));
+    std::u8string_view arlFilePathU8(reinterpret_cast<const char8_t*>(base + PPC_LOAD_U32(r4.u32)));
     XXH64_hash_t hash = XXH3_64bits(arlFilePathU8.data(), arlFilePathU8.size());
     auto findResult = s_cache.find(hash);
 
@@ -522,18 +521,12 @@ PPC_FUNC(sub_82E0D3E8)
         s_cache.emplace(hash, std::move(arlFilePaths));
     }
 
-    ctx.r3 = r3;
-    ctx.r4 = r4;
-    ctx.r5 = r5;
-    ctx.r6 = r6;
-
     if (s_fileNames.empty())
     {
-        __imp__sub_82E0D3E8(ctx, base);
-        return;
+        return __imp__sub_82E0D3E8(ctx, base, r3, r4, r5, r6);
     }
 
-    size_t arlHeaderSize = parseArlFileData(base + ctx.r5.u32, ctx.r6.u32);
+    size_t arlHeaderSize = parseArlFileData(base + r5.u32, r6.u32);
     size_t arlFileSize = arlHeaderSize;
 
     for (auto& fileName : s_fileNames)
@@ -543,7 +536,7 @@ PPC_FUNC(sub_82E0D3E8)
     }
 
     uint8_t* newArlFileData = reinterpret_cast<uint8_t*>(g_userHeap.Alloc(arlFileSize));
-    memcpy(newArlFileData, base + ctx.r5.u32, arlHeaderSize);
+    memcpy(newArlFileData, base + r5.u32, arlHeaderSize);
 
     uint8_t* arlFileNames = newArlFileData + arlHeaderSize;
     for (auto& fileName : s_fileNames)
@@ -554,12 +547,14 @@ PPC_FUNC(sub_82E0D3E8)
         arlFileNames += fileName.size();
     }
 
-    ctx.r5.u32 = uint32_t(newArlFileData - base);
-    ctx.r6.u32 = uint32_t(arlFileSize);
+    r5.u32 = uint32_t(newArlFileData - base);
+    r6.u32 = uint32_t(arlFileSize);
 
-    __imp__sub_82E0D3E8(ctx, base);
+    PPC_SET_RESULT(__imp__sub_82E0D3E8(ctx, base, r3, r4, r5, r6));
 
     g_userHeap.Free(newArlFileData);
+
+    return { r3, r4 };
 }
 
 // Load elements have an unused "pretty name" field. We will use this field to store the archive file path,
@@ -574,23 +569,17 @@ PPC_FUNC(sub_82E0CC38)
 {
     if (g_mods.empty())
     {
-        __imp__sub_82E0CC38(ctx, base);
-        return;
+        return __imp__sub_82E0CC38(ctx, base, r3, r4, r5, r6);
     }
 
-    auto r3 = ctx.r3;
-    auto r4 = ctx.r4;
-    auto r5 = ctx.r5;
-    auto r6 = ctx.r6;
     auto r7 = ctx.r7;
     auto r8 = ctx.r8;
 
     const char* arFilePath = reinterpret_cast<const char*>(base + PPC_LOAD_U32(r5.u32));
 
     // __HH_ALLOC
-    ctx.r3.u32 = 22 + strlen(arFilePath);
-    sub_822C0988(ctx, base);
-    char* prefixedArFilePath = reinterpret_cast<char*>(base + ctx.r3.u32);
+    PPC_SET_RESULT(sub_822C0988(ctx, base, 22 + strlen(arFilePath), r4, r5, r6));
+    char* prefixedArFilePath = reinterpret_cast<char*>(base + r3.u32);
 
     *reinterpret_cast<be<uint32_t>*>(prefixedArFilePath) = 1;
     strcpy(prefixedArFilePath + 0x4, "/UnleashedRecomp/");
@@ -601,20 +590,17 @@ PPC_FUNC(sub_82E0CC38)
     PPC_STORE_U32(stackSpace, static_cast<uint32_t>(reinterpret_cast<uint8_t*>(prefixedArFilePath) - base) + 0x4);
     g_prefixedArFilePath = stackSpace;
 
-    ctx.r3 = r3;
-    ctx.r4 = r4;
-    ctx.r5 = r5;
-    ctx.r6 = r6;
     ctx.r7 = r7;
     ctx.r8 = r8;
-    __imp__sub_82E0CC38(ctx, base);
+    __imp__sub_82E0CC38(ctx, base, r3, r4, r5, r6);
 
     // Hedgehog::Base::CSharedString::~CSharedString
-    ctx.r3.u32 = stackSpace;
-    sub_82DFB148(ctx, base);
+    PPC_SET_RESULT(sub_82DFB148(ctx, base, stackSpace, r4, r5, r6));
 
     g_prefixedArFilePath = NULL;
     ctx.r1.u32 += 0x10;
+
+    return { r3, r4 };
 }
 
 // Hedgehog::Database::SLoadElement::SLoadElement
@@ -622,10 +608,10 @@ PPC_FUNC_IMPL(__imp__sub_82E140D8);
 PPC_FUNC(sub_82E140D8)
 {
     // Store the prefixed archive file path as the pretty name. It's unused for archives we want to append to.
-    if (!g_mods.empty() && PPC_LOAD_U32(ctx.r5.u32) == 0x8200A621 && g_prefixedArFilePath != NULL)
-        ctx.r5.u32 = g_prefixedArFilePath;
+    if (!g_mods.empty() && PPC_LOAD_U32(r5.u32) == 0x8200A621 && g_prefixedArFilePath != NULL)
+        r5.u32 = g_prefixedArFilePath;
 
-    __imp__sub_82E140D8(ctx, base);
+    return __imp__sub_82E140D8(ctx, base, r3, r4, r5, r6);
 }
 
 // Hedgehog::Database::CDatabaseLoader::CCreateFromArchive::CreateCallback
@@ -634,26 +620,24 @@ PPC_FUNC(sub_82E0B500)
 {
     if (g_mods.empty())
     {
-        __imp__sub_82E0B500(ctx, base);
-        return;
+        return __imp__sub_82E0B500(ctx, base, r3, r4, r5, r6);
     }
 
-    uint32_t prefixedArFilePath = PPC_LOAD_U32(ctx.r5.u32);
+    uint32_t prefixedArFilePath = PPC_LOAD_U32(r5.u32);
     std::u8string_view arFilePathU8(reinterpret_cast<const char8_t*>(base + prefixedArFilePath));
     if (!arFilePathU8.starts_with(u8"/UnleashedRecomp/"))
     {
-        __imp__sub_82E0B500(ctx, base);
-        return;
+        return __imp__sub_82E0B500(ctx, base, r3, r4, r5, r6);
     }
 
     // Immediately clear the string, so the remaining splits don't load append archives again.
     PPC_STORE_U8(prefixedArFilePath, 0x00);
     arFilePathU8.remove_prefix(0x11);
 
-    auto r3 = ctx.r3; // Callback
-    auto r4 = ctx.r4; // Database
-    auto r5 = ctx.r5; // Name
-    auto r6 = ctx.r6; // Data
+    //auto r3 = ctx.r3; // Callback
+    //auto r4 = ctx.r4; // Database
+    //auto r5 = ctx.r5; // Name
+    //auto r6 = ctx.r6; // Data
     auto r7 = ctx.r7; // Size
     auto r8 = ctx.r8; // Callback data
 
@@ -688,14 +672,9 @@ PPC_FUNC(sub_82E0B500)
                 arFileDataHolder[0] = g_memory.MapVirtual(arFileData);
                 arFileDataHolder[1] = NULL;
 
-                ctx.r3 = r3;
-                ctx.r4 = r4;
-                ctx.r5 = r5;
-                ctx.r6.u32 = g_memory.MapVirtual(arFileDataHolder);
                 ctx.r7.u32 = uint32_t(arFileSize);
                 ctx.r8 = r8;
-
-                __imp__sub_82E0B500(ctx, base);
+                __imp__sub_82E0B500(ctx, base, r3, r4, r5, g_memory.MapVirtual(arFileDataHolder));
 
                 g_userHeap.Free(arFileDataHolder);
                 g_userHeap.Free(arFileData);
@@ -837,14 +816,10 @@ PPC_FUNC(sub_82E0B500)
         s_cache.emplace(hash, std::move(arFilePaths));
     }
 
-    ctx.r3 = r3;
-    ctx.r4 = r4;
-    ctx.r5 = r5;
-    ctx.r6 = r6;
     ctx.r7 = r7;
     ctx.r8 = r8;
 
-    __imp__sub_82E0B500(ctx, base);
+    return __imp__sub_82E0B500(ctx, base, r3, r4, r5, r6);
 }
 
 // CriAuObjLoc::AttachCueSheet
@@ -855,23 +830,22 @@ PPC_FUNC(sub_8314A310)
     // capacity: 0x24
     // count: 0x28
     // data: 0x2C
-    uint32_t capacity = PPC_LOAD_U32(ctx.r3.u32 + 0x24);
-    if (capacity == PPC_LOAD_U32(ctx.r3.u32 + 0x28))
+    uint32_t capacity = PPC_LOAD_U32(r3.u32 + 0x24);
+    if (capacity == PPC_LOAD_U32(r3.u32 + 0x28))
     {
-        auto r3 = ctx.r3;
-        auto r4 = ctx.r4;
-        auto r5 = ctx.r5;
-
         // Allocate
-        ctx.r3.u32 = PPC_LOAD_U32(r3.u32 + 0x4);
-        ctx.r4.u32 = (capacity * 2) * sizeof(uint32_t);
-        ctx.r5.u32 = 0x82195248; // AuObjCueSheet
-        ctx.r6.u32 = 0x4;
-        sub_83167FD8(ctx, base);
+        sub_83167FD8(
+            ctx,
+            base,
+            PPC_LOAD_U32(r3.u32 + 0x4),
+            static_cast<uint32_t>( (capacity * 2) * sizeof(uint32_t)),
+            0x82195248, // AuObjCueSheet
+            0x4
+        );
 
         // Copy
         uint32_t oldData = PPC_LOAD_U32(r3.u32 + 0x2C);
-        uint32_t newData = ctx.r3.u32;
+        uint32_t newData = r3.u32;
 
         memcpy(base + newData, base + oldData, capacity * sizeof(uint32_t));
         memset(base + newData + (capacity * sizeof(uint32_t)), 0, capacity * sizeof(uint32_t));
@@ -880,14 +854,15 @@ PPC_FUNC(sub_8314A310)
         PPC_STORE_U32(r3.u32 + 0x2C, newData);
 
         // Deallocate
-        ctx.r3.u32 = PPC_LOAD_U32(r3.u32 + 0x4);
-        ctx.r4.u32 = oldData;
-        sub_83168100(ctx, base);
-
-        ctx.r3 = r3;
-        ctx.r4 = r4;
-        ctx.r5 = r5;
+        sub_83168100(
+            ctx,
+            base,
+            PPC_LOAD_U32(r3.u32 + 0x4),
+            oldData,
+            r5,
+            r6
+        );
     }
 
-    __imp__sub_8314A310(ctx, base);
+    return __imp__sub_8314A310(ctx, base, r3, r4, r5, r6);
 }
diff --git a/UnleashedRecomp/patches/CGameModeStageTitle_patches.cpp b/UnleashedRecomp/patches/CGameModeStageTitle_patches.cpp
index 1cf6725..260f498 100644
--- a/UnleashedRecomp/patches/CGameModeStageTitle_patches.cpp
+++ b/UnleashedRecomp/patches/CGameModeStageTitle_patches.cpp
@@ -5,10 +5,12 @@
 PPC_FUNC_IMPL(__imp__sub_825518B8);
 PPC_FUNC(sub_825518B8)
 {
-    auto pGameModeStageTitle = (SWA::CGameModeStageTitle*)g_memory.Translate(ctx.r3.u32);
+    auto pGameModeStageTitle = (SWA::CGameModeStageTitle*)g_memory.Translate(r3.u32);
 
-    __imp__sub_825518B8(ctx, base);
+    PPC_SET_RESULT(__imp__sub_825518B8(ctx, base, r3, r4, r5, r6));
 
     if (g_quitMessageOpen)
         pGameModeStageTitle->m_AdvertiseMovieWaitTime = 0;
+
+    return { r3, r4 };
 }
diff --git a/UnleashedRecomp/patches/CHudPause_patches.cpp b/UnleashedRecomp/patches/CHudPause_patches.cpp
index 51990fa..93592f3 100644
--- a/UnleashedRecomp/patches/CHudPause_patches.cpp
+++ b/UnleashedRecomp/patches/CHudPause_patches.cpp
@@ -121,11 +121,10 @@ PPC_FUNC(sub_824B0930)
 {
     if (App::s_isLoading)
     {
-        __imp__sub_824B0930(ctx, base);
-        return;
+        return __imp__sub_824B0930(ctx, base, r3, r4, r5, r6);
     }
 
-    auto pHudPause = (SWA::CHudPause*)g_memory.Translate(ctx.r3.u32);
+    auto pHudPause = (SWA::CHudPause*)g_memory.Translate(r3.u32);
     auto pInputState = SWA::CInputState::GetInstance();
 
     g_achievementMenuIntroTime += App::s_deltaTime;
@@ -148,7 +147,7 @@ PPC_FUNC(sub_824B0930)
     {
         // HACK: wait for transition to finish before restoring control.
         if (g_achievementMenuIntroThreshold >= g_achievementMenuIntroTime)
-            __imp__sub_824B0930(ctx, base);
+            __imp__sub_824B0930(ctx, base, r3, r4, r5, r6);
 
         if (pInputState->GetPadState().IsTapped(SWA::eKeyState_B) && !g_isAchievementMenuOutro)
         {
@@ -163,7 +162,7 @@ PPC_FUNC(sub_824B0930)
         {
             OptionsMenu::Close();
             GuestToHostFunction<int>(sub_824AFD28, pHudPause, 0, 0, 0, 1);
-            __imp__sub_824B0930(ctx, base);
+            return __imp__sub_824B0930(ctx, base, r3, r4, r5, r6);
         }
     }
     else
@@ -181,6 +180,8 @@ PPC_FUNC(sub_824B0930)
             g_isClosed = true;
         }
 
-        __imp__sub_824B0930(ctx, base);
+        return __imp__sub_824B0930(ctx, base, r3, r4, r5, r6);
     }
+
+    return { r3, r4 };
 }
diff --git a/UnleashedRecomp/patches/CTitleStateIntro_patches.cpp b/UnleashedRecomp/patches/CTitleStateIntro_patches.cpp
index d4a05fc..07e4846 100644
--- a/UnleashedRecomp/patches/CTitleStateIntro_patches.cpp
+++ b/UnleashedRecomp/patches/CTitleStateIntro_patches.cpp
@@ -123,7 +123,7 @@ PPC_FUNC(sub_822C55B0)
     App::s_isSaveDataCorrupt = true;
     g_corruptSaveMessageOpen = true;
     g_corruptSaveMessageOpen.wait(true);
-    ctx.r3.u32 = 0;
+    return { 0, r4 };
 }
 
 void PressStartSaveLoadThreadMidAsmHook()
@@ -148,12 +148,12 @@ void PressStartSaveLoadThreadMidAsmHook()
 PPC_FUNC_IMPL(__imp__sub_82587E50);
 PPC_FUNC(sub_82587E50)
 {
-    auto pTitleStateIntro = (SWA::CTitleStateIntro*)g_memory.Translate(ctx.r3.u32);
+    auto pTitleStateIntro = (SWA::CTitleStateIntro*)g_memory.Translate(r3.u32);
     auto pTime = (be<float>*)((uint8_t*)pTitleStateIntro->GetContextBase() + 0x10C);
 
     if (*SWA::SGlobals::ms_IsAutoSaveWarningShown)
     {
-        __imp__sub_82587E50(ctx, base);
+        return __imp__sub_82587E50(ctx, base, r3, r4, r5, r6);
     }
     else if (!ProcessUpdateAvailableMessage() && !ProcessCorruptSaveMessage() && !ProcessCorruptAchievementsMessage() && !g_faderBegun)
     {
@@ -164,6 +164,8 @@ PPC_FUNC(sub_82587E50)
         }
 
         if (!ProcessQuitMessage())
-            __imp__sub_82587E50(ctx, base);
+            return __imp__sub_82587E50(ctx, base, r3, r4, r5, r6);
     }
+
+    return { r3, r4 };
 }
diff --git a/UnleashedRecomp/patches/CTitleStateMenu_patches.cpp b/UnleashedRecomp/patches/CTitleStateMenu_patches.cpp
index b3ae458..cb7f09c 100644
--- a/UnleashedRecomp/patches/CTitleStateMenu_patches.cpp
+++ b/UnleashedRecomp/patches/CTitleStateMenu_patches.cpp
@@ -52,7 +52,7 @@ static bool ProcessInstallMessage()
 PPC_FUNC_IMPL(__imp__sub_825882B8);
 PPC_FUNC(sub_825882B8)
 {
-    auto pTitleStateMenu = (SWA::CTitleStateMenu*)g_memory.Translate(ctx.r3.u32);
+    auto pTitleStateMenu = (SWA::CTitleStateMenu*)g_memory.Translate(r3.u32);
     auto pGameDocument = SWA::CGameDocument::GetInstance();
 
     auto pInputState = SWA::CInputState::GetInstance();
@@ -100,7 +100,7 @@ PPC_FUNC(sub_825882B8)
     }
 
     if (!OptionsMenu::s_isVisible && !OptionsMenu::s_isRestartRequired && !ProcessInstallMessage())
-        __imp__sub_825882B8(ctx, base);
+        __imp__sub_825882B8(ctx, base, r3, r4, r5, r6);
 
     if (isOptionsIndex)
     {
@@ -110,6 +110,8 @@ PPC_FUNC(sub_825882B8)
             OptionsMenu::Close();
         }
     }
+
+    return { r3,r4 };
 }
 
 void TitleMenuRemoveContinueOnCorruptSaveMidAsmHook(PPCRegister& r3)
diff --git a/UnleashedRecomp/patches/aspect_ratio_patches.cpp b/UnleashedRecomp/patches/aspect_ratio_patches.cpp
index e42c582..9d54b5d 100644
--- a/UnleashedRecomp/patches/aspect_ratio_patches.cpp
+++ b/UnleashedRecomp/patches/aspect_ratio_patches.cpp
@@ -161,12 +161,12 @@ void MakeCsdProjectMidAsmHook(PPCRegister& r3, PPCRegister& r29)
 PPC_FUNC_IMPL(__imp__sub_825E2E60);
 PPC_FUNC(sub_825E2E60)
 {
-    if (ctx.r4.u32 != NULL && PPC_LOAD_U32(ctx.r4.u32) == 0x4E594946 && PPC_LOAD_U32(ctx.r4.u32 + 0x20) == 0x6E43504A) // NYIF, nCPJ
+    if (r4.u32 != NULL && PPC_LOAD_U32(r4.u32) == 0x4E594946 && PPC_LOAD_U32(r4.u32 + 0x20) == 0x6E43504A) // NYIF, nCPJ
     {
-        uint32_t fileSize = PPC_LOAD_U32(ctx.r4.u32 + 0x14);
+        uint32_t fileSize = PPC_LOAD_U32(r4.u32 + 0x14);
 
         std::lock_guard lock(g_pathMutex);
-        const uint8_t* key = base + ctx.r4.u32;
+        const uint8_t* key = base + r4.u32;
 
         auto lower = g_paths.lower_bound(key);
         auto upper = g_paths.lower_bound(key + fileSize);
@@ -174,7 +174,7 @@ PPC_FUNC(sub_825E2E60)
         g_paths.erase(lower, upper);
     }
 
-    __imp__sub_825E2E60(ctx, base);
+    return __imp__sub_825E2E60(ctx, base, r3, r4, r5, r6);
 }
 
 static float ComputeScale(float aspectRatio)
@@ -231,12 +231,14 @@ GUEST_FUNCTION_HOOK(sub_82E169B8, GetViewport);
 PPC_FUNC_IMPL(__imp__sub_8250FC70);
 PPC_FUNC(sub_8250FC70)
 {
-    __imp__sub_8250FC70(ctx, base);
+    PPC_SET_RESULT(__imp__sub_8250FC70(ctx, base, r3, r4, r5, r6));
 
-    auto position = reinterpret_cast<be<float>*>(base + ctx.r3.u32);
+    auto position = reinterpret_cast<be<float>*>(base + r3.u32);
 
     position[0] = (position[0] / 1280.0f * Video::s_viewportWidth - g_aspectRatioOffsetX) / g_aspectRatioScale;
     position[1] = (position[1] / 720.0f * Video::s_viewportHeight - g_aspectRatioOffsetY) / g_aspectRatioScale;
+
+    return { r3, r4 };
 }
 
 void ComputeScreenPositionMidAsmHook(PPCRegister& f1, PPCRegister& f2)
@@ -256,8 +258,7 @@ void WorldMapInfoMidAsmHook(PPCRegister& r4)
 PPC_FUNC_IMPL(__imp__sub_8258B558);
 PPC_FUNC(sub_8258B558)
 {
-    auto r3 = ctx.r3;
-    __imp__sub_8258B558(ctx, base);
+    __imp__sub_8258B558(ctx, base, r3, r4, r5, r6);
 
     uint32_t worldMapSimpleInfo = PPC_LOAD_U32(r3.u32 + 0x70);
     if (worldMapSimpleInfo != NULL)
@@ -270,14 +271,13 @@ PPC_FUNC(sub_8258B558)
                     scene = PPC_LOAD_U32(scene + 0x4);
                     if (scene != NULL)
                     {
-                        ctx.r3.u32 = scene;
                         ctx.f1.f64 = offsetX + g_aspectRatioNarrowScale * 140.0f;
                         ctx.f2.f64 = offsetY;
 
                         if (Config::UIAlignmentMode == EUIAlignmentMode::Edge && g_aspectRatioNarrowScale >= 1.0f)
                             ctx.f1.f64 += g_aspectRatioOffsetX / g_aspectRatioScale;
 
-                        sub_830BB3D0(ctx, base);
+                        PPC_SET_RESULT(sub_830BB3D0(ctx, base, scene, r4, r5, r6));
                     }
                 }
             };
@@ -303,6 +303,8 @@ PPC_FUNC(sub_8258B558)
             }
         }
     }
+
+    return { r3, r4 };
 }
 
 enum
@@ -830,7 +832,7 @@ PPC_FUNC(sub_830BC640)
     g_scenePositionX = 0.0f;
     g_scenePositionY = 0.0f;
 
-    uint32_t motionPattern = PPC_LOAD_U32(ctx.r3.u32 + 0x98);
+    uint32_t motionPattern = PPC_LOAD_U32(r3.u32 + 0x98);
     if (motionPattern != NULL)
     {
         uint32_t member = PPC_LOAD_U32(motionPattern + 0xC);
@@ -844,20 +846,20 @@ PPC_FUNC(sub_830BC640)
         }
     }
 
-    __imp__sub_830BC640(ctx, base);
+    return __imp__sub_830BC640(ctx, base, r3, r4, r5, r6);
 }
 
 // Chao::CSD::Scene::Render
 PPC_FUNC_IMPL(__imp__sub_830C6A00);
 PPC_FUNC(sub_830C6A00)
 {
-    g_sceneModifier = FindModifier(ctx.r3.u32);
+    g_sceneModifier = FindModifier(r3.u32);
 
     if (g_sceneModifier.has_value())
     {
         if (!Config::ControlTutorial && (g_sceneModifier->flags & CONTROL_TUTORIAL) != 0)
         {
-            return;
+            return { r3, r4 };
         }
 
         // Tornado Defense bugs out when applying gameplay UI scaling.
@@ -871,14 +873,9 @@ PPC_FUNC(sub_830C6A00)
 
         if (g_aspectRatio > WIDE_ASPECT_RATIO && (g_sceneModifier->flags & (OFFSET_SCALE_LEFT | OFFSET_SCALE_RIGHT | CORNER_EXTRACT)) != 0)
         {
-            auto r3 = ctx.r3;
-            auto r4 = ctx.r4;
-            auto r5 = ctx.r5;
-            auto r6 = ctx.r6;
-
             // Queue draw calls, but don't actually draw anything. We just want to extract the corner.
             g_cornerExtract = true;
-            __imp__sub_830C6A00(ctx, base);
+            __imp__sub_830C6A00(ctx, base, r3, r4, r5, r6); // Ignore result on purpose
             g_cornerExtract = false;
 
 #ifdef CORNER_DEBUG
@@ -891,15 +888,10 @@ PPC_FUNC(sub_830C6A00)
                 fmt::println("");
             }
 #endif
-
-            ctx.r3 = r3;
-            ctx.r4 = r4;
-            ctx.r5 = r5;
-            ctx.r6 = r6;
         }
     }
 
-    __imp__sub_830C6A00(ctx, base);
+    return __imp__sub_830C6A00(ctx, base, r3, r4, r5, r6);
 }
 
 static std::optional<CsdModifier> g_castNodeModifier;
@@ -916,7 +908,7 @@ void RenderCsdCastMidAsmHook(PPCRegister& r4)
     g_castModifier = FindModifier(r4.u32);
 }
 
-static void Draw(PPCContext& ctx, uint8_t* base, PPCFunc* original, uint32_t stride)
+static PPCReturn Draw(PPCContext& ctx, uint8_t* base, PPCFunc* original, uint32_t stride, PPCRegister r3, PPCRegister r4, PPCRegister r5, PPCRegister r6)
 {
     CsdModifier modifier{};
 
@@ -935,13 +927,13 @@ static void Draw(PPCContext& ctx, uint8_t* base, PPCFunc* original, uint32_t str
 
     if ((modifier.flags & SKIP) != 0)
     {
-        return;
+        return { r3, r4 };
     }
 
     // That goddamn boss gauge doesn't disappear in the cutscene where Dark Gaia and Chip hug each other
-    if ((modifier.flags & SKIP_INSPIRE) != 0 && !InspirePatches::s_sceneName.empty() && *reinterpret_cast<be<float>*>(base + ctx.r4.u32) >= 1280.0f)
+    if ((modifier.flags & SKIP_INSPIRE) != 0 && !InspirePatches::s_sceneName.empty() && *reinterpret_cast<be<float>*>(base + r4.u32) >= 1280.0f)
     {
-        return;
+        return{ r3, r4 };
     }
 
     if (g_cornerExtract)
@@ -949,10 +941,10 @@ static void Draw(PPCContext& ctx, uint8_t* base, PPCFunc* original, uint32_t str
         if ((modifier.flags & (STORE_LEFT_CORNER | STORE_RIGHT_CORNER)) != 0)
         {
             uint32_t vertexIndex = ((modifier.flags & STORE_LEFT_CORNER) != 0) ? 0 : 3;
-            g_corners[modifier.cornerIndex] = *reinterpret_cast<be<float>*>(base + ctx.r4.u32 + vertexIndex * stride);
+            g_corners[modifier.cornerIndex] = *reinterpret_cast<be<float>*>(base + r4.u32 + vertexIndex * stride);
         }
 
-        return;
+        return{ r3, r4 };
     }
 
     if (Config::UIAlignmentMode == EUIAlignmentMode::Centre)
@@ -964,11 +956,11 @@ static void Draw(PPCContext& ctx, uint8_t* base, PPCFunc* original, uint32_t str
     // Tornado Defense UI is squashed at 4:3, presumably to work around an explicit translation issue.
     bool squash = Config::AspectRatio == EAspectRatio::OriginalNarrow && (modifier.flags & TORNADO_DEFENSE) != 0;
 
-    uint32_t size = ctx.r5.u32 * stride;
+    uint32_t size = r5.u32 * stride;
     ctx.r1.u32 -= size;
 
     uint8_t* stack = base + ctx.r1.u32;
-    memcpy(stack, base + ctx.r4.u32, size);
+    memcpy(stack, base + r4.u32, size);
 
     auto getPosition = [&](size_t index)
         {
@@ -1104,7 +1096,7 @@ static void Draw(PPCContext& ctx, uint8_t* base, PPCFunc* original, uint32_t str
             offsetX = Video::s_viewportWidth - (Video::s_viewportWidth - offsetX) * (1280.0f - corner) / (1280.0f - offsetScaleModifier.cornerMax);
     }
 
-    for (size_t i = 0; i < ctx.r5.u32; i++)
+    for (size_t i = 0; i < r5.u32; i++)
     {
         auto position = getPosition(i);
 
@@ -1140,23 +1132,16 @@ static void Draw(PPCContext& ctx, uint8_t* base, PPCFunc* original, uint32_t str
     {
         float width = *getPosition(2) - *getPosition(0);
 
-        auto r3 = ctx.r3;
-        auto r5 = ctx.r5;
-        auto r6 = ctx.r6;
         auto r7 = ctx.r7;
         auto r8 = ctx.r8;
 
         while (*getPosition(2) > 0.0f)
         {
-            ctx.r3 = r3;
-            ctx.r4 = ctx.r1;
-            ctx.r5 = r5;
-            ctx.r6 = r6;
             ctx.r7 = r7;
             ctx.r8 = r8;
-            original(ctx, base);
+            original(ctx, base, r3, ctx.r1, r5, r6);
 
-            for (size_t i = 0; i < ctx.r5.u32; i++)
+            for (size_t i = 0; i < r5.u32; i++)
                 *getPosition(i) = *getPosition(i) - width;
         }
 
@@ -1164,38 +1149,39 @@ static void Draw(PPCContext& ctx, uint8_t* base, PPCFunc* original, uint32_t str
     }
     else
     {
-        ctx.r4.u32 = ctx.r1.u32;
-        original(ctx, base);
+        original(ctx, base, r3, ctx.r1, r5, r6);
         ctx.r1.u32 += size;
     }
+
+    return { r3,r4 };
 }
 
 // SWA::CCsdPlatformMirage::Draw
 PPC_FUNC_IMPL(__imp__sub_825E2E70);
 PPC_FUNC(sub_825E2E70)
 {
-    Draw(ctx, base, __imp__sub_825E2E70, 0x14);
+    return Draw(ctx, base, __imp__sub_825E2E70, 0x14, r3, r4, r5, r6);
 }
 
 // SWA::CCsdPlatformMirage::DrawNoTex
 PPC_FUNC_IMPL(__imp__sub_825E2E88);
 PPC_FUNC(sub_825E2E88)
 {
-    Draw(ctx, base, __imp__sub_825E2E88, 0xC);
+    return Draw(ctx, base, __imp__sub_825E2E88, 0xC, r3, r4, r5, r6);
 }
 
 // Hedgehog::MirageDebug::SetScissorRect
 PPC_FUNC_IMPL(__imp__sub_82E16C70);
 PPC_FUNC(sub_82E16C70)
 {
-    auto scissorRect = reinterpret_cast<GuestRect*>(base + ctx.r4.u32);
+    auto scissorRect = reinterpret_cast<GuestRect*>(base + r4.u32);
 
     scissorRect->left = scissorRect->left * g_aspectRatioScale + g_aspectRatioOffsetX;
     scissorRect->top = scissorRect->top * g_aspectRatioScale + g_aspectRatioOffsetY;
     scissorRect->right = scissorRect->right * g_aspectRatioScale + g_aspectRatioOffsetX;
     scissorRect->bottom = scissorRect->bottom * g_aspectRatioScale + g_aspectRatioOffsetY;
 
-    __imp__sub_82E16C70(ctx, base);
+    return __imp__sub_82E16C70(ctx, base, r3, r4, r5, r6);
 }
 
 // Store whether the primitive should be stretched in available padding space.
@@ -1206,16 +1192,16 @@ static constexpr size_t PRIMITIVE_2D_PADDING_SIZE = 0x3;
 PPC_FUNC_IMPL(__imp__sub_822D0328);
 PPC_FUNC(sub_822D0328)
 {
-    memset(base + ctx.r3.u32 + PRIMITIVE_2D_PADDING_OFFSET, 0, PRIMITIVE_2D_PADDING_SIZE);
-    __imp__sub_822D0328(ctx, base);
+    memset(base + r3.u32 + PRIMITIVE_2D_PADDING_OFFSET, 0, PRIMITIVE_2D_PADDING_SIZE);
+    return __imp__sub_822D0328(ctx, base, r3, r4, r5, r6);
 }
 
 // Hedgehog::MirageDebug::CPrimitive2D::CPrimitive2D(const Hedgehog::MirageDebug::CPrimitive2D&)
 PPC_FUNC_IMPL(__imp__sub_830D2328);
 PPC_FUNC(sub_830D2328)
 {
-    memcpy(base + ctx.r3.u32 + PRIMITIVE_2D_PADDING_OFFSET, base + ctx.r4.u32 + PRIMITIVE_2D_PADDING_OFFSET, PRIMITIVE_2D_PADDING_SIZE);
-    __imp__sub_830D2328(ctx, base);
+    memcpy(base + r3.u32 + PRIMITIVE_2D_PADDING_OFFSET, base + r4.u32 + PRIMITIVE_2D_PADDING_OFFSET, PRIMITIVE_2D_PADDING_SIZE);
+    return __imp__sub_830D2328(ctx, base, r3, r4, r5, r6);
 }
 
 void AddPrimitive2DMidAsmHook(PPCRegister& r3)
@@ -1227,9 +1213,7 @@ void AddPrimitive2DMidAsmHook(PPCRegister& r3)
 PPC_FUNC_IMPL(__imp__sub_830D1EF0);
 PPC_FUNC(sub_830D1EF0)
 {
-    auto r3 = ctx.r3;
-
-    __imp__sub_830D1EF0(ctx, base);
+    __imp__sub_830D1EF0(ctx, base, r3, r4, r5, r6);
 
     struct Vertex
     {
@@ -1242,7 +1226,7 @@ PPC_FUNC(sub_830D1EF0)
         be<float> v;
     };
 
-    auto vertex = reinterpret_cast<Vertex*>(base + ctx.r4.u32);
+    auto vertex = reinterpret_cast<Vertex*>(base + r4.u32);
 
     for (size_t i = 0; i < 4; i++)
     {
@@ -1303,6 +1287,8 @@ PPC_FUNC(sub_830D1EF0)
             vertex[3].y = -1.0f + halfPixelY;
         }
     }
+
+    return { r3, r4 };
 }
 
 // Objects are pushed forward by 1m, so the coordinates need to compensate for it.
@@ -1360,12 +1346,12 @@ PPC_FUNC(sub_82690660)
 {
     if (Config::AspectRatio == EAspectRatio::OriginalNarrow)
     {
-        __imp__sub_82690660(ctx, base);
-        return;
+        return __imp__sub_82690660(ctx, base, r3, r4, r5, r6);
     }
 
-    uint32_t type = PPC_LOAD_U32(ctx.r3.u32 + 0xE8);
+    uint32_t type = PPC_LOAD_U32(r3.u32 + 0xE8);
     ctx.f1.f64 = ComputeObjGetItemX(type);
+    return { r3, r4 };
 }
 
 static double ComputeObjGetItemY(uint32_t type)
@@ -1397,14 +1383,16 @@ PPC_FUNC(sub_826906A8)
 {
     if (Config::AspectRatio == EAspectRatio::OriginalNarrow)
     {
-        __imp__sub_826906A8(ctx, base);
+        PPC_SET_RESULT(__imp__sub_826906A8(ctx, base, r3, r4, r5, r6));
         // Game scales Y by 1.4 at 4:3 aspect ratio.
         ctx.f1.f64 *= 1.4;
-        return;
+        return { r3, r4 };
     }
 
-    uint32_t type = PPC_LOAD_U32(ctx.r3.u32 + 0xE8);
+    uint32_t type = PPC_LOAD_U32(r3.u32 + 0xE8);
     ctx.f1.f64 = ComputeObjGetItemY(type);
+
+    return { r3, r4 };
 }
 
 void WorldMapProjectionMidAsmHook(PPCVRegister& v63, PPCVRegister& v62)
@@ -1449,31 +1437,31 @@ PPC_FUNC_IMPL(__imp__sub_82B8A8F8);
 PPC_FUNC(sub_82B8A8F8)
 {
     // Permanently store the letterbox bool instead of letting the game set it to false from widescreen check.
-    bool letterbox = PPC_LOAD_U8(ctx.r4.u32);
-    __imp__sub_82B8A8F8(ctx, base);
-    PPC_STORE_U8(ctx.r3.u32, letterbox);
+    bool letterbox = PPC_LOAD_U8(r4.u32);
+    PPC_SET_RESULT(__imp__sub_82B8A8F8(ctx, base, r3, r4, r5, r6));
+    PPC_STORE_U8(r3.u32, letterbox);
+    return { r3, r4 };
 }
 
 // SWA::Inspire::CLetterbox::Draw
 PPC_FUNC_IMPL(__imp__sub_82B8AA40);
 PPC_FUNC(sub_82B8AA40)
 {
-    bool letterbox = PPC_LOAD_U8(ctx.r3.u32);
+    bool letterbox = PPC_LOAD_U8(r3.u32);
     bool shouldDrawLetterbox = letterbox && Config::CutsceneAspectRatio != ECutsceneAspectRatio::Unlocked && g_aspectRatio < WIDE_ASPECT_RATIO;
 
-    PPC_STORE_U8(ctx.r3.u32, shouldDrawLetterbox);
+    PPC_STORE_U8(r3.u32, shouldDrawLetterbox);
     if (shouldDrawLetterbox)
     {
         float aspectRatio = std::max(NARROW_ASPECT_RATIO, g_aspectRatio);
         uint32_t width = aspectRatio * 720;
 
-        PPC_STORE_U32(ctx.r3.u32 + 0xC, width);
-        PPC_STORE_U32(ctx.r3.u32 + 0x10, 720);
-        PPC_STORE_U32(ctx.r3.u32 + 0x14, (720 - width * 9 / 16) / 2);
+        PPC_STORE_U32(r3.u32 + 0xC, width);
+        PPC_STORE_U32(r3.u32 + 0x10, 720);
+        PPC_STORE_U32(r3.u32 + 0x14, (720 - width * 9 / 16) / 2);
     }
 
-    auto r3 = ctx.r3;
-    __imp__sub_82B8AA40(ctx, base);
+    __imp__sub_82B8AA40(ctx, base, r3, r4, r5, r6);
 
     // Restore the original letterbox value.
     PPC_STORE_U8(r3.u32, letterbox);
@@ -1483,6 +1471,8 @@ PPC_FUNC(sub_82B8AA40)
         // Would be nice to also push this as a 2D primitive but I really cannot be bothered right now...
         BlackBar::g_inspirePillarbox = Config::CutsceneAspectRatio != ECutsceneAspectRatio::Unlocked && g_aspectRatio > WIDE_ASPECT_RATIO;
     }
+
+    return { r3, r4 };
 }
 
 void InspireLetterboxTopMidAsmHook(PPCRegister& r3)
@@ -1581,8 +1571,8 @@ void EvilHudGuideAllocMidAsmHook(PPCRegister& r3)
 PPC_FUNC_IMPL(__imp__sub_82448CF0);
 PPC_FUNC(sub_82448CF0)
 {
-    *reinterpret_cast<float*>(base + ctx.r3.u32 + EVIL_HUD_GUIDE_BYTE_SIZE) = 0.0f;
-    __imp__sub_82448CF0(ctx, base);
+    *reinterpret_cast<float*>(base + r3.u32 + EVIL_HUD_GUIDE_BYTE_SIZE) = 0.0f;
+    return __imp__sub_82448CF0(ctx, base, r3, r4, r5, r6);
 }
 
 void EvilHudGuideUpdateMidAsmHook(PPCRegister& r30, PPCRegister& f30)
@@ -1594,8 +1584,7 @@ void EvilHudGuideUpdateMidAsmHook(PPCRegister& r30, PPCRegister& f30)
 PPC_FUNC_IMPL(__imp__sub_82449088);
 PPC_FUNC(sub_82449088)
 {
-    auto r3 = ctx.r3;
-    __imp__sub_82449088(ctx, base);
+    __imp__sub_82449088(ctx, base, r3, r4, r5, r6);
 
     float positionX = *reinterpret_cast<float*>(base + r3.u32 + EVIL_HUD_GUIDE_BYTE_SIZE);
     constexpr uint32_t OFFSETS[] = { 312, 320 };
@@ -1608,14 +1597,15 @@ PPC_FUNC(sub_82449088)
             scene = PPC_LOAD_U32(scene + 0x4);
             if (scene != NULL)
             {
-                ctx.r3.u32 = scene;
                 ctx.f1.f64 = (1.5 - 0.5 * g_aspectRatioNarrowScale) * positionX;
                 ctx.f2.f64 = 0.0;
 
-                sub_830BB3D0(ctx, base);
+                PPC_SET_RESULT(sub_830BB3D0(ctx, base, scene, r4 ,r5 ,r6));
             }
         }
     }
+
+    return { r3,r4 };
 }
 
 // The shadow offseting is buggy for FCO text just like Werehog button guide,
@@ -1641,7 +1631,7 @@ PPC_FUNC(sub_82E54950)
         scaled.f32 *= 1.5f;
         PPC_STORE_U32(0x8332B7BC, scaled.u32);
 
-        __imp__sub_82E54950(ctx, base);
+        PPC_SET_RESULT(__imp__sub_82E54950(ctx, base, r3, r4, r5, r6));
 
         // Restore old values.
         PPC_STORE_U32(0x8332B7B8, x);
@@ -1649,6 +1639,8 @@ PPC_FUNC(sub_82E54950)
     }
     else
     {
-        __imp__sub_82E54950(ctx, base);
+        return __imp__sub_82E54950(ctx, base, r3, r4, r5, r6);
     }
+
+    return { r3, r4 };
 }
diff --git a/UnleashedRecomp/patches/camera_patches.cpp b/UnleashedRecomp/patches/camera_patches.cpp
index 059f5c6..c25f32c 100644
--- a/UnleashedRecomp/patches/camera_patches.cpp
+++ b/UnleashedRecomp/patches/camera_patches.cpp
@@ -41,12 +41,12 @@ void CameraFieldOfViewMidAsmHook(PPCRegister& r31, PPCRegister& f31)
 PPC_FUNC_IMPL(__imp__sub_824697B0);
 PPC_FUNC(sub_824697B0)
 {
-    auto pCamera = (SWA::CCamera*)g_memory.Translate(ctx.r3.u32);
+    auto pCamera = (SWA::CCamera*)g_memory.Translate(r3.u32);
 
     pCamera->m_InvertX = Config::HorizontalCamera == ECameraRotationMode::Reverse;
     pCamera->m_InvertY = Config::VerticalCamera == ECameraRotationMode::Reverse;
 
-    __imp__sub_824697B0(ctx, base);
+    return __imp__sub_824697B0(ctx, base, r3, r4, r5, r6);
 }
 
 // SWA::CCamera::UpdateSerial
@@ -56,12 +56,8 @@ PPC_FUNC(sub_82467890)
     if (g_needsResize)
     {
         // Recompute the projection matrix for one frame to fix stretching on pause menu.
-        auto r3 = ctx.r3;
-        auto r4 = ctx.r4;
-        sub_82468E38(ctx, base);
-        ctx.r3 = r3;
-        ctx.r4 = r4;
+        sub_82468E38(ctx, base, r3, r4, r5, r6);
     }
 
-    __imp__sub_82467890(ctx, base);
+    return __imp__sub_82467890(ctx, base, r3, r4, r5, r6);
 }
diff --git a/UnleashedRecomp/patches/fps_patches.cpp b/UnleashedRecomp/patches/fps_patches.cpp
index afd0726..f8cf925 100644
--- a/UnleashedRecomp/patches/fps_patches.cpp
+++ b/UnleashedRecomp/patches/fps_patches.cpp
@@ -101,9 +101,8 @@ bool LoadingUpdateMidAsmHook(PPCRegister& r31)
     uint32_t application = PPC_LOAD_U32(PPC_LOAD_U32(r31.u32 + 4));
     uint32_t update = PPC_LOAD_U32(PPC_LOAD_U32(application) + 20);
 
-    g_ppcContext->r3.u32 = application;
     g_ppcContext->f1.f64 = deltaTime;
-    g_memory.FindFunction(update)(*g_ppcContext, base);
+    g_memory.FindFunction(update)(*g_ppcContext, base, application, 0, 0, 0);
 
     bool loading = *SWA::SGlobals::ms_IsLoading;
     if (loading)
@@ -127,6 +126,8 @@ PPC_FUNC(sub_8312DBF8)
     auto next = now + (INTERVAL - now.time_since_epoch() % INTERVAL);
 
     std::this_thread::sleep_until(next);
+
+    return { r3, r4 };
 }
 
 void WaitVsyncMidAsmHook()
@@ -158,17 +159,18 @@ PPC_FUNC(sub_82B00D00)
     constexpr auto referenceDeltaTime = 1.0f / 30.0f;
     constexpr auto deltaTimeTolerance = 0.0001f;
 
-    auto pElapsedTime = (float*)(base + ctx.r3.u32 + EX_STAGE_BOSS_STATE_BATTLE_SIZE);
+    auto pElapsedTime = (float*)(base + r3.u32 + EX_STAGE_BOSS_STATE_BATTLE_SIZE);
 
     *pElapsedTime += std::min(App::s_deltaTime, 1.0 / 15.0);
 
     if ((*pElapsedTime + deltaTimeTolerance) > referenceDeltaTime)
     {
-        __imp__sub_82B00D00(ctx, base);
+        PPC_SET_RESULT(__imp__sub_82B00D00(ctx, base, r3, r4, r5, r6));
         *pElapsedTime -= referenceDeltaTime;
     }
 
     *pElapsedTime = std::max(*pElapsedTime, 0.0f);
+    return { r3, r4 };
 }
 
 // Fix for Egg Dragoon's drill missile attack rotating 90 degrees at HFR.
diff --git a/UnleashedRecomp/patches/input_patches.cpp b/UnleashedRecomp/patches/input_patches.cpp
index 0ec8f33..d736014 100644
--- a/UnleashedRecomp/patches/input_patches.cpp
+++ b/UnleashedRecomp/patches/input_patches.cpp
@@ -402,23 +402,23 @@ void WorldMapHidSupportYMidAsmHook(PPCRegister& pPadState, PPCRegister& y)
 PPC_FUNC_IMPL(__imp__sub_82486968);
 PPC_FUNC(sub_82486968)
 {
-    auto pWorldMapCamera = (SWA::CWorldMapCamera*)g_memory.Translate(ctx.r3.u32);
+    auto pWorldMapCamera = (SWA::CWorldMapCamera*)g_memory.Translate(r3.u32);
 
     // Reset vertical velocity if maximum pitch reached.
     if (fabs(pWorldMapCamera->m_Pitch) >= 80.0f)
         g_worldMapCursorVelocityY = 0;
 
-    __imp__sub_82486968(ctx, base);
+    return __imp__sub_82486968(ctx, base, r3, r4, r5, r6);
 }
 
 // World Map cursor move hook.
 PPC_FUNC(sub_8256C938)
 {
-    auto pWorldMapCursor = (SWA::CWorldMapCursor*)g_memory.Translate(ctx.r3.u32);
+    auto pWorldMapCursor = (SWA::CWorldMapCursor*)g_memory.Translate(r3.u32);
 
     pWorldMapCursor->m_IsCursorMoving = g_isCursorActive && IsCursorThreshold(1.0);
 
-    if (ctx.r4.u8)
+    if (r4.u8)
     {
         pWorldMapCursor->m_LeftStickVertical = 0;
         pWorldMapCursor->m_LeftStickHorizontal = 0;
@@ -451,4 +451,6 @@ PPC_FUNC(sub_8256C938)
             pWorldMapCursor->m_IsCursorMoving = true;
         }
     }
+
+    return { r3, r4 };
 }
diff --git a/UnleashedRecomp/patches/inspire_patches.cpp b/UnleashedRecomp/patches/inspire_patches.cpp
index 4e493bc..1fb3d51 100644
--- a/UnleashedRecomp/patches/inspire_patches.cpp
+++ b/UnleashedRecomp/patches/inspire_patches.cpp
@@ -41,18 +41,20 @@ static bool g_hideMorphModels;
 PPC_FUNC_IMPL(__imp__sub_82B98D80);
 PPC_FUNC(sub_82B98D80)
 {
-    __imp__sub_82B98D80(ctx, base);
+    PPC_SET_RESULT(__imp__sub_82B98D80(ctx, base, r3, r4, r5, r6));
 
-    g_pScene = (SWA::Inspire::CScene*)g_memory.Translate(ctx.r3.u32);
+    g_pScene = (SWA::Inspire::CScene*)g_memory.Translate(r3.u32);
     g_isFirstFrameChecked = false;
     g_eventDispatchCount = 0;
+
+    return { r3, r4 };
 }
 
 // ~SWA::Inspire::CScene
 PPC_FUNC_IMPL(__imp__sub_82B98D30);
 PPC_FUNC(sub_82B98D30)
 {
-    __imp__sub_82B98D30(ctx, base);
+    PPC_SET_RESULT(__imp__sub_82B98D30(ctx, base, r3, r4, r5, r6));
 
     g_pScene = nullptr;
     InspirePatches::s_sceneName.clear();
@@ -61,16 +63,18 @@ PPC_FUNC(sub_82B98D30)
 
     g_loadedMouthExplosionAnimation = false;
     g_hideMorphModels = false;
+
+    return { r3, r4 };
 }
 
 PPC_FUNC_IMPL(__imp__sub_82B9BA98);
 PPC_FUNC(sub_82B9BA98)
 {
-    auto sceneName = (Hedgehog::Base::CSharedString*)g_memory.Translate(ctx.r5.u32);
+    auto sceneName = (Hedgehog::Base::CSharedString*)g_memory.Translate(r5.u32);
 
     InspirePatches::s_sceneName = sceneName->c_str();
 
-    __imp__sub_82B9BA98(ctx, base);
+    return __imp__sub_82B9BA98(ctx, base, r3, r4, r5, r6);
 }
 
 void AnimationDataMakeMidAsmHook(PPCRegister& r31, PPCRegister& r29, PPCRegister& r28)
@@ -90,7 +94,9 @@ PPC_FUNC_IMPL(__imp__sub_82E32048);
 PPC_FUNC(sub_82E32048)
 {
     if (!g_hideMorphModels)
-        __imp__sub_82E32048(ctx, base);
+        return __imp__sub_82E32048(ctx, base, r3, r4, r5, r6);
+
+    return { r3, r4 };
 }
 
 void InspirePatches::DrawDebug()
diff --git a/UnleashedRecomp/patches/misc_patches.cpp b/UnleashedRecomp/patches/misc_patches.cpp
index 9f318fb..34ef410 100644
--- a/UnleashedRecomp/patches/misc_patches.cpp
+++ b/UnleashedRecomp/patches/misc_patches.cpp
@@ -21,7 +21,7 @@ PPC_FUNC(sub_82AC36E0)
 
     strcpy(pPerfectDarkGaiaChipHintName->get(), Config::Hints ? "V_CHP_067\0" : "end\0");
 
-    __imp__sub_82AC36E0(ctx, base);
+    return __imp__sub_82AC36E0(ctx, base, r3, r4, r5, r6);
 }
 
 bool DisableControlTutorialMidAsmHook()
@@ -61,11 +61,10 @@ PPC_FUNC(sub_825197C0)
 {
     if (Config::Language == ELanguage::Japanese)
     {
-        ctx.r3.u64 = 0;
-        return;
+        return { 0, r4 };
     }
 
-    __imp__sub_825197C0(ctx, base);
+    return __imp__sub_825197C0(ctx, base, r3, r4, r5, r6);
 }
 
 // Logo skip
@@ -74,15 +73,12 @@ PPC_FUNC(sub_82547DF0)
 {
     if (Config::SkipIntroLogos)
     {
-        ctx.r4.u64 = 0;
-        ctx.r5.u64 = 0;
-        ctx.r6.u64 = 1;
         ctx.r7.u64 = 0;
-        sub_825517C8(ctx, base);
+        return sub_825517C8(ctx, base, r3, 0, 0, 1);
     }
     else
     {
-        __imp__sub_82547DF0(ctx, base);
+        return __imp__sub_82547DF0(ctx, base, r3, r4, r5, r6);
     }
 }
 
@@ -91,12 +87,12 @@ PPC_FUNC(sub_82547DF0)
 PPC_FUNC_IMPL(__imp__sub_8305D5B8);
 PPC_FUNC(sub_8305D5B8)
 {
-    auto value = PPC_LOAD_U32(ctx.r3.u32 + 4);
+    auto value = PPC_LOAD_U32(r3.u32 + 4);
 
     if (!value)
-        return;
+        return { r3, r4 };
 
-    __imp__sub_8305D5B8(ctx, base);
+    return __imp__sub_8305D5B8(ctx, base, r3, r4, r5, r6);
 }
 
 // Disable auto save warning.
@@ -106,7 +102,7 @@ PPC_FUNC(sub_82586698)
     if (Config::DisableAutoSaveWarning)
         *(bool*)g_memory.Translate(0x83367BC2) = true;
 
-    __imp__sub_82586698(ctx, base);
+    return __imp__sub_82586698(ctx, base, r3, r4, r5, r6);
 }
 
 // SWA::CObjHint::MsgNotifyObjectEvent::Impl
@@ -116,17 +112,17 @@ PPC_FUNC_IMPL(__imp__sub_82736E80);
 PPC_FUNC(sub_82736E80)
 {
     // GroupID parameter text
-    auto* groupId = (const char*)(base + PPC_LOAD_U32(ctx.r3.u32 + 0x100));
+    auto* groupId = (const char*)(base + PPC_LOAD_U32(r3.u32 + 0x100));
     
     if (!Config::Hints)
     {
         // WhiteIsland_ACT1_001: "Your friend went off that way, Sonic. Quick, let's go after him!"
         // s20n_mykETF_c_navi_2: "Huh? Weird! We can't get through here anymore. We were able to earlier!"
         if (strcmp(groupId, "WhiteIsland_ACT1_001") != 0 && strcmp(groupId, "s20n_mykETF_c_navi_2") != 0)
-            return;
+            return { r3, r4 };
     }
 
-    __imp__sub_82736E80(ctx, base);
+    return __imp__sub_82736E80(ctx, base, r3, r4, r5, r6);
 }
 
 // SWA::CHelpWindow::MsgRequestHelp::Impl
@@ -135,16 +131,16 @@ PPC_FUNC(sub_82736E80)
 PPC_FUNC_IMPL(__imp__sub_824C1E60);
 PPC_FUNC(sub_824C1E60)
 {
-    auto pMsgRequestHelp = (SWA::Message::MsgRequestHelp*)(base + ctx.r4.u32);
+    auto pMsgRequestHelp = (SWA::Message::MsgRequestHelp*)(base + r4.u32);
 
     if (!Config::Hints)
     {
         // s10d_mykETF_c_navi: "Looks like we can get to a bunch of places in the village from here!"
         if (strcmp(pMsgRequestHelp->m_Name.c_str(), "s10d_mykETF_c_navi") == 0)
-            return;
+            return { r3, r4 };
     }
 
-    __imp__sub_824C1E60(ctx, base);
+    return __imp__sub_824C1E60(ctx, base, r3, r4, r5, r6);
 }
 
 // Remove boost filter
diff --git a/UnleashedRecomp/patches/object_patches.cpp b/UnleashedRecomp/patches/object_patches.cpp
index 39ed02e..1db3846 100644
--- a/UnleashedRecomp/patches/object_patches.cpp
+++ b/UnleashedRecomp/patches/object_patches.cpp
@@ -10,8 +10,8 @@
 PPC_FUNC_IMPL(__imp__sub_82608E60);
 PPC_FUNC(sub_82608E60)
 {
-    memset(base + ctx.r3.u32, 0, 0x154);
-    __imp__sub_82608E60(ctx, base);
+    memset(base + r3.u32, 0, 0x154);
+    return __imp__sub_82608E60(ctx, base, r3, r4, r5, r6);
 }
 
 // The barrel gets stuck at a slope at high frame rates and softlocks the player.
@@ -33,24 +33,26 @@ void ObjBigBarrelAllocMidAsmHook(PPCRegister& r3)
 PPC_FUNC_IMPL(__imp__sub_8271AC08);
 PPC_FUNC(sub_8271AC08)
 {
-    new (base + ctx.r3.u32 + OBJ_BIG_BARREL_SIZE) ObjBigBarrelEx();
-    __imp__sub_8271AC08(ctx, base);
+    new (base + r3.u32 + OBJ_BIG_BARREL_SIZE) ObjBigBarrelEx();
+    return __imp__sub_8271AC08(ctx, base, r3, r4, r5, r6);
 }
 
 // CObjBigBarrel::Integrate
 PPC_FUNC_IMPL(__imp__sub_8271AA30);
 PPC_FUNC(sub_8271AA30)
 {
-    auto objBigBarrelEx = reinterpret_cast<ObjBigBarrelEx*>(base + ctx.r3.u32 + OBJ_BIG_BARREL_SIZE);
+    auto objBigBarrelEx = reinterpret_cast<ObjBigBarrelEx*>(base + r3.u32 + OBJ_BIG_BARREL_SIZE);
     objBigBarrelEx->interpolate = ctx.f1.f64 < (1.0 / 30.0);
     objBigBarrelEx->elapsedTime += ctx.f1.f64;
 
     if (!objBigBarrelEx->interpolate || objBigBarrelEx->elapsedTime >= (1.0f / 30.0f))
     {
         ctx.f1.f64 = objBigBarrelEx->elapsedTime;
-        __imp__sub_8271AA30(ctx, base);
+        PPC_SET_RESULT(__imp__sub_8271AA30(ctx, base, r3, r4, r5, r6));
         objBigBarrelEx->elapsedTime = 0.0f;
     }
+
+    return { r3, r4 };
 }
 
 void ObjBigBarrelSetPositionMidAsmHook(PPCRegister& r3, PPCRegister& r4)
@@ -96,7 +98,7 @@ PPC_FUNC(sub_82B14CC0)
         PPC_STORE_U8(0x820C29F3, 'o'); // Y
     }
 
-    __imp__sub_82B14CC0(ctx, base);
+    return __imp__sub_82B14CC0(ctx, base, r3, r4, r5, r6);
 }
 
 // CObjGrindDashPanel is particularly egregious when it comes to overlapping sounds at HFR
@@ -113,8 +115,8 @@ void ObjGrindDashPanelAllocMidAsmHook(PPCRegister& r3)
 PPC_FUNC_IMPL(__imp__sub_82614228);
 PPC_FUNC(sub_82614228)
 {
-    *reinterpret_cast<double*>(base + ctx.r3.u32 + OBJ_GRIND_DASH_PANEL_SIZE) = 0.0;
-    __imp__sub_82614228(ctx, base);
+    *reinterpret_cast<double*>(base + r3.u32 + OBJ_GRIND_DASH_PANEL_SIZE) = 0.0;
+    return __imp__sub_82614228(ctx, base, r3, r4, r5, r6);
 }
 
 // SWA::CObjGrindDashPanel::MsgHitEventCollision::Impl
@@ -124,12 +126,14 @@ PPC_FUNC(sub_826145D8)
     constexpr double REFERENCE_DELTA_TIME = 1.0 / 30.0;
     constexpr double DELTA_TIME_TOLERANCE = 0.0001;
 
-    auto lastHitTime = reinterpret_cast<double*>(base + ctx.r3.u32 + OBJ_GRIND_DASH_PANEL_SIZE);
+    auto lastHitTime = reinterpret_cast<double*>(base + r3.u32 + OBJ_GRIND_DASH_PANEL_SIZE);
     auto deltaTime = App::s_time - *lastHitTime;
 
     if ((deltaTime + DELTA_TIME_TOLERANCE) > REFERENCE_DELTA_TIME)
     {
-        __imp__sub_826145D8(ctx, base);
+        PPC_SET_RESULT(__imp__sub_826145D8(ctx, base, r3, r4, r5, r6));
         *lastHitTime = App::s_time;
     }
+
+    return { r3, r4 };
 }
diff --git a/UnleashedRecomp/patches/player_patches.cpp b/UnleashedRecomp/patches/player_patches.cpp
index cce0a58..45009bf 100644
--- a/UnleashedRecomp/patches/player_patches.cpp
+++ b/UnleashedRecomp/patches/player_patches.cpp
@@ -15,10 +15,10 @@ static bool g_isUnleashCancelled;
 PPC_FUNC_IMPL(__imp__sub_82624308);
 PPC_FUNC(sub_82624308)
 {
-    __imp__sub_82624308(ctx, base);
+    PPC_SET_RESULT(__imp__sub_82624308(ctx, base, r3, r4, r5, r6));
 
     if (!Config::SaveScoreAtCheckpoints)
-        return;
+        return { r3, r4 };
 
     if (auto pGameDocument = SWA::CGameDocument::GetInstance())
     {
@@ -27,6 +27,8 @@ PPC_FUNC(sub_82624308)
 
         LOGFN("Score: {}", g_lastEnemyScore + g_lastTrickScore);
     }
+
+    return { r3, r4 };
 }
 
 /* Hook function that resets the score
@@ -34,10 +36,10 @@ PPC_FUNC(sub_82624308)
 PPC_FUNC_IMPL(__imp__sub_8245F048);
 PPC_FUNC(sub_8245F048)
 {
-    __imp__sub_8245F048(ctx, base);
+    PPC_SET_RESULT(__imp__sub_8245F048(ctx, base, r3, r4, r5, r6));
 
     if (!Config::SaveScoreAtCheckpoints)
-        return;
+        return { r3, r4 };
 
     if (auto pGameDocument = SWA::CGameDocument::GetInstance())
     {
@@ -46,6 +48,8 @@ PPC_FUNC(sub_8245F048)
         pGameDocument->m_pMember->m_ScoreInfo.EnemyScore = g_lastEnemyScore;
         pGameDocument->m_pMember->m_ScoreInfo.TrickScore = g_lastTrickScore;
     }
+
+    return { r3, r4 };
 }
 
 void ResetScoreOnRestartMidAsmHook()
@@ -58,30 +62,32 @@ void ResetScoreOnRestartMidAsmHook()
 PPC_FUNC_IMPL(__imp__sub_823AF7A8);
 PPC_FUNC(sub_823AF7A8)
 {
-    auto pEvilSonicContext = (SWA::Player::CEvilSonicContext*)g_memory.Translate(ctx.r3.u32);
+    auto pEvilSonicContext = (SWA::Player::CEvilSonicContext*)g_memory.Translate(r3.u32);
 
     g_lastDarkGaiaEnergy = pEvilSonicContext->m_DarkGaiaEnergy;
 
     // Don't drain energy if out of control.
     if (Config::FixUnleashOutOfControlDrain && pEvilSonicContext->m_OutOfControlCount && ctx.f1.f64 < 0.0)
-        return;
+        return { r3, r4 };
 
-    __imp__sub_823AF7A8(ctx, base);
+    PPC_SET_RESULT(__imp__sub_823AF7A8(ctx, base, r3, r4, r5, r6));
 
     if (!Config::AllowCancellingUnleash)
-        return;
+        return { r3, r4 };
 
     auto pInputState = SWA::CInputState::GetInstance();
 
     // Don't allow cancelling Unleash if the intro anim is still playing.
     if (!pInputState || pEvilSonicContext->m_AnimationID == 39)
-        return;
+        return { r3, r4 };
 
     if (pInputState->GetPadState().IsTapped(SWA::eKeyState_RightBumper))
     {
         pEvilSonicContext->m_DarkGaiaEnergy = 0.0f;
         g_isUnleashCancelled = true;
     }
+
+    return { r3, r4 };
 }
 
 void PostUnleashMidAsmHook(PPCRegister& r30)
@@ -99,20 +105,24 @@ void PostUnleashMidAsmHook(PPCRegister& r30)
 PPC_FUNC_IMPL(__imp__sub_823B49D8);
 PPC_FUNC(sub_823B49D8)
 {
-    __imp__sub_823B49D8(ctx, base);
+    PPC_SET_RESULT(__imp__sub_823B49D8(ctx, base, r3, r4, r5, r6));
 
     App::s_isWerehog = true;
 
     SDL_User_EvilSonic(true);
+
+    return { r3, r4 };
 }
 
 // ~SWA::Player::CEvilSonicContext
 PPC_FUNC_IMPL(__imp__sub_823B4590);
 PPC_FUNC(sub_823B4590)
 {
-    __imp__sub_823B4590(ctx, base);
+    PPC_SET_RESULT(__imp__sub_823B4590(ctx, base, r3, r4, r5, r6));
 
     App::s_isWerehog = false;
 
     SDL_User_EvilSonic(false);
+
+    return { r3, r4 };
 }
diff --git a/UnleashedRecomp/patches/resident_patches.cpp b/UnleashedRecomp/patches/resident_patches.cpp
index 64a220d..93b2c54 100644
--- a/UnleashedRecomp/patches/resident_patches.cpp
+++ b/UnleashedRecomp/patches/resident_patches.cpp
@@ -11,20 +11,20 @@ bool m_isSavedAchievementData = false;
 PPC_FUNC_IMPL(__imp__sub_824DCF38);
 PPC_FUNC(sub_824DCF38)
 {
-    auto pLoading = (SWA::CLoading*)g_memory.Translate(ctx.r3.u32);
+    auto pLoading = (SWA::CLoading*)g_memory.Translate(r3.u32);
 
     App::s_isLoading = true;
 
-    if (ctx.r4.u32 == SWA::eLoadingDisplayType_WerehogMovie)
+    if (r4.u32 == SWA::eLoadingDisplayType_WerehogMovie)
     {
         if (Config::TimeOfDayTransition == ETimeOfDayTransition::PlayStation)
         {
-            ctx.r4.u32 = SWA::eLoadingDisplayType_ChangeTimeOfDay;
+            r4.u32 = SWA::eLoadingDisplayType_ChangeTimeOfDay;
             pLoading->m_IsNightToDay = App::s_isWerehog;
         }
 
         if (Config::UseArrowsForTimeOfDayTransition)
-            ctx.r4.u32 = SWA::eLoadingDisplayType_Arrows;
+            r4.u32 = SWA::eLoadingDisplayType_Arrows;
     }
 
     if (Config::FixEggmanlandUsingEventGalleryTransition)
@@ -37,13 +37,13 @@ PPC_FUNC(sub_824DCF38)
             {
                 /* Fix restarting Eggmanland as the Werehog
                    erroneously using the Event Gallery transition. */
-                if (ctx.r4.u32 == SWA::eLoadingDisplayType_EventGallery && !strcmp(stageName, "Act_EggmanLand"))
-                    ctx.r4.u32 = SWA::eLoadingDisplayType_NowLoading;
+                if (r4.u32 == SWA::eLoadingDisplayType_EventGallery && !strcmp(stageName, "Act_EggmanLand"))
+                    r4.u32 = SWA::eLoadingDisplayType_NowLoading;
             }
         }
     }
 
-    __imp__sub_824DCF38(ctx, base);
+    return __imp__sub_824DCF38(ctx, base, r3, r4, r5, r6);
 }
 
 // The game checks for a bool to render the PS3 transition animation. It's never set so it's presumably a "is PS3" bool.
@@ -57,45 +57,47 @@ bool LoadingRenderMidAsmHook()
 PPC_FUNC_IMPL(__imp__sub_825E4068);
 PPC_FUNC(sub_825E4068)
 {
-    if (ctx.r4.u32 != NULL && ctx.r5.u32 == 0x65C0C && XXH3_64bits(base + ctx.r4.u32, ctx.r5.u32) == 0xD4DA1A9BE4D79BED)
+    if (r4.u32 != NULL && r5.u32 == 0x65C0C && XXH3_64bits(base + r4.u32, r5.u32) == 0xD4DA1A9BE4D79BED)
     {
         // Keyframe count. First keyframe is at the center of the screen.
-        PPC_STORE_U32(ctx.r4.u32 + 0x2794C, 1);
+        PPC_STORE_U32(r4.u32 + 0x2794C, 1);
     }
 
-    __imp__sub_825E4068(ctx, base);
+    return __imp__sub_825E4068(ctx, base, r3, r4, r5, r6);
 }
 
 // SWA::CLoading::Update
 PPC_FUNC_IMPL(__imp__sub_824DAB60);
 PPC_FUNC(sub_824DAB60)
 {
-    auto pLoading = (SWA::CLoading*)g_memory.Translate(ctx.r3.u32);
+    auto pLoading = (SWA::CLoading*)g_memory.Translate(r3.u32);
 
-    __imp__sub_824DAB60(ctx, base);
+    PPC_SET_RESULT(__imp__sub_824DAB60(ctx, base, r3, r4, r5, r6));
 
     if (!pLoading->m_LoadingDisplayType)
         App::s_isLoading = false;
+
+    return { r3, r4 };
 }
 
 // Load voice language files.
 PPC_FUNC_IMPL(__imp__sub_824EB9B0);
 PPC_FUNC(sub_824EB9B0)
 {
-    auto pApplicationDocument = (SWA::CApplicationDocument*)g_memory.Translate(ctx.r4.u32);
+    auto pApplicationDocument = (SWA::CApplicationDocument*)g_memory.Translate(r4.u32);
 
     pApplicationDocument->m_VoiceLanguage = (SWA::EVoiceLanguage)Config::VoiceLanguage.Value;
 
-    __imp__sub_824EB9B0(ctx, base);
+    return __imp__sub_824EB9B0(ctx, base, r3, r4, r5, r6);
 }
 
 // SWA::CSaveIcon::Update
 PPC_FUNC_IMPL(__imp__sub_824E5170);
 PPC_FUNC(sub_824E5170)
 {
-    auto pSaveIcon = (SWA::CSaveIcon*)g_memory.Translate(ctx.r3.u32);
+    auto pSaveIcon = (SWA::CSaveIcon*)g_memory.Translate(r3.u32);
 
-    __imp__sub_824E5170(ctx, base);
+    PPC_SET_RESULT(__imp__sub_824E5170(ctx, base, r3, r4, r5, r6));
 
     App::s_isSaving = pSaveIcon->m_IsVisible;
 
@@ -114,21 +116,18 @@ PPC_FUNC(sub_824E5170)
     {
         m_isSavedAchievementData = false;
     }
+
+    return { r3, r4 };
 }
 
 // SWA::CApplicationDocument::LoadArchiveDatabases
 PPC_FUNC_IMPL(__imp__sub_824EFD28);
 PPC_FUNC(sub_824EFD28)
 {
-    auto r3 = ctx.r3;
-
     // SWA::CSigninXenon::InitializeDLC
-    ctx.r3.u64 = PPC_LOAD_U32(r3.u32 + 4) + 200;
-    ctx.r4.u64 = 0;
-    sub_822C57D8(ctx, base);
+    sub_822C57D8(ctx, base, PPC_LOAD_U32(r3.u32 + 4) + 200, 0, r5, r6);
 
-    ctx.r3 = r3;
-    __imp__sub_824EFD28(ctx, base);
+    return __imp__sub_824EFD28(ctx, base, r3, r4, r5, r6);
 }
 
 // SWA::CFileReaderXenon_DLC::InitializeParallel
@@ -137,15 +136,18 @@ PPC_FUNC(sub_822C3778)
     if (!PPC_LOAD_U8(0x83361F10)) // ms_DLCInitialized
     {
         // CFileReaderXenon_DLC::InitializeSerial
-        sub_822C2CF0(ctx, base);
+        return sub_822C2CF0(ctx, base, r3, r4, r5, r6);
     }
+
+    return { r3, r4 };
 }
 
 // HasAnyDLC
 // NOTE: This is not used outside title screen outro, so it's safe to hook.
 PPC_FUNC(sub_82BD06C8)
 {
-    ctx.r3.u64 = 0;
+    r3.u64 = 0;
+    return { r3, r4 };
 }
 
 void LoadingScreenControllerMidAsmHook()
diff --git a/UnleashedRecomp/patches/video_patches.cpp b/UnleashedRecomp/patches/video_patches.cpp
index a2320b3..87ccd75 100644
--- a/UnleashedRecomp/patches/video_patches.cpp
+++ b/UnleashedRecomp/patches/video_patches.cpp
@@ -10,13 +10,13 @@ using SVertexData = SWA::Sequence::Utility::CPlayMovieWrapper::CRender::SVertexD
 PPC_FUNC_IMPL(__imp__sub_82AE30D8);
 PPC_FUNC(sub_82AE30D8)
 {
-    auto pViewportWidth = (be<uint32_t>*)g_memory.Translate(ctx.r4.u32 + 0x14);
-    auto pViewportHeight = (be<uint32_t>*)g_memory.Translate(ctx.r4.u32 + 0x18);
+    auto pViewportWidth = (be<uint32_t>*)g_memory.Translate(r4.u32 + 0x14);
+    auto pViewportHeight = (be<uint32_t>*)g_memory.Translate(r4.u32 + 0x18);
 
-    auto pTopLeft = (SVertexData*)g_memory.Translate(ctx.r4.u32 + 0x6C);
-    auto pTopRight = (SVertexData*)g_memory.Translate(ctx.r4.u32 + 0x6C + sizeof(SVertexData));
-    auto pBottomRight = (SVertexData*)g_memory.Translate(ctx.r4.u32 + 0x6C + sizeof(SVertexData) * 2);
-    auto pBottomLeft = (SVertexData*)g_memory.Translate(ctx.r4.u32 + 0x6C + sizeof(SVertexData) * 3);
+    auto pTopLeft = (SVertexData*)g_memory.Translate(r4.u32 + 0x6C);
+    auto pTopRight = (SVertexData*)g_memory.Translate(r4.u32 + 0x6C + sizeof(SVertexData));
+    auto pBottomRight = (SVertexData*)g_memory.Translate(r4.u32 + 0x6C + sizeof(SVertexData) * 2);
+    auto pBottomLeft = (SVertexData*)g_memory.Translate(r4.u32 + 0x6C + sizeof(SVertexData) * 3);
 
     auto quadWidth = std::fabs(pTopRight->X - pTopLeft->X) * ((float)*pViewportWidth / 2);
     auto quadHeight = std::fabs(pTopLeft->Y - pBottomLeft->Y) * ((float)*pViewportHeight / 2);
@@ -59,7 +59,7 @@ PPC_FUNC(sub_82AE30D8)
     pBottomRight->U = (pBottomRight->U - centreV) / scaleU + centreV;
     pBottomRight->V = (pBottomRight->V - centreV) / scaleV + centreV;
 
-    __imp__sub_82AE30D8(ctx, base);
+    return __imp__sub_82AE30D8(ctx, base, r3, r4, r5, r6);
 }
 
 void RemoveMoviePlayerLetterboxMidAsmHook() {}
@@ -73,7 +73,7 @@ bool MotionBlurMidAsmHook()
 PPC_FUNC_IMPL(__imp__sub_830D25D8);
 PPC_FUNC(sub_830D25D8)
 {
-    auto device = reinterpret_cast<GuestDevice*>(base + PPC_LOAD_U32(ctx.r4.u32));
+    auto device = reinterpret_cast<GuestDevice*>(base + PPC_LOAD_U32(r4.u32));
 
     // Set first sampler to use linear filtering.
     // NOTE: We only check for height here since all 2D primitives get centered.
@@ -83,7 +83,7 @@ PPC_FUNC(sub_830D25D8)
         device->dirtyFlags[3] = device->dirtyFlags[3].get() | 0x80000000ull;
     }
 
-    __imp__sub_830D25D8(ctx, base);
+    return __imp__sub_830D25D8(ctx, base, r3, r4, r5, r6);
 }
 
 // Rope renderables sometimes get bogus colors due to the material parameters of whatever
@@ -106,16 +106,16 @@ static void SetDefaultMaterialParameters(GuestDevice* device)
 PPC_FUNC_IMPL(__imp__sub_827CBF68);
 PPC_FUNC(sub_827CBF68)
 {
-    SetDefaultMaterialParameters(reinterpret_cast<GuestDevice*>(base + PPC_LOAD_U32(PPC_LOAD_U32(ctx.r4.u32))));
-    __imp__sub_827CBF68(ctx, base);
+    SetDefaultMaterialParameters(reinterpret_cast<GuestDevice*>(base + PPC_LOAD_U32(PPC_LOAD_U32(r4.u32))));
+    return __imp__sub_827CBF68(ctx, base, r3, r4, r5, r6);
 }
 
 // SWA::CObjUpReel::CPrimitiveReel::Render
 PPC_FUNC_IMPL(__imp__sub_8260BBF8);
 PPC_FUNC(sub_8260BBF8)
 {
-    SetDefaultMaterialParameters(reinterpret_cast<GuestDevice*>(base + PPC_LOAD_U32(PPC_LOAD_U32(ctx.r4.u32))));
-    __imp__sub_8260BBF8(ctx, base);
+    SetDefaultMaterialParameters(reinterpret_cast<GuestDevice*>(base + PPC_LOAD_U32(PPC_LOAD_U32(r4.u32))));
+    return __imp__sub_8260BBF8(ctx, base, r3, r4, r5, r6);
 }
 
 // The pedestal in Gaia Temple is placed on an opaque mesh slot, despite using additive blending.
@@ -126,18 +126,18 @@ PPC_FUNC(sub_8260BBF8)
 PPC_FUNC_IMPL(__imp__sub_82E38650);
 PPC_FUNC(sub_82E38650)
 {
-    if (ctx.r5.u32 == 0xBB90 && XXH3_64bits(base + ctx.r4.u32, ctx.r5.u32) == 0xB524C8C3B80C3F54)
+    if (r5.u32 == 0xBB90 && XXH3_64bits(base + r4.u32, r5.u32) == 0xB524C8C3B80C3F54)
     {
         // Mesh Count
         std::swap(
-            *reinterpret_cast<uint32_t*>(base + ctx.r4.u32 + 0x18),
-            *reinterpret_cast<uint32_t*>(base + ctx.r4.u32 + 0x20));
+            *reinterpret_cast<uint32_t*>(base + r4.u32 + 0x18),
+            *reinterpret_cast<uint32_t*>(base + r4.u32 + 0x20));
 
         // Mesh Offset
         std::swap(
-            *reinterpret_cast<uint32_t*>(base + ctx.r4.u32 + 0x1C),
-            *reinterpret_cast<uint32_t*>(base + ctx.r4.u32 + 0x24));
+            *reinterpret_cast<uint32_t*>(base + r4.u32 + 0x1C),
+            *reinterpret_cast<uint32_t*>(base + r4.u32 + 0x24));
     }
 
-    __imp__sub_82E38650(ctx, base);
+    return __imp__sub_82E38650(ctx, base, r3, r4, r5, r6);
 }
diff --git a/UnleashedRecomp/ui/achievement_overlay.cpp b/UnleashedRecomp/ui/achievement_overlay.cpp
index 3eda011..ef7b998 100644
--- a/UnleashedRecomp/ui/achievement_overlay.cpp
+++ b/UnleashedRecomp/ui/achievement_overlay.cpp
@@ -89,7 +89,7 @@ PPC_FUNC_IMPL(__imp__sub_82B43480);
 PPC_FUNC(sub_82B43480)
 {
     g_soundAdministratorUpdated = true;
-    __imp__sub_82B43480(ctx, base);
+    return __imp__sub_82B43480(ctx, base, r3, r4, r5, r6);
 }
 
 // Dequeue achievements only in the main thread. This is also extra thread safety.

Basically I'm using System V AMD64 ABI (even on Windows) to pass 6 (ctx, base and 4 PPC GP argument registers) and 2 PPC GP return value registers in x64 registers. The remaining 4 PPC GP argument registers are still in ctx.

This generates 4 more mov instructions to prepare the arguments for each call, but these movs should do nothing thanks to register renaming.

The result is a 4.9% increase in file size (75,298,304 bytes to 79,029,760 bytes), and around 3.3% increase in performance (445FPS to 460FPS, lowest graphic settings, Windows 11, AMD 5600X CPU and 7900 GRE GPU).

Maybe reducing the number of arguments passed in registers to 2 or 3 will reduce the file size back down without affecting performance too much, because most function don't have that many of parameters.

[blueskythlikesclouds]

That's 2.24ms vs 2.17ms. Can you compare with the F1 profiler and check the average FPS instead?

[yume-chan]

Sure. I edited them together:

compare.mp4

[blueskythlikesclouds]

Hm, interesting. I actually had an idea like this too, but just for the r3 and r4 registers, but didn't do it because MSVC's ABI doesn't allow passing struct types as registers, so it'd be the same as storing them in the PPC context struct.

If the System V ABI allows that this'd be an interesting optimization.

[yume-chan]

because MSVC's ABI doesn't allow passing struct types as registers

Oh, I never know that. I thought only the size matters, and because the compiler/linker can do any optimizations for internal functions (like me using System V ABI on Windows).

If the System V ABI allows that

According to System V ABI spec (https://gitlab.com/x86-psABIs/x86-64-ABI), structs and unions not exceeding 8 bytes can be passed as integers, in registers.

The main reason I chose System V ABI is that it allows two 64-bit return values, that's same as PPC. I think otherwise passing r4 in register and return it in ctx would be extra complicated.