sonicnext-dev · ReimousTH · Oct 8, 2025
diff --git a/MarathonRecomp/api/Marathon.h b/MarathonRecomp/api/Marathon.h
@@ -20,6 +20,7 @@
 #include "Sonicteam/AlertWindowTask.h"
 #include "Sonicteam/AppMarathon.h"
 #include "Sonicteam/AudioEngineXenon.h"
+#include "Sonicteam/BasicIScriptParamsDesc.h"
 #include "Sonicteam/ButtonWindowTask.h"
 #include "Sonicteam/CObjBalloonIconDrawable.h"
 #include "Sonicteam/Camera/CameraMode.h"
@@ -55,6 +56,7 @@
 #include "Sonicteam/HintWindowTask.h"
 #include "Sonicteam/HudTextParts.h"
 #include "Sonicteam/ImageFilter.h"
+#include "Sonicteam/KeyframedPath.h"
 #include "Sonicteam/MainDisplayTask.h"
 #include "Sonicteam/MainMenuTask.h"
 #include "Sonicteam/MainMode.h"
@@ -85,19 +87,33 @@
 #include "Sonicteam/NoSyncThread.h"
 #include "Sonicteam/ObjectVehicle.h"
 #include "Sonicteam/ObjectVehicleBike.h"
+#include "Sonicteam/Package.h"
+#include "Sonicteam/PackageBinary.h"
+#include "Sonicteam/PathAnimation/Animation.h"
+#include "Sonicteam/PathAnimation/Controller.h"
+#include "Sonicteam/PathAnimation/Entity.h"
 #include "Sonicteam/PauseAdapter.h"
 #include "Sonicteam/PauseTask.h"
+#include "Sonicteam/Player/AllListener.h"
+#include "Sonicteam/Player/Gravity.h"
+#include "Sonicteam/Player/GroundListener.h"
 #include "Sonicteam/Player/GroundRayListener.h"
 #include "Sonicteam/Player/ICollisionListener.h"
 #include "Sonicteam/Player/ICollisionListenerTemplate.h"
 #include "Sonicteam/Player/IDynamicLink.h"
 #include "Sonicteam/Player/IEventerListener.h"
 #include "Sonicteam/Player/IExportExternalFlag.h"
 #include "Sonicteam/Player/IExportPostureRequestFlag.h"
+#include "Sonicteam/Player/IExportVehicleFlag.h"
 #include "Sonicteam/Player/IExportWeaponRequestFlag.h"
 #include "Sonicteam/Player/IFlagCommunicator.h"
+#include "Sonicteam/Player/IForce.h"
 #include "Sonicteam/Player/IGauge.h"
+#include "Sonicteam/Player/IImportAnimation.h"
+#include "Sonicteam/Player/ILoad.h"
+#include "Sonicteam/Player/IModel.h"
 #include "Sonicteam/Player/INotification.h"
+#include "Sonicteam/Player/IPath.h"
 #include "Sonicteam/Player/IPlugIn.h"
 #include "Sonicteam/Player/IPostureControl.h"
 #include "Sonicteam/Player/IPosturePlugIn.h"
@@ -113,14 +129,23 @@
 #include "Sonicteam/Player/Input/IListener.h"
 #include "Sonicteam/Player/Input/ListenerNormal.h"
 #include "Sonicteam/Player/Input/TimedAction.h"
+#include "Sonicteam/Player/Load.h"
+#include "Sonicteam/Player/MovableBody.h"
 #include "Sonicteam/Player/Object.h"
+#include "Sonicteam/Player/PhysicsBodyList.h"
 #include "Sonicteam/Player/PostureControl.h"
+#include "Sonicteam/Player/PostureEdge.h"
+#include "Sonicteam/Player/PostureVehicle.h"
+#include "Sonicteam/Player/RealGroundRayListener.h"
 #include "Sonicteam/Player/RootFrame.h"
+#include "Sonicteam/Player/RotationGravityAxis.h"
 #include "Sonicteam/Player/Score.h"
 #include "Sonicteam/Player/SonicGauge.h"
 #include "Sonicteam/Player/State/CommonContext.h"
 #include "Sonicteam/Player/State/CommonFall.h"
