mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-07 13:23:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_message mostly done (#1097)

Browse Source 
* d_message mostly done

* fopMsgM_selectMessageGet fix
This commit is contained in:
TakaRikka
2026-07-02 17:43:07 -07:00
committed by GitHub
parent 873bb82e00
commit f93c5ba62c
15 changed files with 1837 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_drawlist.h
+6 -5
View File
@@ -149,9 +149,10 @@ public:
void setScale(f32, f32);
void setScroll(int, s16, s16);
virtual void draw();
void setAlpha(u8) {}
void setBlackColor(GXColor& c) { mC0 = c; }
void setWhiteColor(GXColor& c) { mC1 = c; }
void setAlpha(u8 i_alpha) { mBlack.a = i_alpha; }
void setBlackColor(GXColor& c) { mBlack = c; }
void setWhiteColor(GXColor& c) { mWhite = c; }
public:
struct TexEntry {
@@ -169,8 +170,8 @@ public:
/* 0x0A */ s16 mY1;
/* 0x0C */ f32 mScaleX;
/* 0x10 */ f32 mScaleY;
/* 0x14 */ GXColor mC0;
/* 0x18 */ GXColor mC1;
/* 0x14 */ GXColor mBlack;
/* 0x18 */ GXColor mWhite;
/* 0x1C */ TexEntry mTex[2];
};
include/d/d_kankyo.h
+1
View File
@@ -467,5 +467,6 @@ void dKy_contrast_flg_set(u8);
u8 dKy_contrast_flg_get();
BOOL dKyr_player_overhead_bg_chk();
void dKy_usonami_set(f32 param_0);
GXColorS10* dKy_Get_DifCol();
#endif /* D_KANKYO_D_KANKYO_H */
include/d/d_message.h
+64 -4
View File
@@ -1,21 +1,81 @@
#ifndef D_MESSAGE_H
#define D_MESSAGE_H
#include "dolphin/types.h"
#include "f_op/f_op_msg_mng.h"
#include "d/d_drawlist.h"
class sub_msg2_class;
class dDlst_2DMSG2_c {
class dDlst_2DMSG2_c : public dDlst_base_c {
public:
void setActorP(sub_msg2_class*) {}
virtual ~dDlst_2DMSG2_c() {}
void setActorP(sub_msg2_class* i_actorp) { actorP = i_actorp; }
void draw();
void outFontDraw();
/* 0x4 */ sub_msg2_class* actorP;
};
class dDlst_2DCopy_c {
class dDlst_2DCopy_c : public dDlst_base_c {
public:
virtual ~dDlst_2DCopy_c() {}
void draw();
/* 0x4 */ u8 field_0x4[0x8 - 0x4];
/* 0x8 */ void* copyTex;
};
struct sub_msg2_class {
/* 0x000 */ msg_class msg;
/* 0x0FC */ u8 field_0x0FC[0x100 - 0x0FC];
/* 0x100 */ JKRExpHeap* Heap;
/* 0x104 */ JMSMesgEntry_c mesgEntry;
/* 0x11C */ fopMsgM_msgDataProc_c msgDataProc[3];
/* 0x8FC */ fopMsgM_msgGet_c msgGet;
/* 0x90C */ mesg_header* head_p;
/* 0x910 */ fopMsgM_pane_class text_pane[3];
/* 0x9B8 */ fopMsgM_pane_class textSdw_pane[3];
/* 0xA60 */ fopMsgM_pane_class ruby_pane[3];
/* 0xB08 */ fopMsgM_pane_class rubySdw_pane[3];
/* 0xBB0 */ fopMsgM_pane_class field_0xbb0;
/* 0xBE8 */ fopMsgM_pane_class field_0xbe8;
/* 0xC20 */ fopMsgM_pane_class field_0xc20;
/* 0xC58 */ fopMsgM_pane_class field_0xc58;
/* 0xC90 */ fopMsgM_pane_class field_0xc90;
/* 0xCC8 */ fopMsgM_pane_class field_0xcc8;
/* 0xD00 */ fopMsgM_pane_class field_0xd00[3];
/* 0xDA8 */ fopMsgM_pane_class field_0xda8[3];
/* 0xE50 */ JUTFont* mx;
/* 0xE54 */ JUTFont* rx;
/* 0xE58 */ ResTIMG* Tex[2];
/* 0xE60 */ char* message;
/* 0xE64 */ char* output_text[3];
/* 0xE70 */ char* output_ruby[3];
/* 0xE7C */ char* output_textSdw[3];
/* 0xE88 */ char* output_rubySdw[3];
/* 0xE94 */ f32 field_0xe94;
/* 0xE98 */ int field_0xe98;
/* 0xE9C */ u8 field_0xe9c;
/* 0xE9D */ u8 field_0xe9d;
/* 0xE9E */ u8 field_0xe9e;
/* 0xEA0 */ u32 mesgNumber;
/* 0xEA4 */ u16 colorNo;
/* 0xEA8 */ f32 field_0xea8;
/* 0xEAC */ f32 field_0xeac;
/* 0xEB0 */ int field_0xeb0;
/* 0xEB4 */ int field_0xeb4;
/* 0xEB8 */ int field_0xeb8;
/* 0xEBC */ int field_0xebc;
/* 0xEC0 */ u8 field_0xec0;
/* 0xEC4 */ int field_0xec4;
/* 0xEC8 */ int field_0xec8;
/* 0xECC */ int field_0xecc[3];
/* 0xED8 */ u8 field_0xED8[0xEDD - 0xED8];
/* 0xEDD */ u8 field_0xedd;
/* 0xEDE */ u8 field_0xede;
/* 0xEDF */ u8 field_0xedf[4][3];
};
#endif /* D_MESSAGE_H */
include/d/d_meter.h
+9 -36
View File
@@ -386,42 +386,15 @@ public:
void genMessage(JORMContext* ctx);
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 field_0x5;
/* 0x06 */ u8 field_0x6;
/* 0x07 */ u8 field_0x7;
/* 0x08 */ u8 field_0x8;
/* 0x09 */ u8 field_0x9;
/* 0x0A */ u8 field_0xa;
/* 0x0B */ u8 field_0xb;
/* 0x0C */ u8 field_0xc;
/* 0x0D */ u8 field_0xd;
/* 0x0E */ u8 field_0xe;
/* 0x0F */ u8 field_0xf;
/* 0x10 */ u8 field_0x10;
/* 0x11 */ u8 field_0x11;
/* 0x12 */ u8 field_0x12;
/* 0x13 */ u8 field_0x13;
/* 0x14 */ u8 field_0x14;
/* 0x15 */ u8 field_0x15;
/* 0x16 */ u8 field_0x16;
/* 0x17 */ u8 field_0x17;
/* 0x18 */ u8 field_0x18;
/* 0x19 */ u8 field_0x19;
/* 0x1A */ u8 field_0x1a;
/* 0x1B */ u8 field_0x1b;
/* 0x1C */ u8 field_0x1c;
/* 0x1D */ u8 field_0x1d;
/* 0x1E */ u8 field_0x1e;
/* 0x1F */ u8 field_0x1f;
/* 0x20 */ u8 field_0x20;
/* 0x21 */ u8 field_0x21;
/* 0x22 */ u8 field_0x22;
/* 0x23 */ u8 field_0x23;
/* 0x24 */ u8 field_0x24;
/* 0x25 */ u8 field_0x25;
/* 0x26 */ u8 field_0x26;
/* 0x27 */ u8 field_0x27;
/* 0x28 */ u8 field_0x28;
/* 0x05 */ GXColor field_0x5;
/* 0x09 */ GXColor field_0x9;
/* 0x0D */ GXColor field_0xd;
/* 0x11 */ GXColor field_0x11;
/* 0x15 */ GXColor field_0x15;
/* 0x19 */ GXColor field_0x19;
/* 0x1D */ GXColor field_0x1d;
/* 0x21 */ GXColor field_0x21;
/* 0x25 */ GXColor field_0x25;
/* 0x29 */ u8 field_0x29;
/* 0x2A */ u8 field_0x2a;
/* 0x2B */ u8 field_0x2b;