d_menu_collect closer

include/d/d_lib.h

@@ -52,7 +52,9 @@ public:
 
 class CSTControl : public STControl {
 public:
-    CSTControl() : STControl(5, 2, 3, 2) {}
+    CSTControl(s16 a, s16 b, s16 c, s16 d, f32 e = 0.9f, f32 f = 0.5f, s16 g = 0, s16 h = 0x2000)
+        : STControl(a, b, c, d, e, f, g, h)
+        {}
     virtual f32 getValueStick();
     virtual s16 getAngleStick();
 };

include/d/d_menu_base.h

@@ -5,13 +5,14 @@
 
 class dMenu_base_c : public dDlst_base_c {
 public:
-    virtual void draw() {}
+    virtual ~dMenu_base_c() {}
     virtual void _create() {}
     virtual void _delete() {}
     virtual void _move() {}
     virtual void _draw() {}
     virtual bool _open() = 0;
     virtual bool _close() = 0;
+    virtual void draw() {}
 };
 
 #endif //D_MENU_BASE_H

include/d/d_menu_collect.h

@@ -20,6 +20,7 @@ class JUTFont;
 
 class dMenu_Collect_c : public dMenu_base_c {
 public:
+    ~dMenu_Collect_c() {}
     virtual void draw() { _draw(); }
 
     void alphaChange(fopMsgM_pane_class* pane, float alpha) { pane->mInitAlpha *= alpha; }
@@ -32,15 +33,15 @@ public:
     void setQuitArchive(JKRArchive* arc) { mpSaveArc = arc; }
 
     void setFont(JUTFont* font, JUTFont* rfont) {
-        mFont = font;
-        mRFont = rfont;
+        mpFont = font;
+        mpRubyFont = rfont;
     }
 
     void setTactTexBuffer(void* ptr) { mTactTexBuffer = (ResTIMG*)ptr; }
     void setMapTexBuffer(void* ptr) { mMapTexBuffer = (ResTIMG*)ptr; }
     void setTriforceTexBuffer(int idx, void* ptr) { mTriforceTexBuffer[idx] = (ResTIMG*)ptr; }
-    void setSymbolTexBuffer(int idx, void* ptr) { mSymbolTexBuffer[idx] = ptr; }
-    void setItemTexBuffer(int idx, void* ptr) { mItemTexBuffer[idx] = ptr; }
+    void setSymbolTexBuffer(int idx, void* ptr) { mSymbolTexBuffer[idx] = (ResTIMG*)ptr; }
+    void setItemTexBuffer(int idx, void* ptr) { mItemTexBuffer[idx] = (ResTIMG*)ptr; }
 
     void setTextArea(char* name0, char* name1, char* note0, char* note1, char* dummy0, char* dummy1) {
         name[0] = name0;
@@ -176,16 +177,21 @@ private:
     /* 0x2464 */ JKRArchive* mpArc;
     /* 0x2468 */ JKRArchive* mpOptArc;
     /* 0x246C */ JKRArchive* mpSaveArc;
-    /* 0x2470 */ JUTFont* mFont;
-    /* 0x2474 */ JUTFont* mRFont;
+    /* 0x2470 */ JUTFont* mpFont;
+    /* 0x2474 */ JUTFont* mpRubyFont;
     /* 0x2478 */ J2DPane* m2478;
     /* 0x247C */ JPABaseEmitter* m247C[3];
     /* 0x2488 */ J2DWindow::TContentsColor m2488;
     /* 0x2498 */ ResTIMG* mTactTexBuffer;
     /* 0x249C */ ResTIMG* mMapTexBuffer;
     /* 0x24A0 */ ResTIMG* mTriforceTexBuffer[8];
-    /* 0x24C0 */ void* mSymbolTexBuffer[3];
-    /* 0x24CC */ void* mItemTexBuffer[5];
+    /* 0x24C0 */ ResTIMG* mSymbolTexBuffer[3];
+    /* 0x24CC */ ResTIMG* mItemTexBuffer[5];
+#if VERSION == VERSION_PAL
+    /* 0x24E0 */ ResTIMG* mWordSaveTexBuffer;
+    /* 0x24E4 */ ResTIMG* mWordOptionTexBuffer;
+    /* 0x24E8 */ ResTIMG* mTitleCollectTexBuffer;
+#endif
     /* 0x24E0 */ fopMsgM_msgDataProc_c mMsgProc;
     /* 0x2780 */ dMenu_Option_c* dMo_c;
     /* 0x2784 */ dMenu_save_c* dMs_c;
@@ -215,8 +221,6 @@ private:
     /* 0x27F3 */ u8 m27F3;
 }; // Size: 0x27F4
 
-STATIC_ASSERT(sizeof(dMenu_Collect_c) == 0x27F4);
-
 class dMc_HIO_c : public JORReflexible {
 public:
     dMc_HIO_c();

include/d/d_menu_dmap.h

@@ -3,6 +3,7 @@
 
 #include "dolphin/types.h"
 #include "d/d_menu_base.h"
+#include "f_op/f_op_msg_mng.h"
 
 class J2DPane;
 struct fopMsgM_pane_class;

include/d/d_menu_option.h

@@ -21,9 +21,9 @@ public:
     void setArchive(JKRArchive* archive) {
         mpArchive = archive;
     }
-    void setFont(JUTFont* font_1, JUTFont* font_2) {
-        mD2C = font_1;
-        mD30 = font_2;
+    void setFont(JUTFont* i_font, JUTFont* i_rubyFont) {
+        mpFont = i_font;
+        mpRubyFont = i_rubyFont;
     }
     void setTextArea(char* param_1, char* param_2, char* param_3, char* param_4) {
         mD38 = param_1;
@@ -86,8 +86,8 @@ private:
     /* 0xC80 */ fopMsgM_pane_class mC80[2];
     /* 0xCF0 */ fopMsgM_pane_class mCF0;
     /* 0xD28 */ JKRArchive* mpArchive;
-    /* 0xD2C */ JUTFont* mD2C;
-    /* 0xD30 */ JUTFont* mD30;
+    /* 0xD2C */ JUTFont* mpFont;
+    /* 0xD30 */ JUTFont* mpRubyFont;
     /* 0xD34 */ STControl* stick;
     /* 0xD38 */ char* mD38;
     /* 0xD3C */ char* mD3C;

include/d/dolzel.pch

@@ -33,5 +33,6 @@
 #include "d/d_cc_uty.h" // IWYU pragma: export
 #include "d/d_magma.h" // IWYU pragma: export
 #include "d/d_mesg.h" // IWYU pragma: export
+#include "d/d_menu_base.h" // IWYU pragma: export
 
 #endif /* DOLZEL_PCH */