diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-01-19 15:33:38 -0500 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-01-19 15:33:38 -0500 |
| commit | 433fe7c48686aa9ec200cc20acd0eb7fdd7ef516 (patch) | |
| tree | 43da34c4691c86829a21052aed0800ddc33b89b8 /src/d/d_npc.cpp | |
| parent | fa5010b1dd87628d8ade65425ac2f24367585121 (diff) | |
d_a_npc_btsw2 100%, weak order not matching
Diffstat (limited to 'src/d/d_npc.cpp')
| -rw-r--r-- | src/d/d_npc.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/d/d_npc.cpp b/src/d/d_npc.cpp index 3fd1e865..daaac239 100644 --- a/src/d/d_npc.cpp +++ b/src/d/d_npc.cpp @@ -649,7 +649,7 @@ void fopNpc_npc_c::setCollision(f32 radius, f32 height) { } u16 fopNpc_npc_c::talk(int param_1) { - u16 mode = 0xFF; + u16 status = 0xFF; if(mCurrMsgBsPcId == fpcM_ERROR_PROCESS_ID_e) { if(param_1 == 1) { @@ -661,26 +661,26 @@ u16 fopNpc_npc_c::talk(int param_1) { } else { if(mpCurrMsg) { - mode = mpCurrMsg->mStatus; - if(mode == fopMsgStts_MSG_DISPLAYED_e) { + status = mpCurrMsg->mStatus; + if(status == fopMsgStts_MSG_DISPLAYED_e) { mpCurrMsg->mStatus = next_msgStatus(&mCurrMsgNo); if(mpCurrMsg->mStatus == fopMsgStts_MSG_CONTINUES_e) { fopMsgM_messageSet(mCurrMsgNo); } } - else if (mode == fopMsgStts_BOX_CLOSED_e) { + else if (status == fopMsgStts_BOX_CLOSED_e) { mpCurrMsg->mStatus = fopMsgStts_MSG_DESTROYED_e; mCurrMsgBsPcId = fpcM_ERROR_PROCESS_ID_e; } - anmAtr(mode); + anmAtr(status); } else { mpCurrMsg = fopMsgM_SearchByID(mCurrMsgBsPcId); } } - return mode; + return status; } bool dNpc_setAnm_2(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f32 speed, int animFileIdx, int soundFileIdx, const char* arcName) { |
