diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2024-01-03 05:37:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-02 19:37:15 -0800 |
| commit | d5d59471ea885faeb3ca0909e1329082b67a9b90 (patch) | |
| tree | 45a20bec694afc4762cd0f4655dca4506e48b07d /include/d/msg | |
| parent | be10df47608afc4c346e7dba2aac56eca59c45b6 (diff) | |
Match most of d_msg_string_base (#2021)
Diffstat (limited to 'include/d/msg')
| -rw-r--r-- | include/d/msg/d_msg_class.h | 9 | ||||
| -rw-r--r-- | include/d/msg/d_msg_string_base.h | 12 |
2 files changed, 15 insertions, 6 deletions
diff --git a/include/d/msg/d_msg_class.h b/include/d/msg/d_msg_class.h index 75a7885ed8..bad00f58c9 100644 --- a/include/d/msg/d_msg_class.h +++ b/include/d/msg/d_msg_class.h @@ -398,9 +398,16 @@ struct jmessage_string_tReference : public JMessage::TReference { u8 getLineMax() { return mLineMax; } u8 getNowPage() { return mNowPage; } JUTFont* getFont() { return mpFont; } + s16 getLineCount() { return mLineCount; } void setLineCount(s16 lineCount) { mLineCount = lineCount; } void addLineCount() { mLineCount++; } u8 isFlag(u8 flag) { return mFlags & flag; } + void setColor(u32 ccColor, u32 gcColor) { + mCCColor = ccColor; + mGCColor = gcColor; + } + void setNowPage(u8 nowPage) { mNowPage = nowPage; } + void setLineMax(u8 lineMax) { mLineMax = lineMax; } /* 8022F94C */ virtual ~jmessage_string_tReference(); @@ -470,6 +477,8 @@ struct jmessage_string_tRenderingProcessor : public JMessage::TRenderingProcesso /* 80230D48 */ virtual void do_character(int); /* 80231110 */ virtual bool do_tag(u32, void const*, u32); + char* getString() { return field_0x54; } + /* 0x038 */ jmessage_string_tReference* mpReference; /* 0x03C */ f32 field_0x3c; /* 0x040 */ f32 field_0x40; diff --git a/include/d/msg/d_msg_string_base.h b/include/d/msg/d_msg_string_base.h index 1a6c2ad9a2..da2787f493 100644 --- a/include/d/msg/d_msg_string_base.h +++ b/include/d/msg/d_msg_string_base.h @@ -16,16 +16,16 @@ public: /* 802493B4 */ dMsgStringBase_c(); /* 80249528 */ ~dMsgStringBase_c(); /* 80249700 */ void getResource(); - /* 80249768 */ void getStringLocal(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); - /* 802498D8 */ void getStringPageLocal(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, + /* 80249768 */ f32 getStringLocal(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); + /* 802498D8 */ f32 getStringPageLocal(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); - /* 80249A48 */ void getPageMax(int); - /* 80249A70 */ void getMessageLocal(u32, char*); + /* 80249A48 */ u8 getPageMax(int); + /* 80249A70 */ f32 getMessageLocal(u32, char*); /* 80249BB0 */ virtual f32 getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); - /* 80249BD0 */ virtual void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, + /* 80249BD0 */ virtual f32 getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); - /* 80249BF8 */ virtual void getMessage(u32, char*); + /* 80249BF8 */ virtual f32 getMessage(u32, char*); /* 80249C18 */ virtual void resetStringLocal(J2DTextBox*); /* 80249C1C */ virtual void drawOutFontLocal(J2DTextBox*, f32); /* 80249BAC */ virtual void drawFontLocal(J2DTextBox*, u8, f32, f32, f32, f32, u32, u8); |