From 51bfda0e1b8f557552e0f7639ce7b1c2d547b503 Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Sun, 15 Mar 2026 16:45:12 +0000
Subject: Initial work on d_main

---
 include/d/d_main.h         | 13 +++++++++++++
 include/d/d_sys.h          |  8 ++++++++
 include/rvl/OS/OSThread.h  |  3 +++
 include/toBeSorted/d_lib.h |  6 ++++++
 include/toBeSorted/mpls.h  |  7 +++++++
 5 files changed, 37 insertions(+)
 create mode 100644 include/d/d_main.h
 create mode 100644 include/toBeSorted/d_lib.h
 create mode 100644 include/toBeSorted/mpls.h

(limited to 'include')

diff --git a/include/d/d_main.h b/include/d/d_main.h
new file mode 100644
index 00000000..09537513
--- /dev/null
+++ b/include/d/d_main.h
@@ -0,0 +1,13 @@
+#ifndef D_MAIN_H
+#define D_MAIN_H
+
+#include "rvl/OS.h"
+
+namespace dMain {
+    void Create();
+    void Execute();
+    void *main01(void *arg);
+    OSTime g_InitialTime;
+};
+
+#endif // D_MAIN_H
diff --git a/include/d/d_sys.h b/include/d/d_sys.h
index 7557307d..2bb13c1e 100644
--- a/include/d/d_sys.h
+++ b/include/d/d_sys.h
@@ -7,14 +7,22 @@
 
 class dSys_c {
 public:
+    static void setBlack(bool);
     /* Frame rate values: 1 - 60fps, 2 - 30fps */
     static void setFrameRate(u8);
     static u8 getFrameRate();
 
     static void setClearColor(nw4r::ut::Color clr);
 
+    static void create();
+    static void execute();
+
     static EGG::Heap *ms_RootHeapMem1;
     static EGG::Heap *ms_RootHeapMem2;
 };
 
+namespace dSystem {
+void fixHeaps();
+};
+
 #endif
diff --git a/include/rvl/OS/OSThread.h b/include/rvl/OS/OSThread.h
index 871ce0a7..f315c558 100644
--- a/include/rvl/OS/OSThread.h
+++ b/include/rvl/OS/OSThread.h
@@ -12,6 +12,8 @@ extern "C" {
 
 #define OS_THREAD_STACK_MAGIC 0xDEADBABE
 
+typedef s32 OSPriority;
+
 typedef enum {
     OS_THREAD_STATE_EXITED = 0,
     OS_THREAD_STATE_READY = 1,
@@ -97,6 +99,7 @@ s32 OSSuspendThread(OSThread *thread);
 void OSSleepThread(OSThreadQueue *queue);
 void OSWakeupThread(OSThreadQueue *queue);
 BOOL OSSetThreadPriority(OSThread *thread, s32 prio);
+OSPriority OSGetThreadPriority(OSThread *thread);
 void OSClearStack(u8 val);
 void OSSleepTicks(s64 ticks);
 
diff --git a/include/toBeSorted/d_lib.h b/include/toBeSorted/d_lib.h
new file mode 100644
index 00000000..0a4787ca
--- /dev/null
+++ b/include/toBeSorted/d_lib.h
@@ -0,0 +1,6 @@
+#ifndef D_LIB_H
+#define D_LIB_H
+
+void fn_80006C20();
+
+#endif // D_LIB_H
diff --git a/include/toBeSorted/mpls.h b/include/toBeSorted/mpls.h
new file mode 100644
index 00000000..561c5bff
--- /dev/null
+++ b/include/toBeSorted/mpls.h
@@ -0,0 +1,7 @@
+#ifndef MPLS_H
+#define MPLS_H
+
+void fn_80006CE0(int, char **);
+void fn_80006D60();
+
+#endif // MPLS_H
-- 
cgit v1.2.3


From adb84c1cd698cad09b89e97476088ebd624ccf1b Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Sun, 15 Mar 2026 16:53:18 +0000
Subject: Format files

---
 include/d/d_main.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/d/d_main.h b/include/d/d_main.h
index 09537513..12d3a150 100644
--- a/include/d/d_main.h
+++ b/include/d/d_main.h
@@ -4,10 +4,12 @@
 #include "rvl/OS.h"
 
 namespace dMain {
-    void Create();
-    void Execute();
-    void *main01(void *arg);
-    OSTime g_InitialTime;
-};
+
+void Create();
+void Execute();
+void *main01(void *arg);
+OSTime g_InitialTime;
+
+}; // namespace dMain
 
 #endif // D_MAIN_H
-- 
cgit v1.2.3


From dd1c8ac8c2ff91e84272fc2187a5213fef481def Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Sun, 15 Mar 2026 17:33:53 +0000
Subject: Minor formatting adjustments + symbol renaming

---
 include/d/d_main.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/d/d_main.h b/include/d/d_main.h
index 12d3a150..2eca2708 100644
--- a/include/d/d_main.h
+++ b/include/d/d_main.h
@@ -5,10 +5,11 @@
 
 namespace dMain {
 
+OSTime g_InitialTime;
+
 void Create();
 void Execute();
 void *main01(void *arg);
-OSTime g_InitialTime;
 
 }; // namespace dMain
 
-- 
cgit v1.2.3


From 2bcf403ea0c86dbdcb0ded8c81984741aadb08f7 Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Sun, 22 Mar 2026 22:07:56 +0000
Subject: dSys: create() and execute() to 99% each

---
 include/c/c_counter.h                     |  11 +++
 include/d/d_hbm.h                         |   2 +-
 include/d/d_heap.h                        |  20 ++---
 include/d/d_scene.h                       |   4 +
 include/d/d_state.h                       |  13 +++
 include/d/d_sys.h                         |  13 +++
 include/d/d_sys_init.h                    |  12 +++
 include/d/lyt/d_lyt_system_window.h       |   2 +
 include/egg/core/eggSystem.h              | 140 +++++++++++++++++++++++-------
 include/m/m_dvd.h                         |   5 +-
 include/toBeSorted/arc_callback_handler.h |   8 ++
 include/toBeSorted/d_d3d.h                |   4 +
 include/toBeSorted/unk_save_time.h        |   2 +
 13 files changed, 194 insertions(+), 42 deletions(-)
 create mode 100644 include/d/d_state.h
 create mode 100644 include/d/d_sys_init.h
 create mode 100644 include/toBeSorted/arc_callback_handler.h

(limited to 'include')

diff --git a/include/c/c_counter.h b/include/c/c_counter.h
index 8efe5f26..cb19146d 100644
--- a/include/c/c_counter.h
+++ b/include/c/c_counter.h
@@ -9,8 +9,19 @@ public:
         return m_gameFrame;
     }
 
+    static void IncrementGameFrame() {
+        m_gameFrame++;
+    }
+
+    static void IncrementUnkCounter() {
+        m_unkCounter++;
+    }
+
+    static void clear();
+
 private:
     static s32 m_gameFrame;
+    static s32 m_unkCounter;
 };
 
 #endif
diff --git a/include/d/d_hbm.h b/include/d/d_hbm.h
index f02387db..7f6ce607 100644
--- a/include/d/d_hbm.h
+++ b/include/d/d_hbm.h
@@ -12,7 +12,7 @@ public:
 
     typedef void (*MenuInitCallback)();
 
-    static void CreateInstance();
+    static void CreateInstance(EGG::Heap *);
     static Manage_c *GetInstance();
 
     Manage_c(EGG::Heap *);
diff --git a/include/d/d_heap.h b/include/d/d_heap.h
index 8809144b..6a6bb1f0 100644
--- a/include/d/d_heap.h
+++ b/include/d/d_heap.h
@@ -3,20 +3,20 @@
 
 #include "egg/core/eggExpHeap.h"
 