+#include "Sonicteam/Player/State/CommonGrind.h"
 #include "Sonicteam/Player/State/CommonObject.h"
+#include "Sonicteam/Player/State/CommonSpringTemplate.h"
 #include "Sonicteam/Player/State/ContextSpeedAndJump.h"
 #include "Sonicteam/Player/State/ICommonContext.h"
 #include "Sonicteam/Player/State/ICommonContextIF.h"
@@ -130,9 +155,12 @@
 #include "Sonicteam/Player/State/Object2.h"
 #include "Sonicteam/Player/State/SonicContext.h"
 #include "Sonicteam/Player/State/SonicObject.h"
+#include "Sonicteam/Player/State/SonicState.h"
 #include "Sonicteam/Player/State/TailsContext.h"
 #include "Sonicteam/Player/State/TailsFlight.h"
 #include "Sonicteam/Player/Unit/ITestCase.h"
+#include "Sonicteam/Player/WallListener.h"
+#include "Sonicteam/Player/WallRayListener.h"
 #include "Sonicteam/Player/Weapon/SonicWeapons.h"
 #include "Sonicteam/Player/Zock.h"
 #include "Sonicteam/PropFixture.h"
@@ -187,8 +215,10 @@
 #include "Sonicteam/SaveDataTask.h"
 #include "Sonicteam/SaveDataTaskXENON.h"
 #include "Sonicteam/SelectWindowTask.h"
+#include "Sonicteam/SoX/AI/State.h"
 #include "Sonicteam/SoX/AI/StateMachine.h"
 #include "Sonicteam/SoX/ApplicationXenon.h"
+#include "Sonicteam/SoX/Array.h"
 #include "Sonicteam/SoX/Audio/Cue.h"
 #include "Sonicteam/SoX/Audio/IAudioEngine.h"
 #include "Sonicteam/SoX/Audio/Player.h"
@@ -199,45 +229,58 @@
 #include "Sonicteam/SoX/Engine/DocMode.h"
 #include "Sonicteam/SoX/Engine/RenderProcess.h"
 #include "Sonicteam/SoX/Engine/Task.h"
+#include "Sonicteam/SoX/Graphics/AnimationUserDataListener.h"
 #include "Sonicteam/SoX/Graphics/Device.h"
 #include "Sonicteam/SoX/Graphics/Frame.h"
 #include "Sonicteam/SoX/Graphics/FrameGP.h"
 #include "Sonicteam/SoX/Graphics/FrameObserver.h"
 #include "Sonicteam/SoX/Graphics/Technique.h"
 #include "Sonicteam/SoX/Graphics/TechniqueFXL.h"
+#include "Sonicteam/SoX/Graphics/Texture.h"
 #include "Sonicteam/SoX/Graphics/Transforms.h"
 #include "Sonicteam/SoX/Graphics/Vertex.h"
 #include "Sonicteam/SoX/Graphics/Xenon/DeviceXenon.h"
 #include "Sonicteam/SoX/Graphics/Xenon/TextureXenon.h"
 #include "Sonicteam/SoX/IResource.h"
 #include "Sonicteam/SoX/IResource2.h"
 #include "Sonicteam/SoX/IResourceMgr.h"
+#include "Sonicteam/SoX/Input/Listener.h"
 #include "Sonicteam/SoX/Input/Manager.h"
 #include "Sonicteam/SoX/LinkNode.h"
+#include "Sonicteam/SoX/Math/Math.h"
 #include "Sonicteam/SoX/Math/Matrix.h"
 #include "Sonicteam/SoX/Math/Quaternion.h"
 #include "Sonicteam/SoX/Math/Vector.h"
+#include "Sonicteam/SoX/Math/__vector.h"
 #include "Sonicteam/SoX/Message.h"
 #include "Sonicteam/SoX/MessageReceiver.h"
 #include "Sonicteam/SoX/Object.h"
+#include "Sonicteam/SoX/Physics/Body.h"
 #include "Sonicteam/SoX/Physics/Entity.h"
