mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-14 12:24:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

msg work (#1143)

Browse Source 
* fopMsgM_msgDataProc_c::stringSet work

* Fix JPN

* More stringSet work

* work

* get rid of fake temps

* stringSet 99.99%

* fopMsgM_msgDataProc_c::stringLength 100%

* d_msg work

* fix pal

* fix message_paper, d_meter version diff fixes
This commit is contained in:
LagoLunatic
2026-08-02 21:04:29 -04:00
committed by GitHub
parent dbc093a3cf
commit 380407dd26
34 changed files with 2719 additions and 1600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
+10
View File
@@ -444,7 +444,9 @@ public:
int getItemNowMagic() { return mItemNowMagicCount; }
void setItemNowMagic(s16 num) { mItemNowMagicCount = num; }
u32 getNpcNameMessageID() { return mNpcNameMessageID; }
void setNpcNameMessageID(u32 id) { mNpcNameMessageID = id; }
u32 getItemNameMessageID() { return mItemNameMessageID; }
void setItemNameMessageID(u32 id) { mItemNameMessageID = id; }
s16 getItemKeyNumCount() { return mItemKeyNumCount; }
@@ -1010,6 +1012,14 @@ inline s16 dComIfGp_getAuctionGauge() {
return g_dComIfG_gameInfo.play.getAuctionGauge();
}
inline u32 dComIfGp_getNpcNameMessageID() {
return g_dComIfG_gameInfo.play.getNpcNameMessageID();
}
inline u32 dComIfGp_getItemNameMessageID() {
return g_dComIfG_gameInfo.play.getItemNameMessageID();
}
inline void dComIfGs_setRupee(u16 rupee) {
g_dComIfG_gameInfo.save.getPlayer().getPlayerStatusA().setRupee(rupee);
}
include/d/d_message_paper.h
+12 -1
View File
@@ -2,8 +2,12 @@
#define D_MESSAGE_PAPER_H
#include "dolphin/types.h"
#include "f_op/f_op_msg.h"
class sub_msg3_class;
#if VERSION < VERSION_PAL
struct sub_msg3_class : public msg_class {
/* 0x0FC */ u8 m0FC[0xEE8 - 0x0FC];
};
class dmsg3_3d_c {
public:
@@ -22,5 +26,12 @@ public:
void draw();
void outFontDraw();
};
#endif
#if VERSION == VERSION_PAL
struct dMessage_Paper_c : public msg_class {
/* 0x0FC */ u8 m0FC[0x104 - 0x0FC];
};
#endif
#endif /* D_MESSAGE_PAPER_H */
include/d/d_msg.h
+5 -1
View File
@@ -79,7 +79,10 @@ public:
virtual void draw();
void outFontDraw();
sub_msg_class* field_0x4;
void setActorP(sub_msg_class* i_msg) { mpMsg = i_msg; }
private:
sub_msg_class* mpMsg;
};
class dDlst_2Dtact_c : public dDlst_base_c {
@@ -87,6 +90,7 @@ public:
virtual ~dDlst_2Dtact_c();
virtual void draw();
private:
u8 field_0x4[4];
void* field_0x8;
};
include/f_op/f_op_msg_mng.h
+67 -59
View File
@@ -165,12 +165,6 @@ public:
void selectArrow(J2DPicture*, f32, f32);
void colorAnime(J2DPicture*);
void stringSet();
void setSelectFlagYokoOn();
void setSelectFlagOn();
void setHandSendFlagOn();
void setAutoSendFlagOn();
u8 getHandSendFlag();
u8 getAutoSendFlag();
void getString(char*, u32);
void getString(char*, char*, char*, char*, u32, f32*, f32*, int*);
void getRubyString(char*, char*, char*, char*, char*, char*, f32*, f32*, int*);
@@ -239,11 +233,11 @@ public:
void tag_input_kenshi();
#endif
u32 getIconColor(int i_no) { return field_0x1E0[i_no]; }
u8 getIconNum(int i_no) { return field_0x281[i_no]; }
int getIconPosX(int i_no) { return field_0x168[i_no]; }
int getIconPosY(int i_no) { return field_0x1A4[i_no]; }
void getIconScale(int) {}
u8 getIconNum(int i_no) { return iconNum[i_no]; }
int getIconPosX(int i_no) { return iconPosX[i_no]; }
int getIconPosY(int i_no) { return iconPosY[i_no]; }
int getIconScale(int i_no) { return iconScale[i_no]; }
u32 getIconColor(int i_no) { return iconColor[i_no]; }
void setCharSpace(int i_space) { charSpace = i_space; }
void setRubyCharSpace(int i_space) { rubyCharSpace = i_space; }
@@ -259,31 +253,52 @@ public:
field_0x6C = param_3;
field_0x4C = param_3;
}
void setSelectMessage(char*, char*, char*, char*) {}
void setSelectMessage(char* param_0, char* param_1, char* param_2, char* param_3) {
selectMessage[0] = param_0;
selectMessage[1] = param_1;
selectMessage[2] = param_2;
selectMessage[3] = param_3;
}
void setMesgEntry(JMSMesgEntry_c* i_entry) { mesgEntry = i_entry; }
void dec_keyWaitTimer() {}
void dec_waitTimer() { waitTimer = (int)waitTimer > 0 ? waitTimer - 1 : 0; }
u8 getCharAlpha() { return field_0x293; } // ?
u8 getGradAlpha() { return field_0x292; } // ?
u8 getSelectFlag() { return selectFlag; }
void setSelectFlagOff() { selectFlag = 0; }
void setSelectFlagOn() { selectFlag = 1; }
void setSelectFlagYokoOn() { selectFlag = 2; }
u8 getAutoSendFlag() { return autoSendFlag; }
void setAutoSendFlagOff() { autoSendFlag = 0; }
void setAutoSendFlagOn() { autoSendFlag = 1; }
u8 getHandSendFlag() { return handSendFlag; }
void setHandSendFlagOff() { handSendFlag = 0; }
void setHandSendFlagOn() { handSendFlag = 1; }
int get_waitTimer() { return waitTimer; }
void set_waitTimer(int value) { waitTimer = value; }
void set_waitTimerZero() { waitTimer = 0; }
int dec_waitTimer() { return waitTimer = waitTimer > 0 ? waitTimer - 1 : 0; }
int dec_keyWaitTimer() { return keyWaitTimer = keyWaitTimer > 0 ? keyWaitTimer - 1 : 0; }
int getLineCount() { return lineCount; }
u8 getMesgStatus() { return mesgStatus; }
f32 getNowCursorPos() { return field_0x20; }
u8 getRCharAlpha() { return field_0x291; } // ?
u8 getRGradAlpha() { return field_0x290; } // ?
u8 getSelectFlag() { return selectFlag; }
void getSelectLength() {}
u32 getStringColor() { return field_0x25C;}
u32 get_waitTimer() { return waitTimer; }
f32 getNowCursorPos() { return nowCursorPos; }
int getSelectLength() { return selectLength; }
u32 getStringColor() { return stringColor; }
void setStringColor(u32 i_color) { stringColor = i_color; }
void resetNowLine() { nowLine = 0; }
void selectArrow(J2DPicture*) {}
void setActorPosition(cXyz*) {}
void selectArrow(J2DPicture* i_arrowPane) {
selectArrow(i_arrowPane, field_0x26C, field_0x270, field_0x278, field_0x274);
}
void setActorPosition(cXyz* i_pos) { actorPosition = i_pos; }
void setAimLine(int i_line) { aimLine = i_line; }
void setAutoSendFlagOff() { autoSendFlag = 0; }
void setBmgData(char* i_data) { bmgData = i_data; }
void setCenterLineWidth(int i_width) { centerLineWidth = i_width; }
u8 getCharAlpha() { return field_0x290; }
u8 getGradAlpha() { return field_0x291; }
u8 getRCharAlpha() { return field_0x292; }
u8 getRGradAlpha() { return field_0x293; }
void setCharAlpha(u8 param_0, u8 param_1, u8 param_2, u8 param_3) {
field_0x290 = param_0;
field_0x291 = param_1;
@@ -292,35 +307,28 @@ public:
}
void setCount(int i_count) { count = i_count; }
void setFont(JUTFont* i_font) { font[0] = i_font; }
void setFont(JUTFont* i_font) { font = i_font; }
void setFontSize(int i_size) { fontSize = i_size; }
void setHandSendFlagOff() { handSendFlag = 0; }
void setRubyFont(JUTFont* i_font) { rubyFont = i_font; }
void setRubyFontSize(int i_size) { rubyFontSize = i_size; }
void setLineCount(int i_count) { lineCount = i_count; }
void setLineWidth(int i_width) { lineWidth = i_width; }
void setRubyFont(JUTFont* i_font) { font[1] = i_font; }
void setRubyFontSize(int i_size) { rubyFontSize = i_size; }
void setSelectFlagOff() { selectFlag = 0; }
void setSelectNum(u8) {}
void setSendSpeed(int i_speed) { sendSpeed = i_speed; }
void setSpaceFlagOff() { spaceFlag = 0; }
void setSpaceFlagOn() { spaceFlag = 1; }
void setSpaceTimer(int i_timer) { spaceTimer = i_timer; }
void setStringColor(u32 color) { field_0x25C = color; }
void set_waitTimer(int i_timer) { waitTimer = i_timer; }
void set_waitTimerZero() { waitTimer = 0; }
void shortCut() { field_0x299 = 1; }
// fake, replace with real inline once it's figured out
u32 get_0x220(int i) { return field_0x220[i]; }
public:
/* 0x004 */ JUTFont* font[2];
/* 0x004 */ JUTFont* font;
/* 0x008 */ JUTFont* rubyFont;
/* 0x00C */ JMSMesgEntry_c* mesgEntry;
/* 0x010 */ u32 field_0x10;
/* 0x010 */ cXyz* actorPosition;
/* 0x014 */ f32 field_0x14;
/* 0x018 */ f32 field_0x18;
/* 0x01C */ f32 field_0x1C;
/* 0x020 */ f32 field_0x20; // NowCursorPos?
/* 0x020 */ f32 nowCursorPos;
/* 0x024 */ f32 field_0x24;
/* 0x028 */ f32 field_0x28;
/* 0x02C */ u32 field_0x2C;
@@ -332,17 +340,17 @@ public:
/* 0x044 */ char* field_0x44;
/* 0x048 */ char* field_0x48;
/* 0x04C */ char* field_0x4C;
/* 0x050 */ char* field_0x50[4];
/* 0x050 */ char* selectMessage[4]; // TODO: should this be 4 separate fields? or should field_0x40 and field_0x60 also be arrays?
/* 0x060 */ char* field_0x60;
/* 0x064 */ char* field_0x64;
/* 0x068 */ char* field_0x68;
/* 0x06C */ char* field_0x6C;
/* 0x070 */ char field_0x70[0x64]; // no idea how big this array is
/* 0x0D4 */ char field_0xD4[4];
/* 0x0D8 */ s32 field_0xD8[4];
/* 0x0E8 */ s32 field_0xE8[4];
/* 0x0F8 */ s32 field_0xF8[4];
/* 0x108 */ s32 field_0x108[4];
/* 0x0D8 */ int field_0xD8[4];
/* 0x0E8 */ int field_0xE8[4];
/* 0x0F8 */ int field_0xF8[4];
/* 0x108 */ int field_0x108[4];
/* 0x118 */ int count;
/* 0x11C */ int charSpace;
/* 0x120 */ int lineSpace;
@@ -350,25 +358,25 @@ public:
/* 0x128 */ int lineWidth;
/* 0x12C */ int centerLineWidth;
/* 0x130 */ int lineCount;
/* 0x134 */ u32 field_0x134;
/* 0x134 */ int field_0x134;
/* 0x138 */ int nowLine;
/* 0x13C */ int aimLine;
/* 0x140 */ u32 field_0x140;
/* 0x140 */ int field_0x140;
/* 0x144 */ int fontSize;
/* 0x148 */ u32 field_0x148;
/* 0x148 */ int field_0x148; // size/scale?
/* 0x14C */ int rubyFontSize;
/* 0x150 */ int field_0x150;
/* 0x154 */ u32 field_0x154;
/* 0x158 */ u32 waitTimer;
/* 0x154 */ int field_0x154;
/* 0x158 */ int waitTimer;
/* 0x15C */ int spaceTimer;
/* 0x160 */ int sendSpeed;
/* 0x164 */ int field_0x164; // keyWaitTimer?
/* 0x168 */ int field_0x168[0xF]; // IconPosX
/* 0x1A4 */ int field_0x1A4[0xF]; // IconPosY
/* 0x1E0 */ u32 field_0x1E0[0xF]; // IconColor
/* 0x21C */ int field_0x21C;
/* 0x220 */ u32 field_0x220[0xF];
/* 0x25C */ u32 field_0x25C;
/* 0x164 */ int keyWaitTimer;
/* 0x168 */ int iconPosX[0xF];
/* 0x1A4 */ int iconPosY[0xF];
/* 0x1E0 */ int iconScale[0xF];
/* 0x21C */ int selectLength;
/* 0x220 */ u32 iconColor[0xF];
/* 0x25C */ u32 stringColor;
/* 0x260 */ s16 field_0x260;
/* 0x264 */ f32 field_0x264;
/* 0x268 */ f32 field_0x268;
@@ -381,7 +389,7 @@ public:
/* 0x27E */ u8 field_0x27E;
/* 0x27F */ u8 field_0x27F;
/* 0x280 */ u8 field_0x280;
/* 0x281 */ u8 field_0x281[0xF]; // IconNum?
/* 0x281 */ u8 iconNum[0xF];
/* 0x290 */ u8 field_0x290;
/* 0x291 */ u8 field_0x291;
/* 0x292 */ u8 field_0x292;
@@ -398,7 +406,7 @@ public:
/* 0x29B */ u8 field_0x29B;
/* 0x29C */ u8 spaceFlag;
/* 0x29D */ u8 field_0x29D;
};
}; // Size: 0x2A0
typedef int (*fopMsgCreateFunc)(void*);
include/f_pc/f_pc_draw_priority.h
+6 -1
View File
@@ -2,7 +2,7 @@
#ifndef F_PC_DRAW_PRIORITY_H_
#define F_PC_DRAW_PRIORITY_H_
#include "dolphin/types.h"
#include "global.h"
typedef struct draw_priority_class {
s16 mPriority;
@@ -488,10 +488,15 @@ enum {
/* 0x01D5 */ fpcDwPi_SCP_e,
/* 0x01D6 */ fpcDwPi_PB_e,
/* 0x01D7 */ fpcDwPi_METER_e,
#if VERSION == VERSION_PAL
/* 0x01D8 */ fpcDwPi_MSG3_e,
#endif
/* 0x01D8 */ fpcDwPi_MESG_e,
/* 0x01D9 */ fpcDwPi_MSG_e,
/* 0x01DA */ fpcDwPi_MSG2_e,
#if VERSION < VERSION_PAL
/* 0x01DB */ fpcDwPi_MSG3_e,
#endif
/* 0x01DC */ fpcDwPi_AUCTION_SCREEN_e,
/* 0x01DD */ fpcDwPi_PLACE_NAME_e,
/* 0x01DE */ fpcDwPi_GAMEOVER_e,
include/f_pc/f_pc_name.h
+7
View File
@@ -2,6 +2,8 @@
#ifndef F_PC_NAME_H
#define F_PC_NAME_H
#include "global.h"
// The fpcNm prefix is from an error string in TP.
enum {
/* 0x0000 */ fpcNm_OVERLAP0_e,
@@ -494,10 +496,15 @@ enum {
/* 0x01E3 */ fpcNm_CAMERA2_e,
/* 0x01E4 */ fpcNm_KYEFF_e,
/* 0x01E5 */ fpcNm_KYEFF2_e,
#if VERSION == VERSION_PAL
/* 0x01E6 */ fpcNm_MSG3_e,
#endif
/* 0x01E6 */ fpcNm_MESG_e,
/* 0x01E7 */ fpcNm_MSG_e,
/* 0x01E8 */ fpcNm_MSG2_e,
#if VERSION < VERSION_PAL
/* 0x01E9 */ fpcNm_MSG3_e,
#endif
/* 0x01EA */ fpcNm_MENUWINDOW_e,
/* 0x01EB */ fpcNm_Menu_Cloth_e,
/* 0x01EC */ fpcNm_TIMER_e,
include/global.h
+19
View File
@@ -79,4 +79,23 @@ extern void __sync();
#define SJIS(character, value) ((u32)value)
#endif
// Hack to trick the compiler into not inlining functions that use this macro.
#define FORCE_DONT_INLINE \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
(void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0;
#endif
include/m_Do/m_Do_audio.h
+1 -1
View File
@@ -294,7 +294,7 @@ inline void mDoAud_rainPlay(s32 param_0) {
mDoAud_zelAudio_c::getInterface()->rainPlay(param_0);
}
inline f32 mDoAud_tact_getMelodyPattern(s32 melody_no, s32 note_no, s32 * pattern) {
inline f32 mDoAud_tact_getMelodyPattern(s32 melody_no, s32 note_no, s32* pattern) {
return mDoAud_zelAudio_c::mTact.getMelodyPattern(melody_no, note_no, pattern);
}