diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DPicture.h | 7 | ||||
| -rw-r--r-- | include/d/d_com_inf_game.h | 2 | ||||
| -rw-r--r-- | include/d/d_menu_letter.h | 2 | ||||
| -rw-r--r-- | include/d/d_msg_string.h | 13 | ||||
| -rw-r--r-- | include/d/d_stage.h | 2 |
5 files changed, 20 insertions, 6 deletions
diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h index af827f9e4e..c78dfc4d4b 100644 --- a/include/JSystem/J2DGraph/J2DPicture.h +++ b/include/JSystem/J2DGraph/J2DPicture.h @@ -142,7 +142,12 @@ public: /* 802FD964 */ virtual const ResTIMG* changeTexture(char const*, u8); /* 802FD9BC */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8, JUTPalette*); /* 802FDAC8 */ virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*); - /* 800539DC */ virtual JUTTexture* getTexture(u8) const; + /* 800539DC */ virtual JUTTexture* getTexture(u8 param_0) const { + if (param_0 < 2) { + return mTexture[param_0]; + } + return NULL; + } /* 802FF634 */ virtual u8 getTextureCount() const { return mTextureNum; } /* 80053C6C */ virtual bool setBlack(JUtility::TColor i_black) { mBlack = i_black; 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); } |