diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-08-30 14:22:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 15:22:17 -0600 |
| commit | f8979749e3ef8e8cacf2ea8f474c7f23fc5cb6b3 (patch) | |
| tree | 69659df2105266e9b26a4d50b9a2d610b3e437a2 /include/JSystem/J2DGraph/J2DTextBoxEx.h | |
| parent | bc30d007e11458a198c5725626a10bb06a5da536 (diff) | |
j2d / map_path work, d_drawlist / d_attention cleanup (#208)
* work on fop actor / actor mng, daalink, d_a_obj_item
* d_a_title mostly decompiled
* daalink / d_event / JMessage / dmsg_out_font work
* msg_scrn_base / msg_scrn_boss
* some work on mDo machine, d_menu_save, d_tresure, and various
* remove asm
* progress
* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data
* rename more data
* remove asm / progress
* match all of d_pane_class
* fixes / some dKankyo doc
* bunch of j2d work. d_drawlist / d_attention cleanup
* progress / asm
* cleanup wip
* decompile JStage
* setup some more JStudio structs
* set up d_demo classes
* some d_demo work
* cleanup dolphin os stuff
* some initial dEvent documentation
* some At collision documentation
* match JUTConsole::doDraw
* dbgs work / split up some of d_a_alink into .inc files
* d_a_alink_spinner work
Diffstat (limited to 'include/JSystem/J2DGraph/J2DTextBoxEx.h')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DTextBoxEx.h | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/include/JSystem/J2DGraph/J2DTextBoxEx.h b/include/JSystem/J2DGraph/J2DTextBoxEx.h index d9b8a725a1..98f6c44c10 100644 --- a/include/JSystem/J2DGraph/J2DTextBoxEx.h +++ b/include/JSystem/J2DGraph/J2DTextBoxEx.h @@ -8,22 +8,26 @@ class J2DTextBoxEx : public J2DTextBox { public: - enum stage_enum {}; + enum stage_enum { + STAGE_0, + STAGE_1, + STAGE_2, + }; /* 803071E4 */ J2DTextBoxEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*); /* 80307E0C */ void setTevOrder(bool); /* 80307EF0 */ void setTevStage(bool); /* 80307F94 */ void setStage(J2DTevStage*, J2DTextBoxEx::stage_enum); - /* 803084CC */ void getBlackWhite(JUtility::TColor*, JUtility::TColor*) const; - /* 80308668 */ void isSetBlackWhite(JUtility::TColor, JUtility::TColor) const; + /* 803084CC */ bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const; + /* 80308668 */ bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const; /* 8030751C */ virtual ~J2DTextBoxEx(); /* 803089EC */ virtual void setCullBack(bool); /* 803087DC */ virtual void setCullBack(_GXCullMode); /* 803087BC */ virtual void setAlpha(u8); /* 803075AC */ virtual void drawSelf(f32, f32, f32 (*)[3][4]); - /* 80308A28 */ virtual void isUsed(ResTIMG const*); - /* 80308828 */ virtual void isUsed(ResFONT const*); + /* 80308A28 */ virtual bool isUsed(ResTIMG const*); + /* 80308828 */ virtual bool isUsed(ResFONT const*); /* 80308810 */ virtual void rewriteAlpha(); /* 80308A4C */ virtual void setAnimation(J2DAnmBase*); /* 80256044 */ virtual void setAnimation(J2DAnmTransform*); @@ -33,24 +37,24 @@ public: /* 80308938 */ virtual void setAnimation(J2DAnmTevRegKey*); /* 80308964 */ virtual void setAnimation(J2DAnmVisibilityFull*); /* 80308A48 */ virtual void setAnimation(J2DAnmVtxColor*); - /* 8030896C */ virtual void animationPane(J2DAnmTransform const*); + /* 8030896C */ virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*); /* 803078AC */ virtual void draw(f32, f32); /* 80307AF0 */ virtual void draw(f32, f32, f32, J2DTextBoxHBinding); /* 80307D5C */ virtual void setFont(JUTFont*); /* 80307DC0 */ virtual JUTFont* getFont() const; - /* 8030823C */ virtual void setBlack(JUtility::TColor); - /* 803082C4 */ virtual void setWhite(JUtility::TColor); - /* 8030834C */ virtual void setBlackWhite(JUtility::TColor, JUtility::TColor); - /* 803086FC */ virtual void getBlack() const; - /* 8030875C */ virtual void getWhite() const; - /* 80256024 */ virtual void getMaterial() const; + /* 8030823C */ virtual bool setBlack(JUtility::TColor); + /* 803082C4 */ virtual bool setWhite(JUtility::TColor); + /* 8030834C */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor); + /* 803086FC */ virtual JUtility::TColor getBlack() const; + /* 8030875C */ virtual JUtility::TColor getWhite() const; + /* 80256024 */ virtual bool getMaterial() const; private: - /* 0x134 */ u8 field_0x134[4]; /* 0x138 */ J2DMaterial* mMaterial; /* 0x13C */ u16 field_0x13c; /* 0x13E */ u16 field_0x13e; /* 0x140 */ u8 field_0x140; -}; // Size: 0x144 + /* 0x144 */ J2DAnmVisibilityFull* mVisibilityAnm; +}; // Size: 0x148 #endif /* J2DTEXTBOXEX_H */ |
