d_dvd_drive_error OK

8 files changed, 76 insertions, 20 deletions

diff --git a/include/toBeSorted/d_d3d.h b/include/toBeSorted/d_d3d.h
index 1b5b43b1..4d650b79 100644
--- a/include/toBeSorted/d_d3d.h
+++ b/include/toBeSorted/d_d3d.h
@@ -21,6 +21,7 @@ namespace d3d {
 f32 fn_80016960(mVec3_c&, const mVec3_c& pos);
 bool fn_80016A90(const mVec3_c& pos);
 void fn_80016B60(mVec3_c&, const mVec3_c& pos);
+void createLightTextures();
 
 class AnmMdlWrapper : protected m3d::mdlAnmChr {
 public:
diff --git a/include/toBeSorted/d_hbm.h b/include/toBeSorted/d_hbm.h
new file mode 100644
index 00000000..f8eb390b
--- /dev/null
+++ b/include/toBeSorted/d_hbm.h
@@ -0,0 +1,21 @@
+#ifndef D_HBM_H
+#define D_HBM_H
+
+#include "common.h"
+class dHbm_c {
+public:
+    static dHbm_c *GetInstance();
+
+    s32 fn_801967D0();
+    s32 fn_80197560(s32);
+
+    void offFlags(u32 flags) {
+        mFlags &= ~flags;
+    }
+
+private:
+    u8 _0x00[0x218 - 0x000];
+    u32 mFlags;
+};
+
+#endif
diff --git a/include/toBeSorted/hbm.h b/include/toBeSorted/hbm.h
deleted file mode 100644
index 20857729..00000000
--- a/include/toBeSorted/hbm.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef HBM_H
-#define HBM_H
-
-extern "C" void *getHBM();
-extern "C" int fn_801967D0(void *hbm);
-extern "C" int fn_80197560(void *hbm, int);
-
-#endif
diff --git a/include/toBeSorted/lyt_related_floats.h b/include/toBeSorted/lyt_related_floats.h
index 092b8ea7..8496f90d 100644
--- a/include/toBeSorted/lyt_related_floats.h
+++ b/include/toBeSorted/lyt_related_floats.h
@@ -3,6 +3,16 @@
 
 #include "common.h"
 
+extern "C" f32 lbl_80575144;
+inline f32 get_80575144() {
+    return lbl_80575144;
+}
+
+extern "C" f32 lbl_80575148;
+inline f32 get_80575148() {
+    return lbl_80575148;
+}
+
 extern "C" f32 lbl_805751A4;
 inline f32 get_805751A4() {
     return lbl_805751A4;
@@ -13,11 +23,21 @@ inline s32 get_80575134() {
     return lbl_80575134;
 }
 
+extern "C" s32 lbl_80575118;
+inline s32 get_80575118() {
+    return lbl_80575118;
+}
+
 extern "C" s32 lbl_8057511C;
 inline s32 get_8057511C() {
     return lbl_8057511C;
 }
 
+extern "C" f32 lbl_8057514C;
+inline f32 get_8057514C() {
+    return lbl_8057514C;
+}
+
 extern "C" f32 lbl_80575150;
 inline f32 get_80575150() {
     return lbl_80575150;
@@ -28,11 +48,6 @@ inline f32 get_8057515C() {
     return lbl_8057515C;
 }
 
-extern "C" f32 lbl_80575148;
-inline f32 get_80575148() {
-    return lbl_80575148;
-}
-
 extern "C" f32 lbl_8057519C;
 inline f32 get_8057519C() {
     return lbl_8057519C;
diff --git a/include/toBeSorted/nand_result_tracker.h b/include/toBeSorted/nand_result_tracker.h
index 690f0aaa..6177d858 100644
--- a/include/toBeSorted/nand_result_tracker.h
+++ b/include/toBeSorted/nand_result_tracker.h
@@ -1,15 +1,17 @@
 #ifndef NAND_RESULT_TRACKER_H
 #define NAND_RESULT_TRACKER_H
 
+#include "egg/core/eggHeap.h"
 #include "rvl/NAND.h"
 
 class NandResultTracker {
-    public:
-        static NandResultTracker *GetInstance();
-        bool isFailure(NANDResult status);
-    
-    private:
-        NandResultTracker *sInstance;
-    };
+public:
+    static void create(EGG::Heap *heap);
+    static NandResultTracker *GetInstance();
+    bool isFailure(NANDResult status);
+
+private:
+    NandResultTracker *sInstance;
+};
 
 #endif
diff --git a/include/toBeSorted/reload_color_fader.h b/include/toBeSorted/reload_color_fader.h
index e92b8ea6..55cb7c5a 100644
--- a/include/toBeSorted/reload_color_fader.h
+++ b/include/toBeSorted/reload_color_fader.h
@@ -12,6 +12,11 @@ public:
     void fn_80067FE0();
     bool fn_80068E80();
     bool fn_80067F60();
+    void fn_80067DD0(bool);
+
+    bool is1Or5() const {
+        return field_0x0C == 1 || field_0x0C == 5;
+    }
 
     u8 field_0x00[0x0C - 0x00];
     s32 field_0x0C;
diff --git a/include/toBeSorted/save_manager.h b/include/toBeSorted/save_manager.h
index 746b1486..6f261dcf 100644
--- a/include/toBeSorted/save_manager.h
+++ b/include/toBeSorted/save_manager.h
@@ -117,6 +117,7 @@ public:
 };
 
 class SaveMgr {
+public:
     static void create(EGG::Heap *heap);
 
     static SaveMgr *GetInstance() {
diff --git a/include/toBeSorted/save_related.h b/include/toBeSorted/save_related.h
new file mode 100644
index 00000000..f6c85a1c
--- /dev/null
+++ b/include/toBeSorted/save_related.h
@@ -0,0 +1,19 @@
+#ifndef SAVE_RELATED_H
+#define SAVE_RELATED_H
+
+class SaveRelated {
+public:
+    static void create();
+    static void remove();
+
+    static SaveRelated *GetInstance() {
+        return sInstance;
+    }
+
+    void fn_80015F40();
+
+private:
+    static SaveRelated *sInstance;
+};
+
+#endif