Implement fix for Skyscraper Scamper Act 1 (Day) building drawing incorrectly

UnleashedRecomp/app.cpp

@@ -89,6 +89,9 @@ 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/fps_patches.cpp

@@ -195,3 +195,11 @@ bool SparkleLocusMidAsmHook()
     // This has the side effect of the locus particle eventually snapping to the rest position during pause, but it's better than vertices exploding.
     return App::s_deltaTime < (1.0 / 60.0);
 }
+
+void CEvilSonicContext_CStateWall_LeaveRotationMidAsmHook(PPCRegister& f1)
+{
+    // The code in the Werehog's "wall" state for leaving walls adds a constant
+    // value of 0.05 to his transform every frame. This makes the value respect
+    // delta time whilst maintaining the original behaviour at 30 FPS.
+    f1.f64 = f1.f64 * (std::min(App::s_deltaTime, 1.0 / 15.0) / (1.0 / 30.0));
+}

UnleashedRecomp/patches/misc_patches.cpp

@@ -1,4 +1,3 @@
-#include "misc_patches.h"
 #include <api/SWA.h>
 #include <ui/game_window.h>
 #include <user/achievement_manager.h>
@@ -194,54 +193,3 @@ PPC_FUNC(sub_824EE620)
 
     ctx.r3.u32 = PersistentStorageManager::ShouldDisplayDLCMessage(true);
 }
-
-bool StageCollisionDebugViewMidAsmHook(PPCRegister& r27)
-{
-    if (Config::EnableStageCollisionDebugView)
-    {
-        r27.u32 = true;
-        return true;
-    }
-    
-    return false;
-}
-
-// The game is set up so that after parsing the Stage.set.xml it checks if TerrainInfoFile is found or not.
-// Based on the result of that it will either draw terrain or debug collision (if enabled).
-//
-// The XMLs in the game are populated like this generally speaking:
-//  <Terrain>
-//    <TerrainInfoFile>terrain</TerrainInfoFile>
-//    <GIAtlas>1</GIAtlas>
-//  </Terrain>
-//  <Terrain>
-//    <RigidBodyContainer>collision</RigidBodyContainer>
-//    <IsCollisionRender>false</IsCollisionRender>
-//  </Terrain>
-//
-// In some cases however, the information in these two Terrain blocks is combined into one block,
-// which makes the logic checking TerrainInfoFile's contents only fire once, and with success only, as such
-// the logic for drawing collision will never execute.
-//
-// To combat this we check if both types returned with some value from the XML file, which indicates that its
-// a single Terrain block, and if so we store that information so we can later on re-use to manually fire the
-// logic controlling the drawing of the debug collision view.
-void StageCollisionDebugViewStoreXmlTypeMidAsmHook(PPCRegister& r1)
-{
-    uint8_t* base = g_memory.base;
-
-    const char* rigidBodyContainer = (const char*)(base + PPC_LOAD_U32(r1.u32 + 108));
-    const char* terrainInfoFile = (const char*)(base + PPC_LOAD_U32(r1.u32 + 132));
-    if (*rigidBodyContainer != '\0' && *terrainInfoFile != '\0')
-    {
-        g_singleTerrainBlockXml = true;
-    }
-}
-
-bool StageCollisionDebugViewSingleTerrainBlockXmlMidAsmHook()
-{
-    bool runCollisionViewDrawLogic = g_singleTerrainBlockXml;
-    g_singleTerrainBlockXml = false;
-
-    return runCollisionViewDrawLogic;
-}

UnleashedRecomp/patches/misc_patches.h

@@ -1,3 +0,0 @@
-#pragma once
-
-static bool g_singleTerrainBlockXml = false;

UnleashedRecomp/patches/video_patches.cpp

@@ -141,3 +141,26 @@ PPC_FUNC(sub_82E38650)
 
     __imp__sub_82E38650(ctx, base);
 }
+
+// Part of the building right after exiting the tunnel after the drift turn after the first checkpoint
+// is placed on an transparent mesh slot. This somehow works. Except on high-performance Windows machines,
+// hinting at the fact that its related to some scheduler issue with the asset loading.
+// We can fix it by detecting the asset runtime, and combining the opaque and transparent mesh slots by
+// using the name offset field on the mesh group as an additional value in the array and shifting the
+// opaque mesh slot's offset back by one and then correcting the offset table for this change.
+
+// Hedgehog::Mirage::CTerrainModelData::Make
+PPC_FUNC_IMPL(__imp__sub_82E39618);
+PPC_FUNC(sub_82E39618)
+{
+    if (ctx.r5.u32 == 0xA470 && XXH3_64bits(base + ctx.r4.u32, ctx.r5.u32) == 0x8474C14C113626D2)
+    {
+        PPC_STORE_U32(ctx.r4.u32 + 0x28, 7);
+        PPC_STORE_U32(ctx.r4.u32 + 0x2C, 0x38);
+        PPC_STORE_U32(ctx.r4.u32 + 0x30, 0);
+        PPC_STORE_U32(ctx.r4.u32 + 0x50, 0x88C4);
+        PPC_STORE_U32(ctx.r4.u32 + 0xA438, 0x38);
+    }
+
+    __imp__sub_82E39618(ctx, base);
+}

UnleashedRecompLib/config/SWA.toml

@@ -1142,18 +1142,14 @@ name = "EndingTextPositionMidAsmHook"
 address = 0x82580168
 registers = ["r31", "f13"]
 
+# Wall Leave - Left
 [[midasm_hook]]
-name = "StageCollisionDebugViewMidAsmHook"
+name = "CEvilSonicContext_CStateWall_LeaveRotationMidAsmHook"
-address = 0x825648F8
+address = 0x824067BC
-registers = ["r27"]
+registers = ["f1"]
-jump_address_on_true = 0x825648FC
 
+# Wall Leave - Right
 [[midasm_hook]]
-name = "StageCollisionDebugViewStoreXmlTypeMidAsmHook"
+name = "CEvilSonicContext_CStateWall_LeaveRotationMidAsmHook"
-address = 0x8256422C
+address = 0x82406774
-registers = ["r1"]
+registers = ["f1"]
-
-[[midasm_hook]]
-name = "StageCollisionDebugViewSingleTerrainBlockXmlMidAsmHook"
-address = 0x82564B00
-jump_address_on_true = 0x82564764