summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/d/d_d2d.h1
-rw-r--r--include/d/d_dvd_drive_error.h26
-rw-r--r--include/d/d_dvd_unk.h25
-rw-r--r--include/d/d_gfx.h8
-rw-r--r--include/d/d_s_boot.h8
-rw-r--r--include/d/lyt/d_lyt_system_window.h2
-rw-r--r--include/toBeSorted/d_d3d.h1
-rw-r--r--include/toBeSorted/d_hbm.h21
-rw-r--r--include/toBeSorted/hbm.h8
-rw-r--r--include/toBeSorted/lyt_related_floats.h25
-rw-r--r--include/toBeSorted/nand_result_tracker.h16
-rw-r--r--include/toBeSorted/reload_color_fader.h5
-rw-r--r--include/toBeSorted/save_manager.h1
-rw-r--r--include/toBeSorted/save_related.h19
14 files changed, 123 insertions, 43 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);
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
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 21:30:32 +0000