Final

Author: ReimousTH

MarathonRecomp/api/Sonicteam/GE1PE/EffectBank.h

@@ -38,6 +38,7 @@ 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);

MarathonRecomp/api/Sonicteam/GE1PE/ParticleEngine.h

@@ -31,6 +31,7 @@ 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);

MarathonRecomp/api/Sonicteam/MainMenuExpositionTask.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/RefCountObject.h>
+
+namespace Sonicteam
+{
+    class MainMenuExpositionTask : public SoX::RefCountObject, public SoX::Engine::Task 
+    {
+    public:
+        be<uint32_t> m_MSTAnimateState;
+    };
+
+    MARATHON_ASSERT_OFFSETOF(MainMenuExpositionTask, m_MSTAnimateState, 0x54);
+}

MarathonRecomp/api/Sonicteam/MainMenuTask.h

@@ -4,6 +4,8 @@
 #include <Sonicteam/SoX/Math/Vector.h>
 #include <Sonicteam/Player/Object.h>
 #include <Sonicteam/ButtonWindowTask.h>
+#include <Sonicteam/MainMenuExpositionTask.h>
+#include <Sonicteam/SoX/RefSharedPointer.h>
 
 namespace Sonicteam
 {
@@ -39,7 +41,7 @@ namespace Sonicteam
         xpointer<HUDMainMenu> m_pHUDMainMenu;
         MARATHON_INSERT_PADDING(0x20);
         xpointer<ButtonWindowTask> m_pButtonWindowTask;
-        MARATHON_INSERT_PADDING(4);
+        SoX::RefSharedPointer<MainMenuExpositionTask> m_pMainMenuExpositionTask;
         be<uint32_t> m_MainMenuSelectedIndex;
         MARATHON_INSERT_PADDING(0x1D8);
         be<uint32_t> m_PressedButtons;
@@ -52,6 +54,7 @@ namespace Sonicteam
     MARATHON_ASSERT_OFFSETOF(MainMenuTask, m_State, 0x4C);
     MARATHON_ASSERT_OFFSETOF(MainMenuTask, m_pHUDMainMenu, 0x74);
     MARATHON_ASSERT_OFFSETOF(MainMenuTask, m_pButtonWindowTask, 0x98);
+    MARATHON_ASSERT_OFFSETOF(MainMenuTask, m_pMainMenuExpositionTask, 0x9C);
     MARATHON_ASSERT_OFFSETOF(MainMenuTask, m_MainMenuSelectedIndex, 0xA0);
     MARATHON_ASSERT_OFFSETOF(MainMenuTask, m_PressedButtons, 0x27C);
     MARATHON_ASSERT_OFFSETOF(MainMenuTask, m_Field298, 0x298);

MarathonRecomp/api/Sonicteam/MainMode.h

@@ -12,10 +12,13 @@ namespace Sonicteam
         MARATHON_INSERT_PADDING(0x24);
         boost::shared_ptr<SoX::Scenery::Camera> m_spSelectCamera;
         xpointer<SoX::Graphics::FrameGP> m_pFrameGP;
-        MARATHON_INSERT_PADDING(0x0C);
+        MARATHON_INSERT_PADDING(0x4);
+        xpointer<SoX::Engine::Task> m_pMainTask;
+        MARATHON_INSERT_PADDING(0x4);
     };
 
     MARATHON_ASSERT_OFFSETOF(MainMode, m_spSelectCamera, 0x74);
     MARATHON_ASSERT_OFFSETOF(MainMode, m_pFrameGP, 0x7C);
+    MARATHON_ASSERT_OFFSETOF(MainMode, m_pMainTask, 0x84);
     MARATHON_ASSERT_SIZEOF(MainMode, 0x8C);
 }

MarathonRecomp/api/Sonicteam/SoX/Graphics/Surface.h

@@ -16,9 +16,9 @@ namespace Sonicteam::SoX::Graphics
         be<uint32_t> m_Width;
         be<uint32_t> m_Height;
         MARATHON_INSERT_PADDING(4);
-        xpointer<GuestSurface> m_pGuestSurface; //backbuffer. and any
+        xpointer<GuestSurface> m_pSurface; //backbuffer. and any
         xpointer<Texture> m_spTexture; //RefSharedPointer but st didnt use seems their auto type for it (why they did this manually)
-        xpointer<GuestTexture> m_pGuestTexture;
+        xpointer<GuestTexture> m_pTexture;
         MARATHON_INSERT_PADDING(0xC);
     };
 }

MarathonRecomp/api/Sonicteam/SoX/MessageReceiver.h

@@ -25,6 +25,18 @@ namespace Sonicteam::SoX
         {
             return GuestToHostFunction<bool>(m_pVftable->fpProcessMessage, this, pMessage);
         }
+        
+        /*
+        template <typename T  = IMessage>
+        bool ProcessMessage(T& pMessage)
+        {
+            auto pIMessage = g_userHeap.AllocPhysical<T>();
+            *pIMessage = pMessage;
+            bool result = GuestToHostFunction<bool>(m_pVftable->fpProcessMessage, this, pIMessage);
+            pMessage = *pIMessage;
+            return result;
+        }
+        */
     };
 
     MARATHON_ASSERT_OFFSETOF(MessageReceiver, m_pVftable, 0x00);

MarathonRecomp/app.cpp

@@ -64,7 +64,7 @@ PPC_FUNC(sub_8262A568)
     InitPatches();
 }
 
-std::array<const char*, 46> _pause_ignore_task_ =
+std::array<const char*, 46> g_PauseModeTaskList =
 {
     "root",
     "TL_Debug",
@@ -174,19 +174,18 @@ void UpateSpecificTasksPause(Sonicteam::SoX::Engine::Task* ttask)
 {
     for (auto& task : *ttask)
     {
-        std::string taskName = (&task)->GetName();
-        printf("task %p - %s \n", &task, (&task)->GetName());
+        const char* taskName = (&task)->GetName();
 
         if ((task.m_Flag1 & 4) == 0)
         {
 
-            auto shouldIgnore = std::find_if(_pause_ignore_task_.begin(), _pause_ignore_task_.end(),
-                [&taskName](const char* task) 
+            auto shouldIgnore = std::find_if(g_PauseModeTaskList.begin(), g_PauseModeTaskList.end(),
+                [taskName](const char* task) 
                 {
-                    return strcmp(task ? task : "", taskName.c_str()) == 0;
+                    return strcmp(task ? task : "", taskName) == 0;
                 });
 
-            if (shouldIgnore != _pause_ignore_task_.end())
+            if (shouldIgnore != g_PauseModeTaskList.end())
             {
                 (&task)->Update(0.0);
             }
@@ -236,12 +235,11 @@ PPC_FUNC(sub_825EA610)
     __imp__sub_825EA610(ctx, base);
 
 
-    //Always These Tasks in pause mode
+    //Always Do Specic Tasks during pause, to not 
     if (pDocState->m_PauseFlags.get() != 0)
     {
 
         GuestToHostFunction<void>(sub_825D49E0, &pDocState->m_CriticalSection1);
-        printf("Traverse Main\n");
         UpateSpecificTasksPause(pDocState->m_pRootTask.get());
         GuestToHostFunction<void>(sub_82580920, &pDocState->m_CriticalSection1);
     }