diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-09-05 23:00:43 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-09-05 23:00:43 -0400 |
| commit | 4e0dcdf62b2d66851e480d1a8c032594c14ca1d0 (patch) | |
| tree | 096cdfda45f90f624a0c6763387311ed910d8637 /src/d/actor/d_a_auction.cpp | |
| parent | 6ed56c2bad174adc4d11c2a731a57f19519380cf (diff) | |
Cleanup
Diffstat (limited to 'src/d/actor/d_a_auction.cpp')
| -rw-r--r-- | src/d/actor/d_a_auction.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index 45a109b9..9bdb94f0 100644 --- a/src/d/actor/d_a_auction.cpp +++ b/src/d/actor/d_a_auction.cpp @@ -1300,7 +1300,7 @@ bool daAuction_c::eventCameraTest() { /* 00002F6C-0000369C .text next_msgStatus__11daAuction_cFPUl */ u16 daAuction_c::next_msgStatus(u32* pMsgNo) { - u16 ret = 0xF; + u16 msgStatus = fopMsgStts_MSG_CONTINUES_e; switch (*pMsgNo) { case 0x1CF2: @@ -1337,7 +1337,7 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) { *pMsgNo = l_npc_msg_dat[getAucMdlNo(m824)].field_0x02; } } else { - ret = 0x10; + msgStatus = fopMsgStts_MSG_ENDS_e; } m825 = m824; @@ -1395,7 +1395,7 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) { if (mpCurrMsg->mSelectNum == 0) { *pMsgNo = 0x1D1F; } else { - ret = 0x10; + msgStatus = fopMsgStts_MSG_ENDS_e; } break; case 0x1D1A: @@ -1403,14 +1403,14 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) { m82B = 1; } - ret = 0x10; + msgStatus = fopMsgStts_MSG_ENDS_e; break; case 0x1D1F: dComIfGp_setNextStage("sea", 3, 11); case 0x1D24: m82B = 1; - ret = 0x10; + msgStatus = fopMsgStts_MSG_ENDS_e; break; case 0x1D20: @@ -1435,7 +1435,7 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) { case 0x1D3C: this->m834 |= 2; this->m808 = 0; - ret = 0x10; + msgStatus = fopMsgStts_MSG_ENDS_e; break; case 0x1D05: @@ -1451,12 +1451,12 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) { } fopAcM_delete(mCurrAuctionItemPID); - ret = 0x10; + msgStatus = fopMsgStts_MSG_ENDS_e; } break; case 0x1D1C: dComIfGp_setItemRupeeCount(mCurrBid); - ret = 0x10; + msgStatus = fopMsgStts_MSG_ENDS_e; break; case 0x1D07: dComIfGp_setItemRupeeCount(-mCurrBid); @@ -1468,17 +1468,17 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) { break; default: - ret = 0x10; + msgStatus = fopMsgStts_MSG_ENDS_e; break; } - if (ret == 0xF) { + if (msgStatus == fopMsgStts_MSG_CONTINUES_e) { m7EC = *pMsgNo; } else { m7EC = 0; } - return ret; + return msgStatus; } /* 0000369C-000036AC .text setMessage__11daAuction_cFUl */ |