Proper WindowsResize

ReimousTH · ReimousTH · commit c5221cd7368e · 2025-11-07T22:24:02.000+03:00
Particles &amp; CSM &amp; Reflection &amp; Hint Text &amp; Combo Text
TODO : Proper Main Menu MST Text during Resize
diff --git a/MarathonRecomp/api/Sonicteam/DocMarathonImp.h b/MarathonRecomp/api/Sonicteam/DocMarathonImp.h
@@ -9,6 +9,8 @@
 #include <Sonicteam/RaderMapManager.h>
 #include <Sonicteam/RenderTargetContainer.h>
 #include <Sonicteam/Particles/ParticleManager.h>
+#include <Sonicteam/SoX/LinkNode.h>
+#include <Sonicteam/SoX/Thread.h>
 #include <stdx/vector.h>
 
 namespace Sonicteam
@@ -25,16 +27,22 @@ namespace Sonicteam
         MARATHON_INSERT_PADDING(4);
         xpointer<RenderTargetContainer> m_pRenderTargetContainer;
         xpointer<SFXAgent> m_pSFXAgent;
-        MARATHON_INSERT_PADDING(0x2A4);
+        MARATHON_INSERT_PADDING(0xC);
+        be<uint32_t> m_PauseFlags;
+        MARATHON_INSERT_PADDING(0x8);
+        xpointer<SoX::LinkedList<SoX::Thread>> m_lnThread;
+        MARATHON_INSERT_PADDING(0x288);
         xpointer<Particles::ParticleManager> m_pParticleManager;
         MARATHON_INSERT_PADDING(0x15D0);
         xpointer<RaderMapManager> m_pRaderMapManager;
         MARATHON_INSERT_PADDING(0x542D0);
         be<uint32_t> m_aPadIDs[4];
     };
 
+    MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_PauseFlags, 0xEC);
     MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_vspInputManager, 0x9C);
     MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_VFrame, 0xD0);
     MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_aPadIDs, 0x55C2C);
-    MARATHON_ASSERT_SIZEOF(DocMarathonImp, 0x55C68);
+    MARATHON_ASSERT_SIZEOF(DocMarathonImp, 0x55C3C);
+
 }
diff --git a/MarathonRecomp/api/Sonicteam/DocMarathonState.h b/MarathonRecomp/api/Sonicteam/DocMarathonState.h
@@ -7,5 +7,5 @@ namespace Sonicteam
 {
     class DocMarathonState : public DocMarathonImp {};
 
-    MARATHON_ASSERT_SIZEOF(DocMarathonState, 0x55C68);
+    MARATHON_ASSERT_SIZEOF(DocMarathonState, 0x55C3C);
 }
diff --git a/MarathonRecomp/api/Sonicteam/GE1PE/EffectBank.h b/MarathonRecomp/api/Sonicteam/GE1PE/EffectBank.h
@@ -23,6 +23,11 @@ namespace Sonicteam::GE1PE
         xpointer<void> m_Data3;
         stdx::map<stdx::string, be<uint32_t>> m_EffectDataIndices; //barrier_g = 0x23
     };
+    MARATHON_ASSERT_OFFSETOF(EffectBankData, m_Field0, 0);
+    MARATHON_ASSERT_OFFSETOF(EffectBankData, m_DataName, 4);
+    MARATHON_ASSERT_OFFSETOF(EffectBankData, m_Data1, 0x20);
+    MARATHON_ASSERT_OFFSETOF(EffectBankData, m_Data2, 0x24);
+    MARATHON_ASSERT_OFFSETOF(EffectBankData, m_Data3, 0x28);
     MARATHON_ASSERT_OFFSETOF(EffectBankData, m_EffectDataIndices, 0x2C);
     MARATHON_ASSERT_SIZEOF(EffectBankData, 0x38);
 
@@ -33,5 +38,8 @@ namespace Sonicteam::GE1PE
         be<uint32_t> m_FieldC; //index ?
         xpointer<EffectBankData> m_pEffectBankA;
     };
+    MARATHON_ASSERT_OFFSETOF(EffectBank,m_pParticleEngine, 8);
+    MARATHON_ASSERT_OFFSETOF(EffectBank,m_FieldC, 0xC);
+    MARATHON_ASSERT_OFFSETOF(EffectBank, m_pEffectBankA, 0x10);
     MARATHON_ASSERT_SIZEOF(EffectBank, 0x14);
 }
