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

d_msg - 99% matching (#899)

Browse Source 
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
This commit is contained in:
123456789758
2025-11-14 22:51:12 -05:00
committed by GitHub
parent 909a2a0dd6
commit 9075155201
18 changed files with 3045 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_cb1.cpp
+1 -1
View File
@@ -1580,7 +1580,7 @@ BOOL daNpc_Cb1_c::execTalk(BOOL param_1) {
fopMsgM_messageSet(mMsgNo);
}
}
else if(l_msg->mStatus == fopMsgStts_UNK15_e) {
else if(l_msg->mStatus == fopMsgStts_INPUT_e) {
if(param_1) {
if(dComIfGp_checkMesgCancelButton()) {
l_msg->mStatus = fopMsgStts_MSG_ENDS_e;
src/d/actor/d_a_npc_md.cpp
+1 -1
View File
@@ -2311,7 +2311,7 @@ BOOL daNpc_Md_c::talk(int r4) {
fopMsgM_messageSet(mMsgNo);
m313A = 0;
}
} else if (msgStatus == fopMsgStts_UNK15_e) {
} else if (msgStatus == fopMsgStts_INPUT_e) {
if (r4 != 0) {
if (dComIfGp_checkMesgCancelButton()) {
l_msg->mStatus = fopMsgStts_MSG_ENDS_e;
src/d/actor/d_a_npc_os.cpp
+1 -1
View File
@@ -1641,7 +1641,7 @@ BOOL daNpc_Os_c::talk() {
fopMsgM_messageSet(field_0x780);
}
}
else if(l_msg->mStatus != fopMsgStts_UNK15_e && l_msg->mStatus != fopMsgStts_MSG_TYPING_e && l_msg->mStatus == fopMsgStts_BOX_CLOSED_e) {
else if(l_msg->mStatus != fopMsgStts_INPUT_e && l_msg->mStatus != fopMsgStts_MSG_TYPING_e && l_msg->mStatus == fopMsgStts_BOX_CLOSED_e) {
l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e;
return true;
src/d/actor/d_a_npc_people.cpp
+1 -1
View File
@@ -6289,7 +6289,7 @@ u16 daNpcPeople_c::talk2(int param_1, fopAc_ac_c* param_2) {
}
break;
case fopMsgStts_UNKA_e:
case fopMsgStts_CLOSE_WAIT_e:
if(m7A8 == 0) {
chkMsg();
m7A8 = 1;
src/d/actor/d_a_obj_mknjd.cpp
+1 -1
View File
@@ -540,7 +540,7 @@ void daObjMknjD::Act_c::privateCut() {
case ACT_LESSON: {
u16 msgStatus = talk(1);
if (msgStatus == fopMsgStts_BOX_CLOSED_e || msgStatus == fopMsgStts_UNK15_e) {
if (msgStatus == fopMsgStts_BOX_CLOSED_e || msgStatus == fopMsgStts_INPUT_e) {
doCutEnd = true;
}
break;
src/d/actor/d_a_tag_hint.cpp
+4 -4
View File
@@ -514,13 +514,13 @@ u16 daTag_Hint_c::talk() {
break;
case 2:
sVar3 = l_msg->mStatus;
if (sVar3 == 0xe) {
if (sVar3 == fopMsgStts_MSG_DISPLAYED_e) {
l_msg->mStatus = next_msgStatus(&m290);
if (l_msg->mStatus == 0xf) {
if (l_msg->mStatus == fopMsgStts_MSG_CONTINUES_e) {
fopMsgM_messageSet(m290);
}
} else if (sVar3 == 0x12) {
l_msg->mStatus = 0x13;
} else if (sVar3 == fopMsgStts_BOX_CLOSED_e) {
l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e;
m294 = -1;
}
break;
src/d/actor/d_a_tag_island.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ void daTag_Island_c::demoInitTact_Bf() {
/* 00000778-000007C8 .text demoProcTact_Bf__14daTag_Island_cFv */
BOOL daTag_Island_c::demoProcTact_Bf() {
if (talk() == fopMsgStts_UNK15_e)
if (talk() == fopMsgStts_INPUT_e)
dComIfGp_evmng_cutEnd(mStaffId);
return TRUE;
}