100% d_state

2 files changed, 33 insertions, 3 deletions

diff --git a/src/d/d_main.cpp b/src/d/d_main.cpp
index 28118b10..653f1051 100644
--- a/src/d/d_main.cpp
+++ b/src/d/d_main.cpp
@@ -10,11 +10,11 @@
 u32 lbl_805751D0;
 OSTime g_InitialTime;
 
-bool fn_80054F90(u32 val) {
+bool dMain::fn_80054F90(u32 val) {
     return lbl_805751D0 & val;
 }
 
-void fn_80054FB0(u32 val) {
+void dMain::fn_80054FB0(u32 val) {
     u32 flags = lbl_805751D0;
 
     if (!flags) {
@@ -27,7 +27,7 @@ void fn_80054FB0(u32 val) {
     lbl_805751D0 = flags | val;
 }
 
-void fn_80054FE0(u32 val) {
+void dMain::fn_80054FE0(u32 val) {
     lbl_805751D0 &= ~val;
 
     if (!lbl_805751D0) {
diff --git a/src/d/d_state.cpp b/src/d/d_state.cpp
new file mode 100644
index 00000000..12209932
--- /dev/null
+++ b/src/d/d_state.cpp
@@ -0,0 +1,30 @@
+#include "d/d_main.h"
+#include "d/d_state.h"
+#include "m/m3d/m_state.h"
+
+void dState::fn_80062E40() {
+    m3d::mState::fn_802EE0A0();
+}
+
+void dState::fn_80062E50() {
+    m3d::mState::fn_802EE0B0();
+
+    if (m3d::mState::fn_802EE0D0()) {
+        if (dMain::fn_80054F90(1)) {
+            dMain::fn_80054FE0(1);
+        }
+    }
+    else {
+        if (!dMain::fn_80054F90(1)) {
+            dMain::fn_80054FB0(1);
+        }
+    }
+}
+
+void dState::fn_80062EB0() {
+    m3d::mState::fn_802EE0C0();
+}
+
+bool dState::fn_80062EC0() {
+    return m3d::mState::fn_802EE0D0();
+}