d_msg_scrn_3select done (#2153)

* msg_scrn_3select done

* remove asm

* d_msg_scrn_jimaku done

5 files changed, 57 insertions, 25 deletions

diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h
index 2a64b83493..569c7a9b0f 100644
--- a/include/JSystem/J2DGraph/J2DTextBox.h
+++ b/include/JSystem/J2DGraph/J2DTextBox.h
@@ -137,6 +137,7 @@ public:
 
     JUtility::TColor getCharColor() { return mCharColor; }
     JUtility::TColor getGradColor() { return mGradientColor; }
+    u16 getStringAllocByte() const { return mStringLength; }
 
 // private:
     /* 0x0100 */ JUTFont* mFont;
@@ -153,7 +154,7 @@ public:
     /* 0x012C */ JUtility::TColor mBlackColor;
     /* 0x0130 */ u8 mFlags;
     /* 0x0131 */ bool mTextFontOwned;
-    /* 0x0132 */ s16 mStringLength;
+    /* 0x0132 */ u16 mStringLength;
     /* 0x0134 */ u8 field_0x134[4];
 };  // Size: 0x138
 
diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h
index 93c561b9db..225f94ef3b 100644
--- a/include/d/msg/d_msg_object.h
+++ b/include/d/msg/d_msg_object.h
@@ -558,7 +558,7 @@ public:
     /* 0x2F4 */ s16 mMsgIndex;
     /* 0x2F6 */ s16 mFlowIndex;
     /* 0x2F8 */ s16 mSaveSeqMsgIndex;
-    /* 0x2FA */ u16 mSelWeightFrame;
+    /* 0x2FA */ s16 mSelWaitFrame;
     /* 0x2FC */ u16 mBoxAppearBound;
     /* 0x2FE */ u16 mBoxAppearFrame;
     /* 0x300 */ u16 mWaitFrame;
