Config and Style Fix

Author: ReimousTH

MarathonRecomp/api/Marathon.h

@@ -16,7 +16,6 @@
 #include "CSD/Manager/csdmSubjectBase.h"
 #include "CSD/Platform/csdTexList.h"
 #include "Sonicteam/Actor.h"
-#include "Sonicteam/Fixture.h"
 #include "Sonicteam/AlertWindowTask.h"
 #include "Sonicteam/AppMarathon.h"
 #include "Sonicteam/AudioEngineXenon.h"
@@ -30,6 +29,7 @@
 #include "Sonicteam/CsdResource.h"
 #include "Sonicteam/DocMarathonImp.h"
 #include "Sonicteam/DocMarathonState.h"
+#include "Sonicteam/Fixture.h"
 #include "Sonicteam/GameImp.h"
 #include "Sonicteam/GameMode.h"
 #include "Sonicteam/Globals.h"
@@ -50,6 +50,7 @@
 #include "Sonicteam/MainMenuTask.h"
 #include "Sonicteam/MainMode.h"
 #include "Sonicteam/Message/MsgSuckPlayer.h"
+#include "Sonicteam/Message/MsgObjJump123GetNextPoint.h"
 #include "Sonicteam/MessageWindowTask.h"
 #include "Sonicteam/MovieObject.h"
 #include "Sonicteam/MovieObjectWmv.h"

MarathonRecomp/api/Sonicteam/Message/MsgObjJump123GetNextPoint.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Math/Vector.h>
+#include <Sonicteam/SoX/Message.h>
+
+namespace Sonicteam::Message
+{
+    struct MsgObjJump123GetNextPoint : SoX::Message<0x10007>
+    {
+        Sonicteam::SoX::Math::Quaternion m_Rotation;
+		Sonicteam::SoX::Math::Vector m_Position;
+    };
+}

MarathonRecomp/api/Sonicteam/Player/RootFrame.h

@@ -14,7 +14,7 @@ namespace Sonicteam::Player
     public:
         SoX::Math::Matrix4x4 m_Field70;
         SoX::Math::Matrix4x4 m_FieldB0;
-        SoX::Math::Vector m_FieldF0;
+        SoX::Math::Vector m_PositionF0;
         SoX::Math::Vector m_Field100;
         SoX::Math::Vector m_Impulse;
         MARATHON_INSERT_PADDING(0x30);

MarathonRecomp/api/Sonicteam/SoX/MessageReceiver.h

@@ -18,7 +18,7 @@ namespace Sonicteam::SoX
 
         bool OnMessageReceived(IMessage* pMessage)
         {
-            return GuestToHostFunction<uint32_t>(m_pVftable->fpOnMessageReceived, this, pMessage);
+            return GuestToHostFunction<bool>(m_pVftable->fpOnMessageReceived, this, pMessage);
         }
     };
 }

MarathonRecomp/patches/player_patches.cpp

@@ -198,9 +198,11 @@ void RestoreChaosBoostJump(PPCRegister& r10, PPCRegister& r11)
     r11.u32 = 2;
 }
 
-
 void RestoreChainJumpFlips1(PPCRegister& r_ObjectPlayer, PPCRegister& r_Message,PPCRegister& r_ObjectContext,PPCRegister& f1, PPCRegister& f2, PPCRegister& f3)
 {
+    if (!Config::RestoreChainJumpFlips)
+        return;
+
     struct Message0x11047
     {
         be<uint32_t> m_id;
@@ -220,17 +222,10 @@ void RestoreChainJumpFlips1(PPCRegister& r_ObjectPlayer, PPCRegister& r_Message,
     if (pMessage->m_ActorID.get() != -1)
     {
         auto pFixture = GuestToHostFunction<Sonicteam::Fixture*>(sub_821609D0,App::s_pApp->m_pDoc->GetDocMode<Sonicteam::GameMode>()->m_pGameImp->m_spActorManager.get(), &pMessage->m_ActorID);
-        struct Message10007:Sonicteam::SoX::Message
-        {
-            be<uint32_t> m_id;
-            Sonicteam::SoX::Math::Quaternion m_Rotation;
-            Sonicteam::SoX::Math::Vector m_Position;
-        };
-        auto sMessage = guest_stack_var<Message10007>();
-        sMessage->m_id = 0x10007; 
+        auto sMessage = guest_stack_var<Sonicteam::Message::MsgObjJump123GetNextPoint>();
         sMessage->m_Rotation = { 0,0,0,1 };
         sMessage->m_Position = { 0,0,0,1 };
-        if (pFixture->OnMessageRecieved(sMessage))
+        if (pFixture->OnMessageReceived(sMessage))
         {
             Target = sMessage->m_Position;
         }

MarathonRecompLib/config/Marathon.toml

@@ -422,11 +422,6 @@ name = "RestoreChainJumpFlips1"
 address = 0x82199654
 registers = ["r31","r30","r11","f1", "f2", "f3"]
 
-[[midasm_hook]]
-name = "RestoreChainJumpFlips2"
-address = 0x82199654
-registers = ["r10","r11","r3"]
-
 [[midasm_hook]]
 name = "DisablePushState"
 address = 0x821A03F0