+#include "Sonicteam/SoX/Physics/EntityRef.h"
 #include "Sonicteam/SoX/Physics/Havok/EntityHavok.h"
 #include "Sonicteam/SoX/Physics/Havok/EntityHavokImp.h"
 #include "Sonicteam/SoX/Physics/Havok/PhantomHavok.h"
+#include "Sonicteam/SoX/Physics/Havok/RayCastHavok.h"
+#include "Sonicteam/SoX/Physics/Havok/ShapeCastHavok.h"
 #include "Sonicteam/SoX/Physics/Havok/WorldHavok.h"
 #include "Sonicteam/SoX/Physics/IntersectEvent.h"
 #include "Sonicteam/SoX/Physics/IntersectListener.h"
 #include "Sonicteam/SoX/Physics/Phantom.h"
 #include "Sonicteam/SoX/Physics/PhantomListener.h"
+#include "Sonicteam/SoX/Physics/RayCast.h"
 #include "Sonicteam/SoX/Physics/Shape.h"
+#include "Sonicteam/SoX/Physics/ShapeCast.h"
 #include "Sonicteam/SoX/Physics/ShapeCastEvent.h"
 #include "Sonicteam/SoX/Physics/ShapeCastListener.h"
 #include "Sonicteam/SoX/Physics/World.h"
 #include "Sonicteam/SoX/RefCountObject.h"
 #include "Sonicteam/SoX/RefSharedPointer.h"
+#include "Sonicteam/SoX/ResourceManager.h"
 #include "Sonicteam/SoX/Scenery/Camera.h"
 #include "Sonicteam/SoX/Scenery/CameraEventCallback.h"
 #include "Sonicteam/SoX/Scenery/CameraImp.h"
+#include "Sonicteam/SoX/Scenery/Clump.h"
 #include "Sonicteam/SoX/Scenery/Drawable.h"
 #include "Sonicteam/SoX/Thread.h"
 #include "Sonicteam/StdImageFilters/BurnoutBlurFilter.h"
@@ -263,22 +306,32 @@
 #include "hk330/hkArray.h"
 #include "hk330/hkReferencedObject.h"
 #include "hk330/hkpBroadPhaseHandle.h"
+#include "hk330/hkpBvShape.h"
 #include "hk330/hkpCdBody.h"
 #include "hk330/hkpCollidable.h"
 #include "hk330/hkpCollidableCollidableFilter.h"
 #include "hk330/hkpCollisionFilter.h"
 #include "hk330/hkpEntity.h"
 #include "hk330/hkpLinkedCollidable.h"
+#include "hk330/hkpMotion.h"
 #include "hk330/hkpPhantom.h"
 #include "hk330/hkpProperty.h"
 #include "hk330/hkpRayCollidableFilter.h"
 #include "hk330/hkpRayShapeCollectionFilter.h"
 #include "hk330/hkpRigidBody.h"
 #include "hk330/hkpShape.h"
 #include "hk330/hkpShapeCollectionFilter.h"
+#include "hk330/hkpShapeContainer.h"
+#include "hk330/hkpShapeSphere.h"
+#include "hk330/hkpSingleShapeContainer.h"
 #include "hk330/hkpTypedBroadPhaseHandle.h"
 #include "hk330/hkpWorld.h"
 #include "hk330/hkpWorldObject.h"
+#include "stdx/RTTI.h"
+#include "stdx/deque.h"
+#include "stdx/list.h"
+#include "stdx/map.h"
 #include "stdx/string.h"
+#include "stdx/type_info.h"
 #include "stdx/vector.h"
 #include "stdx/wstring.h"
diff --git a/MarathonRecomp/api/Marathon.inl b/MarathonRecomp/api/Marathon.inl
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cpu/guest_stack_var.h>
+#include <cpu/guest_heap_var.h>
 #include <kernel/function.h>
 
 constexpr float RAD2DEGf = 57.2958f;
