mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-06 03:38:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_menu_letter equivalent (#2407)

Browse Source
This commit is contained in:
hatal175
2025-04-23 21:39:12 +03:00
committed by GitHub
parent 556bfc958c
commit cfb614e8b2
10 changed files with 193 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DPicture.h
+6 -1
View File
@@ -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;
include/d/d_com_inf_game.h
+1 -1
View File
@@ -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);
}
include/d/d_menu_letter.h
+1 -1
View File
@@ -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; }
include/d/d_msg_string.h
+11 -2
View File
@@ -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);
include/d/d_stage.h
+1 -1
View File
@@ -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);
}