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

use more inlines and enums

Browse Source
This commit is contained in:
LagoLunatic
2024-01-06 22:21:56 -05:00
parent 2dd14bfcdc
commit cee53aa7b2
21 changed files with 159 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_mknjd.cpp
+15 -25
View File
@@ -393,21 +393,11 @@ void daObjMknjD::Act_c::setPlayerAngle(int i_staffIdx) {
/* 00000E84-00000F88 .text talk__Q210daObjMknjD5Act_cFi */
u16 daObjMknjD::Act_c::talk(int i_param1) {
u16 msgMode = 0xFF;
u16 msgStatus = 0xFF;
if (mMsgPID == fpcM_ERROR_PROCESS_ID_e) {
if (i_param1 == 1) {
u32 msgId;
if (m0500 == 0) {
g_dComIfG_gameInfo.play.mTactMode = mTactMode;
msgId = 0x05B3;
}
else {
msgId = 0x1901;
}
mMsgNo = msgId;
mMsgNo = getMsg();
}
mMsgPID = fopMsgM_messageSet(mMsgNo, this);
@@ -415,18 +405,18 @@ u16 daObjMknjD::Act_c::talk(int i_param1) {
}
else {
if (mMsgPtr) {
msgMode = mMsgPtr->mMode;
msgStatus = mMsgPtr->mStatus;
if (msgMode == 0x0E) {
if (g_dComIfG_gameInfo.play.field_0x4949 != 0) {
if (msgStatus == fopMsgStts_MSG_DISPLAYED_e) {
if (dComIfGp_checkMesgCancelButton() != 0) {
m0504 = true;
fopMsgM_messageSendOn();
}
mMsgPtr->mMode = 0x10;
mMsgPtr->mStatus = fopMsgStts_MSG_ENDS_e;
}
else if (msgMode == 0x12) {
mMsgPtr->mMode = 0x13;
else if (msgStatus == fopMsgStts_BOX_CLOSED_e) {
mMsgPtr->mStatus = fopMsgStts_MSG_DESTROYED_e;
mMsgPID = fpcM_ERROR_PROCESS_ID_e;
}
}
@@ -435,7 +425,7 @@ u16 daObjMknjD::Act_c::talk(int i_param1) {
}
}
return msgMode;
return msgStatus;
}
/* 00000F88-00001348 .text privateCut__Q210daObjMknjD5Act_cFv */
@@ -511,7 +501,7 @@ void daObjMknjD::Act_c::privateCut() {
doCutEnd = true;
break;
case ACT_INPUT:
if (talk(1) == 0x12) {
if (talk(1) == fopMsgStts_BOX_CLOSED_e) {
doCutEnd = true;
}
break;
@@ -541,9 +531,9 @@ void daObjMknjD::Act_c::privateCut() {
}
break;
case ACT_LESSON:
u32 talkResult = talk(1);
u16 msgStatus = talk(1);
if (talkResult == 0x12 || talkResult == 0x15) {
if (msgStatus == fopMsgStts_BOX_CLOSED_e || msgStatus == fopMsgStts_UNK15_e) {
doCutEnd = true;
}
break;
@@ -870,7 +860,7 @@ int daObjMknjD::Act_c::Execute(Mtx** i_mtx) {
case 10:
privateCut();
if (g_dComIfG_gameInfo.play.mEvtCtrl.mMode == 0) {
if (!dComIfGp_event_runCheck()) {
if (checkItemGet(mGiveItemNo, 1) != 0) {
m043F = 0;
}
@@ -885,9 +875,9 @@ int daObjMknjD::Act_c::Execute(Mtx** i_mtx) {
m043F = 12;
break;
case 12:
if (talk(1) == 18) {
if (talk(1) == fopMsgStts_BOX_CLOSED_e) {
player->offPlayerNoDraw();
g_dComIfG_gameInfo.play.mEvtCtrl.mEventFlag |= 8;
dComIfGp_event_reset();
if (checkItemGet(mGiveItemNo, 1) != 0) {
m043F = 0;