diff --git a/MarathonRecomp/api/Sonicteam/GE1PE/Manager.h b/MarathonRecomp/api/Sonicteam/GE1PE/Manager.h
@@ -39,5 +39,5 @@ namespace Sonicteam::GE1PE
     MARATHON_ASSERT_OFFSETOF(Manager, m_lnEmitter, 0x44);
     MARATHON_ASSERT_OFFSETOF(Manager, m_lnEffect, 0x50);
     MARATHON_ASSERT_OFFSETOF(Manager, m_lnField5C, 0x5C);
-    //size == 0x34 (but PE::MyPlugin no idea about this)
+
 }
diff --git a/MarathonRecomp/api/Sonicteam/GE1PE/ParticleEngine.h b/MarathonRecomp/api/Sonicteam/GE1PE/ParticleEngine.h
@@ -31,6 +31,10 @@ namespace Sonicteam::GE1PE
         SoX::LinkNode<Manager> m_lnManager;
         stdx::vector<void> m_vField6C;
     };
+    MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_spPlugin, 4);
+    MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_mEffectIndicies, 0xC);
+    MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_mTextureIndicies, 0x18);
+    MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_MaterialIndicies, 0x24);
     MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_vpEffectBank, 0x30);
     MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_vpTextureBank, 0x40);
     MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_vpMaterialBank, 0x50);
diff --git a/MarathonRecomp/api/Sonicteam/GE1PE/Plugin.h b/MarathonRecomp/api/Sonicteam/GE1PE/Plugin.h
@@ -17,5 +17,5 @@ namespace Sonicteam::GE1PE
         xpointer<Vftable> m_pVftable;
         xpointer<SoX::Engine::Doc> m_pDoc;
     };
-    //size == 0x34 (but PE::MyPlugin no idea about this)
+
 }
diff --git a/MarathonRecomp/api/Sonicteam/HUDPopupScreen.h b/MarathonRecomp/api/Sonicteam/HUDPopupScreen.h
@@ -36,16 +36,16 @@ namespace Sonicteam
         MARATHON_INSERT_PADDING(8);
     };
 
-    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_pCsdObject, 0x4C);
-    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_pMainTexture, 0x50);
-    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_pMaskTexture, 0x54);
-    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_pTechnique, 0x58);
-    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_SceneName, 0x5C);
-    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_SpriteName, 0x78);
-    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_State, 0x94);
-    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_IsClosing, 0x99);
-    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_ClosingTime, 0x9C);
-    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_X, 0xA0);
-    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_Y, 0xA4);
-    MARATHON_ASSERT_SIZEOF(HUDPopupScreen, 0xB0);
+    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_pCsdObject, 0x54);
+    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_pMainTexture, 0x58);
+    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_pMaskTexture, 0x5C);
+    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_pTechnique, 0x60);
+    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_SceneName, 0x64);
+    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_SpriteName, 0x80);
+    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_State, 0x9C);
+    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_IsClosing, 0xA1);
+    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_ClosingTime, 0xA4);
+    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_X, 0xA8);
+    MARATHON_ASSERT_OFFSETOF(HUDPopupScreen, m_Y, 0xAC);
+    MARATHON_ASSERT_SIZEOF(HUDPopupScreen, 0xB8);
 }
diff --git a/MarathonRecomp/api/Sonicteam/HUDRaderMap.h b/MarathonRecomp/api/Sonicteam/HUDRaderMap.h
@@ -7,5 +7,4 @@ namespace Sonicteam
 {
     class HUDRaderMap : public HUDPopupScreen {};
 
-    MARATHON_ASSERT_SIZEOF(HUDRaderMap, 0xB0);
 }
diff --git a/MarathonRecomp/api/Sonicteam/LuaNode.h b/MarathonRecomp/api/Sonicteam/LuaNode.h
@@ -16,4 +16,6 @@ namespace Sonicteam
         xpointer<Vftable> m_pVftable;
         lua50::lua_State m_pLuaState;
     };
+
+    MARATHON_ASSERT_SIZEOF(LuaNode, 8);
 }
