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/JSystem/J2DGraph/J2DPane.h
+1 -1
View File
@@ -89,7 +89,7 @@ public:
void hide() { mVisible = false; }
bool isVisible() { return mVisible; }
void getBounds() {}
const JGeometry::TBox2<f32>& getBounds() { return mBounds; }
const JGeometry::TBox2<f32>& getGlbBounds() { return mGlobalBounds; }
f32 getRotate() const { return mRotation; }
void place(const JGeometry::TBox2<f32>&) {}
include/JSystem/J2DGraph/J2DTextBox.h
+4 -2
View File
@@ -66,8 +66,10 @@ public:
char* getStringPtr() const;
s32 setString(const char*, ...);
// TODO
void setFontColor(JUtility::TColor, JUtility::TColor) {}
void setFontColor(JUtility::TColor i_charColor, JUtility::TColor i_GradientColor) {
mCharColor = i_charColor;
mGradColor = i_GradientColor;
}
virtual ~J2DTextBox();
virtual bool setConnectParent(bool);
include/JSystem/JKernel/JKRArchive.h
+4
View File
@@ -236,4 +236,8 @@ inline u32 JKRReadIdResource(void* buffer, u32 bufferSize, u16 id, JKRArchive* a
return JKRReadResource(buffer, bufferSize, id, arc);
}
inline u32 JKRReadTypeResource(void* buffer, u32 bufferSize, u32 tag, const char* name, JKRArchive* arc) {
return JKRArchive::readTypeResource(buffer, bufferSize, tag, name, arc);
}
#endif
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;
include/f_op/f_op_msg_mng.h
+73 -55
View File
@@ -97,6 +97,10 @@ public:
JMSMesgEntry_c getMesgEntry(mesg_header*);
const char* getMessage(mesg_header*);
u32 getMesgNumber() {
return (mGroupID << 8) | mResMsgNo;
}
public:
/* 0x04 */ u32 mMsgIdx;
/* 0x08 */ u16 mGroupID;
@@ -150,7 +154,7 @@ public:
void dataInit();
f32 charLength(int, int, bool);
f32 rubyLength(int, bool);
void stringLength();
u32 stringLength();
void stringShift();
void iconSelect(int, u8);
void iconIdxRefresh();
@@ -237,14 +241,14 @@ public:
#endif
void getIconColor(int) {}
void getIconNum(int) {}
void getIconPosX(int) {}
void getIconPosY(int) {}
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) {}
void setCharSpace(int) {}
void setRubyCharSpace(int) {}
void setLineSpace(int) {}
void setCharSpace(int i_space) { charSpace = i_space; }
void setRubyCharSpace(int i_space) { rubyCharSpace = i_space; }
void setLineSpace(int i_space) { lineSpace = i_space; }
void setOutMessage(char* param_0, char* param_1, char* param_2, char* param_3) {
field_0x60 = param_0;
@@ -258,63 +262,77 @@ public:
}
void setSelectMessage(char*, char*, char*, char*) {}
void setMesgEntry(JMSMesgEntry_c*) {}
void setMesgEntry(JMSMesgEntry_c* i_entry) { mesgEntry = i_entry; }
void dec_keyWaitTimer() {}
void dec_waitTimer() {}
void getCharAlpha() {}
void getGradAlpha() {}
void getLineCount() {}
void getMesgStatus() {}
void getNowCursorPos() {}
void getRCharAlpha() {}
void getRGradAlpha() {}
u8 getCharAlpha() { return field_0x293; } // ?
u8 getGradAlpha() { return field_0x292; } // ?
int getLineCount() { return lineCount; }
u8 getMesgStatus() { return mesgStatus; }
f32 getNowCursorPos() { return field_0x20; }
u8 getRCharAlpha() { return field_0x291; } // ?
u8 getRGradAlpha() { return field_0x290; } // ?
void getSelectFlag() {}
void getSelectLength() {}
void getStringColor() {}
void get_waitTimer() {}
void resetNowLine() {}
void resetNowLine() { nowLine = 0; }
void selectArrow(J2DPicture*) {}
void setActorPosition(cXyz*) {}
void setAimLine(int) {}
void setAimLine(int i_line) { aimLine = i_line; }
void setAutoSendFlagOff() {}
void setBmgData(char*) {}
void setCenterLineWidth(int) {}
void setCharAlpha(u8, u8, u8, u8) {}
void setCount(int) {}
void setFont(JUTFont*) {}
void setFontSize(int) {}
void setBmgData(char* i_data) { bmgData = i_data; }
void setCenterLineWidth(int i_width) { centerLineWidth = i_width; }
void setCharAlpha(u8 param_0, u8 param_1, u8 param_2, u8 param_3) {
field_0x290 = param_0;
field_0x291 = param_1;
field_0x292 = param_2;
field_0x293 = param_3;
}
void setCount(int i_count) { count = i_count; }
void setFont(JUTFont* i_font) { font[0] = i_font; }
void setFontSize(int i_size) { fontSize = i_size; }
void setHandSendFlagOff() {}
void setLineCount(int) {}
void setLineWidth(int) {}
void setRubyFont(JUTFont*) {}
void setRubyFontSize(int) {}
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() {}
void setSelectNum(u8) {}
void setSendSpeed(int) {}
void setSpaceFlagOff() {}
void setSendSpeed(int i_speed) { sendSpeed = i_speed; }
void setSpaceFlagOff() { spaceFlag = 0; }
void setSpaceFlagOn() {}
void setSpaceTimer(int) {}
void setSpaceTimer(int i_timer) { spaceTimer = i_timer; }
void setStringColor(u32) {}
void set_waitTimer(int) {}
void set_waitTimerZero() {}
void shortCut() {}
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];
/* 0x00C */ JMSMesgEntry_c* field_0x0C;
/* 0x00C */ JMSMesgEntry_c* mesgEntry;
/* 0x010 */ u32 field_0x10;
/* 0x014 */ f32 field_0x14;
/* 0x018 */ f32 field_0x18;
/* 0x01C */ f32 field_0x1C;
/* 0x020 */ f32 field_0x20;
/* 0x020 */ f32 field_0x20; // NowCursorPos?
/* 0x024 */ f32 field_0x24;
/* 0x028 */ f32 field_0x28;
/* 0x02C */ u32 field_0x2C;
/* 0x030 */ u32 field_0x30;
/* 0x034 */ u32 field_0x34;
/* 0x038 */ u32 field_0x38;
/* 0x03C */ const char* field_0x3C;
/* 0x03C */ const char* bmgData;
/* 0x040 */ char* field_0x40;
/* 0x044 */ char* field_0x44;
/* 0x048 */ char* field_0x48;
@@ -330,28 +348,28 @@ public:
/* 0x0E8 */ s32 field_0xE8[4];
/* 0x0F8 */ s32 field_0xF8[4];
/* 0x108 */ s32 field_0x108[4];
/* 0x118 */ u32 field_0x118;
/* 0x11C */ s32 field_0x11C;
/* 0x120 */ s32 field_0x120;
/* 0x124 */ s32 field_0x124;
/* 0x128 */ s32 field_0x128;
/* 0x12C */ u32 field_0x12C;
/* 0x130 */ s32 field_0x130;
/* 0x118 */ int count;
/* 0x11C */ int charSpace;
/* 0x120 */ int lineSpace;
/* 0x124 */ int rubyCharSpace;
/* 0x128 */ int lineWidth;
/* 0x12C */ int centerLineWidth;
/* 0x130 */ int lineCount;
/* 0x134 */ u32 field_0x134;
/* 0x138 */ u32 field_0x138;
/* 0x13C */ u32 field_0x13C;
/* 0x138 */ int nowLine;
/* 0x13C */ int aimLine;
/* 0x140 */ u32 field_0x140;
/* 0x144 */ s32 field_0x144;
/* 0x144 */ int fontSize;
/* 0x148 */ u32 field_0x148;
/* 0x14C */ s32 field_0x14C;
/* 0x14C */ int rubyFontSize;
/* 0x150 */ int field_0x150;
/* 0x154 */ u32 field_0x154;
/* 0x158 */ u32 field_0x158;
/* 0x15C */ u32 field_0x15C;
/* 0x160 */ u32 field_0x160;
/* 0x164 */ int field_0x164;
/* 0x168 */ s32 field_0x168[0xF];
/* 0x1A4 */ u32 field_0x1A4[0xF];
/* 0x15C */ int spaceTimer;
/* 0x160 */ int sendSpeed;
/* 0x164 */ int field_0x164; // keyWaitTimer?
/* 0x168 */ int field_0x168[0xF]; // IconPosX
/* 0x1A4 */ int field_0x1A4[0xF]; // IconPosY
/* 0x1A4 */ u32 field_0x1E0[0xF];
/* 0x21C */ int field_0x21C;
/* 0x21C */ u32 field_0x220[0xF];
@@ -363,7 +381,7 @@ public:
/* 0x270 */ f32 field_0x270;
/* 0x274 */ f32 field_0x274;
/* 0x278 */ f32 field_0x278;
/* 0x27C */ u8 field_0x27C;
/* 0x27C */ u8 mesgStatus;
/* 0x27D */ u8 field_0x27D;
/* 0x27E */ u8 field_0x27E;
/* 0x27F */ u8 field_0x27F;
@@ -373,17 +391,17 @@ public:
/* 0x291 */ u8 field_0x291;
/* 0x292 */ u8 field_0x292;
/* 0x293 */ u8 field_0x293;
/* 0x294 */ u8 field_0x294;
/* 0x294 */ u8 selectFlag;
/* 0x295 */ u8 field_0x295;
#if VERSION > VERSION_DEMO
/* 0x296 */ u8 field_0x296;
#endif
/* 0x297 */ u8 field_0x297;
/* 0x298 */ u8 field_0x298;
/* 0x297 */ u8 autoSendFlag;
/* 0x298 */ u8 handSendFlag;
/* 0x299 */ u8 field_0x299;
/* 0x29A */ u8 field_0x29A;
/* 0x29B */ u8 field_0x29B;
/* 0x29C */ u8 field_0x29C;
/* 0x29C */ u8 spaceFlag;
/* 0x29D */ u8 field_0x29D;
};
include/m_Do/m_Do_controller_pad.h
+10
View File
@@ -33,6 +33,16 @@ extern interface_of_controller_pad g_mDoCPd_cpadInfo[4];
#define CPad_CHECK_TRIG_RIGHT(padNo) (g_mDoCPd_cpadInfo[padNo].mButtonTrig.right)
#define CPad_CHECK_TRIG_LEFT(padNo) (g_mDoCPd_cpadInfo[padNo].mButtonTrig.left)
#define CPad_GET_STICK_POS_X(padNo) (g_mDoCPd_cpadInfo[padNo].mMainStickPosX)
#define CPad_GET_STICK_POS_Y(padNo) (g_mDoCPd_cpadInfo[padNo].mMainStickPosY)
#define CPad_GET_STICK_VALUE(padNo) (g_mDoCPd_cpadInfo[padNo].mMainStickValue)
#define CPad_GET_STICK_ANGLE(padNo) (g_mDoCPd_cpadInfo[padNo].mMainStickAngle)
#define CPad_GET_SUBSTICK_POS_X(padNo) (g_mDoCPd_cpadInfo[padNo].mCStickPosX)
#define CPad_GET_SUBSTICK_POS_Y(padNo) (g_mDoCPd_cpadInfo[padNo].mCStickPosY)
#define CPad_GET_SUBSTICK_VALUE(padNo) (g_mDoCPd_cpadInfo[padNo].mCStickValue)
#define CPad_GET_SUBSTICK_ANGLE(padNo) (g_mDoCPd_cpadInfo[padNo].mCStickAngle)
int mDoCPd_Create();
int mDoCPd_Read();
src/d/d_drawlist.cpp
+2 -2
View File
@@ -533,8 +533,8 @@ void dDlst_2Dm_c::draw() {
GXLoadTlut(&mTex[1].mTlutObj, GXGetTexObjTlut(&mTex[1].mTexObj));
GXSetNumChans(0);
GXSetTevColor(GX_TEVREG0, mC0);
GXSetTevColor(GX_TEVREG1, mC1);
GXSetTevColor(GX_TEVREG0, mBlack);
GXSetTevColor(GX_TEVREG1, mWhite);
GXSetNumTexGens(2);
GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY);
src/d/d_menu_option.cpp
+14 -14
View File
@@ -665,29 +665,29 @@ void dMenu_Option_c::noteSet() {
msg_entry = msgGet.getMesgEntry(head_p);
msgDataProc.dataInit();
msgDataProc.field_0x3C = mesg;
msgDataProc.bmgData = mesg;
msgDataProc.setOutMessage(mD38, mD3C, mD40, mD44);
msgDataProc.font[0] = mD2C;
msgDataProc.font[1] = mD30;
msgDataProc.field_0x11C = ((J2DTextBox*)m740[0].pane)->getCharSpace();
msgDataProc.field_0x124 = ((J2DTextBox*)m740[1].pane)->getCharSpace();
msgDataProc.field_0x120 = ((J2DTextBox*)m740[0].pane)->getLineSpace();
msgDataProc.field_0x0C = &msg_entry;
msgDataProc.field_0x144 = f31;
msgDataProc.field_0x14C = f30;
msgDataProc.field_0x128 = 0x1D0;
msgDataProc.field_0x12C = 0x1D0;
msgDataProc.field_0x160 = 2;
msgDataProc.field_0x15C = 0;
msgDataProc.charSpace = ((J2DTextBox*)m740[0].pane)->getCharSpace();
msgDataProc.rubyCharSpace = ((J2DTextBox*)m740[1].pane)->getCharSpace();
msgDataProc.lineSpace = ((J2DTextBox*)m740[0].pane)->getLineSpace();
msgDataProc.mesgEntry = &msg_entry;
msgDataProc.fontSize = f31;
msgDataProc.rubyFontSize = f30;
msgDataProc.lineWidth = 0x1D0;
msgDataProc.centerLineWidth = 0x1D0;
msgDataProc.sendSpeed = 2;
msgDataProc.spaceTimer = 0;
msgDataProc.field_0x299 = 1;
msgDataProc.field_0x29C = 0;
msgDataProc.spaceFlag = 0;
msgDataProc.stringLength();
msgDataProc.stringShift();
msgDataProc.iconIdxRefresh();
s16 r26 = msgDataProc.field_0x130;
msgDataProc.field_0x130 = 0;
s16 r26 = msgDataProc.lineCount;
msgDataProc.lineCount = 0;
msgDataProc.stringSet();
f32 f30_2 = (m740[0].pane->getHeight() - f31 - (f32)r26 * ((J2DTextBox*)m740[0].pane)->getLineSpace()) / 2.0f;
((J2DTextBox*)m740[0].pane)->shiftSet(0.0f, f30_2);
src/d/d_message.cpp
+1100 -90
View File
File diff suppressed because it is too large Load Diff
src/d/d_meter.cpp
+65 -56
View File
@@ -459,42 +459,51 @@ dMeter_msg_HIO_c::dMeter_msg_HIO_c() {
/* 801EF75C-801EF924 .text __ct__20dMeter_message_HIO_cFv */
dMeter_message_HIO_c::dMeter_message_HIO_c() {
field_0x5 = 0;
field_0x6 = 0;
field_0x7 = 0;
field_0x8 = 0xff;
field_0x9 = 0xff;
field_0xa = 0xff;
field_0xb = 0xff;
field_0xc = 0xff;
field_0xd = 0xff;
field_0xe = 0xff;
field_0xf = 0xff;
field_0x10 = 0;
field_0x11 = 0xff;
field_0x12 = 0xff;
field_0x13 = 0xff;
field_0x14 = 0xff;
field_0x15 = 0xff;
field_0x16 = 0xff;
field_0x17 = 0xff;
field_0x18 = 0xff;
field_0x19 = 0xff;
field_0x1a = 0xff;
field_0x1b = 0xff;
field_0x1c = 0;
field_0x1d = 0;
field_0x1e = 0;
field_0x1f = 0;
field_0x20 = 0xff;
field_0x21 = 0xff;
field_0x22 = 0xff;
field_0x23 = 0xff;
field_0x24 = 0xff;
field_0x25 = 0xff;
field_0x26 = 0xff;
field_0x27 = 0xff;
field_0x28 = 0;
field_0x5.r = 0;
field_0x5.g = 0;
field_0x5.b = 0;
field_0x5.a = 0xff;
field_0x9.r = 0xff;
field_0x9.g = 0xff;
field_0x9.b = 0xff;
field_0x9.a = 0xff;
field_0xd.r = 0xff;
field_0xd.g = 0xff;
field_0xd.b = 0xff;
field_0xd.a = 0;
field_0x11.r = 0xff;
field_0x11.g = 0xff;
field_0x11.b = 0xff;
field_0x11.a = 0xff;
field_0x15.r = 0xff;
field_0x15.g = 0xff;
field_0x15.b = 0xff;
field_0x15.a = 0xff;
field_0x19.r = 0xff;
field_0x19.g = 0xff;
field_0x19.b = 0xff;
field_0x19.a = 0;
field_0x1d.r = 0;
field_0x1d.g = 0;
field_0x1d.b = 0;
field_0x1d.a = 0xff;
field_0x21.r = 0xff;
field_0x21.g = 0xff;
field_0x21.b = 0xff;
field_0x21.a = 0xff;
field_0x25.r = 0xff;
field_0x25.g = 0xff;
field_0x25.b = 0xff;
field_0x25.a = 0;
field_0x29 = 0x80;
field_0x2a = 0xff;
field_0x2b = 0xff;
@@ -5783,15 +5792,15 @@ void dMeter_clockMultiMove(sub_meter_class* i_Meter) {
fVar2 = i_Meter->field_0x1868[i].mPosCenter.y;
clock[i].setPos(sVar4, sVar5, sVar4 + i_Meter->field_0x1830.mSizeOrig.x, sVar5 + i_Meter->field_0x1830.mSizeOrig.y);
GXColor color1 = {0xFF, 0XFF, 0XFF, 0XFF};
clock[i].mC0.r = color1.r;
clock[i].mC0.g = color1.g;
clock[i].mC0.b = color1.b;
clock[i].mC0.a = color1.a;
clock[i].mBlack.r = color1.r;
clock[i].mBlack.g = color1.g;
clock[i].mBlack.b = color1.b;
clock[i].mBlack.a = color1.a;
GXColor color2 = {0x00, 0x00, 0XFF, 0x00};
clock[i].mC1.r = color2.r;
clock[i].mC1.g = color2.g;
clock[i].mC1.b = color2.b;
clock[i].mC1.a = color2.a;
clock[i].mWhite.r = color2.r;
clock[i].mWhite.g = color2.g;
clock[i].mWhite.b = color2.b;
clock[i].mWhite.a = color2.a;
clock[i].setScroll(0, 0, 0);
clock[i].setScroll(1, fVar1, fVar2);
clock[i].setScale((100.0f * (1.0f / scaleX[i]) / g_meterHIO.field_0x78[i]), (100.0f * (1.0f / scaleY[i])) / g_meterHIO.field_0x78[i]);
@@ -6215,7 +6224,7 @@ void dMeter_swimPaneHide(sub_meter_class* i_Meter) {
fopMsgM_setNowAlphaZero(&i_Meter->field_0x2d30);
fopMsgM_setNowAlphaZero(&i_Meter->field_0x2da0);
fopMsgM_setNowAlphaZero(&i_Meter->field_0x2dd8);
tekari.mC0.a = 0;
tekari.mBlack.a = 0;
}
/* 80200630-802006AC .text dMeter_swimPaneTransY__FP15sub_meter_classf */
@@ -6607,17 +6616,17 @@ void dMeter_swimTekariScroll(sub_meter_class* i_Meter) {
}
tekari.setPos(temp_r29, temp_r28, temp_r27, temp_r26);
GXColor color1 = {0xFF, 0xFF, 0xFF, 0XFF};
tekari.mC0.r = color1.r;
tekari.mC0.g = color1.g;
tekari.mC0.b = color1.b;
tekari.mC0.a = color1.a;
tekari.mBlack.r = color1.r;
tekari.mBlack.g = color1.g;
tekari.mBlack.b = color1.b;
tekari.mBlack.a = color1.a;
GXColor color2 = {0xFF, 0xFF, 0xFF, 0X00};
tekari.mC1.r = color2.r;
tekari.mC1.g = color2.g;
tekari.mC1.b = color2.b;
tekari.mC1.a = color2.a;
tekari.mWhite.r = color2.r;
tekari.mWhite.g = color2.g;
tekari.mWhite.b = color2.b;
tekari.mWhite.a = color2.a;
tekari.setScroll(0, 0, 0);
tekari.mC0.a = 0xFF;
tekari.mBlack.a = 0xFF;
tekari.setScroll(1, var_r30, var_r30);
}
@@ -7164,11 +7173,11 @@ static BOOL dMeter_Draw(sub_meter_class* i_Meter) {
fopMsgM_setAlpha(&i_Meter->field_0x1948);
if (i_Meter->field_0x1830.pane->isVisible() && i_Meter->field_0x3020 == 7) {
for (s32 i = 0; i < 3; i++) {
clock[i].mC0.a = i_Meter->field_0x1830.mNowAlpha;
clock[i].mBlack.a = i_Meter->field_0x1830.mNowAlpha;
}
} else {
for (s32 i = 0; i < 3; i++) {
clock[i].mC0.a = 0;
clock[i].mBlack.a = 0;
}
}
fopMsgM_setAlpha(&i_Meter->field_0x1980);
src/d/d_msg.cpp
+87 -87
View File
@@ -762,7 +762,7 @@ void dMsg_ScreenDataValueInitTalk(sub_msg_class* i_Msg) {
i_Msg->mMsgDataProc.dataInit();
i_Msg->mMsgDataProc.field_0x25C = i_Msg->m1164;
i_Msg->mMsgDataProc.field_0x10 = (int)&i_Msg->mPos;
i_Msg->mMsgDataProc.field_0x3C = (char*)i_Msg->mpMesgStr;
i_Msg->mMsgDataProc.bmgData = (char*)i_Msg->mpMesgStr;
pcVar8 = i_Msg->output_rubSdw;
pcVar7 = i_Msg->output_textSdw;
pcVar5 = i_Msg->output_rub;
@@ -784,20 +784,20 @@ void dMsg_ScreenDataValueInitTalk(sub_msg_class* i_Msg) {
i_Msg->mMsgDataProc.field_0x50[3] = pcVar4;
i_Msg->mMsgDataProc.font[0] = textFont;
i_Msg->mMsgDataProc.font[1] = rubyFont;
i_Msg->mMsgDataProc.field_0x11C = iVar1;
i_Msg->mMsgDataProc.field_0x124 = iVar2;
i_Msg->mMsgDataProc.field_0x120 = (int)((J2DTextBox*)i_Msg->m0544[0].pane)->getLineSpace();
i_Msg->mMsgDataProc.field_0x0C = &i_Msg->mMesgEntry;
i_Msg->mMsgDataProc.field_0x144 = i_Msg->m110C;
i_Msg->mMsgDataProc.field_0x14C = i_Msg->m1110;
i_Msg->mMsgDataProc.field_0x128 = 0x1f7;
i_Msg->mMsgDataProc.field_0x12C = 0x1e6;
i_Msg->mMsgDataProc.field_0x160 = g_msgHIO.field_0x82;
i_Msg->mMsgDataProc.field_0x15C = 2;
i_Msg->mMsgDataProc.charSpace = iVar1;
i_Msg->mMsgDataProc.rubyCharSpace = iVar2;
i_Msg->mMsgDataProc.lineSpace = (int)((J2DTextBox*)i_Msg->m0544[0].pane)->getLineSpace();
i_Msg->mMsgDataProc.mesgEntry = &i_Msg->mMesgEntry;
i_Msg->mMsgDataProc.fontSize = i_Msg->m110C;
i_Msg->mMsgDataProc.rubyFontSize = i_Msg->m1110;
i_Msg->mMsgDataProc.lineWidth = 0x1f7;
i_Msg->mMsgDataProc.centerLineWidth = 0x1e6;
i_Msg->mMsgDataProc.sendSpeed = g_msgHIO.field_0x82;
i_Msg->mMsgDataProc.spaceTimer = 2;
if (g_msgHIO.field_0x83 != 0) {
i_Msg->mMsgDataProc.field_0x29C = 1;
i_Msg->mMsgDataProc.spaceFlag = 1;
} else {
i_Msg->mMsgDataProc.field_0x29C = 0;
i_Msg->mMsgDataProc.spaceFlag = 0;
}
i_Msg->m10D0 = (i_Msg->m10D8) - i_Msg->m049C.mPosCenter.x;
i_Msg->m10D4 = (i_Msg->m10DC) - i_Msg->m049C.mPosCenter.y;
@@ -854,7 +854,7 @@ void dMsg_ScreenDataValueInitItem(sub_msg_class* i_Msg) {
fopMsgM_cposMove(&i_Msg->m049C);
i_Msg->mMsgDataProc.dataInit();
i_Msg->mMsgDataProc.field_0x10 = (int)&i_Msg->mPos;
i_Msg->mMsgDataProc.field_0x3C = (char*)i_Msg->mpMesgStr;
i_Msg->mMsgDataProc.bmgData = (char*)i_Msg->mpMesgStr;
pcVar8 = i_Msg->output_rubSdw;
pcVar7 = i_Msg->output_textSdw;
pcVar6 = i_Msg->output_rub;
@@ -876,24 +876,24 @@ void dMsg_ScreenDataValueInitItem(sub_msg_class* i_Msg) {
i_Msg->mMsgDataProc.field_0x50[3] = pcVar5;
i_Msg->mMsgDataProc.font[0] = textFont;
i_Msg->mMsgDataProc.font[1] = rubyFont;
i_Msg->mMsgDataProc.field_0x11C = (int)fVar3;
i_Msg->mMsgDataProc.field_0x124 = (int)fVar4;
i_Msg->mMsgDataProc.field_0x0C = &i_Msg->mMesgEntry;
i_Msg->mMsgDataProc.field_0x144 = i_Msg->m110C;
i_Msg->mMsgDataProc.field_0x14C = i_Msg->m1110;
i_Msg->mMsgDataProc.charSpace = (int)fVar3;
i_Msg->mMsgDataProc.rubyCharSpace = (int)fVar4;
i_Msg->mMsgDataProc.mesgEntry = &i_Msg->mMesgEntry;
i_Msg->mMsgDataProc.fontSize = i_Msg->m110C;
i_Msg->mMsgDataProc.rubyFontSize = i_Msg->m1110;
if ((i_Msg->mMesgEntry.mTextboxType == 9) && (i_Msg->m0624[8].mUserArea == 0)) {
i_Msg->mMsgDataProc.field_0x128 = 0x1a3;
i_Msg->mMsgDataProc.field_0x12C = 0x192;
i_Msg->mMsgDataProc.lineWidth = 0x1a3;
i_Msg->mMsgDataProc.centerLineWidth = 0x192;
} else {
i_Msg->mMsgDataProc.field_0x128 = 0x1f7;
i_Msg->mMsgDataProc.field_0x12C = 0x1e6;
i_Msg->mMsgDataProc.lineWidth = 0x1f7;
i_Msg->mMsgDataProc.centerLineWidth = 0x1e6;
}
i_Msg->mMsgDataProc.field_0x160 = g_msgHIO.field_0x82;
i_Msg->mMsgDataProc.field_0x15C = 2;
i_Msg->mMsgDataProc.sendSpeed = g_msgHIO.field_0x82;
i_Msg->mMsgDataProc.spaceTimer = 2;
if (g_msgHIO.field_0x83 != 0) {
i_Msg->mMsgDataProc.field_0x29C = 1;
i_Msg->mMsgDataProc.spaceFlag = 1;
} else {
i_Msg->mMsgDataProc.field_0x29C = 0;
i_Msg->mMsgDataProc.spaceFlag = 0;
}
i_Msg->m10D0 = (i_Msg->m10D8) - i_Msg->m049C.mPosCenter.x;
i_Msg->m10D4 = (i_Msg->m10DC) - i_Msg->m049C.mPosCenter.y;
@@ -937,7 +937,7 @@ void dMsg_ScreenDataValueInitTact(sub_msg_class* i_Msg) {
fopMsgM_cposMove(&i_Msg->m049C);
i_Msg->mMsgDataProc.dataInit();
i_Msg->mMsgDataProc.field_0x10 = (int)&i_Msg->mPos;
i_Msg->mMsgDataProc.field_0x3C = (char*)i_Msg->mpMesgStr;
i_Msg->mMsgDataProc.bmgData = (char*)i_Msg->mpMesgStr;
pcVar6 = i_Msg->output_rubSdw;
pcVar5 = i_Msg->output_textSdw;
pcVar4 = i_Msg->output_rub;
@@ -959,24 +959,24 @@ void dMsg_ScreenDataValueInitTact(sub_msg_class* i_Msg) {
i_Msg->mMsgDataProc.field_0x50[3] = pcVar3;
i_Msg->mMsgDataProc.font[0] = textFont;
i_Msg->mMsgDataProc.font[1] = rubyFont;
i_Msg->mMsgDataProc.field_0x11C = (int)dVar7;
i_Msg->mMsgDataProc.field_0x124 = (int)dVar8;
i_Msg->mMsgDataProc.field_0x0C = &i_Msg->mMesgEntry;
i_Msg->mMsgDataProc.field_0x144 = i_Msg->m110C;
i_Msg->mMsgDataProc.field_0x14C = i_Msg->m1110;
i_Msg->mMsgDataProc.charSpace = (int)dVar7;
i_Msg->mMsgDataProc.rubyCharSpace = (int)dVar8;
i_Msg->mMsgDataProc.mesgEntry = &i_Msg->mMesgEntry;
i_Msg->mMsgDataProc.fontSize = i_Msg->m110C;
i_Msg->mMsgDataProc.rubyFontSize = i_Msg->m1110;
if ((i_Msg->mMesgEntry.mTextboxType == 9) && (i_Msg->m0624[8].mUserArea == 0)) {
i_Msg->mMsgDataProc.field_0x128 = 0x1a3;
i_Msg->mMsgDataProc.field_0x12C = 0x192;
i_Msg->mMsgDataProc.lineWidth = 0x1a3;
i_Msg->mMsgDataProc.centerLineWidth = 0x192;
} else {
i_Msg->mMsgDataProc.field_0x128 = 0x1f7;
i_Msg->mMsgDataProc.field_0x12C = 0x1e6;
i_Msg->mMsgDataProc.lineWidth = 0x1f7;
i_Msg->mMsgDataProc.centerLineWidth = 0x1e6;
}
i_Msg->mMsgDataProc.field_0x160 = g_msgHIO.field_0x82;
i_Msg->mMsgDataProc.field_0x15C = 2;
i_Msg->mMsgDataProc.sendSpeed = g_msgHIO.field_0x82;
i_Msg->mMsgDataProc.spaceTimer = 2;
if (g_msgHIO.field_0x83 != 0) {
i_Msg->mMsgDataProc.field_0x29C = 1;
i_Msg->mMsgDataProc.spaceFlag = 1;
} else {
i_Msg->mMsgDataProc.field_0x29C = 0;
i_Msg->mMsgDataProc.spaceFlag = 0;
}
i_Msg->m10D0 = (i_Msg->m10D8) - i_Msg->m049C.mPosCenter.x;
i_Msg->m10D4 = (i_Msg->m10DC) - i_Msg->m049C.mPosCenter.y;
@@ -1000,7 +1000,7 @@ void dMsg_ScreenDataValueInitDemo(sub_msg_class* i_Msg) {
f32 tmp = 0.5f;
i_Msg->m1104 = (((J2DTextBox*)i_Msg->m0544[0].pane)->mLineSpace * tmp);
i_Msg->mMsgDataProc.dataInit();
i_Msg->mMsgDataProc.field_0x3C = (char*)i_Msg->mpMesgStr;
i_Msg->mMsgDataProc.bmgData = (char*)i_Msg->mpMesgStr;
pcVar5 = i_Msg->output_rubSdw;
pcVar4 = i_Msg->output_textSdw;
pcVar2 = i_Msg->output_rub;
@@ -1022,19 +1022,19 @@ void dMsg_ScreenDataValueInitDemo(sub_msg_class* i_Msg) {
i_Msg->mMsgDataProc.field_0x50[3] = pcVar1;
i_Msg->mMsgDataProc.font[0] = textFont;
i_Msg->mMsgDataProc.font[1] = rubyFont;
i_Msg->mMsgDataProc.field_0x11C = dVar6;
i_Msg->mMsgDataProc.field_0x124 = dVar7;
i_Msg->mMsgDataProc.field_0x0C = &i_Msg->mMesgEntry;
i_Msg->mMsgDataProc.field_0x144 = i_Msg->m110C;
i_Msg->mMsgDataProc.field_0x14C = i_Msg->m1110;
i_Msg->mMsgDataProc.field_0x128 = 0x1f7;
i_Msg->mMsgDataProc.field_0x12C = 0x1e6;
i_Msg->mMsgDataProc.field_0x160 = g_msgHIO.field_0x82;
i_Msg->mMsgDataProc.field_0x15C = 2;
i_Msg->mMsgDataProc.charSpace = dVar6;
i_Msg->mMsgDataProc.rubyCharSpace = dVar7;
i_Msg->mMsgDataProc.mesgEntry = &i_Msg->mMesgEntry;
i_Msg->mMsgDataProc.fontSize = i_Msg->m110C;
i_Msg->mMsgDataProc.rubyFontSize = i_Msg->m1110;
i_Msg->mMsgDataProc.lineWidth = 0x1f7;
i_Msg->mMsgDataProc.centerLineWidth = 0x1e6;
i_Msg->mMsgDataProc.sendSpeed = g_msgHIO.field_0x82;
i_Msg->mMsgDataProc.spaceTimer = 2;
if (g_msgHIO.field_0x83 != 0) {
i_Msg->mMsgDataProc.field_0x29C = 1;
i_Msg->mMsgDataProc.spaceFlag = 1;
} else {
i_Msg->mMsgDataProc.field_0x29C = 0;
i_Msg->mMsgDataProc.spaceFlag = 0;
}
}
@@ -1081,8 +1081,8 @@ void dMsg_setString(sub_msg_class* i_Msg) {
/* 8020EDE0-8020EE38 .text dMsg_yose_select__FP13sub_msg_class */
void dMsg_yose_select(sub_msg_class* i_Msg) {
i_Msg->mMsgDataProc.stringLength();
i_Msg->m1108 = i_Msg->mMsgDataProc.field_0x130;
i_Msg->mMsgDataProc.field_0x130 = 0;
i_Msg->m1108 = i_Msg->mMsgDataProc.lineCount;
i_Msg->mMsgDataProc.lineCount = 0;
i_Msg->mMsgDataProc.stringShift();
i_Msg->mMsgDataProc.iconIdxRefresh();
dMsg_textPosition(i_Msg);
@@ -1950,11 +1950,11 @@ s32 dMsg_stopProc(sub_msg_class* i_Msg) {
u8 bVar1;
u32 uVar2;
if (i_Msg->mMsgDataProc.field_0x297 != 0) {
if (i_Msg->mMsgDataProc.autoSendFlag != 0) {
uVar2 = (int)i_Msg->mMsgDataProc.field_0x158 > 0 ? i_Msg->mMsgDataProc.field_0x158 - 1 : 0;
i_Msg->mMsgDataProc.field_0x158 = uVar2;
if (uVar2 == 0) {
i_Msg->mMsgDataProc.field_0x297 = 0;
i_Msg->mMsgDataProc.autoSendFlag = 0;
#if VERSION > VERSION_DEMO
i_Msg->mMsgDataProc.field_0x296 = 0;
#endif
@@ -2003,7 +2003,7 @@ s32 dMsg_stopProc(sub_msg_class* i_Msg) {
{
i_Msg->mMsgDataProc.field_0x299 = 1;
}
if (((i_Msg->mMsgDataProc.field_0x297 == 0) && (i_Msg->mMsgDataProc.field_0x298 == 0)) && ((s32)i_Msg->mMsgDataProc.field_0x158 != 0)) {
if (((i_Msg->mMsgDataProc.autoSendFlag == 0) && (i_Msg->mMsgDataProc.handSendFlag == 0)) && ((s32)i_Msg->mMsgDataProc.field_0x158 != 0)) {
i_Msg->mMsgDataProc.field_0x158 = 0;
#if VERSION > VERSION_DEMO
i_Msg->mMsgDataProc.field_0x296 = 0;
@@ -2330,11 +2330,11 @@ s32 dMsg_continueProc(sub_msg_class* i_Msg) {
iVar1 = (int)((J2DTextBox*)i_Msg->m0544[0].pane)->getCharSpace();
iVar2 = (int)((J2DTextBox*)i_Msg->m0544[1].pane)->getCharSpace();
if (((((CPad_CHECK_TRIG_A(0)) || (CPad_CHECK_TRIG_B(0))) || (i_Msg->mMsgDataProc.field_0x294 != 0)) ||
if (((((CPad_CHECK_TRIG_A(0)) || (CPad_CHECK_TRIG_B(0))) || (i_Msg->mMsgDataProc.selectFlag != 0)) ||
(fopMsgM_checkMessageSend() || (i_Msg->mMsgNo == 0x5ac && (dComIfGp_checkMesgCancelButton())))) &&
(!dComIfGp_checkMesgBgm()))
{
i_Msg->mMsgDataProc.field_0x294 = 0;
i_Msg->mMsgDataProc.selectFlag = 0;
i_Msg->m1100 = 0;
JKRFileLoader::removeResource(i_Msg->head_p, NULL);
if ((i_Msg->mMesgEntry.mTextboxType != 5) && (i_Msg->mMesgEntry.mTextboxType != 0xe)) {
@@ -2359,7 +2359,7 @@ s32 dMsg_continueProc(sub_msg_class* i_Msg) {
dMsg_value_init(i_Msg);
i_Msg->mMsgDataProc.dataInit();
i_Msg->mMsgDataProc.field_0x25C = i_Msg->m1164;
i_Msg->mMsgDataProc.field_0x3C = (char*)i_Msg->mpMesgStr;
i_Msg->mMsgDataProc.bmgData = (char*)i_Msg->mpMesgStr;
pcVar13 = i_Msg->output_rubSdw;
pcVar12 = i_Msg->output_textSdw;
pcVar10 = i_Msg->output_rub;
@@ -2381,24 +2381,24 @@ s32 dMsg_continueProc(sub_msg_class* i_Msg) {
i_Msg->mMsgDataProc.field_0x50[3] = pcVar10;
i_Msg->mMsgDataProc.font[0] = textFont;
i_Msg->mMsgDataProc.font[1] = rubyFont;
i_Msg->mMsgDataProc.field_0x11C = iVar1;
i_Msg->mMsgDataProc.field_0x124 = iVar2;
i_Msg->mMsgDataProc.field_0x0C = &i_Msg->mMesgEntry;
i_Msg->mMsgDataProc.field_0x144 = i_Msg->m110C;
i_Msg->mMsgDataProc.field_0x14C = i_Msg->m1110;
i_Msg->mMsgDataProc.charSpace = iVar1;
i_Msg->mMsgDataProc.rubyCharSpace = iVar2;
i_Msg->mMsgDataProc.mesgEntry = &i_Msg->mMesgEntry;
i_Msg->mMsgDataProc.fontSize = i_Msg->m110C;
i_Msg->mMsgDataProc.rubyFontSize = i_Msg->m1110;
if ((i_Msg->mMesgEntry.mTextboxType == 9) && (i_Msg->m0624[8].mUserArea == 0)) {
i_Msg->mMsgDataProc.field_0x128 = 0x1a3;
i_Msg->mMsgDataProc.field_0x12C = 0x192;
i_Msg->mMsgDataProc.lineWidth = 0x1a3;
i_Msg->mMsgDataProc.centerLineWidth = 0x192;
} else {
i_Msg->mMsgDataProc.field_0x128 = 0x1f7;
i_Msg->mMsgDataProc.field_0x12C = 0x1e6;
i_Msg->mMsgDataProc.lineWidth = 0x1f7;
i_Msg->mMsgDataProc.centerLineWidth = 0x1e6;
}
i_Msg->mMsgDataProc.field_0x160 = g_msgHIO.field_0x82;
i_Msg->mMsgDataProc.field_0x15C = 2;
i_Msg->mMsgDataProc.sendSpeed = g_msgHIO.field_0x82;
i_Msg->mMsgDataProc.spaceTimer = 2;
if (g_msgHIO.field_0x83 != 0) {
i_Msg->mMsgDataProc.field_0x29C = 1;
i_Msg->mMsgDataProc.spaceFlag = 1;
} else {
i_Msg->mMsgDataProc.field_0x29C = 0;
i_Msg->mMsgDataProc.spaceFlag = 0;
}
dMsg_yose_select(i_Msg);
if (i_Msg->mMesgEntry.mInitialSound != 0) {
@@ -2468,7 +2468,7 @@ s32 dMsg_continueProc(sub_msg_class* i_Msg) {
{
i_Msg->mMsgDataProc.field_0x299 = 1;
}
if (((i_Msg->mMsgDataProc.field_0x297 == 0) && (i_Msg->mMsgDataProc.field_0x298 == 0)) && ((s32)i_Msg->mMsgDataProc.field_0x158 != 0)) {
if (((i_Msg->mMsgDataProc.autoSendFlag == 0) && (i_Msg->mMsgDataProc.handSendFlag == 0)) && ((s32)i_Msg->mMsgDataProc.field_0x158 != 0)) {
i_Msg->mMsgDataProc.field_0x158 = 0;
#if VERSION > VERSION_DEMO
i_Msg->mMsgDataProc.field_0x296 = 0;
@@ -2490,11 +2490,11 @@ s32 dMsg_closewaitProc(sub_msg_class* i_Msg) {
u8 bVar1;
u32 uVar3;
if (i_Msg->mMsgDataProc.field_0x297 != 0) {
if (i_Msg->mMsgDataProc.autoSendFlag != 0) {
uVar3 = (int)i_Msg->mMsgDataProc.field_0x158 > 0 ? i_Msg->mMsgDataProc.field_0x158 - 1 : 0;
i_Msg->mMsgDataProc.field_0x158 = uVar3;
if ((uVar3 == 0) || (fopMsgM_checkMessageSend())) {
i_Msg->mMsgDataProc.field_0x297 = 0;
i_Msg->mMsgDataProc.autoSendFlag = 0;
#if VERSION > VERSION_DEMO
i_Msg->mMsgDataProc.field_0x296 = 0;
#endif
@@ -2505,12 +2505,12 @@ s32 dMsg_closewaitProc(sub_msg_class* i_Msg) {
dComIfGp_setMesgSendButton(i_Msg->m116A);
}
} else {
if (i_Msg->mMsgDataProc.field_0x298 != 0) {
if (i_Msg->mMsgDataProc.handSendFlag != 0) {
uVar3 = (int)i_Msg->mMsgDataProc.field_0x158 > 0 ? i_Msg->mMsgDataProc.field_0x158 - 1 : 0;
i_Msg->mMsgDataProc.field_0x158 = uVar3;
if (uVar3 != 0) {
if ((((CPad_CHECK_TRIG_A(0)) || (CPad_CHECK_TRIG_B(0))) || (fopMsgM_checkMessageSend())) && (!dComIfGp_checkMesgBgm())) {
i_Msg->mMsgDataProc.field_0x298 = 0;
i_Msg->mMsgDataProc.handSendFlag = 0;
i_Msg->mStatus = fopMsgStts_BOX_CLOSING_e;
bVar1 = i_Msg->mMesgEntry.mTextboxType;
if ((bVar1 != 5) && (bVar1 != 0xe)) {
@@ -2528,7 +2528,7 @@ s32 dMsg_closewaitProc(sub_msg_class* i_Msg) {
dMeter_Info.field_0x0 = 4;
}
} else {
i_Msg->mMsgDataProc.field_0x298 = 0;
i_Msg->mMsgDataProc.handSendFlag = 0;
i_Msg->mStatus = fopMsgStts_BOX_CLOSING_e;
bVar1 = i_Msg->mMesgEntry.mTextboxType;
if ((bVar1 != 5) && (bVar1 != 0xe)) {
@@ -2546,11 +2546,11 @@ s32 dMsg_closewaitProc(sub_msg_class* i_Msg) {
/* 80213830-80213960 .text dMsg_finishProc__FP13sub_msg_class */
s32 dMsg_finishProc(sub_msg_class* i_Msg) {
if ((((((CPad_CHECK_TRIG_A(0)) || (CPad_CHECK_TRIG_B(0))) || (i_Msg->mMsgDataProc.field_0x294 != 0)) || (fopMsgM_checkMessageSend())) ||
if ((((((CPad_CHECK_TRIG_A(0)) || (CPad_CHECK_TRIG_B(0))) || (i_Msg->mMsgDataProc.selectFlag != 0)) || (fopMsgM_checkMessageSend())) ||
(i_Msg->mMsgNo == 0x5ac && (dComIfGp_checkMesgCancelButton()))) &&
(!dComIfGp_checkMesgBgm()))
{
i_Msg->mMsgDataProc.field_0x294 = 0;
i_Msg->mMsgDataProc.selectFlag = 0;
i_Msg->mStatus = fopMsgStts_BOX_CLOSING_e;
if ((i_Msg->mMesgEntry.mTextboxType != 5) && (i_Msg->mMesgEntry.mTextboxType != 0xe)) {
fopMsgM_setNowAlphaZero(&i_Msg->m050C);
@@ -2748,7 +2748,7 @@ s32 dMsg_initProc(sub_msg_class* i_Msg) {
/* 802140CC-8021411C .text dMsg_tactProc__FP13sub_msg_class */
s32 dMsg_tactProc(sub_msg_class* i_Msg) {
if (fopMsgM_checkMessageSend()) {
i_Msg->mMsgDataProc.field_0x297 = 1;
i_Msg->mMsgDataProc.autoSendFlag = 1;
i_Msg->mMsgDataProc.field_0x158 = 30;
i_Msg->mStatus = fopMsgStts_CLOSE_WAIT_e;
}
@@ -2773,7 +2773,7 @@ s32 dMsg_outnowProc(sub_msg_class* i_Msg) {
if (i_Msg->mMesgEntry.mDrawType == 0) {
if (((CPad_CHECK_TRIG_A(0)) || (CPad_CHECK_TRIG_B(0))) && (!dComIfGp_checkMesgBgm())) {
i_Msg->mMsgDataProc.field_0x299 = 1;
if ((i_Msg->mMsgDataProc.field_0x297 == 0 && (i_Msg->mMsgDataProc.field_0x298 == 0)) && ((s32)i_Msg->mMsgDataProc.field_0x158 != 0)) {
if ((i_Msg->mMsgDataProc.autoSendFlag == 0 && (i_Msg->mMsgDataProc.handSendFlag == 0)) && ((s32)i_Msg->mMsgDataProc.field_0x158 != 0)) {
i_Msg->mMsgDataProc.field_0x158 = 0;
#if VERSION > VERSION_DEMO
i_Msg->mMsgDataProc.field_0x296 = 0;
@@ -2788,12 +2788,12 @@ s32 dMsg_outnowProc(sub_msg_class* i_Msg) {
) {
i_Msg->mMsgDataProc.field_0x299 = 1;
}
if (((i_Msg->mMsgDataProc.field_0x297 == 0) && (i_Msg->mMsgDataProc.field_0x298 == 0)) && ((int)i_Msg->mMsgDataProc.field_0x158 != 0)) {
if (((i_Msg->mMsgDataProc.autoSendFlag == 0) && (i_Msg->mMsgDataProc.handSendFlag == 0)) && ((int)i_Msg->mMsgDataProc.field_0x158 != 0)) {
i_Msg->mMsgDataProc.field_0x158 = (int)i_Msg->mMsgDataProc.field_0x158 > 0 ? i_Msg->mMsgDataProc.field_0x158 - 1 : 0;
} else {
i_Msg->mMsgDataProc.stringSet();
i_Msg->m1164 = i_Msg->mMsgDataProc.field_0x25C;
i_Msg->mStatus = (u16)i_Msg->mMsgDataProc.field_0x27C;
i_Msg->mStatus = (u16)i_Msg->mMsgDataProc.mesgStatus;
for (s32 i = 0; i < 8; i++) {
cVar4 = i_Msg->mMsgDataProc.field_0x281[i];
iVar3 = i_Msg->mMsgDataProc.field_0x220[i];
@@ -2808,7 +2808,7 @@ s32 dMsg_outnowProc(sub_msg_class* i_Msg) {
uVar2 = i_Msg->mStatus;
if (uVar2 == 7) {
i_Msg->m1100 = 0;
} else if ((uVar2 == 10) && (i_Msg->mMsgDataProc.field_0x297 == 0)) {
} else if ((uVar2 == 10) && (i_Msg->mMsgDataProc.autoSendFlag == 0)) {
i_Msg->m1100 = 0;
}
}
src/f_op/f_op_msg_mng.cpp
+397 -307
View File
File diff suppressed because it is too large Load Diff