mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-27 23:45:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Work on d_msg_scrn_talk (#2192)

Browse Source 
* Work on d_msg_scrn_talk

* Generate d_pane_class_ex virtual inlines
This commit is contained in:
hatal175
2024-08-14 23:50:36 +03:00
committed by GitHub
parent 8316d7e952
commit 7d8dc7eb17
27 changed files with 505 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DPicture.h
+1 -1
View File
@@ -111,7 +111,7 @@ public:
/* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white);
/* 801DFA4C */ virtual JUtility::TColor getBlack() const;
/* 801DFA40 */ virtual JUtility::TColor getWhite() const;
/* 8025603C */ virtual bool getMaterial() const;
/* 8025603C */ virtual J2DMaterial* getMaterial() const { return NULL; }
/* 802FDBFC */ virtual void drawFullSet(f32, f32, f32, f32, Mtx*);
/* 802FE380 */ virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16,
s16, Mtx*);
include/JSystem/J2DGraph/J2DPictureEx.h
+2 -2
View File
@@ -37,7 +37,7 @@ public:
/* 803071A4 */ virtual void isUsed(ResFONT const*);
/* 80306A0C */ virtual void rewriteAlpha();
/* 803071C4 */ virtual void setAnimation(J2DAnmBase*);
/* 80256064 */ virtual void setAnimation(J2DAnmTransform*);
/* 80256064 */ virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
/* 80306AC4 */ virtual void setAnimation(J2DAnmColor*);
/* 80306B1C */ virtual void setAnimation(J2DAnmTexPattern*);
/* 80306AF0 */ virtual void setAnimation(J2DAnmTextureSRTKey*);
@@ -86,7 +86,7 @@ public:
/* 80306480 */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 803068F8 */ virtual void getBlack() const;
/* 80306958 */ virtual void getWhite() const;
/* 80256034 */ virtual void getMaterial() const;
/* 80256034 */ virtual J2DMaterial* getMaterial() const { return mMaterial; }
/* 80303B80 */ virtual void drawFullSet(f32, f32, f32, f32, f32 (*)[3][4]);
/* 80303BDC */ virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16,
s16, f32 (*)[3][4]);
include/JSystem/J2DGraph/J2DTextBox.h
+1 -1
View File
@@ -79,7 +79,7 @@ public:
/* 8019230C */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 801DFA34 */ virtual JUtility::TColor getBlack() const;
/* 801DFA28 */ virtual JUtility::TColor getWhite() const;
/* 8025602C */ virtual bool getMaterial() const;
/* 8025602C */ virtual J2DMaterial* getMaterial() const { return NULL; }
/* 802FFBC4 */ J2DTextBox(u64, JGeometry::TBox2<f32> const&, ResFONT const*, char const*, s16,
J2DTextBoxHBinding, J2DTextBoxVBinding);
include/JSystem/J2DGraph/J2DTextBoxEx.h
+2 -2
View File
@@ -33,7 +33,7 @@ public:
/* 80308828 */ virtual bool isUsed(ResFONT const*);
/* 80308810 */ virtual void rewriteAlpha();
/* 80308A4C */ virtual void setAnimation(J2DAnmBase*);
/* 80256044 */ virtual void setAnimation(J2DAnmTransform*);
/* 80256044 */ virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
/* 803088B4 */ virtual void setAnimation(J2DAnmColor*);
/* 8030890C */ virtual void setAnimation(J2DAnmTexPattern*);
/* 803088E0 */ virtual void setAnimation(J2DAnmTextureSRTKey*);
@@ -50,7 +50,7 @@ public:
/* 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;
/* 80256024 */ virtual J2DMaterial* getMaterial() const { return mMaterial; }
private:
/* 0x138 */ J2DMaterial* mMaterial;
include/JSystem/J2DGraph/J2DWindowEx.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
/* 803035FC */ virtual bool isUsed(ResFONT const*);
/* 80302DF4 */ virtual void rewriteAlpha();
/* 8030361C */ virtual void setAnimation(J2DAnmBase*);
/* 80256084 */ virtual void setAnimation(J2DAnmTransform*);
/* 80256084 */ virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
/* 80302FFC */ virtual void setAnimation(J2DAnmColor*);
/* 8030310C */ virtual void setAnimation(J2DAnmTexPattern*);
/* 80303084 */ virtual void setAnimation(J2DAnmTextureSRTKey*);
include/d/msg/d_msg_object.h
+3 -3
View File
@@ -599,9 +599,9 @@ public:
/* 0x0E0 */ f32 mBoxItemTextPosX;
/* 0x0E4 */ f32 mBoxItemTextPosY;
/* 0x0E8 */ JUtility::TColor
mBoxStartBlack[20]; // talk, navi, midna, item, stone, wood, book, wolf,
mBoxStartBlack[2][10]; // talk, navi, midna, item, stone, wood, book, wolf,
/* 0x110 */ //JUtility::TColor mBoxEndBlack[10];
/* 0x138 */ JUtility::TColor mBoxStartWhite[20];
/* 0x138 */ JUtility::TColor mBoxStartWhite[2][10];
/* 0x160 */ //JUtility::TColor mBoxEndWhite[10];
/* 0x188 */ JUtility::TColor mSelMsgInactiveCol;
/* 0x18C */ f32 mStageTitleCharPosX;
@@ -636,7 +636,7 @@ public:
/* 0x2E4 */ JUtility::TColor mPikariPikaR0;
/* 0x2E8 */ JUtility::TColor mPikariPikaR1;
/* 0x2EC */ f32 mPikariAnmSpeed;
/* 0x2F0 */ u16 mPikariHaloDelay_spirit;
/* 0x2F0 */ s16 mPikariHaloDelay_spirit;
/* 0x2F2 */ u8 mStageTitleDisplayType;
/* 0x2F4 */ s16 mMsgIndex;
/* 0x2F6 */ s16 mFlowIndex;
include/d/msg/d_msg_scrn_talk.h
+20 -1
View File
@@ -4,6 +4,10 @@
#include "dolphin/types.h"
#include "d/msg/d_msg_scrn_base.h"
class dMsgScrnArrow_c;
class dMsgScrn3Select_c;
class dMsgScrnLight_c;
struct dMsgScrnTalk_c : public dMsgScrnBase_c {
/* 80246FF0 */ dMsgScrnTalk_c(u8, u8, JKRExpHeap*);
/* 80247A90 */ ~dMsgScrnTalk_c();
@@ -24,7 +28,22 @@ struct dMsgScrnTalk_c : public dMsgScrnBase_c {
/* 802482B4 */ void fukiAlpha(f32);
/* 8024835C */ void fukiPosCalc(u8);
u8 field_0xc4[0x48c - 0xc4];
/* 0x0C4 */ J2DScreen* mpTxScreen;
/* 0x0C8 */ dMsgScrnArrow_c* mpArrow_c;
/* 0x0CC */ dMsgScrn3Select_c* mpSelect_c;
/* 0x0D0 */ dMsgScrnLight_c* mpLight_c;
/* 0x0D4 */ int field_0xd4;
/* 0x0D8 */ CPaneMgr* mpArw_c;
/* 0x0DC */ CPaneMgr* mpMg_c[2];
/* 0x0E4 */ JKRExpHeap* field_0xe4;
/* 0x0E8 */ f32 field_0xe8;
/* 0x0EC */ f32 field_0xec;
/* 0x0F0 */ f32 field_0xf0;
/* 0x0F4 */ f32 field_0xf4;
/* 0x0F8 */ f32 field_0xf8[150];
/* 0x350 */ f32 field_0x350[3];
/* 0x35C */ s16 field_0x35c[150];
/* 0x488 */ u8 field_0x488;
};
#endif /* MSG_SCRN_D_MSG_SCRN_TALK_H */