diff --git a/MarathonRecomp/api/Sonicteam/LuaNodeImp.h b/MarathonRecomp/api/Sonicteam/LuaNodeImp.h
@@ -63,4 +63,28 @@ namespace Sonicteam
 
         stdx::string m_LuaTable;
     };
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpGetTableString, 4);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpGetTableConstString, 8);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpGetTableConstStringFast, 0xC);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpGetRoot, 0x10);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpGetEmptyNode, 0x14);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpIsTableExist, 0x18);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpIsRoot, 0x1C);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpSetTablePath, 0x20);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpCallFunction, 0x24);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpCallFunction2, 0x28);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpCallFunction3, 0x2C);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpIsNumber, 0x30);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpGetNumber, 0x34);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpSetNumber, 0x38);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpGetNumberFloat, 0x3C);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpSetNumberFloat, 0x40);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpGetString, 0x44);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpSetString, 0x48);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpIsBoolean, 0x4C);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpGetBoolean, 0x50);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpSetBoolean, 0x54);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpSetNil, 0x58);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpRegisterFunctions, 0x5C);
+    MARATHON_ASSERT_OFFSETOF(LuaNodeImp::Vftable, fpFunc60, 0x60);
 }
diff --git a/MarathonRecomp/api/Sonicteam/MyGraphicsDevice.h b/MarathonRecomp/api/Sonicteam/MyGraphicsDevice.h
@@ -29,5 +29,5 @@ namespace Sonicteam
         MARATHON_INSERT_PADDING(0x180); 
     };
 
-    MARATHON_ASSERT_SIZEOF(MyGraphicsDevice, 0x350);
+    MARATHON_ASSERT_SIZEOF(MyGraphicsDevice, 0x30C);
 }
diff --git a/MarathonRecomp/api/Sonicteam/MyPE/CManageParticle.h b/MarathonRecomp/api/Sonicteam/MyPE/CManageParticle.h
@@ -48,4 +48,8 @@ namespace Sonicteam::MyPE
     MARATHON_ASSERT_OFFSETOF(CManageParticle, m_lContainer, 0x24);
     MARATHON_ASSERT_OFFSETOF(CManageParticle, m_lnParticle, 0x30);
     MARATHON_ASSERT_OFFSETOF(CManageParticle, m_pManagerParticleTask, 0x3C);
+    MARATHON_ASSERT_OFFSETOF(CManageParticle, m_spManager, 0x44);
+    MARATHON_ASSERT_OFFSETOF(CManageParticle, m_spMyPlugin, 0x4C);
+    MARATHON_ASSERT_OFFSETOF(CManageParticle, m_MyEmitterListener, 0x54);
+    MARATHON_ASSERT_SIZEOF(CManageParticle, 0x84);
 }
diff --git a/MarathonRecomp/api/Sonicteam/MyPE/EffectBankLoad.h b/MarathonRecomp/api/Sonicteam/MyPE/EffectBankLoad.h
@@ -8,12 +8,12 @@
 namespace Sonicteam::MyPE
 {
     class EffectBankLoadManager;
-
     class TextureBankLoad; //implement later
 
     class EffectBankLoad : public SoX::IResource2<EffectBankLoad, EffectBankLoadManager>
     {
     public:
         SoX::RefSharedPointer<MyEffectBank> m_spMyEffectBank;
     };
+    MARATHON_ASSERT_OFFSETOF(EffectBankLoad, m_spMyEffectBank, 0x64);
 }
diff --git a/MarathonRecomp/api/Sonicteam/NoSyncThread.h b/MarathonRecomp/api/Sonicteam/NoSyncThread.h
@@ -11,5 +11,4 @@ namespace Sonicteam
         MARATHON_INSERT_PADDING(4);
     };
 
-    MARATHON_ASSERT_SIZEOF(NoSyncThread, 0x4C);
 }
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Component.h b/MarathonRecomp/api/Sonicteam/SoX/Component.h
@@ -14,6 +14,12 @@ namespace Sonicteam::SoX
     class Component : public Object
     {
     public:
+        struct Vftable : public Object::Vftable
+        {
+            be<uint32_t> fpDestroy;
+            be<uint32_t> fpUpdate;
+        };
+
         xpointer<Component> m_pParent;
         LinkNode<Component> m_lnComponent;
         LinkedList<Component> m_llComponent;
@@ -23,8 +29,14 @@ namespace Sonicteam::SoX
         {
             return (T*)m_pParent.get();
         }
+
+        void Update(float delta)
+        {
+            auto vft = (Vftable*)m_pVftable.get();
+            GuestToHostFunction<void>(vft->fpUpdate, this,delta);
+        }
     };
 
