Implement dynamic UI aspect ratio scaling, VERT+ and controller icons

MarathonRecomp/CMakeLists.txt

@@ -140,6 +140,8 @@ set(MARATHON_RECOMP_PATCHES_CXX_SOURCES
     "patches/camera_patches.cpp"
     "patches/fps_patches.cpp"
     "patches/frontend_listener.cpp"
+    "patches/loading_patches.cpp"
+    "patches/MainMenuTask_patches.cpp"
     "patches/misc_patches.cpp"
     "patches/player_patches.cpp"
     "patches/SaveDataTask_patches.cpp"

MarathonRecomp/api/CSD/Manager/csdmNode.h

@@ -16,17 +16,5 @@ namespace Chao::CSD
         MARATHON_INSERT_PADDING(0x34);
         xpointer<CMotionPattern> m_pMotionPattern;
         MARATHON_INSERT_PADDING(0x18);
-
-        ~CNode();
-
-        void SetText(const char* in_pText);
-        void SetText(const wchar_t* in_pText);
-        void SetPosition(float in_X, float in_Y);
-        void SetHideFlag(uint32_t in_HideFlag);
-        void SetRotation(float in_Rotation);
-        void SetScale(float in_X, float in_Y);
-        void SetPatternIndex(uint32_t in_PatternIndex);
     };
 }
-
-#include <CSD/Manager/csdmNode.inl>

MarathonRecomp/api/CSD/Manager/csdmNodeObserver.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CSD/Manager/csdmObserverBase.h"
+#include <CSD/Manager/csdmObserverBase.h>
 
 namespace Chao::CSD
 {

MarathonRecomp/api/CSD/Manager/csdmObserverBase.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Marathon.inl"
+#include <Marathon.inl>
 
 namespace Chao::CSD
 {
@@ -10,14 +10,10 @@ namespace Chao::CSD
     public:
         struct Vftable
         {
-            be<uint32_t> m_fpDtor;
+            be<uint32_t> fpDestroy;
         };
 
         xpointer<Vftable> m_pVftable;
         MARATHON_INSERT_PADDING(0x08);
-
-        ~CObserverBase();
     };
 }
-
-#include "CSD/Manager/csdmObserverBase.inl"

MarathonRecomp/api/CSD/Manager/csdmProject.h

@@ -1,31 +1,26 @@
 #pragma once
 
-#include "Marathon.inl"
-#include "CSD/Manager/csdmBase.h"
-#include "CSD/Manager/csdmResourceBase.h"
+#include <Marathon.inl>
+#include <CSD/Manager/csdmBase.h>
+#include <CSD/Manager/csdmResourceBase.h>
 
 namespace Chao::CSD
 {
-    struct Project;
+    class SceneNode;
     class CProject;
     class CScene;
     class CTexList;
 
+    struct Project
+    {
+        xpointer<SceneNode> pRootNode;
+    };
+
     class CProject : public CResourceBase<Project>, CBase
     {
     public:
         MARATHON_INSERT_PADDING(0x1C);
         RCPtr<CTexList> m_rcTexList;
         MARATHON_INSERT_PADDING(0x1C);
-
-        RCPtr<CScene> CreateScene(const char* in_pName) const;
-        RCPtr<CScene> CreateScene(const char* in_pName, const char* in_pMotionName) const;
-
-        void DestroyScene(CScene* in_pScene);
-        void DestroyScene(RCPtr<CScene>& inout_rcScene);
-
-        static void DestroyScene(CProject* in_pProject, RCPtr<CScene>& inout_rcScene);
     };
 }
-
-#include "CSD/Manager/csdmProject.inl"

MarathonRecomp/api/CSD/Manager/csdmRCObject.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CSD/Manager/csdmRCPtrAbs.h"
+#include <CSD/Manager/csdmRCPtrAbs.h>
 
 namespace Chao::CSD
 {
@@ -9,20 +9,14 @@ namespace Chao::CSD
     public:
         struct Vftable
         {
-            be<uint32_t> m_fpDtor;
-            be<uint32_t> m_fpDeallocate;
+            be<uint32_t> fpDestroy;
+            be<uint32_t> fpDeallocate;
         };
 
         xpointer<Vftable> m_pVftable;
         xpointer<void> m_pMemory;
         be<uint32_t> m_RefCount;
         xpointer<void> m_pDealloctor;
         be<uint32_t> m_eDealloctor;
-
-        ~RCObject();
-        void Deallocate(void* in_pMemory);
-        void Release();
     };
 }
-
-#include "CSD/Manager/csdmRCObject.inl"

MarathonRecomp/api/CSD/Manager/csdmRCObjectImp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CSD/Manager/csdmRCPtr.h"
+#include <CSD/Manager/csdmRCPtr.h>
 
 namespace Chao::CSD
 {

MarathonRecomp/api/CSD/Manager/csdmRCPtr.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CSD/Manager/csdmRCPtrAbs.h"
+#include <CSD/Manager/csdmRCPtrAbs.h>
 
 namespace Chao::CSD
 {
@@ -9,24 +9,5 @@ namespace Chao::CSD
     {
     public:
         class RCObjectImp;
-
-        RCPtr() : RCPtrAbs() {}
-        RCPtr(T* in_pMemory) : RCPtrAbs(in_pMemory) {}
-        RCPtr(const RCPtr& in_rOther) : RCPtrAbs(in_rOther) {}
-        RCPtr(RCPtr&& in_rOther) : RCPtrAbs(std::move(in_rOther)) {}
-
-        void Attach(T* in_pObject);
-
-        T* Get() const;
-        void Set(const RCPtr& in_rOther);
-
-        T* operator*() const;
-        T* operator->() const;
-
-        RCPtr& operator=(const RCPtr& in_rOther);
-
-        operator bool() const;
     };
 }
-
-#include "CSD/Manager/csdmRCPtr.inl"