6 files changed, 47 insertions, 23 deletions
diff --git a/include/d/d_d2d.h b/include/d/d_d2d.h
index 105d2852..801f79e1 100644
--- a/include/d/d_d2d.h
+++ b/include/d/d_d2d.h
@@ -4,6 +4,7 @@
 namespace d2d {
 
 void defaultSet();
+void draw();
 
 } // namespace d2d
 
diff --git a/include/d/d_dvd_drive_error.h b/include/d/d_dvd_drive_error.h
new file mode 100644
index 00000000..9c950315
--- /dev/null
+++ b/include/d/d_dvd_drive_error.h
@@ -0,0 +1,26 @@
+#ifndef D_DVD_DRIVE_ERROR_H
+#define D_DVD_DRIVE_ERROR_H
+
+#include "common.h"
+#include "egg/core/eggHeap.h"
+
+class dDvdDriveError_c {
+public:
+    static void create(EGG::Heap *heap);
+    void draw();
+    void execute();
+    void init();
+    bool isError() const;
+
+    static dDvdDriveError_c *GetInstance() {
+        return sInstance;
+    }
+
+private:
+    static dDvdDriveError_c *sInstance;
+
+    /* 0x00 */ s32 mDvdDriveStatus;
+    /* 0x04 */ bool mIsError;
+};
+
+#endif
diff --git a/include/d/d_dvd_unk.h b/include/d/d_dvd_unk.h
index 71291116..419dc63b 100644
--- a/include/d/d_dvd_unk.h
+++ b/include/d/d_dvd_unk.h
@@ -10,32 +10,21 @@
 
 namespace dDvdUnk {
 
-class unkstruct_c {
-public:
-    static unkstruct_c *create(EGG::Heap *heap);
-    void draw();
-    void execute();
-    void init();
-    char getUnk();
-
-    static void createFont(EGG::Heap *heap);
-
-private:
-    UNKWORD field_0x0;
-    char field_0x4;
-};
-
 class FontUnk {
 public:
-    FontUnk() {}
+    FontUnk() : field_0x2D(0) {}
 
     static FontUnk *GetInstance() {
         return sInstance;
     }
 
+    static void create(EGG::Heap *heap);
+    void init();
+
     void fn_80052D00(bool);
     void fn_80052D50();
     void fn_80052C90();
+    void fn_80052C60();
 
     s32 getField_0x24() const {
         return field_0x24;
@@ -53,6 +42,10 @@ public:
         field_0x2C = val;
     }
 
+    const nw4r::ut::ResFont &getFont() const {
+        return mFont;
+    }
+
 private:
     static FontUnk *sInstance;
 
diff --git a/include/d/d_gfx.h b/include/d/d_gfx.h
index fe5d2d90..18e63957 100644
--- a/include/d/d_gfx.h
+++ b/include/d/d_gfx.h
@@ -6,10 +6,10 @@
 // Made up name
 class dGfx_c {
 public:
-    typedef void (*PreDrawCallback)(void);
+    typedef void (*DrawCallback)(void);
 
-    void setDrawCallback(PreDrawCallback cb) {
-        mPreDrawCb = cb;
+    void setDrawCallback(DrawCallback cb) {
+        mDrawCallback = cb;
     }
 
     void setField0x09(u8 val) {
@@ -24,7 +24,7 @@ private:
     static dGfx_c *sInstance;
 
     /* 0x00 */ u8 _0x00[0x04 - 0x00];
-    /* 0x04 */ PreDrawCallback mPreDrawCb;
+    /* 0x04 */ DrawCallback mDrawCallback;
     /* 0x08 */ u8 field_0x08;
     /* 0x09 */ u8 field_0x09;
 };
diff --git a/include/d/d_s_boot.h b/include/d/d_s_boot.h
index 5c365380..a7e9fe9a 100644
--- a/include/d/d_s_boot.h
+++ b/include/d/d_s_boot.h
@@ -38,8 +38,8 @@ private:
 
     private:
         /* 0x000 */ SizedString<64> mArcName;
-        /* 0x040 */ SizedString<64> mStr2;
-        /* 0x080 */ SizedString<64> mStr3;
+        /* 0x040 */ SizedString<64> mLytFileName;
+        /* 0x080 */ SizedString<64> mAnimFileName;
         /* 0x0C0 */ d2d::ResAccIf_c mResAcc;
         /* 0x430 */ m2d::Simple_c mLyt;
         /* 0x4C8 */ m2d::Anm_c mAnm;
@@ -58,6 +58,8 @@ private:
 
     bool checkDone();
 
+    static void drawCallback();
+
     sFPhaseBase::sFPhaseState cb1();
     sFPhaseBase::sFPhaseState cb2();
     sFPhaseBase::sFPhaseState cb3();
@@ -77,7 +79,7 @@ private:
     /* 0x570 */ mDvd_callback_c *mpDvdCallback;
     /* 0x574 */ STATE_MGR_DECLARE(dScBoot_c);
     /* 0x5B4 */ dFader_c mFader;
-    /* 0x5D4 */ s32 field_0x5D4;
+    /* 0x5D4 */ s32 mProgressStage;
     /* 0x5D8 */ u32 field_0x5D8;
     /* 0x5DC */ u8 field_0x5DC;
     /* 0x5DD */ u8 field_0x5DD;
diff --git a/include/d/lyt/d_lyt_system_window.h b/include/d/lyt/d_lyt_system_window.h
index 10f81063..b0a3a6b6 100644
--- a/include/d/lyt/d_lyt_system_window.h
+++ b/include/d/lyt/d_lyt_system_window.h
@@ -11,6 +11,8 @@ public:
         return sInstance;
     }
 
+    static bool create();
+
     bool setProperties(const char *label, bool, const wchar_t *);
     void showMaybe();
     void showMaybe(s32 arg);