-    MARATHON_ASSERT_OFFSETOF(Component, m_pDocMode, 0x04);
+    MARATHON_ASSERT_OFFSETOF(Component, m_pParent, 0x04);
     MARATHON_ASSERT_SIZEOF(Component, 0x20);
 }
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Engine/Doc.h b/MarathonRecomp/api/Sonicteam/SoX/Engine/Doc.h
@@ -19,7 +19,8 @@ namespace Sonicteam::SoX::Engine
         MARATHON_INSERT_PADDING(8);
         xpointer<Task> m_pDocModeExecutor;
         xpointer<RenderScheduler> m_pRenderScheduler;
-        MARATHON_INSERT_PADDING(0x38);
+        XRTL_CRITICAL_SECTION m_CriticalSection1;
+        XRTL_CRITICAL_SECTION m_CriticalSection2;
 
         template <typename T = DocMode>
         inline T* GetDocMode()
@@ -33,5 +34,8 @@ namespace Sonicteam::SoX::Engine
     MARATHON_ASSERT_OFFSETOF(Doc, m_pRootTask, 0x0C);
     MARATHON_ASSERT_OFFSETOF(Doc, m_pRootGTask, 0x10);
     MARATHON_ASSERT_OFFSETOF(Doc, m_pDocModeExecutor, 0x1C);
+    MARATHON_ASSERT_OFFSETOF(Doc, m_pRenderScheduler, 0x20);
+    MARATHON_ASSERT_OFFSETOF(Doc, m_CriticalSection1, 0x24);
+    MARATHON_ASSERT_OFFSETOF(Doc, m_CriticalSection2, 0x40);
     MARATHON_ASSERT_SIZEOF(Doc, 0x5C);
 }
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Engine/Task.h b/MarathonRecomp/api/Sonicteam/SoX/Engine/Task.h
@@ -12,7 +12,8 @@ namespace Sonicteam::SoX::Engine
     class Task : public Component, public MessageReceiver
     {
     public:
-        be<uint32_t> m_Flags;
+        char m_Flag1;
+        MARATHON_INSERT_PADDING(3);
         be<uint32_t> m_Timestamp;
         xpointer<Task> m_pPrevSibling;
         xpointer<Task> m_pNextSibling;
@@ -21,7 +22,34 @@ namespace Sonicteam::SoX::Engine
         xpointer<Doc> m_pDoc;
         LinkNode<Task> m_lnTask;
 
-        Task* GetFirstDependency() const 
+        class Iterator
+        {
+        public:
+            Iterator(Task* current = nullptr) : m_current(current) {}
+
+            Task& operator*() const { return *m_current; }
+            Task* operator->() const { return m_current; }
+
+            Iterator& operator++()
+            {
+                if (m_current)
+                    m_current = m_current->m_pPrevSibling.get();
+                return *this;
+            }
+
+            bool operator!=(const Iterator& other) const
+            {
+                return m_current != other.m_current;
+            }
+
+        private:
+            Task* m_current;
+        };
+
+        Iterator begin() { return Iterator(this); }
+        Iterator end() { return Iterator(nullptr); }
+
+        Task* GetFirstDependency() const
         {
             if (!m_pDependencies)
                 return nullptr;
@@ -39,14 +67,14 @@ namespace Sonicteam::SoX::Engine
             return m_pDependencies.get();
         }
 
-        template <typename T = Doc>
+        template <typename T = Engine::Doc>
         T* GetDoc()
         {
             return (T*)m_pDoc.get();
         }
     };
 
