diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-06-29 13:19:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-29 22:19:09 +0200 |
| commit | 046d178003035ea87d3042a61917c2d482c68c74 (patch) | |
| tree | 4240e760d8d40201ca4ec96634da8abff211f6bb /include/msg | |
| parent | cd5b02450cf278cbeb2c8bb90be1ad22518938c7 (diff) | |
work on daalink, fop actor, mDo machine, msg_scrn, + various (#201)
* 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
Diffstat (limited to 'include/msg')
| -rw-r--r-- | include/msg/scrn/d_msg_scrn_base.h | 68 | ||||
| -rw-r--r-- | include/msg/scrn/d_msg_scrn_boss.h | 19 | ||||
| -rw-r--r-- | include/msg/scrn/d_msg_scrn_explain.h | 66 |
3 files changed, 150 insertions, 3 deletions
diff --git a/include/msg/scrn/d_msg_scrn_base.h b/include/msg/scrn/d_msg_scrn_base.h index 143b9e6b4a..c4a6d36dea 100644 --- a/include/msg/scrn/d_msg_scrn_base.h +++ b/include/msg/scrn/d_msg_scrn_base.h @@ -1,6 +1,72 @@ #ifndef MSG_SCRN_D_MSG_SCRN_BASE_H #define MSG_SCRN_D_MSG_SCRN_BASE_H -#include "dolphin/types.h" +#include "d/msg/d_msg_out_font.h" +#include "d/com/d_com_inf_game.h" + +struct CharInfo_c; + +class dMsgScrnBase_c : public dDlst_base_c { +public: + /* 8023C0DC */ dMsgScrnBase_c(); + /* 8023C16C */ void init(); + /* 8023C32C */ void drawOutFont(f32, f32, f32); + /* 8023C360 */ void setString(char*, char*); + /* 8023C3EC */ void setRubyString(char*); + /* 8023C574 */ bool isTalkNow(); + + /* 8023C274 */ virtual void draw(); + /* 8023C124 */ virtual ~dMsgScrnBase_c(); + /* 80238C3C */ virtual void exec(); + /* 8023C234 */ virtual void multiDraw(); + /* 8023C300 */ virtual void drawSelf(); + /* 80238C44 */ virtual void setSelectString(char*, char*, char*); + /* 80238C40 */ virtual void setSelectRubyString(char*, char*, char*); + /* 80238C58 */ virtual void arwAnimeInit(); + /* 80238C54 */ virtual void arwAnimeMove(); + /* 80238C74 */ virtual void dotAnimeInit(); + /* 80238C70 */ virtual void dotAnimeMove(); + /* 80238C60 */ virtual bool isSelect(); + /* 80238C50 */ virtual void selectAnimeInit(u8, u8, f32, u8); + /* 80238C48 */ virtual bool selectAnimeMove(u8, u8, bool); + /* 80238C68 */ virtual bool selectAnimeEnd(); + /* 8023C458 */ virtual void fukiScale(f32); + /* 8023C480 */ virtual void fukiTrans(f32, f32); + /* 8023C4A4 */ virtual void fukiAlpha(f32); + /* 8023C4F4 */ virtual void fontAlpha(f32); + /* 80238C5C */ virtual void fukiPosCalc(u8); + + /* 0x04 */ J2DScreen* mpScreen; + /* 0x08 */ CPaneMgr* mpPmp_c; + /* 0x0C */ CPaneMgr* mpTm_c[7]; + /* 0x28 */ CPaneMgr* mpTmr_c[7]; + /* 0x44 */ COutFont_c* mpOutFont; + /* 0x48 */ dDlst_base_c* field_0x48; + /* 0x4C */ u32 field_0x4c; + /* 0x50 */ CharInfo_c* mCharInfoPtr; + /* 0x54 */ u32 field_0x54; + /* 0x58 */ J2DTextBox::TFontSize mFontSize; + /* 0x60 */ f32 mRubySize; + /* 0x64 */ f32 mTextBoxPosX; + /* 0x68 */ f32 mTextBoxPosY; + /* 0x6C */ f32 mTextBoxScaleX; + /* 0x70 */ f32 mTextBoxScaleY; + /* 0x74 */ f32 mTBoxWidth; + /* 0x78 */ f32 mTBoxHeight; + /* 0x7C */ f32 mLineSpace; + /* 0x80 */ f32 mCharSpace; + /* 0x84 */ f32 mRubyCharSpace; + /* 0x88 */ f32 mSelFontSize; + /* 0x8C */ f32 mSelRubySize; + /* 0x90 */ f32 mSelTextBoxPosX[3]; + /* 0x9C */ f32 mSelTextBoxPosY[3]; + /* 0xA8 */ f32 mSelTBoxWidth; + /* 0xAC */ f32 mSelCharSpace; + /* 0xB0 */ f32 mSelRubyCharSpace; + /* 0xB4 */ f32 mTextBoxPosOffsetY; + /* 0xB8 */ f32 field_0xb8; + /* 0xBC */ f32 mCharAlphaRate; + /* 0xC0 */ u16 mMsgID; +}; #endif /* MSG_SCRN_D_MSG_SCRN_BASE_H */ diff --git a/include/msg/scrn/d_msg_scrn_boss.h b/include/msg/scrn/d_msg_scrn_boss.h index 8f0460725b..bc1b6775ba 100644 --- a/include/msg/scrn/d_msg_scrn_boss.h +++ b/include/msg/scrn/d_msg_scrn_boss.h @@ -1,6 +1,23 @@ #ifndef MSG_SCRN_D_MSG_SCRN_BOSS_H #define MSG_SCRN_D_MSG_SCRN_BOSS_H -#include "dolphin/types.h" +#include "msg/scrn/d_msg_scrn_base.h" + +class dMsgScrnBoss_c : public dMsgScrnBase_c { +public: + /* 8023C5C8 */ dMsgScrnBoss_c(); + + /* 8023C928 */ virtual ~dMsgScrnBoss_c(); + /* 8023CA88 */ virtual void exec(); + /* 8023CB98 */ virtual void drawSelf(); + /* 8023CC7C */ virtual void fukiScale(f32); + /* 8023CC80 */ virtual void fukiTrans(f32, f32); + /* 8023CC84 */ virtual void fontAlpha(f32); + /* 8023CBF0 */ virtual void fukiAlpha(f32); + +private: + /* 0xC4 */ CPaneMgr* mpBaseParent; + /* 0xC8 */ CPaneMgr* mpFontParent; +}; #endif /* MSG_SCRN_D_MSG_SCRN_BOSS_H */ diff --git a/include/msg/scrn/d_msg_scrn_explain.h b/include/msg/scrn/d_msg_scrn_explain.h index 5fdf7b869e..aaee0f0a7c 100644 --- a/include/msg/scrn/d_msg_scrn_explain.h +++ b/include/msg/scrn/d_msg_scrn_explain.h @@ -1,6 +1,70 @@ #ifndef MSG_SCRN_D_MSG_SCRN_EXPLAIN_H #define MSG_SCRN_D_MSG_SCRN_EXPLAIN_H -#include "dolphin/types.h" +#include "msg/scrn/d_msg_scrn_base.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" + +class dMsgScrnArrow_c; +class dMsgScrn3Select_c; + +class dMsgScrnExplain_c { +public: + /* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8); + /* 8023D7D8 */ void move(); + /* 8023D918 */ void draw(J2DOrthoGraph*); + /* 8023DAD0 */ void wait_init(); + /* 8023DAD4 */ void wait_proc(); + /* 8023DAD8 */ void open_request_init(); + /* 8023DADC */ void open_request_proc(); + /* 8023DBE4 */ void open_init(); + /* 8023DC7C */ void open_proc(); + /* 8023DD90 */ void move_init(); + /* 8023DDB4 */ void move_proc(); + /* 8023DE8C */ void move_select_init(); + /* 8023E0F4 */ void move_select_proc(); + /* 8023E43C */ void close_init(); + /* 8023E448 */ void close_proc(); + /* 8023E558 */ bool openExplain(u32, u8, u8, u8, bool); + /* 8023E5CC */ void getAlphaRatio(); + /* 8023E640 */ void checkTriggerA(); + /* 8023E654 */ void checkTriggerB(); + + /* 8023D538 */ virtual ~dMsgScrnExplain_c(); + + u8 getStatus() { return mStatus; } + void setForceSelect() { mForceSelect = 1; } + void setKeyWaitTimer(s16 timer) { mKeyWaitTimer = timer; } + +private: + /* 0x04 */ dMsgString_c* mpString_c; + /* 0x08 */ CPaneMgr* mpTm_c[2]; + /* 0x10 */ CPaneMgr* field_0x10[2]; + /* 0x18 */ CPaneMgr* mpMg_c[2]; + /* 0x20 */ CPaneMgr* mpRoot_c[2]; + /* 0x28 */ CPaneMgr* mpArw_c; + /* 0x2C */ J2DScreen* mpScreen; + /* 0x30 */ J2DScreen* mpTxScreen; + /* 0x34 */ dMsgScrnArrow_c* mpArrow_c; + /* 0x38 */ dMsgScrn3Select_c* mpSelect_c; + /* 0x3C */ COutFont_c* mpOutFont; + /* 0x40 */ J2DPicture* mpBackTex; + /* 0x44 */ STControl* field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4c; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ u32 field_0x54; + /* 0x58 */ u8 field_0x58; + /* 0x5A */ s16 field_0x5a; + /* 0x5C */ s16 field_0x5c; + /* 0x5E */ s16 mKeyWaitTimer; + /* 0x60 */ u8 mStatus; + /* 0x61 */ u8 mSelCursor; + /* 0x62 */ u8 field_0x62; + /* 0x63 */ u8 field_0x63; + /* 0x64 */ u8 field_0x64; + /* 0x65 */ u8 mForceSelect; + /* 0x66 */ u8 field_0x66; + /* 0x67 */ u8 field_0x67; +}; // Size: 0x68 #endif /* MSG_SCRN_D_MSG_SCRN_EXPLAIN_H */ |