-class dHeap {
+class dHeap : public EGG::Heap {
 public:
     EGG::ExpHeap *heap;
 
 public:
-    static dHeap work1Heap;
-    static dHeap work2Heap;
-    static dHeap workExHeap;
-    static dHeap layoutHeap;
-    static dHeap layoutExHeap;
-    static dHeap layoutEx2Heap;
-    static dHeap layoutResHeap;
-    static dHeap fontHeap;
-    static dHeap HBMHeap;
+    static dHeap *work1Heap;
+    static dHeap *work2Heap;
+    static dHeap *workExHeap;
+    static dHeap *layoutHeap;
+    static dHeap *layoutExHeap;
+    static dHeap *layoutEx2Heap;
+    static dHeap *layoutResHeap;
+    static dHeap *fontHeap;
+    static dHeap *HBMHeap;
 
 public:
     EGG::ExpHeap *init(const char *name, size_t size, EGG::Heap *parent);
diff --git a/include/d/d_scene.h b/include/d/d_scene.h
index 8c2334a0..eee6ea91 100644
--- a/include/d/d_scene.h
+++ b/include/d/d_scene.h
@@ -19,6 +19,10 @@ public:
     static dBase_c *staticExecute();
     static void setRootActor(fProfile::PROFILE_NAME_e rootActor, u32 params, s32 fadeInType, s32 fadeOutType);
 
+    static dFader_c *getFader() {
+        return &sFader;
+    }
+
 protected:
     static dFader_c sFader;
 };
diff --git a/include/d/d_state.h b/include/d/d_state.h
new file mode 100644
index 00000000..b6384b7d
--- /dev/null
+++ b/include/d/d_state.h
@@ -0,0 +1,13 @@
+#ifndef D_STATE_H
+#define D_STATE_H
+
+namespace dState {
+
+void fn_80062E40();
+void fn_80062E50();
+void fn_80062EB0();
+bool fn_80062EC0();
+
+}
+
+#endif // D_STATE_H
diff --git a/include/d/d_sys.h b/include/d/d_sys.h
index 2bb13c1e..384c5779 100644
--- a/include/d/d_sys.h
+++ b/include/d/d_sys.h
@@ -3,10 +3,20 @@
 
 #include "common.h"
 #include "egg/core/eggHeap.h"
+#include "egg/core/eggSystem.h"
 #include "nw4r/ut/ut_Color.h"
 
+class dSndMgr_c;
+
 class dSys_c {
 public:
+    static dSndMgr_c *initAudioMgr(EGG::Heap *heap);
+
+    static void beginRender();
+    static void endRender();
+    static void beginFrame();
+    static void endFrame();
+
     static void setBlack(bool);
     /* Frame rate values: 1 - 60fps, 2 - 30fps */
     static void setFrameRate(u8);
@@ -17,12 +27,15 @@ public:
     static void create();
     static void execute();
 
+    static EGG::BaseSystem *ms_configuration_p;
     static EGG::Heap *ms_RootHeapMem1;
     static EGG::Heap *ms_RootHeapMem2;
 };
 
 namespace dSystem {
+
 void fixHeaps();
+
 };
 
 #endif
diff --git a/include/d/d_sys_init.h b/include/d/d_sys_init.h
new file mode 100644
index 00000000..b87d3526
--- /dev/null
+++ b/include/d/d_sys_init.h
@@ -0,0 +1,12 @@
+#ifndef D_SYS_INIT_H
+#define D_SYS_INIT_H
+
+#include "s/s_Phase.hpp"
+
+namespace dSystem {
+
+extern sPhase_c myDylinkInitPhase;
+
+}
+
+#endif // D_SYS_INIT_H
diff --git a/include/d/lyt/d_lyt_system_window.h b/include/d/lyt/d_lyt_system_window.h
index 838edc69..bba711d5 100644
--- a/include/d/lyt/d_lyt_system_window.h
+++ b/include/d/lyt/d_lyt_system_window.h
@@ -80,6 +80,8 @@ public:
 
     s32 getField_0xDE0() const;
     bool getField_0xDFC() const;
+    void fn_80125E20();
+    void fn_80125EF0();
     void fn_80152F10();
     bool fn_80152F50() const;
     bool fn_80152F60() const;
diff --git a/include/egg/core/eggSystem.h b/include/egg/core/eggSystem.h
index 919c84da..97682fa3 100644
--- a/include/egg/core/eggSystem.h
+++ b/include/egg/core/eggSystem.h
@@ -2,64 +2,146 @@
 #define EGG_SYSTEM_H
 
 #include "common.h"
+#include "egg/core/eggGraphicsFifo.h"
 #include "egg/core/eggHeap.h"
 
+#include "rvl/SC.h"
+
+// Ported from https://github.com/snailspeed3/mkw/blob/master/lib/egg/core/eggSystem.hpp
 
 namespace EGG {
 
 class Display;
-class XfbManager;
+class Heap;
+class PerformanceView;
+class SceneManager;
+class SimpleAudioMgr;
+class Thread;
 class Video;
+class XfbManager;
+
+class BaseSystem {
+public:
+    static BaseSystem *sSystem;
 
-class ConfigurationData {
 public:
-    // vtable at 0x0
+    inline BaseSystem() : mSysHeapSize(0x97000), mGraphicsFifoSize(0x80000), mRenderMode(nullptr) {}
+
     /* vt 0x08 */ virtual Video *getVideo() = 0;
-    /* vt 0x0C */ virtual Heap *getSystemHeap() = 0;
+    /* vt 0x0C */ virtual Heap *getSysHeap() = 0;
     /* vt 0x10 */ virtual Display *getDisplay() = 0;
     /* vt 0x14 */ virtual XfbManager *getXfbMgr() = 0;
-    /* vt 0x18 */ virtual void getPerfView() = 0;
-    /* vt 0x1C */ virtual void getScnMgr() = 0;
-    /* vt 0x20 */ virtual void getAudioMgr() = 0;
+    /* vt 0x18 */ virtual PerformanceView *getPerfView() = 0;
+    /* vt 0x1C */ virtual SceneManager *getSceneMgr() = 0;
+    /* vt 0x20 */ virtual SimpleAudioMgr *getAudioMgr() = 0;
     /* vt 0x24 */ virtual void onBeginFrame();
     /* vt 0x28 */ virtual void onEndFrame();
     /* vt 0x2C */ virtual void initRenderMode();
     /* vt 0x30 */ virtual void initMemory();
     /* vt 0x34 */ virtual void run();
+    /* vt 0x38 */ virtual void initialize() = 0;
 
 public:
-    /* 0x04 */ u32 mRoot1HeapStart;
-    /* 0x08 */ u32 mRoot1HeapEnd;
-    /* 0x0C */ u32 mRoot2HeapStart;
-    /* 0x10 */ u32 mRoot2HeapEnd;
-    /* 0x14 */ u32 mMemSize;
+    /* 0x04 */ void *mMEM1ArenaLo;
+    /* 0x08 */ void *mMEM1ArenaHi;
+    /* 0x0C */ void *mMEM2ArenaLo;
+    /* 0x10 */ void *mMEM2ArenaHi;
+    /* 0x14 */ u32 mMemorySize;
     /* 0x18 */ Heap *mRootHeapMem1;
     /* 0x1C */ Heap *mRootHeapMem2;
     /* 0x20 */ Heap *mRootHeapDebug;
-    /* 0x24 */ Heap *mSystemHeap;
-    /* 0x28 */ Thread *mSystemThread;
-    /* 0x2C */ u32 field_0x2C;
-    /* 0x30 */ u32 mSystemHeapStart;
-    /* 0x34 */ u32 mSystemHeapSize;
+    /* 0x24 */ Heap *mSysHeap;
+    /* 0x28 */ Thread *mThread;
+    /* 0x2C */ void *_2c;
+    /* 0x30 */ void *_30;
+    /* 0x34 */ u32 mSysHeapSize;
     /* 0x38 */ u32 mGraphicsFifoSize;
-    /* 0x3C */ u32 field_0x3C;
+    /* 0x3C */ GXRenderModeObj *mRenderMode;
 };
-class BaseSystem {
+
+template <class tVideo, class tDisplay, class tXfbMgr, class tAudioMgr, class tSceneMgr, class tPerfView>
+class TSystem : public BaseSystem {
 public:
-    static ConfigurationData *mConfigData;
-    static XfbManager *getXfbMgr() {
-        return mConfigData->getXfbMgr();
+    inline TSystem() : BaseSystem() {}
+
+    Video *getVideo() override {
+        return static_cast<Video *>(mVideo);
     }
-    static Display *getDisplay() {
-        return mConfigData->getDisplay();
+
+    Heap *getSysHeap() override {
+        return mSysHeap;
     }
-    static Video *getVideo() {
-        return mConfigData->getVideo();
+
+    Display *getDisplay() override {
+        return static_cast<Display *>(mDisplay);
     }
-};
 
-template <class TVideo, class TDisplay, class TXfbManager, class TAudioManager, class TSceneManager, class TPerfView>
-class TSystem : ConfigurationData {};
+    XfbManager *getXfbMgr() override {
+        return static_cast<XfbManager *>(mXfbMgr);
+    }
+
+    PerformanceView *getPerfView() override {
+        return static_cast<PerformanceView *>(mPerfView);
+    }
+
+    SceneManager *getSceneMgr() override {
+        return static_cast<SceneManager *>(mSceneMgr);
+    }
+
+    SimpleAudioMgr *getAudioMgr() override {
+        return static_cast<SimpleAudioMgr *>(mAudioMgr);
+    }
+
+    void onBeginFrame() override {}
+    void onEndFrame() override {}
+
+    void initRenderMode() override {}
+
+    void initialize() override {
+        // DVDInit();
+        // SCInit();
+
+        // initMemory();
+        // initRenderMode();
+
+        // GraphicsFifo::create(mGraphicsFifoSize, nullptr);
+
+        // mVideo = new tVideo(mRenderMode, nullptr);
+
+        // mXfbMgr = new tXfbMgr(nullptr);
+        // for (int i = 0; i < 2; ++i) {
+        //     mXfbMgr->attach(new Xfb(mRootHeapMem2));
+        // }
+
+        // mDisplay = new tDisplay(1);
+
+        // Thread::initialize();
+        // mThread = new Thread(OSGetCurrentThread(), 4);
+
+        // mPerfView = new tPerfView(true);
+
+        // DvdFile::initialize();
+
+        // CoreControllerMgr::createStaticInstance();
+        // GCControllerMgr::createStaticInstance();
+
+        // Exception_create(0x40, 0x20, 4, nullptr, 1);
+
+        // mSceneMgr = new tSceneMgr(nullptr);
+
+        // mRootHeapMem1->becomeCurrentHeap();
+
+        // mAudioMgr = new tAudioMgr();
+    }
+
+public:
+    /* 0x40 */ tAudioMgr *mAudioMgr;
+    /* 0x44 */ tVideo *mVideo;
+    /* 0x48 */ tXfbMgr *mXfbMgr;
+    /* 0x4c */ tDisplay *mDisplay;
+    /* 0x50 */ tPerfView *mPerfView;
+    /* 0x54 */ tSceneMgr *mSceneMgr;
+};
 
 } // namespace EGG
 
diff --git a/include/m/m_dvd.h b/include/m/m_dvd.h
index 32c0a4f5..da704ec2 100644
--- a/include/m/m_dvd.h
+++ b/include/m/m_dvd.h
@@ -9,10 +9,11 @@
 
 // Note: names are taken from NSMBW where available but a lot are made up
 
-void unk_initDecompressors();
-
 namespace mDvd {
 
+void unk_initDecompressors();
+void setAutoStreamDecomp(bool arg);
+
 extern void *somePtr;
 
 class UncompressInfo_c {
diff --git a/include/toBeSorted/arc_callback_handler.h b/include/toBeSorted/arc_callback_handler.h
new file mode 100644
index 00000000..288707e0
--- /dev/null
+++ b/include/toBeSorted/arc_callback_handler.h
@@ -0,0 +1,8 @@
+#ifndef ARC_CALLBACK_HANDLER_H
+#define ARC_CALLBACK_HANDLER_H
+
+#include "common.h"
+
+void *ArcCallbackHandlerCreate(u32);
+
+#endif // ARC_CALLBACK_HANDLER_H
diff --git a/include/toBeSorted/d_d3d.h b/include/toBeSorted/d_d3d.h
index e565ddf2..212fd381 100644
--- a/include/toBeSorted/d_d3d.h
+++ b/include/toBeSorted/d_d3d.h
@@ -25,6 +25,10 @@ bool isOnScreen(const mVec3_c &worldPos);
 void screenToWorld(mVec3_c &result, const mVec3_c &screenPos);
 void createLightTextures();
 
+void fn_80016860();
+void clearList();
+void fn_80017500();
+
 class AnmMdlWrapper : public m3d::mdlAnmChr {
 public:
     AnmMdlWrapper();
diff --git a/include/toBeSorted/unk_save_time.h b/include/toBeSorted/unk_save_time.h
index 0cc5ec8d..0f98e691 100644
--- a/include/toBeSorted/unk_save_time.h
+++ b/include/toBeSorted/unk_save_time.h
@@ -17,6 +17,8 @@ public:
         return field_0x30;
     }
 
+    static void fn_80190780(EGG::Heap *heap);
+    void fn_801907C0();
     s64 fn_801907D0();
     void fn_801907F0();
     void fn_801909A0();
-- 
cgit v1.2.3


From 2b997a772ebc860b7a872bf140801519aeb4653d Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Sun, 22 Mar 2026 22:58:23 +0000
Subject: dSys: additional function matches

---
 include/d/d_sys.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/d/d_sys.h b/include/d/d_sys.h
index 384c5779..2caf7e36 100644
--- a/include/d/d_sys.h
+++ b/include/d/d_sys.h
@@ -6,6 +6,8 @@
 #include "egg/core/eggSystem.h"
 #include "nw4r/ut/ut_Color.h"
 
+typedef EGG::TSystem<EGG::Video, EGG::Display, EGG::XfbManager, EGG::SimpleAudioMgr, EGG::SceneManager, EGG::PerformanceView> System;
+
 class dSndMgr_c;
 
 class dSys_c {
@@ -17,17 +19,19 @@ public:
     static void beginFrame();
     static void endFrame();
 
-    static void setBlack(bool);
+    static bool setBlack(bool);
     /* Frame rate values: 1 - 60fps, 2 - 30fps */
     static void setFrameRate(u8);
     static u8 getFrameRate();
 
     static void setClearColor(nw4r::ut::Color clr);
+    static nw4r::ut::Color getClearColor();
 
     static void create();
     static void execute();
 
-    static EGG::BaseSystem *ms_configuration_p;
+private:
+    static System *ms_configuration_p;
     static EGG::Heap *ms_RootHeapMem1;
     static EGG::Heap *ms_RootHeapMem2;
 };
-- 
cgit v1.2.3


From f2aaeac6c68dc126286035db3e6da43bacdd01e1 Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Sun, 5 Apr 2026 17:45:43 +0100
Subject: Broken but too much work to fix

---
 include/d/d_heap.h | 20 ++++++++++----------
 include/d/d_sys.h  |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'include')

diff --git a/include/d/d_heap.h b/include/d/d_heap.h
index 6a6bb1f0..8809144b 100644
--- a/include/d/d_heap.h
+++ b/include/d/d_heap.h
@@ -3,20 +3,20 @@
 
 #include "egg/core/eggExpHeap.h"
 
-class dHeap : public EGG::Heap {
+class dHeap {
 public:
     EGG::ExpHeap *heap;
 
 public:
-    static dHeap *work1Heap;
-    static dHeap *work2Heap;
-    static dHeap *workExHeap;
-    static dHeap *layoutHeap;
-    static dHeap *layoutExHeap;
-    static dHeap *layoutEx2Heap;
-    static dHeap *layoutResHeap;
-    static dHeap *fontHeap;
-    static dHeap *HBMHeap;
+    static dHeap work1Heap;
+    static dHeap work2Heap;
+    static dHeap workExHeap;
+    static dHeap layoutHeap;
+    static dHeap layoutExHeap;
+    static dHeap layoutEx2Heap;
+    static dHeap layoutResHeap;
+    static dHeap fontHeap;
+    static dHeap HBMHeap;
 
 public:
     EGG::ExpHeap *init(const char *name, size_t size, EGG::Heap *parent);
diff --git a/include/d/d_sys.h b/include/d/d_sys.h
index 2caf7e36..61135bc4 100644
--- a/include/d/d_sys.h
+++ b/include/d/d_sys.h
@@ -30,7 +30,7 @@ public:
     static void create();
     static void execute();
 
-private:
+public:
     static System *ms_configuration_p;
     static EGG::Heap *ms_RootHeapMem1;
     static EGG::Heap *ms_RootHeapMem2;
-- 
cgit v1.2.3


From 97d808fe06b024aa79e17d23c744003085dad5f6 Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Mon, 6 Apr 2026 16:50:38 +0100
Subject: 100% match for d_sys

---
 include/d/d_sys.h                |  17 +-
 include/egg/core/eggController.h |   4 +
 include/egg/core/eggDisplay.h    |   4 +
 include/egg/core/eggDvdFile.h    |   2 +-
 include/egg/core/eggSystem.h     | 448 +++++++++++++++++++++++++++++++++------
 include/egg/core/eggVideo.h      |   4 +-
 include/egg/core/eggXfbManager.h |   1 +
 include/rvl/WPAD/WPAD.h          |   1 +
 8 files changed, 415 insertions(+), 66 deletions(-)

(limited to 'include')

diff --git a/include/d/d_sys.h b/include/d/d_sys.h
index 61135bc4..f8fbc979 100644
--- a/include/d/d_sys.h
+++ b/include/d/d_sys.h
@@ -2,11 +2,21 @@
 #define D_SYS_H
 
 #include "common.h"
+#include "egg/core/eggAsyncDisplay.h"
 #include "egg/core/eggHeap.h"
 #include "egg/core/eggSystem.h"
 #include "nw4r/ut/ut_Color.h"
 
-typedef EGG::TSystem<EGG::Video, EGG::Display, EGG::XfbManager, EGG::SimpleAudioMgr, EGG::SceneManager, EGG::PerformanceView> System;
+#define ROUND_UP_4KB(x) (((u32)(x) + 4096 - 1) & ~(4096 - 1))
+
+typedef EGG::TSystem<
+    EGG::Video,
+    EGG::AsyncDisplay,
+    EGG::XfbManager,
+    EGG::SimpleAudioMgr,
+    EGG::SceneManager,
+    EGG::PerformanceView
+> System;
 
 class dSndMgr_c;
 
@@ -38,6 +48,11 @@ public:
 
 namespace dSystem {
 
+void *s_OrgMEM1ArenaLo;
+void *s_NewMEM1ArenaLo;
+void *s_OrgMEM1ArenaHi;
+void *s_NewMEM1ArenaHi;
+
 void fixHeaps();
 
 };
diff --git a/include/egg/core/eggController.h b/include/egg/core/eggController.h
index a790b667..8dd447a4 100644
--- a/include/egg/core/eggController.h
+++ b/include/egg/core/eggController.h
@@ -346,6 +346,10 @@ public:
         sConnectCallback = cb;
     }
 
+    static void setWPADWorkSize(u32 size) {
+        sWPADWorkSize = size;
+    }
+
 private:
     CoreControllerMgr();
 
diff --git a/include/egg/core/eggDisplay.h b/include/egg/core/eggDisplay.h
index cdf2fe7a..986cfcda 100644
--- a/include/egg/core/eggDisplay.h
+++ b/include/egg/core/eggDisplay.h
@@ -58,6 +58,10 @@ public:
         mClearColor = color;
     }
 
+    u32 getClearZ() {
+        return mClearZ;
+    }
+
 public:
     static u32 sTickPeriod;
 };
diff --git a/include/egg/core/eggDvdFile.h b/include/egg/core/eggDvdFile.h
index ac36ae4e..6b511e2a 100644
--- a/include/egg/core/eggDvdFile.h
+++ b/include/egg/core/eggDvdFile.h
@@ -39,7 +39,7 @@ public:
     /* vt 0x24 */ virtual bool open(const char *path, void *);
 
 public:
-    void initialize();
+    static void initialize();
     DvdFile();
     void initiate();
     s32 sync();
diff --git a/include/egg/core/eggSystem.h b/include/egg/core/eggSystem.h
index 97682fa3..c1686d2e 100644
--- a/include/egg/core/eggSystem.h
+++ b/include/egg/core/eggSystem.h
@@ -2,31 +2,336 @@
 #define EGG_SYSTEM_H
 
 #include "common.h"
+#include "egg/core/eggController.h"
+#include "egg/core/eggDisplay.h"
+#include "egg/core/eggDvdFile.h"
 #include "egg/core/eggGraphicsFifo.h"
 #include "egg/core/eggHeap.h"
+#include "egg/core/eggVideo.h"
+#include "egg/core/eggXfbManager.h"
+#include "rvl/WPAD.h"
+#include "toBeSorted/d_exception.h"
+
+namespace {
+
+// TODO Determine better names (+ location?) for this render mode set
+
+const GXRenderModeObj gRMO_Unk1 = {
+    0, // tvInfo
+    608, // fbWidth
+    456, // efbHeight
+    456, // xfbHeight
+    25, // viXOrigin
+    12, // viYOrigin
+    670, // viWidth
+    456, // viHeight
+    1, // xfbMode
+    0, // field_rendering
+    0, // aa
+    {
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            }, // sample_pattern
+    {0, 0, 21, 22, 21, 0, 0}  // vFilter
+};
+
+const GXRenderModeObj gRMO_Unk2 = {
+    2, // tvInfo
+    608, // fbWidth
+    456, // efbHeight
+    456, // xfbHeight
+    25, // viXOrigin
+    12, // viYOrigin
+    670, // viWidth
+    456, // viHeight
+    0, // xfbMode
+    0, // field_rendering
+    0, // aa
+    {
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            }, // sample_pattern
+    {0, 0, 21, 22, 21, 0, 0}  // vFilter
+};
+
+const GXRenderModeObj gRMO_Unk3 = {
+    4, // tvInfo
+    608, // fbWidth
+    456, // efbHeight
+    542, // xfbHeight
+    27, // viXOrigin
+    16, // viYOrigin
+    666, // viWidth
+    542, // viHeight
+    1, // xfbMode
+    0, // field_rendering
+    0, // aa
+    {
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            }, // sample_pattern
+    {0, 0, 21, 22, 21, 0, 0}  // vFilter
+};
+
+const GXRenderModeObj gRMO_Unk4 = {
+    20, // tvInfo
+    608, // fbWidth
+    456, // efbHeight
+    456, // xfbHeight
+    25, // viXOrigin
+    12, // viYOrigin
+    670, // viWidth
+    456, // viHeight
+    1, // xfbMode
+    0, // field_rendering
+    0, // aa
+    {
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            }, // sample_pattern
+    {0, 0, 21, 22, 21, 0, 0}      // vFilter
+};
+
+const GXRenderModeObj gRMO_Unk5 = {
+    22, // tvInfo
+    608, // fbWidth
+    456, // efbHeight
+    456, // xfbHeight
+    25, // viXOrigin
+    12, // viYOrigin
+    670, // viWidth
+    456, // viHeight
+    0, // xfbMode
+    0, // field_rendering
+    0, // aa
+    {
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            }, // sample_pattern
+    {0, 0, 21, 22, 21, 0, 0}  // vFilter
+};
+
+const GXRenderModeObj gRMO_Unk6 = {
+    0, // tvInfo
+    608, // fbWidth
+    456, // efbHeight
+    456, // xfbHeight
+    17, // viXOrigin
+    12, // viYOrigin
+    686, // viWidth
+    456, // viHeight
+    1, // xfbMode
+    0, // field_rendering
+    0, // aa
+    {
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            }, // sample_pattern
+    {0, 0, 21, 22, 21, 0, 0}  // vFilter
+};
+
+const GXRenderModeObj gRMO_Unk7 = {
+    2, // tvInfo
+    608, // fbWidth
+    456, // efbHeight
+    456, // xfbHeight
+    17, // viXOrigin
+    12, // viYOrigin
+    686, // viWidth
+    456, // viHeight
+    0, // xfbMode
+    0, // field_rendering
+    0, // aa
+    {
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            }, // sample_pattern
+    {0, 0, 21, 22, 21, 0, 0}  // vFilter
+};
+
+const GXRenderModeObj gRMO_Unk8 = {
+    4, // tvInfo
+    608, // fbWidth
+    456, // efbHeight
+    542, // xfbHeight
+    19, // viXOrigin
+    16, // viYOrigin
+    682, // viWidth
+    542, // viHeight
+    1, // xfbMode
+    0, // field_rendering
+    0, // aa
+    {
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            }, // sample_pattern
+    {0, 0, 21, 22, 21, 0, 0}  // vFilter
+};
+
+const GXRenderModeObj gRMO_Unk9 = {
+    20, // tvInfo
+    608, // fbWidth
+    456, // efbHeight
+    456, // xfbHeight
+    17, // viXOrigin
+    12, // viYOrigin
+    686, // viWidth
+    456, // viHeight
+    1, // xfbMode
+    0, // field_rendering
+    0, // aa
+    {
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            }, // sample_pattern
+    {0, 0, 21, 22, 21, 0, 0}  // vFilter
+};
+
+const GXRenderModeObj gRMO_Unk10 = {
+    22, // tvInfo
+    608, // fbWidth
+    456, // efbHeight
+    456, // xfbHeight
+    17, // viXOrigin
+    12, // viYOrigin
+    686, // viWidth
+    456, // viHeight
+    0, // xfbMode
+    0, // field_rendering
+    0, // aa
+    {
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            {6, 6},
+            }, // sample_pattern
+    {0, 0, 21, 22, 21, 0, 0}  // vFilter
+};
 
-#include "rvl/SC.h"
+const EGG::Video::RenderModeObjSet gUnkRenderModeObjSet = {
+    {&gRMO_Unk1, &gRMO_Unk2, &gRMO_Unk3,
+     &gRMO_Unk4, &gRMO_Unk5, &gRMO_Unk6,
+     &gRMO_Unk7, &gRMO_Unk8, &gRMO_Unk9,
+     &gRMO_Unk10}
+};
 
-// Ported from https://github.com/snailspeed3/mkw/blob/master/lib/egg/core/eggSystem.hpp
+}
 
 namespace EGG {
 
-class Display;
-class Heap;
-class PerformanceView;
+// TODO Proper definition of PerformanceView
+class PerformanceView {
+public:
+    u8 placeholder[0x4c];
+    /* 0x4c */ u32 _4c;
+};
+
 class SceneManager;
 class SimpleAudioMgr;
-class Thread;
-class Video;
-class XfbManager;
 
-class BaseSystem {
+class ConfigurationData {
 public:
-    static BaseSystem *sSystem;
-
-public:
-    inline BaseSystem() : mSysHeapSize(0x97000), mGraphicsFifoSize(0x80000), mRenderMode(nullptr) {}
+    inline ConfigurationData() : mSystemHeapSize(0x89000) {}
 
+    // vtable at 0x0
     /* vt 0x08 */ virtual Video *getVideo() = 0;
     /* vt 0x0C */ virtual Heap *getSysHeap() = 0;
     /* vt 0x10 */ virtual Display *getDisplay() = 0;
@@ -42,34 +347,51 @@ public:
     /* vt 0x38 */ virtual void initialize() = 0;
 
 public:
-    /* 0x04 */ void *mMEM1ArenaLo;
-    /* 0x08 */ void *mMEM1ArenaHi;
-    /* 0x0C */ void *mMEM2ArenaLo;
-    /* 0x10 */ void *mMEM2ArenaHi;
-    /* 0x14 */ u32 mMemorySize;
+    /* 0x04 */ u32 mRoot1HeapStart;
+    /* 0x08 */ u32 mRoot1HeapEnd;
+    /* 0x0C */ u32 mRoot2HeapStart;
+    /* 0x10 */ u32 mRoot2HeapEnd;
+    /* 0x14 */ u32 mMemSize;
     /* 0x18 */ Heap *mRootHeapMem1;
     /* 0x1C */ Heap *mRootHeapMem2;
     /* 0x20 */ Heap *mRootHeapDebug;
-    /* 0x24 */ Heap *mSysHeap;
-    /* 0x28 */ Thread *mThread;
-    /* 0x2C */ void *_2c;
-    /* 0x30 */ void *_30;
-    /* 0x34 */ u32 mSysHeapSize;
-    /* 0x38 */ u32 mGraphicsFifoSize;
-    /* 0x3C */ GXRenderModeObj *mRenderMode;
+    /* 0x24 */ Heap *mSystemHeap;
+    /* 0x28 */ Thread *mSystemThread;
+    /* 0x2C */ u32 field_0x2C;
+    /* 0x30 */ u32 mSystemHeapStart;
+    /* 0x34 */ u32 mSystemHeapSize;
+};
+class BaseSystem {
+public:
+    static ConfigurationData *mConfigData;
+    
+    static XfbManager *getXfbMgr() {
+        return mConfigData->getXfbMgr();
+    }
+    static Display *getDisplay() {
+        return mConfigData->getDisplay();
+    }
+    static Video *getVideo() {
+        return mConfigData->getVideo();
+    }
 };
 
-template <class tVideo, class tDisplay, class tXfbMgr, class tAudioMgr, class tSceneMgr, class tPerfView>
-class TSystem : public BaseSystem {
+template <class TVideo, class TDisplay, class TXfbManager, class TAudioManager, class TSceneManager, class TPerfView>
+class TSystem : public ConfigurationData {
 public:
-    inline TSystem() : BaseSystem() {}
+    inline TSystem() : mGraphicsFifoSize(0x80000), mRenderMode() {}
+
+    void onBeginFrame() override {}
+    void onEndFrame() override {}
+
+    void initRenderMode() override {}
 
     Video *getVideo() override {
         return static_cast<Video *>(mVideo);
     }
 
     Heap *getSysHeap() override {
-        return mSysHeap;
+        return mSystemHeap;
     }
 
     Display *getDisplay() override {
@@ -81,7 +403,10 @@ public:
     }
 
     PerformanceView *getPerfView() override {
-        return static_cast<PerformanceView *>(mPerfView);
+        if (!mPerfView)
+            return mPerfView;
+        // TODO remove cast hack if/when more is known about PerformanceView
+        return static_cast<PerformanceView *>((void *)&mPerfView->_4c);
     }
 
     SceneManager *getSceneMgr() override {
@@ -92,55 +417,52 @@ public:
         return static_cast<SimpleAudioMgr *>(mAudioMgr);
     }
 
-    void onBeginFrame() override {}
-    void onEndFrame() override {}
-
-    void initRenderMode() override {}
-
     void initialize() override {
-        // DVDInit();
-        // SCInit();
-
-        // initMemory();
-        // initRenderMode();
+        DVDInit();
+        SCInit();
 
-        // GraphicsFifo::create(mGraphicsFifoSize, nullptr);
+        initMemory();
 
-        // mVideo = new tVideo(mRenderMode, nullptr);
+        Heap *heap = Heap::sCurrentHeap;
 
-        // mXfbMgr = new tXfbMgr(nullptr);
-        // for (int i = 0; i < 2; ++i) {
-        //     mXfbMgr->attach(new Xfb(mRootHeapMem2));
-        // }
+        GraphicsFifo::create(mGraphicsFifoSize, heap);
+        mHeap::createAssertHeap(mRootHeapMem1);
 
-        // mDisplay = new tDisplay(1);
+        mVideo = new (heap) TVideo(&gUnkRenderModeObjSet);
 
-        // Thread::initialize();
-        // mThread = new Thread(OSGetCurrentThread(), 4);
+        mXfbMgr = new (heap) TXfbManager();
+        for (int i = 0; i < 2; ++i) {
+            mXfbMgr->attach(new (heap) Xfb(mRootHeapMem2));
+        }
 
-        // mPerfView = new tPerfView(true);
+        mDisplay = new (heap) TDisplay(1);
+        mDisplay->setClearColor(nw4r::ut::Color::BLACK);
+        mDisplay->clearEFB();
 
-        // DvdFile::initialize();
+        Thread::initialize();
+        mSystemThread = new (heap) Thread(OSGetCurrentThread(), 4);
 
-        // CoreControllerMgr::createStaticInstance();
-        // GCControllerMgr::createStaticInstance();
+        DvdFile::initialize();
 
-        // Exception_create(0x40, 0x20, 4, nullptr, 1);
+        CoreControllerMgr::setWPADWorkSize(WPADGetWorkMemorySize() + 228);
+        CoreControllerMgr::createInstance();
 
-        // mSceneMgr = new tSceneMgr(nullptr);
+        exceptionCreate(heap);
 
-        // mRootHeapMem1->becomeCurrentHeap();
+        BaseSystem::mConfigData->getSysHeap()->mFlag.setBit(0);
 
-        // mAudioMgr = new tAudioMgr();
+        mHeap::setCurrentHeap(mHeap::g_assertHeap);
     }
 
 public:
-    /* 0x40 */ tAudioMgr *mAudioMgr;
-    /* 0x44 */ tVideo *mVideo;
-    /* 0x48 */ tXfbMgr *mXfbMgr;
-    /* 0x4c */ tDisplay *mDisplay;
-    /* 0x50 */ tPerfView *mPerfView;
-    /* 0x54 */ tSceneMgr *mSceneMgr;
+    /* 0x38 */ u32 mGraphicsFifoSize;
+    /* 0x3C */ GXRenderModeObj *mRenderMode;
+    /* 0x40 */ TAudioManager *mAudioMgr;
+    /* 0x44 */ TVideo *mVideo;
+    /* 0x48 */ TXfbManager *mXfbMgr;
+    /* 0x4c */ TDisplay *mDisplay;
+    /* 0x50 */ TPerfView *mPerfView;
+    /* 0x54 */ TSceneManager *mSceneMgr;
 };
 
 } // namespace EGG
diff --git a/include/egg/core/eggVideo.h b/include/egg/core/eggVideo.h
index cfaf7336..87ebaea4 100644
--- a/include/egg/core/eggVideo.h
+++ b/include/egg/core/eggVideo.h
@@ -20,7 +20,9 @@ public:
     /* 0x08 */ u32 mConfiguredTime;
 
 public:
-    Video() : pRenderMode(0), mFlag(), mConfiguredTime(){};
+    Video() : pRenderMode(0), mFlag(0), mConfiguredTime() {};
+    Video(const RenderModeObjSet *set) : pRenderMode(0), mFlag(0), mConfiguredTime() { initialize(nullptr, set); };
+
     void initialize(GXRenderModeObj *, const RenderModeObjSet *);
     GXRenderModeObj *configure(GXRenderModeObj *, const RenderModeObjSet *);
     static u32 getTickPerVRetrace(u32 tvFormat);
diff --git a/include/egg/core/eggXfbManager.h b/include/egg/core/eggXfbManager.h
index 76ba56dc..6291864e 100644
--- a/include/egg/core/eggXfbManager.h
+++ b/include/egg/core/eggXfbManager.h
@@ -15,6 +15,7 @@ public:
     /* 0xC */ u8 mNumXfbs;      // Total number of Xfbs ever attached
     /* 0xD */ u8 mNumXfbs_Copy; // Unsure of purpose yet, but showing wont proceed until its under 3
 public:
+    XfbManager() : mNextXfb(), mToCopyXfb(), mToShowXfb(), mNumXfbs(), mNumXfbs_Copy() {}
     bool isRegisterd(Xfb &xfb) const; // yes. this is correct spelling
     bool attach(Xfb *xfb);
     void copyEFB(bool);
diff --git a/include/rvl/WPAD/WPAD.h b/include/rvl/WPAD/WPAD.h
index 669874ee..0a36fd74 100644
--- a/include/rvl/WPAD/WPAD.h
+++ b/include/rvl/WPAD/WPAD.h
@@ -571,6 +571,7 @@ BOOL WPADStopSimpleSync(void);
 BOOL WPADCancelSyncDevice(void);
 WPADSimpleSyncCallback *WPADSetSimpleSyncCallback(WPADSimpleSyncCallback *cb);
 void WPADRegisterAllocator(WPADAllocFunc *alloc, WPADFreeFunc *free);
+u32 WPADGetWorkMemorySize(void);
 WPADLibStatus WPADGetStatus(void);
 u8 WPADGetRadioSensitivity(WPADChannel chan);
 void WPADGetAddress(WPADChannel chan, BD_ADDR_PTR addr);
-- 
cgit v1.2.3


From 5bd9fb7badf06a3da32d8b15ea57a3f5f00b8a7a Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Mon, 6 Apr 2026 16:54:52 +0100
Subject: Fix definition of global variables in header file

---
 include/d/d_sys.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/d/d_sys.h b/include/d/d_sys.h
index f8fbc979..45550b4c 100644
--- a/include/d/d_sys.h
+++ b/include/d/d_sys.h
@@ -48,10 +48,10 @@ public:
 
 namespace dSystem {
 
-void *s_OrgMEM1ArenaLo;
-void *s_NewMEM1ArenaLo;
-void *s_OrgMEM1ArenaHi;
-void *s_NewMEM1ArenaHi;
+extern void *s_OrgMEM1ArenaLo;
+extern void *s_NewMEM1ArenaLo;
+extern void *s_OrgMEM1ArenaHi;
+extern void *s_NewMEM1ArenaHi;
 
 void fixHeaps();
 
-- 
cgit v1.2.3


From 10e438bea8e8c475f576539683c7bc99c04b3cab Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Mon, 6 Apr 2026 18:12:54 +0100
Subject: Match remaining functions in d_main

---
 include/f/f_manager.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'include')

diff --git a/include/f/f_manager.h b/include/f/f_manager.h
index 91459e56..9202612e 100644
--- a/include/f/f_manager.h
+++ b/include/f/f_manager.h
@@ -35,6 +35,7 @@ public:
         PROC_FLAG_DELETE = GET_PROC_FLAG(DELETE),
         PROC_FLAG_DRAW = GET_PROC_FLAG(DRAW)
     };
+
     fManager_c(fBase_c *owner) : connect_node(owner), execute_node(owner), draw_node(owner), search_node(owner) {}
     ~fManager_c() {}
     int getSearchTableNum();
@@ -43,6 +44,14 @@ public:
     static fBase_c *searchBaseByGroupType(u8 groupType, const fBase_c *parent = nullptr);
     static void mainLoop();
 
+    static void setStopProcFlags(u32 flags) {
+        m_StopProcInf |= flags;
+    }
+
+    static void keepStopProcFlags(u32 flags) {
+        m_StopProcInf &= flags;
+    }
+
 private:
     fTrNdBa_c connect_node;   ///< The node in ::m_connectManage.
     fLiNdPrio_c execute_node; ///< The node in ::m_executeManage.
-- 
cgit v1.2.3


From 287c5ec50c05adc1e602b5bed14c091a996fca89 Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Tue, 7 Apr 2026 07:16:20 +0100
Subject: Fix incorrect/poor names, missing import

---
 include/d/lyt/d_lyt_system_window.h | 4 ++--
 include/egg/core/eggSystem.h        | 6 +++---
 include/f/f_manager.h               | 2 +-
 include/toBeSorted/unk_save_time.h  | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/d/lyt/d_lyt_system_window.h b/include/d/lyt/d_lyt_system_window.h
index bba711d5..87094657 100644
--- a/include/d/lyt/d_lyt_system_window.h
+++ b/include/d/lyt/d_lyt_system_window.h
@@ -80,8 +80,8 @@ public:
 
     s32 getField_0xDE0() const;
     bool getField_0xDFC() const;
-    void fn_80125E20();
-    void fn_80125EF0();
+    void fn_80152E20();
+    void fn_80152EF0();
     void fn_80152F10();
     bool fn_80152F50() const;
     bool fn_80152F60() const;
diff --git a/include/egg/core/eggSystem.h b/include/egg/core/eggSystem.h
index c1686d2e..6c1e1a22 100644
--- a/include/egg/core/eggSystem.h
+++ b/include/egg/core/eggSystem.h
@@ -333,7 +333,7 @@ public:
 
     // vtable at 0x0
     /* vt 0x08 */ virtual Video *getVideo() = 0;
-    /* vt 0x0C */ virtual Heap *getSysHeap() = 0;
+    /* vt 0x0C */ virtual Heap *getSystemHeap() = 0;
     /* vt 0x10 */ virtual Display *getDisplay() = 0;
     /* vt 0x14 */ virtual XfbManager *getXfbMgr() = 0;
     /* vt 0x18 */ virtual PerformanceView *getPerfView() = 0;
@@ -390,7 +390,7 @@ public:
         return static_cast<Video *>(mVideo);
     }
 
-    Heap *getSysHeap() override {
+    Heap *getSystemHeap() override {
         return mSystemHeap;
     }
 
@@ -449,7 +449,7 @@ public:
 
         exceptionCreate(heap);
 
-        BaseSystem::mConfigData->getSysHeap()->mFlag.setBit(0);
+        BaseSystem::mConfigData->getSystemHeap()->mFlag.setBit(0);
 
         mHeap::setCurrentHeap(mHeap::g_assertHeap);
     }
diff --git a/include/f/f_manager.h b/include/f/f_manager.h
index 9202612e..1dd4eb16 100644
--- a/include/f/f_manager.h
+++ b/include/f/f_manager.h
@@ -48,7 +48,7 @@ public:
         m_StopProcInf |= flags;
     }
 
-    static void keepStopProcFlags(u32 flags) {
+    static void maskStopProcFlags(u32 flags) {
         m_StopProcInf &= flags;
     }
 
diff --git a/include/toBeSorted/unk_save_time.h b/include/toBeSorted/unk_save_time.h
index 0f98e691..b2d8ae62 100644
--- a/include/toBeSorted/unk_save_time.h
+++ b/include/toBeSorted/unk_save_time.h
@@ -2,6 +2,7 @@
 #define UNK_SAVE_TIME_H
 
 #include "common.h"
+#include "egg/core/eggHeap.h"
 
 class SaveTimeRelated {
 public:
-- 
cgit v1.2.3


From 76626a3617b4089da543819f2b1947ce1313d49c Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Tue, 7 Apr 2026 09:38:41 +0100
Subject: Move TSystem::initialize implementation into d_sys.cpp

---
 include/d/d_sys.h            |  1 -
 include/egg/core/eggSystem.h | 56 +++++++-------------------------------------
 2 files changed, 9 insertions(+), 48 deletions(-)

(limited to 'include')

diff --git a/include/d/d_sys.h b/include/d/d_sys.h
index 45550b4c..54e93367 100644
--- a/include/d/d_sys.h
+++ b/include/d/d_sys.h
@@ -2,7 +2,6 @@
 #define D_SYS_H
 
 #include "common.h"
-#include "egg/core/eggAsyncDisplay.h"
 #include "egg/core/eggHeap.h"
 #include "egg/core/eggSystem.h"
 #include "nw4r/ut/ut_Color.h"
diff --git a/include/egg/core/eggSystem.h b/include/egg/core/eggSystem.h
index 6c1e1a22..0f382618 100644
--- a/include/egg/core/eggSystem.h
+++ b/include/egg/core/eggSystem.h
@@ -2,15 +2,7 @@
 #define EGG_SYSTEM_H
 
 #include "common.h"
-#include "egg/core/eggController.h"
-#include "egg/core/eggDisplay.h"
-#include "egg/core/eggDvdFile.h"
-#include "egg/core/eggGraphicsFifo.h"
-#include "egg/core/eggHeap.h"
 #include "egg/core/eggVideo.h"
-#include "egg/core/eggXfbManager.h"
-#include "rvl/WPAD.h"
-#include "toBeSorted/d_exception.h"
 
 namespace {
 
@@ -324,8 +316,14 @@ public:
     /* 0x4c */ u32 _4c;
 };
 
+class Display;
+class Heap;
+class PerformanceView;
 class SceneManager;
 class SimpleAudioMgr;
+class Thread;
+class Video;
+class XfbManager;
 
 class ConfigurationData {
 public:
@@ -385,13 +383,14 @@ public:
     void onEndFrame() override {}
 
     void initRenderMode() override {}
-
+    void initialize() override {}
+    
     Video *getVideo() override {
         return static_cast<Video *>(mVideo);
     }
 
     Heap *getSystemHeap() override {
-        return mSystemHeap;
+        return static_cast<Heap *>(mSystemHeap);
     }
 
     Display *getDisplay() override {
@@ -417,43 +416,6 @@ public:
         return static_cast<SimpleAudioMgr *>(mAudioMgr);
     }
 
-    void initialize() override {
-        DVDInit();
-        SCInit();
-
-        initMemory();
-
-        Heap *heap = Heap::sCurrentHeap;
-
-        GraphicsFifo::create(mGraphicsFifoSize, heap);
-        mHeap::createAssertHeap(mRootHeapMem1);
-
-        mVideo = new (heap) TVideo(&gUnkRenderModeObjSet);
-
-        mXfbMgr = new (heap) TXfbManager();
-        for (int i = 0; i < 2; ++i) {
-            mXfbMgr->attach(new (heap) Xfb(mRootHeapMem2));
-        }
-
-        mDisplay = new (heap) TDisplay(1);
-        mDisplay->setClearColor(nw4r::ut::Color::BLACK);
-        mDisplay->clearEFB();
-
-        Thread::initialize();
-        mSystemThread = new (heap) Thread(OSGetCurrentThread(), 4);
-
-        DvdFile::initialize();
-
-        CoreControllerMgr::setWPADWorkSize(WPADGetWorkMemorySize() + 228);
-        CoreControllerMgr::createInstance();
-
-        exceptionCreate(heap);
-
-        BaseSystem::mConfigData->getSystemHeap()->mFlag.setBit(0);
-
-        mHeap::setCurrentHeap(mHeap::g_assertHeap);
-    }
-
 public:
     /* 0x38 */ u32 mGraphicsFifoSize;
     /* 0x3C */ GXRenderModeObj *mRenderMode;
-- 
cgit v1.2.3


From 172bf2620b360175a10251ac70d4bbfcee4ab438 Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Tue, 7 Apr 2026 09:46:57 +0100
Subject: Move render mode object set from eggSystem.h to d_sys.cpp + rename

---
 include/egg/core/eggSystem.h | 303 -------------------------------------------
 1 file changed, 303 deletions(-)

(limited to 'include')

diff --git a/include/egg/core/eggSystem.h b/include/egg/core/eggSystem.h
index 0f382618..2adc5351 100644
--- a/include/egg/core/eggSystem.h
+++ b/include/egg/core/eggSystem.h
@@ -4,309 +4,6 @@
 #include "common.h"
 #include "egg/core/eggVideo.h"
 
-namespace {
-
-// TODO Determine better names (+ location?) for this render mode set
-
-const GXRenderModeObj gRMO_Unk1 = {
-    0, // tvInfo
-    608, // fbWidth
-    456, // efbHeight
-    456, // xfbHeight
-    25, // viXOrigin
-    12, // viYOrigin
-    670, // viWidth
-    456, // viHeight
-    1, // xfbMode
-    0, // field_rendering
-    0, // aa
-    {
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            }, // sample_pattern
-    {0, 0, 21, 22, 21, 0, 0}  // vFilter
-};
-
-const GXRenderModeObj gRMO_Unk2 = {
-    2, // tvInfo
-    608, // fbWidth
-    456, // efbHeight
-    456, // xfbHeight
-    25, // viXOrigin
-    12, // viYOrigin
-    670, // viWidth
-    456, // viHeight
-    0, // xfbMode
-    0, // field_rendering
-    0, // aa
-    {
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            }, // sample_pattern
-    {0, 0, 21, 22, 21, 0, 0}  // vFilter
-};
-
-const GXRenderModeObj gRMO_Unk3 = {
-    4, // tvInfo
-    608, // fbWidth
-    456, // efbHeight
-    542, // xfbHeight
-    27, // viXOrigin
-    16, // viYOrigin
-    666, // viWidth
-    542, // viHeight
-    1, // xfbMode
-    0, // field_rendering
-    0, // aa
-    {
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            }, // sample_pattern
-    {0, 0, 21, 22, 21, 0, 0}  // vFilter
-};
-
-const GXRenderModeObj gRMO_Unk4 = {
-    20, // tvInfo
-    608, // fbWidth
-    456, // efbHeight
-    456, // xfbHeight
-    25, // viXOrigin
-    12, // viYOrigin
-    670, // viWidth
-    456, // viHeight
-    1, // xfbMode
-    0, // field_rendering
-    0, // aa
-    {
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            }, // sample_pattern
-    {0, 0, 21, 22, 21, 0, 0}      // vFilter
-};
-
-const GXRenderModeObj gRMO_Unk5 = {
-    22, // tvInfo
-    608, // fbWidth
-    456, // efbHeight
-    456, // xfbHeight
-    25, // viXOrigin
-    12, // viYOrigin
-    670, // viWidth
-    456, // viHeight
-    0, // xfbMode
-    0, // field_rendering
-    0, // aa
-    {
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            }, // sample_pattern
-    {0, 0, 21, 22, 21, 0, 0}  // vFilter
-};
-
-const GXRenderModeObj gRMO_Unk6 = {
-    0, // tvInfo
-    608, // fbWidth
-    456, // efbHeight
-    456, // xfbHeight
-    17, // viXOrigin
-    12, // viYOrigin
-    686, // viWidth
-    456, // viHeight
-    1, // xfbMode
-    0, // field_rendering
-    0, // aa
-    {
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            }, // sample_pattern
-    {0, 0, 21, 22, 21, 0, 0}  // vFilter
-};
-
-const GXRenderModeObj gRMO_Unk7 = {
-    2, // tvInfo
-    608, // fbWidth
-    456, // efbHeight
-    456, // xfbHeight
-    17, // viXOrigin
-    12, // viYOrigin
-    686, // viWidth
-    456, // viHeight
-    0, // xfbMode
-    0, // field_rendering
-    0, // aa
-    {
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            }, // sample_pattern
-    {0, 0, 21, 22, 21, 0, 0}  // vFilter
-};
-
-const GXRenderModeObj gRMO_Unk8 = {
-    4, // tvInfo
-    608, // fbWidth
-    456, // efbHeight
-    542, // xfbHeight
-    19, // viXOrigin
-    16, // viYOrigin
-    682, // viWidth
-    542, // viHeight
-    1, // xfbMode
-    0, // field_rendering
-    0, // aa
-    {
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            }, // sample_pattern
-    {0, 0, 21, 22, 21, 0, 0}  // vFilter
-};
-
-const GXRenderModeObj gRMO_Unk9 = {
-    20, // tvInfo
-    608, // fbWidth
-    456, // efbHeight
-    456, // xfbHeight
-    17, // viXOrigin
-    12, // viYOrigin
-    686, // viWidth
-    456, // viHeight
-    1, // xfbMode
-    0, // field_rendering
-    0, // aa
-    {
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            }, // sample_pattern
-    {0, 0, 21, 22, 21, 0, 0}  // vFilter
-};
-
-const GXRenderModeObj gRMO_Unk10 = {
-    22, // tvInfo
-    608, // fbWidth
-    456, // efbHeight
-    456, // xfbHeight
-    17, // viXOrigin
-    12, // viYOrigin
-    686, // viWidth
-    456, // viHeight
-    0, // xfbMode
-    0, // field_rendering
-    0, // aa
-    {
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            {6, 6},
-            }, // sample_pattern
-    {0, 0, 21, 22, 21, 0, 0}  // vFilter
-};
-
-const EGG::Video::RenderModeObjSet gUnkRenderModeObjSet = {
-    {&gRMO_Unk1, &gRMO_Unk2, &gRMO_Unk3,
-     &gRMO_Unk4, &gRMO_Unk5, &gRMO_Unk6,
-     &gRMO_Unk7, &gRMO_Unk8, &gRMO_Unk9,
-     &gRMO_Unk10}
-};
-
-}
-
 namespace EGG {
 
 // TODO Proper definition of PerformanceView
-- 
cgit v1.2.3


From c1610da573139af0ee0922cfc32d6a4187a54a38 Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Tue, 7 Apr 2026 15:08:16 +0100
Subject: 100% mpls.cpp

---
 include/rvl/OS/OSExec.h   | 2 ++
 include/rvl/SC/scapi.h    | 1 +
 include/toBeSorted/mpls.h | 1 +
 3 files changed, 4 insertions(+)

(limited to 'include')

diff --git a/include/rvl/OS/OSExec.h b/include/rvl/OS/OSExec.h
index 37b72f80..74093536 100644
--- a/include/rvl/OS/OSExec.h
+++ b/include/rvl/OS/OSExec.h
@@ -19,6 +19,8 @@ extern BOOL __OSInReboot;
 void __OSGetExecParams(OSExecParams *out);
 void __OSLaunchMenu(void);
 
+void OSExecl(const char* dolfile, const char* arg0, ...);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/rvl/SC/scapi.h b/include/rvl/SC/scapi.h
index b63389f3..b9971c1a 100644
--- a/include/rvl/SC/scapi.h
+++ b/include/rvl/SC/scapi.h
@@ -74,6 +74,7 @@ u32 SCGetCounterBias(void);
 void SCGetBtDeviceInfoArray(SCBtDeviceInfoArray *info);
 void SCSetBtDeviceInfoArray(const SCBtDeviceInfoArray *info);
 u32 SCGetBtDpdSensibility(void);
+BOOL SCGetMplsMoviePlay(void);
 u8 SCGetWpadMotorMode(void);
 void SCSetWpadMotorMode(u8 mode);
 u8 SCGetWpadSensorBarPosition(void);
diff --git a/include/toBeSorted/mpls.h b/include/toBeSorted/mpls.h
index 561c5bff..c7820a31 100644
--- a/include/toBeSorted/mpls.h
+++ b/include/toBeSorted/mpls.h
@@ -3,5 +3,6 @@
 
 void fn_80006CE0(int, char **);
 void fn_80006D60();
+void fn_80006DC0();
 
 #endif // MPLS_H
-- 
cgit v1.2.3


From bb203d257f780b0cd50c8d01017f5970b8a25c50 Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Tue, 7 Apr 2026 15:13:50 +0100
Subject: Run clang-format on edited files

---
 include/d/d_sys.h            | 11 +++--------
 include/egg/core/eggSystem.h |  7 ++++---
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'include')

diff --git a/include/d/d_sys.h b/include/d/d_sys.h
index 54e93367..201a7df2 100644
--- a/include/d/d_sys.h
+++ b/include/d/d_sys.h
@@ -9,13 +9,8 @@
 #define ROUND_UP_4KB(x) (((u32)(x) + 4096 - 1) & ~(4096 - 1))
 
 typedef EGG::TSystem<
-    EGG::Video,
-    EGG::AsyncDisplay,
-    EGG::XfbManager,
-    EGG::SimpleAudioMgr,
-    EGG::SceneManager,
-    EGG::PerformanceView
-> System;
+    EGG::Video, EGG::AsyncDisplay, EGG::XfbManager, EGG::SimpleAudioMgr, EGG::SceneManager, EGG::PerformanceView>
+    System;
 
 class dSndMgr_c;
 
@@ -54,6 +49,6 @@ extern void *s_NewMEM1ArenaHi;
 
 void fixHeaps();
 
-};
+}; // namespace dSystem
 
 #endif
diff --git a/include/egg/core/eggSystem.h b/include/egg/core/eggSystem.h
index 2adc5351..422002a4 100644
--- a/include/egg/core/eggSystem.h
+++ b/include/egg/core/eggSystem.h
@@ -59,7 +59,7 @@ public:
 class BaseSystem {
 public:
     static ConfigurationData *mConfigData;
-    
+
     static XfbManager *getXfbMgr() {
         return mConfigData->getXfbMgr();
     }
@@ -81,7 +81,7 @@ public:
 
     void initRenderMode() override {}
     void initialize() override {}
-    
+
     Video *getVideo() override {
         return static_cast<Video *>(mVideo);
     }
@@ -99,8 +99,9 @@ public:
     }
 
     PerformanceView *getPerfView() override {
-        if (!mPerfView)
+        if (!mPerfView) {
             return mPerfView;
+        }
         // TODO remove cast hack if/when more is known about PerformanceView
         return static_cast<PerformanceView *>((void *)&mPerfView->_4c);
     }
-- 
cgit v1.2.3


From 373e541fa6507a8552fb63a8f08b197bea4e752b Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Tue, 7 Apr 2026 15:38:16 +0100
Subject: Proper setup of PerformanceView/ProcessMeter

---
 include/d/d_sys.h                  |  3 ++-
 include/egg/core/eggProcessMeter.h | 14 ++++++++++++++
 include/egg/core/eggSystem.h       | 13 +------------
 3 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 include/egg/core/eggProcessMeter.h

(limited to 'include')

diff --git a/include/d/d_sys.h b/include/d/d_sys.h
index 201a7df2..cf602af8 100644
--- a/include/d/d_sys.h
+++ b/include/d/d_sys.h
@@ -3,13 +3,14 @@
 
 #include "common.h"
 #include "egg/core/eggHeap.h"
+#include "egg/core/eggProcessMeter.h"
 #include "egg/core/eggSystem.h"
 #include "nw4r/ut/ut_Color.h"
 
 #define ROUND_UP_4KB(x) (((u32)(x) + 4096 - 1) & ~(4096 - 1))
 
 typedef EGG::TSystem<
-    EGG::Video, EGG::AsyncDisplay, EGG::XfbManager, EGG::SimpleAudioMgr, EGG::SceneManager, EGG::PerformanceView>
+    EGG::Video, EGG::AsyncDisplay, EGG::XfbManager, EGG::SimpleAudioMgr, EGG::SceneManager, EGG::ProcessMeter>
     System;
 
 class dSndMgr_c;
diff --git a/include/egg/core/eggProcessMeter.h b/include/egg/core/eggProcessMeter.h
new file mode 100644
index 00000000..3641c43d
--- /dev/null
+++ b/include/egg/core/eggProcessMeter.h
@@ -0,0 +1,14 @@
+#ifndef EGG_PROCESS_METER_H
+#define EGG_PROCESS_METER_H
+
+#include "egg/core/eggThread.h"
+
+namespace EGG {
+
+class PerformanceView {};
+
+class ProcessMeter : public Thread, public PerformanceView {};
+
+};
+
+#endif // EGG_PROCESS_METER_H
diff --git a/include/egg/core/eggSystem.h b/include/egg/core/eggSystem.h
index 422002a4..28336391 100644
--- a/include/egg/core/eggSystem.h
+++ b/include/egg/core/eggSystem.h
@@ -6,13 +6,6 @@
 
 namespace EGG {
 
-// TODO Proper definition of PerformanceView
-class PerformanceView {
-public:
-    u8 placeholder[0x4c];
-    /* 0x4c */ u32 _4c;
-};
-
 class Display;
 class Heap;
 class PerformanceView;
@@ -99,11 +92,7 @@ public:
     }
 
     PerformanceView *getPerfView() override {
-        if (!mPerfView) {
-            return mPerfView;
-        }
-        // TODO remove cast hack if/when more is known about PerformanceView
-        return static_cast<PerformanceView *>((void *)&mPerfView->_4c);
+        return static_cast<PerformanceView *>(mPerfView);
     }
 
     SceneManager *getSceneMgr() override {
-- 
cgit v1.2.3


From 917f8508248fa793ae3ac8ffd5338e5d6275a190 Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Tue, 7 Apr 2026 16:26:14 +0100
Subject: 100% d_lib.cpp + mpls symbol names

---
 include/toBeSorted/d_lib.h |  7 ++++++-
 include/toBeSorted/mpls.h  | 10 +++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/toBeSorted/d_lib.h b/include/toBeSorted/d_lib.h
index 0a4787ca..b9f7c26d 100644
--- a/include/toBeSorted/d_lib.h
+++ b/include/toBeSorted/d_lib.h
@@ -1,6 +1,11 @@
 #ifndef D_LIB_H
 #define D_LIB_H
 
-void fn_80006C20();
+namespace dLib {
+
+void unknownStub();
+bool strequals(const char *str1, const char *str2);
+
+}; // namespace dLib
 
 #endif // D_LIB_H
diff --git a/include/toBeSorted/mpls.h b/include/toBeSorted/mpls.h
index c7820a31..71283297 100644
--- a/include/toBeSorted/mpls.h
+++ b/include/toBeSorted/mpls.h
@@ -1,8 +1,12 @@
 #ifndef MPLS_H
 #define MPLS_H
 
-void fn_80006CE0(int, char **);
-void fn_80006D60();
-void fn_80006DC0();
+namespace Mpls {
+
+void initialize(int argc, char **argv);
+void tryLaunchMovie();
+void forceLaunchMovie();
+
+}; // namespace Mpls
 
 #endif // MPLS_H
-- 
cgit v1.2.3


From 21c847dfd63f557d7d617182148a52198f2466ef Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Tue, 7 Apr 2026 16:49:03 +0100
Subject: Fix link error with d_lib.cpp & mark as matching

---
 include/toBeSorted/d_lib.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/toBeSorted/d_lib.h b/include/toBeSorted/d_lib.h
index b9f7c26d..d60dee78 100644
--- a/include/toBeSorted/d_lib.h
+++ b/include/toBeSorted/d_lib.h
@@ -1,11 +1,20 @@
 #ifndef D_LIB_H
 #define D_LIB_H
 
-namespace dLib {
+#include "common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern u32 lbl_80574FA0;
+extern u32 lbl_80574FA4;
 
 void unknownStub();
-bool strequals(const char *str1, const char *str2);
+bool strequals(const char *lhs, const char *rhs);
 
-}; // namespace dLib
+#ifdef __cplusplus
+}
+#endif
 
 #endif // D_LIB_H
-- 
cgit v1.2.3


From 880dc5f03ecc98c65e7e7d4adeae10a9a20613b7 Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Tue, 7 Apr 2026 18:55:44 +0100
Subject: Move variable out of d_main.h, add TODO in d_sys.cpp

---
 include/d/d_main.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'include')

diff --git a/include/d/d_main.h b/include/d/d_main.h
index 2eca2708..57332fe9 100644
--- a/include/d/d_main.h
+++ b/include/d/d_main.h
@@ -5,8 +5,6 @@
 
 namespace dMain {
 
-OSTime g_InitialTime;
-
 void Create();
 void Execute();
 void *main01(void *arg);
-- 
cgit v1.2.3


From 5083d2031c263e392165fe440fe175d67ef86bd1 Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Tue, 7 Apr 2026 21:43:31 +0100
Subject: Fix weak function order in d_sys.cpp & mark matching

---
 include/egg/core/eggSystem.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'include')

diff --git a/include/egg/core/eggSystem.h b/include/egg/core/eggSystem.h
index 28336391..634b7578 100644
--- a/include/egg/core/eggSystem.h
+++ b/include/egg/core/eggSystem.h
@@ -103,6 +103,12 @@ public:
         return static_cast<SimpleAudioMgr *>(mAudioMgr);
     }
 
+    // Trick to fix weak function order in d_sys.cpp
+    // https://github.com/zeldaret/ss/pull/305#issuecomment-4201728492
+    void doInitialize() {
+        initialize();
+    }
+
 public:
     /* 0x38 */ u32 mGraphicsFifoSize;
     /* 0x3C */ GXRenderModeObj *mRenderMode;
-- 
cgit v1.2.3