start d_menu_option

include/JSystem/JGeometry.h

@@ -2,7 +2,6 @@
 #define JGEOMETRY_H
 
 #include "dolphin/mtx/vec.h"
-#include "float.h"
 #include "math.h"
 
 namespace JGeometry {

include/SSystem/SComponent/c_lib.h

@@ -59,6 +59,9 @@ inline void cLib_setBit(T& value, T bit) {
 template <typename T>
 inline T cLib_minMaxLimit(T val, T min, T max) {
     return (T)((T)val < (T)min ? (T)min : ((T)val > (T)max ? (T)max : (T)val));
+    // Might also be one of these? Try them first if having issues getting this inline to match.
+    // return (T)((T)val < min ? min : ((T)val > max ? max : (T)val));
+    // return (T)(val < min ? min : (val > max ? max : val));
 }
 
 template <typename T>

include/d/d_lib.h

@@ -18,7 +18,7 @@ public:
         setWaitParm(0xF, 0xF, 0, 0, 0.9f, 0.5f, 0, 0x2000);
         init();
     }
-    STControl(s16, s16, s16, s16, f32, f32, s16, s16);
+    STControl(s16, s16, s16, s16, f32 = 0.9f, f32 = 0.5f, s16 = 0, s16 = 0x2000);
     void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16);
     void init();
     void Xinit();

include/d/d_menu_option.h

@@ -1,15 +1,19 @@
 #ifndef D_MENU_OPTION_H
 #define D_MENU_OPTION_H
 
-#include "dolphin/types.h"
+#include "JSystem/J2DGraph/J2DScreen.h"
+#include "d/d_drawlist.h"
+#include "d/d_lib.h"
+#include "f_op/f_op_msg_mng.h"
+#include "m_Do/m_Do_hostIO.h"
 
 class fopMsgM_pane_class;
 class JKRArchive;
 class JUTFont;
 
-class dMenu_Option_c {
+class dMenu_Option_c : public dDlst_base_c {
 public:
-    void alphaChange(fopMsgM_pane_class*, float) {}
+    void alphaChange(fopMsgM_pane_class*, f32) {}
     void getQuitStatus() {}
     void setArchive(JKRArchive*) {}
     void setFont(JUTFont*, JUTFont*) {}
@@ -27,14 +31,14 @@ public:
     void typeMove();
     void yazAnime();
     void ccAnime();
-    void stickMove(unsigned char);
+    void stickMove(u8);
     void noteSet();
     void outFontInit();
     void outFontMove();
     void outFontDraw();
     void stringlength(fopMsgM_pane_class*, char*);
     void changeScaleCenter(fopMsgM_pane_class*, char*);
-    void setSoundMode(unsigned long);
+    void setSoundMode(u32);
     void changeScaleRight(fopMsgM_pane_class*, char*);
     void initialize();
     void _create();
@@ -43,12 +47,61 @@ public:
     void _draw();
     void _open();
     void _close();
-};
 
-class dMo_HIO_c {
+private:
+    /* 0x004 */ J2DScreen* scrn;
+    /* 0x008 */ fopMsgM_pane_class m008;
+    /* 0x040 */ fopMsgM_pane_class m040;
+    /* 0x078 */ fopMsgM_pane_class m078;
+    /* 0x0B0 */ fopMsgM_pane_class m0B0[15];
+    /* 0x3F8 */ fopMsgM_pane_class m3F8[15];
+    /* 0x740 */ fopMsgM_pane_class m740;
+    /* 0x778 */ fopMsgM_pane_class m778;
+    /* 0x7B0 */ fopMsgM_pane_class m7B0;
+    /* 0x7E8 */ fopMsgM_pane_class m7E8;
+    /* 0x820 */ fopMsgM_pane_class m820;
+    /* 0x858 */ fopMsgM_pane_class m858;
+    /* 0x890 */ fopMsgM_pane_class m890;
+    /* 0x8C8 */ fopMsgM_pane_class m8C8[4];
+    /* 0x9A8 */ fopMsgM_pane_class m9A8[2];
+    /* 0xA18 */ fopMsgM_pane_class mA18[3];
+    /* 0xAC0 */ fopMsgM_pane_class mAC0[2];
+    /* 0xB30 */ fopMsgM_pane_class mB30;
+    /* 0xB68 */ fopMsgM_pane_class mB68;
+    /* 0xBA0 */ fopMsgM_pane_class mBA0;
+    /* 0xBD8 */ fopMsgM_pane_class mBD8;
+    /* 0xC10 */ fopMsgM_pane_class mC10;
+    /* 0xC48 */ fopMsgM_pane_class mC48;
+    /* 0xC80 */ fopMsgM_pane_class mC80;
+    /* 0xCB8 */ fopMsgM_pane_class mCB8;
+    /* 0xCF0 */ fopMsgM_pane_class mCF0;
+    /* 0xD28 */ JKRArchive* mpArchive;
+    /* 0xD2C */ JUTFont* mD2C;
+    /* 0xD30 */ JUTFont* mD30;
+    /* 0xD34 */ STControl* stick;
+    /* 0xD38 */ u8 mD38[0xD48 - 0xD38];
+    /* 0xD48 */ char mD48[20];
+    /* 0xD5C */ char mD5C[2][20];
+    /* 0xD84 */ char mD84[2][20];
+    /* 0xDAC */ char mDAC[3][20];
+    /* 0xDE8 */ char mDE8[4][20];
+    /* 0xE38 */ u8 mE38;
+    /* 0xE39 */ u8 mE39;
+    /* 0xE3A */ u8 mE3A;
+    /* 0xE3B */ u8 mE3B;
+    /* 0xE3C */ u8 mE3C[0xE40 - 0xE3C];
+    /* 0xE40 */ u8 mE40;
+    /* 0xE41 */ u8 mE41[0xE42 - 0xE41];
+};  // Size: 0xE42
+
+class dMo_HIO_c : public JORReflexible {
 public:
     dMo_HIO_c();
-};
+    virtual ~dMo_HIO_c() {}
+
+public:
+    /* 0x04 */ s8 mChildID;
+};  // Size: 0x08
 
 
 #endif /* D_MENU_OPTION_H */

include/f_op/f_op_msg_mng.h

@@ -205,4 +205,6 @@ void fopMsgM_demoMsgFlagOn();
 void fopMsgM_demoMsgFlagOff();
 bool fopMsgM_demoMsgFlagCheck();
 
+void fopMsgM_blendInit(fopMsgM_pane_class* i_this, const char* data);
+
 #endif

include/global.h

@@ -41,6 +41,7 @@
 #endif
 
 extern int __cntlzw(uint);
+extern void __dcbz(void*, int);
 
 #define VERSION_JPN 0
 #define VERSION_USA 1