Clean-up

Author: hyperbx

MarathonRecomp/patches/fps_patches.cpp

@@ -25,85 +25,60 @@ void SonicCamera_RotationSpeedFix(PPCRegister& f0, PPCRegister& deltaTime, PPCRe
     f0.f64 = float((f0.f64 * (deltaTime.f64 * (1.0 / (deltaTime.f64 * 60.0)))) + f13.f64);
 }
 
-
-bool FixTPJRopeHFR2BNE(PPCRegister& r30)
-{
-    if (Config::FPS > 60.0)
-        return r30.f64 >= 0;
-    else
-        return false; // original
-}
-
-void FixTPJRopeHFR3LFS(PPCRegister& r_value, PPCRegister& r_delta)
-{
-    if (Config::FPS <= 60.0)
-        return;
-
-    r_value.f64 = r_delta.f64;
-}
-//Not finished
-void FixTPJRopeHFR4LFS(PPCRegister& r_value, PPCRegister& r_delta)
+bool ObjTarzan_VolatileBranch(PPCRegister& r30)
 {
-    if (Config::FPS <= 60.0)
-        return;
+    if (Config::FPS <= 60.0f)
+        return false;
 
-    r_value.f64 = r_delta.f64;
+    return r30.f64 >= 0;
 }
-void FixTPJRopeHFR5LFS(PPCRegister& r_value, PPCRegister& r_delta)
-{
-    if (Config::FPS <= 60.0)
-        return;
 
-    r_value.f64 = r_delta.f64;
-}
-void FixTPJRopeHFR6LFS(PPCRegister& r_value, PPCRegister& r_delta)
+void ObjTarzan_PatchStaticDeltaTime(PPCRegister& value, PPCRegister& delta)
 {
-    if (Config::FPS <= 60.0)
+    if (Config::FPS <= 60.0f)
         return;
 
-    r_value.f64 = r_delta.f64;
+    value.f64 = delta.f64;
 }
 
-//force to save
-void FixTPJRopeHFR7EXTRA(PPCRegister& r_value, PPCRegister& r_value2, PPCRegister& r_stack)
+void ObjTarzan_PatchDeltaTimeArgument(PPCRegister& value, PPCRegister& value2, PPCRegister& stack)
 {
-    if (Config::FPS <= 60.0)
+    if (Config::FPS <= 60.0f)
         return;
 
-    auto deltaTime = *(be<double>*)g_memory.Translate(r_stack.u32 + 0x90 + 0x420 - 0x88);
-    r_value.f64 = deltaTime;
-    r_value2.f64 = deltaTime;
-}
-
-//no Tarzan Class implementation, because Fixture in gauge patch o-o
-struct TPJ_POINT
-{
-    MARATHON_INSERT_PADDING(0x4C);
-    be<float> m_Time;
-    MARATHON_INSERT_PADDING(0xB0);
+    auto deltaTime = *(be<double>*)g_memory.Translate(stack.u32 + 0x90 + 0x420 - 0x88);
 
-};
+    value.f64 = deltaTime;
+    value2.f64 = deltaTime;
+}
 
-// SonicTeam::TPJ
+// Sonicteam::ObjTarzan::Update
 PPC_FUNC_IMPL(__imp__sub_8232D770);
 PPC_FUNC(sub_8232D770)
 {
-    if (Config::FPS <= 60.0)
+    if (Config::FPS <= 60.0f)
     {
         __imp__sub_8232D770(ctx, base);
         return;
     }
 
-    auto pTPJ = (TPJ_POINT*)(base + ctx.r3.u32);
-    auto delta = ctx.f1.f64;
-    PPCRegister _r4 = ctx.f1;
+    struct TarzanPoint
+    {
+        MARATHON_INSERT_PADDING(0x4C);
+        be<float> m_Time;
+        MARATHON_INSERT_PADDING(0xB0);
+    };
+
+    auto pTarzanPoint = (TarzanPoint*)(base + ctx.r3.u32);
+    auto deltaTime = ctx.f1.f64;
+
+    if (deltaTime > 1.0)
+        deltaTime = 1.0;
 
-    if (delta > 1.0)
-        delta = 1.0;
     do
     {
-        //f1,f2,f3
-        GuestToHostFunction<void>(sub_8232D288, pTPJ, _r4.u64,delta,delta,delta);
-        pTPJ->m_Time = pTPJ->m_Time - delta;
-    } while (pTPJ->m_Time >= delta);
+        GuestToHostFunction<void>(sub_8232D288, pTarzanPoint, ctx.f1.u64, deltaTime, deltaTime, deltaTime);
+        pTarzanPoint->m_Time = pTarzanPoint->m_Time - deltaTime;
+    }
+    while (pTarzanPoint->m_Time >= deltaTime);
 }

MarathonRecompLib/config/Marathon.toml

@@ -400,37 +400,37 @@ address = 0x821A03F0
 jump_address_on_true = 0x821A03FC
 
 [[midasm_hook]]
-name = "FixTPJRopeHFR2BNE"
+name = "ObjTarzan_VolatileBranch"
 address = 0x8232D3E0
-jump_address_on_true = 0x8232D3E4
 registers = ["r30"]
+jump_address_on_true = 0x8232D3E4
 
 [[midasm_hook]]
-name = "FixTPJRopeHFR3LFS"
+name = "ObjTarzan_PatchStaticDeltaTime"
 address = 0x8232D3E4
-registers = ["f0","r30"]
+registers = ["f0", "r30"]
 after_instruction = true
 
 [[midasm_hook]]
-name = "FixTPJRopeHFR4LFS"
+name = "ObjTarzan_PatchStaticDeltaTime"
 address = 0x8232D49C
-registers = ["f1","f3"]
+registers = ["f1", "f3"]
 after_instruction = true
 
 [[midasm_hook]]
-name = "FixTPJRopeHFR5LFS"
+name = "ObjTarzan_PatchStaticDeltaTime"
 address = 0x8232D530
-registers = ["f1","f3"]
+registers = ["f1", "f3"]
 after_instruction = true
 
 [[midasm_hook]]
-name = "FixTPJRopeHFR6LFS"
+name = "ObjTarzan_PatchStaticDeltaTime"
 address = 0x8232D57C
-registers = ["f0","f3"]
+registers = ["f0", "f3"]
 after_instruction = true
 
 [[midasm_hook]]
-name = "FixTPJRopeHFR7EXTRA"
+name = "ObjTarzan_PatchDeltaTimeArgument"
 address = 0x8232D818
-registers = ["f3","r4","r1"]
+registers = ["f3", "r4", "r1"]