DebugPlayerSwitch

Author: ReimousTH

MarathonRecomp/api/Marathon.h

@@ -58,10 +58,12 @@
 #include "Sonicteam/SoX/Object.h"
 #include "Sonicteam/SoX/Physics/Havok/WorldHavok.h"
 #include "Sonicteam/SoX/Physics/World.h"
+#include "Sonicteam/SoX/Input/Manager.h"
 #include "Sonicteam/SoX/RefCountObject.h"
 #include "Sonicteam/System/CreateStatic.h"
 #include "Sonicteam/System/Singleton.h"
 #include "Sonicteam/TitleTask.h"
 #include "boost/smart_ptr/make_shared_object.h"
 #include "boost/smart_ptr/shared_ptr.h"
 #include "stdx/string.h"
+#include "stdx/vector.h"

MarathonRecomp/api/Sonicteam/DocMarathonImp.h

@@ -2,13 +2,21 @@
 
 #include <Marathon.inl>
 #include <Sonicteam/SoX/Engine/Doc.h>
+#include <Sonicteam/SoX/Input/Manager.h>
+#include <boost/smart_ptr/shared_ptr.h>
+#include <api/stdx/vector.h>
+
 
 namespace Sonicteam
 {
     class DocMarathonImp : public SoX::Engine::Doc
     {
     public:
-        MARATHON_INSERT_PADDING(0x74);
+        MARATHON_INSERT_PADDING(0x40);
+        stdx::vector<boost::shared_ptr<Sonicteam::SoX::Input::Manager>> m_vspInputManager;
+        MARATHON_INSERT_PADDING(0x24);
         bool m_VFrame;
+        MARATHON_INSERT_PADDING(0x55B58);
+        be<uint32_t> m_PlayerControllerID[4];
     };
 }

MarathonRecomp/api/Sonicteam/GameImp.h

@@ -36,6 +36,16 @@ namespace Sonicteam
 
         template <typename T>
         inline T* GetPhysicsWorld();
+
+        uint32_t PlayerActorIDToIndex(uint32_t ActorID)
+        {
+            for (int i = 0; i < 4; i++)
+            {
+                if (m_PlayerData[i].ActorID == ActorID)
+                    return i;
+            }
+            return -1;
+        }
     };
 }
 

MarathonRecomp/api/Sonicteam/Player/Object.h

@@ -10,9 +10,15 @@ namespace Sonicteam::Player
     public:
         MARATHON_INSERT_PADDING(0x40);
         be<uint32_t> m_PlayerIndex;
-        MARATHON_INSERT_PADDING(0x48);
+        MARATHON_INSERT_PADDING(0x2C);
+        uint8_t isPlayer;
+        uint8_t isPosture;
+        uint8_t isAI;
+        MARATHON_INSERT_PADDING(0x19);
         boost::shared_ptr<State::Machine2> m_spStateMachine;
-        MARATHON_INSERT_PADDING(0x18);
+        MARATHON_INSERT_PADDING(0x10);
+        be<uint32_t> m_SetupModuleIndexPre;
+        be<uint32_t> m_SetupModuleIndexPost;
         boost::shared_ptr<IGauge> m_spGauge;
         MARATHON_INSERT_PADDING(0x204);
 

MarathonRecomp/api/Sonicteam/SoX/Input/Manager.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include <Marathon.inl>
+
+namespace Sonicteam::SoX::Input
+{
+    static const uint32_t XENON_GAMEPAD_BACK = 2048;
+    struct MGamepad
+    {
+        be<uint32_t> wLastButtons;
+        be<uint32_t> wCLastButtons; // ~wLastButtons
+        MARATHON_INSERT_PADDING(8);
+
+        //Left Stick
+        be<float> fX1;
+        be<float> fY1;
+        be<short> sThumbLX;
+        be<short> sThumbLY;
+
+        //Right Stick
+        be<float> fX2;
+        be<float> fY2;
+        be<short> sThumbRX;
+        be<short> sThumbRY;
+    };
+
+    class Manager
+    {
+    public:
+        be<uint32_t> m_ControllerID;
+        MARATHON_INSERT_PADDING(0xC);
+        MGamepad m_Gamepad;
+        MARATHON_INSERT_PADDING(0x28);
+    };
+}

MarathonRecomp/api/stdx/string.h

@@ -3,6 +3,7 @@
 #include <kernel/heap.h>
 #include <kernel/function.h>
 
+
 namespace stdx
 {
     class string
@@ -56,9 +57,28 @@ namespace stdx
             _Myres = 0xF;
             _Mysize = 0;
             _bx._buffer[0] = '\0';
+            from_cstr(str);
+        }
 
-            auto len = strlen(str);
+        ~string()
+        {
+            cleanup();
+            _Myres = 0xF;
+            _Mysize = 0;
+            _bx._buffer[0] = '\0';
+        }
 
