Merge pull request #305 from bgsamm/d_main

Matches for d_main, d_sys, & mpls

7 files changed, 81 insertions, 1 deletions

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_main.h b/include/d/d_main.h
new file mode 100644
index 00000000..57332fe9
--- /dev/null
+++ b/include/d/d_main.h
@@ -0,0 +1,14 @@
+#ifndef D_MAIN_H
+#define D_MAIN_H
+
+#include "rvl/OS.h"
+
+namespace dMain {
+
+void Create();
+void Execute();
+void *main01(void *arg);
+
+}; // namespace dMain
+
+#endif // D_MAIN_H
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 7557307d..cf602af8 100644
--- a/include/d/d_sys.h
+++ b/include/d/d_sys.h
@@ -3,18 +3,53 @@
 
 #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::ProcessMeter>
+    System;
+
+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 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();
 
+public:
+    static System *ms_configuration_p;
     static EGG::Heap *ms_RootHeapMem1;
     static EGG::Heap *ms_RootHeapMem2;
 };
 
+namespace dSystem {
+
+extern void *s_OrgMEM1ArenaLo;
+extern void *s_NewMEM1ArenaLo;
+extern void *s_OrgMEM1ArenaHi;
+extern void *s_NewMEM1ArenaHi;
+
+void fixHeaps();
+
+}; // namespace dSystem
+
 #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..87094657 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_80152E20();
+    void fn_80152EF0();
     void fn_80152F10();
     bool fn_80152F50() const;
     bool fn_80152F60() const;