d_menu_collect mostly matching for GZLE01 (#1164)

* more progress

* more progress

* more progress

* more progress

* d_menu work

d_menu_collect class members cleaned up, some functions at 100% matching

* added `Nonmatching` tag to unmatched functions

* more functions at 100%

* more functions matching

* more functions matching

* more progress

* more progress

* d_menu mostly matching for GZLE01

* fixed broken member names

include/JSystem/J2DGraph/J2DWindow.h

@@ -44,10 +44,10 @@ public:
         param_0.mBR = mColorBR;
     }
     void getWhite() const {}
-    void setBlack(JUtility::TColor) {}
-    void setContentsColor(TContentsColor) {}
-    void setContentsColor(JUtility::TColor) {}
-    void setWhite(JUtility::TColor) {}
+    void setBlack(JUtility::TColor black) { mBlack = black; }
+    void setContentsColor(TContentsColor& param_0) { setContentsColor(param_0.mTL, param_0.mTR, param_0.mBL, param_0.mBR); }
+    void setContentsColor(JUtility::TColor param_0) { setContentsColor(param_0, param_0, param_0, param_0); }
+    void setWhite(JUtility::TColor white) { mWhite = white; }
 
 public:
     /* 0x0CC */ JUTTexture* mpFrameTexture1;

include/d/d_2dnumber.h

@@ -83,6 +83,7 @@ public:
 
 class dDlst_2DOutFont_c {
 public:
+    dDlst_2DOutFont_c() { m20 = NULL; m18 = NULL; m2C = NULL; m74 = 0; }
     void setLeftUpPos(f32 x, f32 y) { mPosTopLeftX = x; mPosTopLeftY = y; }
     
     void initial();
@@ -107,9 +108,13 @@ public:
     /* 0x18 */ J2DPane* m18;
     /* 0x1C */ u8 m1C[0x20 - 0x1C];
     /* 0x20 */ JUTFont* m20;
-    /* 0x24 */ u8 m24[0x30 - 0x24];
+    /* 0x24 */ u8 m24[0x2C - 0x24];
+    /* 0x2C */ JUTFont* m2C;
     /* 0x30 */ f32 mPosTopLeftX;
     /* 0x34 */ f32 mPosTopLeftY;
-};
+    /* 0x38 */ u8 m38[0x74 - 0x38];
+    /* 0x74 */ u8 m74;
+    /* 0x75 */ u8 m75[0x150 - 0x75];
+}; // Size = 0x150
 
 #endif /* D_2DNUMBER_H */

include/d/d_lib.h

@@ -52,6 +52,7 @@ public:
 
 class CSTControl : public STControl {
 public:
+    CSTControl() : STControl(5, 2, 3, 2) {}
     virtual f32 getValueStick();
     virtual s16 getAngleStick();
 };

include/d/d_menu_collect.h

@@ -58,7 +58,7 @@ public:
     void initialize();
     void cursorAnime();
     int stickDirection(unsigned char);
-    int cursorMainMove();
+    u8 cursorMainMove();
     u8 noteCheck();
     void noteInit();
     void noteAppear();
@@ -197,12 +197,12 @@ private:
     /* 0x27B8 */ char* note[2];
     /* 0x27C0 */ char* dummy[2];
     /* 0x27C8 */ u8 m27C8[0x27DC - 0x27C8];
-    /* 0x27DC */ u32 m27DC;
+    /* 0x27DC */ s32 m27DC;
     /* 0x27E0 */ s16 m27E0;
     /* 0x27E2 */ s16 mTimer;
-    /* 0x27E4 */ u16 m27E4;
-    /* 0x27E6 */ u16 m27E6;
-    /* 0x27E8 */ u16 m27E8;
+    /* 0x27E4 */ s16 m27E4;
+    /* 0x27E6 */ s16 m27E6;
+    /* 0x27E8 */ s16 m27E8;
     /* 0x27EA */ u8 m27EA;
     /* 0x27EB */ u8 m27EB;
     /* 0x27EC */ u8 mTriggerInfo;

include/d/d_menu_option.h

@@ -11,8 +11,11 @@ struct fopMsgM_pane_class;
 class JKRArchive;
 class JUTFont;
 
-class dMenu_Option_c : public dDlst_base_c {
+class dMenu_Option_c {
 public:
+    dMenu_Option_c() { }
+    virtual ~dMenu_Option_c() {}
+
     void alphaChange(fopMsgM_pane_class*, f32) {}
     u8 getQuitStatus() { return mE40; }
     void setArchive(JKRArchive* archive) {

include/m_Do/m_Do_audio.h

@@ -354,7 +354,9 @@ inline void mDoAud_tact_melodyPlay(s32 param_1) {
     mDoAud_zelAudio_c::getTact().melodyPlay(param_1);
 }
 
-inline void mDoAud_tact_melodyStop() {}
+inline void mDoAud_tact_melodyStop() {
+    mDoAud_zelAudio_c::getTact().melodyStop();
+}
 
 inline BOOL mDoAud_checkCbPracticePlay() {
     return mDoAud_zelAudio_c::getInterface()->checkCbPracticePlay();