Merge 4b61b2279b into 80e779afd9

UnleashedRecomp/app.cpp

@@ -89,9 +89,6 @@ PPC_FUNC(sub_822C1130)
     if (Config::EnableObjectCollisionDebugView)
         *SWA::SGlobals::ms_IsObjectCollisionRender = true;
 
-    if (Config::EnableStageCollisionDebugView)
-        *SWA::SGlobals::ms_IsCollisionRender = true;
-
     __imp__sub_822C1130(ctx, base);
 }
 

UnleashedRecomp/patches/misc_patches.cpp

@@ -193,3 +193,14 @@ PPC_FUNC(sub_824EE620)
 
     ctx.r3.u32 = PersistentStorageManager::ShouldDisplayDLCMessage(true);
 }
+
+bool StageCollisionDebugViewMidAsmHook(PPCRegister& r27)
+{
+    if (Config::EnableStageCollisionDebugView)
+    {
+        r27.u32 = true;
+        return true;
+    }
+    
+    return false;
+}

UnleashedRecompLib/config/SWA.toml

@@ -1141,3 +1141,9 @@ registers = ["r3"]
 name = "EndingTextPositionMidAsmHook"
 address = 0x82580168
 registers = ["r31", "f13"]
+
+[[midasm_hook]]
+name = "StageCollisionDebugViewMidAsmHook"
+address = 0x825648F8
+registers = ["r27"]
+jump_address_on_true = 0x825648FC