+
+        void cleanup()
+        {
+            if (!is_short()) {
+                g_userHeap.Free((void*)_bx._str.get());
+            }
+        }
+
+        void from_cstr(const char* str)
+        {
+            auto len = strlen(str);
             if (len <= 0xF)
             {
                 memcpy((void*)&_bx._buffer, str, len + 1);
@@ -68,6 +88,7 @@ namespace stdx
             {
                 if (is_short() || capacity() < len + 1)
                 {
+                    cleanup();
                     char* new_buf = g_userHeap.Alloc<char>(len + 1);
                     memset((void*)(new_buf), 0, len + 1);
                     memcpy((void*)(new_buf), (const void*)(str), len + 1);
@@ -83,14 +104,10 @@ namespace stdx
             }
         }
 
-        ~string()
+        string& operator=(const char* str)
         {
-            if (!is_short())
-                g_userHeap.Free((void*)_bx._str.get());
-
-            _Myres = 0xF;
-            _Mysize = 0;
-            _bx._buffer[0] = '\0';
+            from_cstr(str);
+            return *this;
         }
 
         bool operator==(const char* str) const

MarathonRecomp/api/stdx/vector.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <kernel/heap.h>
+#include <kernel/function.h>
+
+namespace stdx
+{
+    template <typename Type>
+    struct vector
+    {
+        be<uint32_t> _MyProxy;
+        xpointer<Type> _MyFirst;
+        xpointer<Type> _MyLast;
+        xpointer<Type> _MyEnd;
+
+        Type& operator[](uint32_t index)
+        {
+            return *(Type*)((uint64_t)_MyFirst.get() + (index * sizeof(Type)));
+        }
+        size_t size()
+        {
+            return (_MyLast.ptr.get() - _MyFirst.ptr.get()) / sizeof(Type);
+        }
+    };
+}

MarathonRecomp/patches/player_patches.cpp

@@ -99,3 +99,55 @@ bool MidairSnowboardControl3()
 {
     return Config::MidairControlForSnowboards;
 }
+
+
+//Add Missing SetupModuleDebug to table
+void DebugPlayerSwitch_0(PPCRegister& r_sstring, PPCRegister& r_index)
+{
+    if (!Config::DebugSwitch)
+    {
+        return;
+    }
+
+    auto pString = (stdx::string*)(g_memory.Translate(r_sstring.u32));
+    auto Index = r_index.u32;
+    switch (Index)
+    {
+    case 0:
+        *pString = "SetupModuleDebug";
+        break;
+    case 1:
+        *pString = "SetupModule";
+        break;
+    case 2:
+        *pString = "SetupModuleDebug";
+        break;
+    }
+}
+
+PPC_FUNC_IMPL(__imp__sub_82195500);
+PPC_FUNC(sub_82195500)
+{
+    if (!Config::DebugSwitch)
+    {
+        __imp__sub_82195500(ctx, base);
+        return;
+    }
+
+    auto pDoc = App::s_pApp->m_pDoc;
+    auto pGameImp = App::s_pApp->m_pDoc->GetDocMode<Sonicteam::GameMode>()->m_pGameImp;
+    auto pPlayer = (Sonicteam::Player::Object*)(base + ctx.r3.u32);
+
+
+    if (pPlayer->m_SetupModuleIndexPost != -2 && pPlayer->isPlayer)
+    {
+        auto PIndex = pGameImp->PlayerActorIDToIndex(pPlayer->m_ActorID);
+        auto PManager = pDoc->m_vspInputManager[pDoc->m_PlayerControllerID[PIndex].get()].get();
+        if ((PManager->m_Gamepad.wLastButtons.get() & Sonicteam::SoX::Input::XENON_GAMEPAD_BACK) != 0)
+        {
+            pPlayer->m_SetupModuleIndexPost = 2;
+        }
+    }
+
+    __imp__sub_82195500(ctx, base);
+}

MarathonRecomp/user/config_def.h

@@ -80,6 +80,7 @@ CONFIG_DEFINE_HIDDEN("Codes", bool, DisableLowResolutionFontOnCustomUI, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, RestoreContextualHUDColours, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, DisableEdgeGrabLeftover, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, TailsGauge, false);
+CONFIG_DEFINE_HIDDEN("Codes", bool, DebugSwitch, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, MidairControlForMachSpeed, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, MidairControlForSnowboards, false);
 

MarathonRecompLib/config/Marathon.toml

@@ -199,3 +199,10 @@ registers = ["r4"]
 name = "FurtherObjectShadows"
 address = 0x8260D7E0
 registers = ["r26"]
+
+
+
+[[midasm_hook]]
+name = "DebugPlayerSwitch_0"
+address = 0x82195AD0
+registers = ["r5","r27"]