diff --git a/include/d/msg/d_msg_scrn_3select.h b/include/d/msg/d_msg_scrn_3select.h
index 37b09d3047..6a3c37a285 100644
--- a/include/d/msg/d_msg_scrn_3select.h
+++ b/include/d/msg/d_msg_scrn_3select.h
@@ -13,6 +13,16 @@ class J2DTextBox;
 
 class dMsgScrn3Select_c {
 public:
+    enum Process_e {
+        PROC_OPEN1_e,
+        PROC_OPEN2_e,
+        PROC_WAIT_e,
+        PROC_SELECT_e,
+        PROC_CHANGE_e,
+        PROC_CLOSE_e,
+        PROC_MAX_e,
+    };
+
     /* 802390B4 */ dMsgScrn3Select_c();
     /* 802398CC */ virtual ~dMsgScrn3Select_c();
     /* 80239C64 */ bool isSelect();
@@ -21,15 +31,15 @@ public:
     /* 80239D98 */ void translate(f32, f32);
     /* 80239DD4 */ void draw(f32, f32);
     /* 8023A094 */ void selAnimeInit(u8, u8, u8, f32, u8);
-    /* 8023A398 */ void selAnimeMove(u8, u8, bool);
+    /* 8023A398 */ BOOL selAnimeMove(u8, u8, bool);
     /* 8023A680 */ bool selAnimeEnd();
     /* 8023A934 */ f32 getTextBoxWidth();
     /* 8023A94C */ f32 getFontSize();
-    /* 8023A95C */ void getRubyFontSize();
+    /* 8023A95C */ f32 getRubyFontSize();
     /* 8023A97C */ f32 getCharSpace();
-    /* 8023A98C */ void getRubyCharSpace();
-    /* 8023A9AC */ void getTextBoxGlobalPosX(int);
-    /* 8023A9D8 */ void getTextBoxGlobalPosY(int);
+    /* 8023A98C */ f32 getRubyCharSpace();
+    /* 8023A9AC */ f32 getTextBoxGlobalPosX(int);
+    /* 8023A9D8 */ f32 getTextBoxGlobalPosY(int);
     /* 8023AA04 */ void open1Proc();
     /* 8023AAF4 */ void open2Proc();
     /* 8023AC14 */ void waitProc();
@@ -41,6 +51,9 @@ public:
     /* 8023B870 */ void selectAnimeTransform(int);
 
     void setOffsetX(f32 i_offsetX) { mOffsetX = i_offsetX; }
+    bool isAnimeUpdate(int param_0) { return (field_0x114 & (u8)(1 << param_0)) ? TRUE : FALSE; }
+    void onAnimeUpdate(int param_0) { field_0x114 |= (u8)(1 << param_0); }
+    void offAnimeUpdate(int param_0) { field_0x114 &= ~(u8)(1 << param_0); }
 
 private:
     /* 0x004 */ J2DScreen* mpScreen;
@@ -49,8 +62,8 @@ private:
     /* 0x010 */ J2DAnmTextureSRTKey* mpAnmBtk;
     /* 0x014 */ dSelect_cursor_c* mpSelectCursor;
     /* 0x018 */ CPaneMgr* mpParent;
-    /* 0x01C */ CPaneMgr* mpTouchArea[3];
-    /* 0x028 */ J2DTextBox* mpTmrSel_c[3];
+    /* 0x01C */ CPaneMgr* mpTmSel_c[3];
+    /* 0x028 */ CPaneMgr* mpTmrSel_c[3];
     /* 0x034 */ CPaneMgr* mpSel_c[3];
     /* 0x040 */ CPaneMgr* mpSelCld_c[3];
     /* 0x04C */ CPaneMgr* mpSelCldr_c[3];
@@ -59,25 +72,24 @@ private:
     /* 0x0A0 */ CPaneMgr* mpSelPo_c[3];
     /* 0x0AC */ CPaneMgr* mpKahen_c[3];
     /* 0x0B8 */ CPaneMgr* mpCursor_c[3];
-    /* 0x0C4 */ JUtility::TColor field_0xc4;
-    /* 0x0C8 */ JUtility::TColor field_0xc8;
-    /* 0x0CC */ u8 field_0xcc[0xF0 - 0xCC];
-    /* 0x0F0 */ f32 field_0xf0;
-    /* 0x0F4 */ f32 field_0xf4;
-    /* 0x0F8 */ f32 field_0xf8;
+    /* 0x0C4 */ JUtility::TColor mSelMsgCol;
+    /* 0x0C8 */ JUtility::TColor mSelMsgInactiveCol;
+    /* 0x0CC */ Vec mCursorPos[3];
+    /* 0x0F0 */ f32 mBckFrame;
+    /* 0x0F4 */ f32 mBpkFrame;
+    /* 0x0F8 */ f32 mBtkFrame;
     /* 0x0FC */ f32 mOffsetX;
-    /* 0x100 */ f32 field_0x100;
-    /* 0x104 */ f32 field_0x104;
+    /* 0x100 */ f32 mBaseWidth;
+    /* 0x104 */ f32 mWidth;
     /* 0x108 */ u8 field_0x108;
-    /* 0x109 */ u8 field_0x109[0x10A - 0x109];
-    /* 0x10A */ s16 field_0x10a;
+    /* 0x10A */ s16 mSelWaitTimer;
     /* 0x10C */ s16 field_0x10c;
-    /* 0x10E */ u8 field_0x10e;
-    /* 0x10F */ u8 field_0x10f;
+    /* 0x10E */ u8 mSelNo;
+    /* 0x10F */ u8 mLastSelNo;
     /* 0x110 */ u8 field_0x110;
-    /* 0x111 */ u8 field_0x111;
+    /* 0x111 */ u8 mSelNum;
     /* 0x112 */ u8 field_0x112;
-    /* 0x113 */ u8 field_0x113;
+    /* 0x113 */ u8 mProcess;
     /* 0x114 */ u8 field_0x114;
     /* 0x115 */ u8 field_0x115;
     /* 0x116 */ u8 field_0x116;
diff --git a/include/d/msg/d_msg_scrn_base.h b/include/d/msg/d_msg_scrn_base.h
index 26ac093523..fc9f0e5663 100644
--- a/include/d/msg/d_msg_scrn_base.h
+++ b/include/d/msg/d_msg_scrn_base.h
@@ -39,7 +39,7 @@ public:
     /* 80238C5C */ virtual void fukiPosCalc(u8);
 
     /* 0x04 */ J2DScreen* mpScreen;
-    /* 0x08 */ CPaneMgr* mpPmp_c;
+    /* 0x08 */ CPaneMgr* mpPmP_c;
     /* 0x0C */ CPaneMgr* mpTm_c[7];
     /* 0x28 */ CPaneMgr* mpTmr_c[7];
     /* 0x44 */ COutFont_c* mpOutFont;
diff --git a/include/d/msg/d_msg_scrn_jimaku.h b/include/d/msg/d_msg_scrn_jimaku.h
index 9f27ef04d3..6dd7947a93 100644
--- a/include/d/msg/d_msg_scrn_jimaku.h
+++ b/include/d/msg/d_msg_scrn_jimaku.h
@@ -1,6 +1,25 @@
 #ifndef MSG_SCRN_D_MSG_SCRN_JIMAKU_H
 #define MSG_SCRN_D_MSG_SCRN_JIMAKU_H
 
-#include "dolphin/types.h"
+#include "d/msg/d_msg_scrn_base.h"
+#include "JSystem/JKernel/JKRExpHeap.h"
+
+class dMsgScrnLight_c;
+
+class dMsgScrnJimaku_c : public dMsgScrnBase_c {
+public:
+    /* 80244558 */ dMsgScrnJimaku_c(u8, JKRExpHeap*);
+    /* 80244A74 */ virtual ~dMsgScrnJimaku_c();
+    /* 80244C2C */ virtual void exec();
+    /* 80244D34 */ virtual void drawSelf();
+    /* 80244E2C */ virtual void fukiScale(f32);
+    /* 80244D8C */ virtual void fukiAlpha(f32);
+    /* 80244E30 */ virtual void fukiTrans(f32, f32);
+    /* 80244E34 */ virtual void fontAlpha(f32);
+
+    /* 0xC4 */ dMsgScrnLight_c* mpLight_c;
+    /* 0xC8 */ JKRExpHeap* heap;
+    /* 0xCC */ f32 field_0xcc;
+};
 
 #endif /* MSG_SCRN_D_MSG_SCRN_JIMAKU_H */