API: mapped state context

Author: hyperbx

MarathonRecomp/api/Marathon.h

@@ -61,6 +61,9 @@
 #include "Sonicteam/Player/State/IMachine.h"
 #include "Sonicteam/Player/State/Machine2.h"
 #include "Sonicteam/Player/State/Object2.h"
+#include "Sonicteam/Player/State/SonicContext.h"
+#include "Sonicteam/Player/State/SonicObject.h"
+#include "Sonicteam/Player/State/SonicSpinDash.h"
 #include "Sonicteam/Player/State/TailsContext.h"
 #include "Sonicteam/Player/Zock.h"
 #include "Sonicteam/SaveDataTask.h"

MarathonRecomp/api/Sonicteam/Player/State/ICommonContext.h

@@ -10,6 +10,12 @@ namespace Sonicteam::Player::State
     class ICommonContext : public IContext, public ICommonContextIF, public ContextSpeedAndJump
     {
     public:
-        MARATHON_INSERT_PADDING(0x60);
+        MARATHON_INSERT_PADDING(0x10);
+        be<uint32_t> m_StateID;
+        MARATHON_INSERT_PADDING(0x10);
+        be<uint32_t> m_Buttons;
+        MARATHON_INSERT_PADDING(0x18);
+        be<int32_t> m_Field70;
+        MARATHON_INSERT_PADDING(0x1C);
     };
 }

MarathonRecomp/api/Sonicteam/Player/State/SonicContext.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <Marathon.inl>
+
+namespace Sonicteam::Player::State
+{
+    class SonicContext : public CommonContext {};
+}

MarathonRecomp/api/Sonicteam/Player/State/SonicObject.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <Marathon.inl>
+
+namespace Sonicteam::Player::State
+{
+    class SonicObject : public CommonObject {};
+}

MarathonRecomp/api/Sonicteam/Player/State/SonicSpinDash.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <Marathon.inl>
+
+namespace Sonicteam::Player::State
+{
+    class SonicSpinDash : public SonicObject {};
+}

MarathonRecomp/api/Sonicteam/SoX/AI/StateMachine.h

@@ -4,14 +4,21 @@
 
 namespace Sonicteam::SoX::AI
 {
-    template <typename T>
+    template <typename TState>
     class StateMachine
     {
     public:
         xpointer<void> m_pVftable;
-        xpointer<StateMachine<T>> m_pState;
-        MARATHON_INSERT_PADDING(0x10);
-        be<float> m_Time;
+        xpointer<StateMachine<TState>> m_pState;
+        MARATHON_INSERT_PADDING(4);
+        xpointer<IContext> m_pContext;
         MARATHON_INSERT_PADDING(4);
+        be<float> m_Time;
+
+        template <typename TContext = IContext>
+        TContext* GetContext()
+        {
+            return (TContext*)m_pContext.get();
+        }
     };
 }