@@ -24,6 +25,9 @@ constexpr double DEG2RAD = 0.01745329238474369;
 #define MARATHON_VIRTUAL_FUNCTION(returnType, virtualIndex, ...) \
     GuestToHostFunction<returnType>(*(be<uint32_t>*)(g_memory.Translate(*(be<uint32_t>*)(this) + (4 * virtualIndex))), __VA_ARGS__)
 
+#define MARATHON_CALL_VIRTUAL_FUNCTION(base, returnType, func, ...) \
+    GuestToHostFunction<returnType>((Vftable*)(static_cast<base*>(this)->m_pVftable.get())->*func, ##__VA_ARGS__)
+
 struct marathon_null_ctor {};
 
 inline std::vector<std::string_view> ParseTextVariables(const char* pVariables)
@@ -138,3 +142,13 @@ inline void printU16(const uint16_t* str, bool endianSwap = false)
 
     printf("\n");
 }
+
+struct MARATHON_NULL_CTOR {};
+
+struct MARATHON_STD_MAP_CONST_CHAR_COMPARE
+{
+    bool operator()(xpointer<const char> lhs, xpointer<const char> rhs) const
+    {
+        return std::strcmp(lhs.get(), rhs.get()) < 0;
+    }
+};
diff --git a/MarathonRecomp/api/Sonicteam/ActorManager.h b/MarathonRecomp/api/Sonicteam/ActorManager.h
@@ -8,16 +8,13 @@ namespace Sonicteam
     class ActorManager
     {
     public:
-		be<uint32_t> m_aActorIDs[0xFFFF];
-		xpointer<Actor> m_aActors[0xFFFF];
-		be<uint32_t> m_LastActorID;
-		be<uint32_t> m_LastActorIndex;
-        MARATHON_INSERT_PADDING(4);
-    };
+        be<uint32_t> m_ActorID[0xFFFF];
+        xpointer<Actor> m_Actor[0xFFFF];
+        be<uint32_t> m_LastActorID;
+        be<uint32_t> m_LastActorIndex;
 
-    MARATHON_ASSERT_OFFSETOF(ActorManager, m_aActorIDs, 0x00);
-    MARATHON_ASSERT_OFFSETOF(ActorManager, m_aActors, 0x3FFFC);
-    MARATHON_ASSERT_OFFSETOF(ActorManager, m_LastActorID, 0x7FFF8);
-    MARATHON_ASSERT_OFFSETOF(ActorManager, m_LastActorIndex, 0x7FFFC);
-    MARATHON_ASSERT_SIZEOF(ActorManager, 0x80004);
+        Sonicteam::Actor* FindActor(uint32_t ActorID);
+    };
 }
+
+#include "ActorManager.inl"
diff --git a/MarathonRecomp/api/Sonicteam/ActorManager.inl b/MarathonRecomp/api/Sonicteam/ActorManager.inl
@@ -0,0 +1,27 @@
+#pragma once
+
+namespace Sonicteam
+{
+    inline Actor* ActorManager::FindActor(uint32_t ActorID)
+    {
+        unsigned int left = 0;
+        unsigned int right = this->m_LastActorIndex - 1;
+        int Index = 0;
+
+        while (left <= right) {
+            unsigned int mid = left + (right - left) / 2;
+            if (this->m_ActorID[mid] == ActorID) {
+                Index = mid;
+                break;
+            }
+            if (this->m_ActorID[mid] < ActorID) {
+                left = mid + 1;
+            }
+            else {
+                right = mid - 1;
+            }
+        }
+        if (!this->m_Actor[Index]) return 0;
+        return this->m_Actor[Index];
+    }
+}
diff --git a/MarathonRecomp/api/Sonicteam/BasicIScriptParamsDesc.h b/MarathonRecomp/api/Sonicteam/BasicIScriptParamsDesc.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Engine/Task.h>
+
+namespace Sonicteam
+{
+    class BasicIScriptParamsDesc
+    {
+        xpointer<void> m_pDefaultDesc; // Points to static ?
+    };
+
+    // Static 0x8202AC38 ?
+}
diff --git a/MarathonRecomp/api/Sonicteam/DocMarathonImp.h b/MarathonRecomp/api/Sonicteam/DocMarathonImp.h
@@ -1,26 +1,49 @@
 #pragma once
 
 #include <Marathon.inl>
