mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-10 15:13:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Work on d_msg_scrn_item (#2188)

Browse Source
This commit is contained in:
hatal175
2024-08-10 06:23:17 +03:00
committed by GitHub
parent e7e5453771
commit 7894ea5140
28 changed files with 653 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DPane.h
+2
View File
@@ -138,6 +138,8 @@ public:
MtxP getGlbMtx() { return mGlobalMtx; }
JGeometry::TBox2<f32>& getGlbBounds() { return mGlobalBounds; }
void setMtx(Mtx m) { MTXCopy(m, mPositionMtx); }
void translate(f32 transX, f32 transY) {
include/JSystem/JKernel/JKRArchive.h
+4
View File
@@ -242,4 +242,8 @@ inline void JKRUnmountArchive(JKRArchive* arc) {
arc->unmount();
}
inline void JKRReadIdxResource(void* param_1, u32 param_2, u32 param_3, JKRArchive* param_4) {
param_4->readIdxResource(param_1, param_2, param_3);
}
#endif
include/d/a/d_a_npc.h
+1 -1
View File
@@ -251,7 +251,7 @@ public:
/* 0xD90 */ u32 field_0xd90;
/* 0xD94 */ u32 field_0xd94;
/* 0xD98 */ u32 field_0xd98;
/* 0xD9C */ profile_method_class* sub_method;
/* 0xD9C */ u32 mMsgId;
/* 0xDA0 */ u8 field_0xda0[8];
/* 0xDA8 */ u32 field_0xda8;
/* 0xDAC */ int field_0xdac;
include/d/d_item_data.h
+2
View File
@@ -11,6 +11,8 @@ struct dItem_itemInfo {
};
struct dItem_itemResource {
f32 getTexScale() { return mTexScale; }
/* 0x00 */ const char* mArcName;
/* 0x04 */ s16 mBmdName;
/* 0x06 */ s16 mBtkName;
include/d/msg/d_msg_object.h
+6 -3
View File
@@ -119,7 +119,7 @@ public:
char*, char*, char*, s16*);
/* 80238174 */ static void* getMsgDtPtr();
/* 80238188 */ static void setProcessID(unsigned int);
/* 8023819C */ static fopAc_ac_c* getActor();
/* 8023819C */ static msg_class* getActor();
/* 802381C0 */ static fopAc_ac_c* getpTalkActor();
/* 802381D4 */ static int getIdx();
/* 802381E8 */ static u16 getNodeIdx();
@@ -222,8 +222,7 @@ public:
u8 getBombNumLocal(int idx) { return mBombNum[idx]; }
bool isCameraCancelFlagLocal() { return mCameraCancelFlag; }
void* getMsgDtPtrLocal() { return mpMsgDt; }
// TODO: The type return is unclear. Maybe msg_class*.
fopAc_ac_c* getActorLocal() { return (fopAc_ac_c*)field_0x100; }
msg_class* getActorLocal() { return field_0x100; }
fopAc_ac_c* getpTalkActorLocal() { return mpTalkActor; }
int getIdxLocal() { return mIdx; }
u16 getNodeIdxLocal() { return mNodeIdx; }
@@ -677,4 +676,8 @@ public:
/* 0x35C */ dMsgObject_HowlHIO_c mHowlHIO;
};
#ifndef DISABLE_MSG_OBJECT_EXTERN
extern dMsgObject_HIO_c g_MsgObject_HIO_c;
#endif
#endif /* D_MSG_D_MSG_OBJECT_H */
include/d/msg/d_msg_scrn_3select.h
+1 -1
View File
@@ -31,7 +31,7 @@ public:
/* 80239D98 */ void translate(f32, f32);
/* 80239DD4 */ void draw(f32, f32);
/* 8023A094 */ void selAnimeInit(u8, u8, u8, f32, u8);
/* 8023A398 */ BOOL selAnimeMove(u8, u8, bool);
/* 8023A398 */ bool selAnimeMove(u8, u8, bool);
/* 8023A680 */ bool selAnimeEnd();
/* 8023A934 */ f32 getTextBoxWidth();
/* 8023A94C */ f32 getFontSize();
include/d/msg/d_msg_scrn_item.h
+44 -2
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 dMsgScrnItem_c : public dMsgScrnBase_c {
/* 8023E79C */ dMsgScrnItem_c(u8, u8, JKRExpHeap*);
/* 8023F51C */ ~dMsgScrnItem_c();
@@ -26,9 +30,47 @@ struct dMsgScrnItem_c : public dMsgScrnBase_c {
/* 8024074C */ void setBtk0Animation(J2DAnmTextureSRTKey*);
/* 802407E8 */ void setBpk0Animation(J2DAnmColor*);
/* 80240844 */ void setBpk1Animation(J2DAnmColor*);
/* 802408A4 */ void isOugiID();
/* 802408A4 */ bool isOugiID();
u8 field_0xc4[0x1a0 - 0xc4];
/* 0x0C4 */ J2DScreen* mpTxScreen;
/* 0x0C8 */ J2DPicture* mpItemPane[3];
/* 0x0D4 */ void* mpItemTex[3];
/* 0x0E0 */ ResTIMG* field_0x0e0[3];
/* 0x0EC */ dMsgScrnArrow_c* mpArrow_c;
/* 0x0F0 */ dMsgScrn3Select_c* mpSelect_c;
/* 0x0F4 */ dMsgScrnLight_c* mpLight_c;
/* 0x0F8 */ u8 field_0xf8[0x108 - 0xf8];
/* 0x108 */ CPaneMgr* mpArw_c;
/* 0x10C */ CPaneMgr* mpMg_c[2];
/* 0x114 */ u32 field_0x114;
/* 0x118 */ J2DAnmTextureSRTKey* field_0x118[1];
/* 0x11C */ u32 field_0x11c;
/* 0x120 */ u8 field_0x120[0x12c - 0x120];
/* 0x12C */ J2DAnmColorKey* field_0x12c[2];
/* 0x134 */ u32 field_0x134;
/* 0x138 */ JKRExpHeap* field_0x138;
/* 0x13C */ f32 field_0x13c;
/* 0x140 */ f32 field_0x140[1];
/* 0x13C */ u8 field_0x144[0x154 - 0x144];
/* 0x154 */ f32 field_0x154[2];
/* 0x15C */ f32 field_0x15c;
/* 0x160 */ f32 field_0x160;
/* 0x164 */ f32 field_0x164;
/* 0x168 */ f32 field_0x168;
/* 0x16C */ f32 field_0x16c;
/* 0x170 */ f32 field_0x170;
/* 0x174 */ f32 field_0x174;
/* 0x178 */ f32 field_0x178;
/* 0x17C */ f32 field_0x17c;
/* 0x180 */ f32 field_0x180;
/* 0x184 */ f32 field_0x184;
/* 0x188 */ f32 field_0x188[3];
/* 0x194 */ f32 field_0x194;
/* 0x198 */ int mItemIndex;
/* 0x19C */ u8 field_0x19c;
/* 0x19D */ bool field_0x19d;
/* 0x19E */ bool field_0x19e;
/* 0x19F */ u8 field_0x19f;
};
#endif /* MSG_SCRN_D_MSG_SCRN_ITEM_H */