mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-07 21:30:47 -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
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