d_menu_letter equivalent (#2407)

4 files changed, 14 insertions, 5 deletions

diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 3965488c37..98cf2f7813 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -3376,7 +3376,7 @@ inline BOOL dComIfGp_roomControl_checkRoomDisp(int i_roomNo) {
     return g_dComIfG_gameInfo.play.getRoomControl()->checkRoomDisp(i_roomNo);
 }
 
-inline BOOL dComIfGp_roomControl_checkStatusFlag(int i_roomNo, u8 flag) {
+inline u8 dComIfGp_roomControl_checkStatusFlag(int i_roomNo, u8 flag) {
     return g_dComIfG_gameInfo.play.getRoomControl()->checkStatusFlag(i_roomNo, flag);
 }
 
diff --git a/include/d/d_menu_letter.h b/include/d/d_menu_letter.h
index 6a517e22a7..1de117ce45 100644
--- a/include/d/d_menu_letter.h
+++ b/include/d/d_menu_letter.h
@@ -55,7 +55,7 @@ public:
     /* 801E1678 */ u8 getLetterNum();
     /* 801E1748 */ void setHIO(bool);
 
-    /* 801E1D5C */ virtual void draw();
+    /* 801E1D5C */ virtual void draw() { _draw(); }
     /* 801DCF34 */ virtual ~dMenu_Letter_c();
 
     u8 getStatus() { return mStatus; }
diff --git a/include/d/d_msg_string.h b/include/d/d_msg_string.h
index 44eb0e4013..3fb5d4da33 100644
--- a/include/d/d_msg_string.h
+++ b/include/d/d_msg_string.h
@@ -20,8 +20,17 @@ public:
             return getStringLocal(param_0, param_1, param_2, param_3, param_4, param_5);
         }
     }
-    /* 801E1D10 */ virtual f32 getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
-                                      u8);
+    /* 801E1D10 */ virtual f32 getStringPage(u32 param_1, u8 param_2, u8 param_3,
+                                             J2DTextBox* param_4, J2DTextBox* param_5,
+                                             JUTFont* param_6, COutFont_c* param_7, u8 param_8) {
+        if (param_7 == NULL && mpOutFont != NULL) {
+            return getStringPageLocal(param_1, param_2, param_3, param_4, param_5, param_6,
+                                      mpOutFont, param_8);
+        } else {
+            return getStringPageLocal(param_1, param_2, param_3, param_4, param_5, param_6, param_7,
+                                      param_8);
+        }
+    }
     /* 80249DB4 */ virtual void resetStringLocal(J2DTextBox*);
     /* 80249DE4 */ virtual void drawOutFontLocal(J2DTextBox*, f32);
     /* 80249ED0 */ virtual void drawFontLocal(J2DTextBox*, u8, f32, f32, f32, f32, u32, u8);
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index bcf132eff9..7656b16e70 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -1114,7 +1114,7 @@ public:
         mStatus[param_0].mpBgW = i_bgw;
     }
 
-    BOOL checkStatusFlag(int i_roomNo, u8 flag) const {
+    u8 checkStatusFlag(int i_roomNo, u8 flag) const {
         return cLib_checkBit(mStatus[i_roomNo].mFlag, flag);
     }