-    MARATHON_ASSERT_OFFSETOF(Task, m_Flags, 0x24);
+    MARATHON_ASSERT_OFFSETOF(Task, m_Flag1, 0x24);
     MARATHON_ASSERT_OFFSETOF(Task, m_Timestamp, 0x28);
     MARATHON_ASSERT_OFFSETOF(Task, m_pPrevSibling, 0x2C);
     MARATHON_ASSERT_OFFSETOF(Task, m_pNextSibling, 0x30);
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Graphics/Device.h b/MarathonRecomp/api/Sonicteam/SoX/Graphics/Device.h
@@ -29,8 +29,17 @@ namespace Sonicteam::SoX::Graphics
         MARATHON_INSERT_PADDING(0xC);
     };
 
-    MARATHON_ASSERT_OFFSETOF(Device, m_pVftable, 0x00);
+    MARATHON_ASSERT_OFFSETOF(Device, m_DBRFlag, 0x18);
     MARATHON_ASSERT_OFFSETOF(Device, m_Field40, 0x40);
     MARATHON_ASSERT_OFFSETOF(Device, m_Field80, 0x80);
+    MARATHON_ASSERT_OFFSETOF(Device, m_Field84, 0x84);
+    MARATHON_ASSERT_OFFSETOF(Device, m_Field84, 0x84);
+    MARATHON_ASSERT_OFFSETOF(Device, m_Width1, 0x8C);
+    MARATHON_ASSERT_OFFSETOF(Device, m_Height1, 0x90);
+    MARATHON_ASSERT_OFFSETOF(Device, m_Field94, 0x94);
+    MARATHON_ASSERT_OFFSETOF(Device, m_Field98, 0x98);
+    MARATHON_ASSERT_OFFSETOF(Device, m_Width2, 0x9C);
+    MARATHON_ASSERT_OFFSETOF(Device, m_Height2, 0xA0);
+    MARATHON_ASSERT_OFFSETOF(Device, m_FrameBufferObject, 0xC0);
     MARATHON_ASSERT_SIZEOF(Device, 0xD0);
 }
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Graphics/Xenon/DeviceXenon.h b/MarathonRecomp/api/Sonicteam/SoX/Graphics/Xenon/DeviceXenon.h
@@ -26,6 +26,15 @@ namespace Sonicteam::SoX::Graphics::Xenon
         SoX::RefSharedPointer<Graphics::Surface> m_spColorTile4X;
         SoX::RefSharedPointer<Graphics::Surface> m_spDepthTile4X;
     };
-
-    MARATHON_ASSERT_SIZEOF(DeviceXenon, 0x190);
+    MARATHON_ASSERT_OFFSETOF(DeviceXenon, m_spBackBuffer, 0xD0);
+    MARATHON_ASSERT_OFFSETOF(DeviceXenon, m_spDepthStencil, 0xD4);
+    MARATHON_ASSERT_OFFSETOF(DeviceXenon, m_apTexture, 0x108);
+    MARATHON_ASSERT_OFFSETOF(DeviceXenon, m_SurfaceParamsA, 0x158);
+    MARATHON_ASSERT_OFFSETOF(DeviceXenon, m_SurfaceParamsB, 0x164);
+    MARATHON_ASSERT_OFFSETOF(DeviceXenon, m_SurfaceParamsC, 0x170);
+    MARATHON_ASSERT_OFFSETOF(DeviceXenon, m_spColorTile2X, 0x17C);
+    MARATHON_ASSERT_OFFSETOF(DeviceXenon, m_spDepthTile2X, 0x180);
+    MARATHON_ASSERT_OFFSETOF(DeviceXenon, m_spColorTile4X, 0x184);
+    MARATHON_ASSERT_OFFSETOF(DeviceXenon, m_spDepthTile4X, 0x188);
+    MARATHON_ASSERT_SIZEOF(DeviceXenon, 0x18C);
 }
diff --git a/MarathonRecomp/api/Sonicteam/SoX/IResource.h b/MarathonRecomp/api/Sonicteam/SoX/IResource.h
@@ -43,6 +43,6 @@ namespace Sonicteam::SoX
         }
     };
 
-    MARATHON_ASSERT_OFFSETOF(IResource, m_FilePath, 0x0C);
+    MARATHON_ASSERT_OFFSETOF(IResource, m_MgrResourceName, 0x0C);
     MARATHON_ASSERT_SIZEOF(IResource, 0x64);
 }