+#include <boost/smart_ptr/shared_ptr.h>
 #include <Sonicteam/SoX/Engine/Doc.h>
 #include <Sonicteam/SoX/Input/Manager.h>
-#include <boost/smart_ptr/shared_ptr.h>
-#include <api/stdx/vector.h>
+#include <Sonicteam/SoX/LinkNode.h>
+#include <Sonicteam/SoX/Thread.h>
+#include <Sonicteam/MyGraphicsDevice.h>
+#include <Sonicteam/RaderMapManager.h>
+#include <stdx/vector.h>
 
 namespace Sonicteam
 {
+    class RenderTargetContainer;
+    class SFXAgent;
+
     class DocMarathonImp : public SoX::Engine::Doc
     {
     public:
-        MARATHON_INSERT_PADDING(0x40);
-        stdx::vector<boost::shared_ptr<SoX::Input::Manager>> m_vspInputManager;
+        MARATHON_INSERT_PADDING(4);
+        xpointer<MyGraphicsDevice> m_pMyGraphicsDevice;
+        MARATHON_INSERT_PADDING(0x38);
+        stdx::vector<boost::shared_ptr<SoX::Input::Manager>> m_vspInputManagers;
         MARATHON_INSERT_PADDING(0x24);
         bool m_VFrame;
-        MARATHON_INSERT_PADDING(0x55B58);
+        MARATHON_INSERT_PADDING(4);
+        xpointer<RenderTargetContainer> m_pRenderTargetContainer;
+        xpointer<SFXAgent> m_pSFXAgent;
+        MARATHON_INSERT_PADDING(0x8);
+        be<float> m_DocSpeed;
+        be<uint32_t> m_PauseFlags;
+        MARATHON_INSERT_PADDING(0x8);
+        xpointer<SoX::LinkedList<SoX::Thread>> m_lnThread;
+        MARATHON_INSERT_PADDING(0x288);
+        xpointer<void> m_pParticleManager;
+        MARATHON_INSERT_PADDING(0x15D0);
+        xpointer<RaderMapManager> m_pRaderMapManager;
+        MARATHON_INSERT_PADDING(0x542D0);
         be<uint32_t> m_aPadIDs[4];
         MARATHON_INSERT_PADDING(0x2C);
     };
 
-    MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_vspInputManager, 0x9C);
+    MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_DocSpeed, 0xE8);
+    MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_PauseFlags, 0xEC);
+    MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_vspInputManagers, 0x9C);
     MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_VFrame, 0xD0);
     MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_aPadIDs, 0x55C2C);
     MARATHON_ASSERT_SIZEOF(DocMarathonImp, 0x55C68);

diff --git a/MarathonRecomp/api/Sonicteam/KeyframedPath.h b/MarathonRecomp/api/Sonicteam/KeyframedPath.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/PathAnimation/Animation.h>
+
+namespace Sonicteam
+{
+    class KeyframedPath : public PathAnimation::Animation
+    {
+        MARATHON_INSERT_PADDING(0x14);
+    };
+
+    MARATHON_ASSERT_SIZEOF(KeyframedPath, 0x1C);
+}
diff --git a/MarathonRecomp/api/Sonicteam/Package.h b/MarathonRecomp/api/Sonicteam/Package.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/IResource2.h>
+
+namespace Sonicteam
+{
+    class PackageMgr;
+
+    class Package : public SoX::IResource2<Sonicteam::Package, Sonicteam::PackageMgr> {};
+
+    MARATHON_ASSERT_SIZEOF(Package, 0x64);
+}
diff --git a/MarathonRecomp/api/Sonicteam/PackageBinary.h b/MarathonRecomp/api/Sonicteam/PackageBinary.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/Package.h>
+
+namespace Sonicteam
+{
+    class PackageBinary : public Package
+    {
+    public:
+        MARATHON_INSERT_PADDING(0x18);
+    };
+
+    MARATHON_ASSERT_SIZEOF(PackageBinary, 0x7C);
+}