diff --git a/MarathonRecomp/api/Sonicteam/SoX/LinkNode.h b/MarathonRecomp/api/Sonicteam/SoX/LinkNode.h
@@ -27,6 +27,16 @@ namespace Sonicteam::SoX
                 : m_pCurrent(start ? start->m_pNext.get() : nullptr)
                 , m_pStart(start)
             {
+
+                if (m_pStart && m_pStart->m_pNext.get() == m_pStart)
+                {
+                    m_pCurrent = nullptr;
+                }
+
+                else if (m_pStart)
+                {
+                    m_pCurrent = m_pStart->m_pNext.get();
+                }
             }
 
             reference operator*() const
@@ -39,7 +49,6 @@ namespace Sonicteam::SoX
                 return m_pCurrent;
             }
 
-            // Prefix increment - traverse to next node
             iterator& operator++()
             {
                 if (m_pCurrent && m_pCurrent->m_pNext)
@@ -58,7 +67,6 @@ namespace Sonicteam::SoX
                 return *this;
             }
 
-            // Postfix increment
             iterator operator++(int)
             {
                 iterator tmp = *this;
@@ -95,6 +103,14 @@ namespace Sonicteam::SoX
                 : m_pCurrent(start ? start->m_pNext.get() : nullptr)
                 , m_pStart(start)
             {
+                if (m_pStart && m_pStart->m_pNext.get() == m_pStart)
+                {
+                    m_pCurrent = nullptr;
+                }
+                else if (m_pStart)
+                {
+                    m_pCurrent = m_pStart->m_pNext.get();
+                }
             }
 
             const_iterator(const iterator& it)
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Object.h b/MarathonRecomp/api/Sonicteam/SoX/Object.h
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Thread.h b/MarathonRecomp/api/Sonicteam/SoX/Thread.h
diff --git a/MarathonRecomp/api/lua/lua.h b/MarathonRecomp/api/lua/lua.h
diff --git a/MarathonRecomp/app.cpp b/MarathonRecomp/app.cpp
diff --git a/MarathonRecomp/gpu/video.cpp b/MarathonRecomp/gpu/video.cpp
diff --git a/MarathonRecomp/patches/TitleTask_patches.cpp b/MarathonRecomp/patches/TitleTask_patches.cpp
diff --git a/MarathonRecomp/ui/message_window.cpp b/MarathonRecomp/ui/message_window.cpp
diff --git a/MarathonRecomp/ui/options_menu.cpp b/MarathonRecomp/ui/options_menu.cpp
diff --git a/d b/d

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ namespace Sonicteam`
`7`	`7`	`{`
`8`	`8`	`class DocMarathonState : public DocMarathonImp {};`
`9`	`9`
`10`		`- MARATHON_ASSERT_SIZEOF(DocMarathonState, 0x55C68);`
	`10`	`+ MARATHON_ASSERT_SIZEOF(DocMarathonState, 0x55C3C);`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,5 @@ namespace Sonicteam::GE1PE`
`39`	`39`	`MARATHON_ASSERT_OFFSETOF(Manager, m_lnEmitter, 0x44);`
`40`	`40`	`MARATHON_ASSERT_OFFSETOF(Manager, m_lnEffect, 0x50);`
`41`	`41`	`MARATHON_ASSERT_OFFSETOF(Manager, m_lnField5C, 0x5C);`
`42`		`- //size == 0x34 (but PE::MyPlugin no idea about this)`
	`42`	`+`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@ namespace Sonicteam::GE1PE`
`17`	`17`	`xpointer<Vftable> m_pVftable;`
`18`	`18`	`xpointer<SoX::Engine::Doc> m_pDoc;`
`19`	`19`	`};`
`20`		`- //size == 0x34 (but PE::MyPlugin no idea about this)`
	`20`	`+`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,4 @@ namespace Sonicteam`
`7`	`7`	`{`
`8`	`8`	`class HUDRaderMap : public HUDPopupScreen {};`
`9`	`9`
`10`		`- MARATHON_ASSERT_SIZEOF(HUDRaderMap, 0xB0);`
`11`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,6 @@ namespace Sonicteam`
`16`	`16`	`xpointer<Vftable> m_pVftable;`
`17`	`17`	`lua50::lua_State m_pLuaState;`
`18`	`18`	`};`
	`19`	`+`
	`20`	`+ MARATHON_ASSERT_SIZEOF(LuaNode, 8);`
`19`	`21`	`}`