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

Cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-09-05 23:00:43 -04:00
parent 6ed56c2bad
commit 4e0dcdf62b
9 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_auction.cpp
+11 -11
View File
@@ -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 */
src/d/actor/d_a_dai.cpp
+12 -12
View File
@@ -84,8 +84,8 @@ void daDai_c::CreateInit() {
mCyl.Set(l_cyl_src);
mCyl.SetStts(&mStts);
if (mDoLib_clipper::mSystemFar > 1.0f) {
fopAcM_setCullSizeFar(this, 5000.0f / mDoLib_clipper::mSystemFar);
if (mDoLib_clipper::getFar() > 1.0f) {
fopAcM_setCullSizeFar(this, 5000.0f / mDoLib_clipper::getFar());
}
set_mtx();
@@ -116,7 +116,7 @@ void daDai_c::CreateInit() {
cPhs_State daDai_c::_create() {
fopAcM_SetupActor(this, daDai_c);
if (!checkItemGet(0x30, 1)) {
if (!checkItemGet(dItem_DELIVERY_BAG_e, TRUE)) {
return cPhs_ERROR_e;
}
@@ -296,12 +296,12 @@ u32 daDai_c::getMsg() {
}
/* 00000EDC-0000109C .text next_msgStatus__7daDai_cFPUl */
u16 daDai_c::next_msgStatus(unsigned long* arg1) {
u16 uVar8 = 0xf;
u16 daDai_c::next_msgStatus(u32* pMsgNo) {
u16 msgStatus = fopMsgStts_MSG_CONTINUES_e;
switch (*arg1) {
switch (*pMsgNo) {
case 0xF11:
*arg1 = 0xf12;
*pMsgNo = 0xf12;
break;
case 0xF0D:
@@ -309,7 +309,7 @@ u16 daDai_c::next_msgStatus(unsigned long* arg1) {
case 0:
if (dComIfGs_checkReserveItemEmpty() && getRotenItemNumInBag() < 3) {
fopAcM_seStart(this, JA_SE_LK_W_DAIZA_TAKEOFF, 0);
*arg1 = 0xf0f;
*pMsgNo = 0xf0f;
fopAc_ac_c* pfVar4 = fopAcM_SearchByID(m850);
if (pfVar4 != NULL) {
@@ -322,13 +322,13 @@ u16 daDai_c::next_msgStatus(unsigned long* arg1) {
decNowItemNum();
m84A = 0;
} else {
*arg1 = 0xf0e;
*pMsgNo = 0xf0e;
}
break;
case 1:
default:
uVar8 = 0x10;
msgStatus = fopMsgStts_MSG_ENDS_e;
break;
}
break;
@@ -336,11 +336,11 @@ u16 daDai_c::next_msgStatus(unsigned long* arg1) {
case 0xF0E:
case 0xF12:
default:
uVar8 = 0x10;
msgStatus = fopMsgStts_MSG_ENDS_e;
break;
}
return uVar8;
return msgStatus;
}
/* 0000109C-000010BC .text daDai_Create__FPv */
src/d/actor/d_a_door12.cpp
+1 -1
View File
@@ -428,7 +428,7 @@ void daDoor12_c::setEventPrm() {
}
}
if (checkArea(12100.0f, 12100.0f, 62500.0f)) {
if (checkArea(SQUARE(110.0f), SQUARE(110.0f), SQUARE(250.0f))) {
eventInfo.setEventId(mEventIdx[m2C6]);
eventInfo.setToolId(mToolId[m2C6]);
eventInfo.onCondition(dEvtCnd_CANDOOR_e);
src/d/actor/d_a_npc_bs1.cpp
+3 -3
View File
@@ -865,7 +865,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) {
}
int itemNo = mShopItems.getSelectItemNo();
if(!checkItemGet(itemNo, 0)) {
if(!checkItemGet(itemNo, FALSE)) {
m82A = 3;
msgStatus = fopMsgStts_MSG_ENDS_e;
break;
@@ -940,7 +940,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) {
}
// these int casts are probably fake
if(!checkItemGet((int)mShopItems.getSelectItemNo(), 0)) {
if(!checkItemGet((int)mShopItems.getSelectItemNo(), FALSE)) {
m82A = 3;
msgStatus = fopMsgStts_MSG_ENDS_e;
break;
@@ -1869,7 +1869,7 @@ BOOL daNpc_Bs1_c::evn_talk() {
l_msgId = fpcM_ERROR_PROCESS_ID_e;
return TRUE;
}
if ((msgStatus == 2 || msgStatus == 6) && (m738 == m744)) {
if ((msgStatus == fopMsgStts_BOX_OPENING_e || msgStatus == fopMsgStts_MSG_TYPING_e) && (m738 == m744)) {
m744 = 0;
return TRUE;
}
src/d/actor/d_a_npc_nz.cpp
+1 -1
View File
@@ -539,7 +539,7 @@ static u32 daNpcNz_getShopBoughtMsg(u8 itemNo) {
}
int itemTemp = itemNo; // probably fake
if(checkItemGet(itemTemp, 0)) {
if(checkItemGet(itemTemp, FALSE)) {
dComIfGp_setItemRupeeCount(-messageRupee);
execItemGet(itemTemp);
return 0x3403;
src/d/actor/d_a_npc_people.cpp
+1 -1
View File
@@ -4533,7 +4533,7 @@ cPhs_State daNpcPeople_c::createInit() {
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -70.0f, 0.0f, -70.0f, 70.0f, 200.0f, 70.0f);
fopAcM_setCullSizeFar(this, mpNpcDat->field_0x30 / mDoLib_clipper::mSystemFar);
fopAcM_setCullSizeFar(this, mpNpcDat->field_0x30 / mDoLib_clipper::getFar());
attention_info.distances[fopAc_Attn_TYPE_TALK_e] = l_npc_dist_tbl[mNpcType][mbIsNight];
attention_info.distances[fopAc_Attn_TYPE_SPEAK_e] = l_npc_dist_tbl[mNpcType][mbIsNight];
attention_info.flags = fopAc_Attn_UNK1000000_e | fopAc_Attn_ACTION_SPEAK_e | fopAc_Attn_LOCKON_TALK_e;
src/d/actor/d_a_obj_mknjd.cpp
+3 -3
View File
@@ -279,7 +279,7 @@ BOOL daObjMknjD::Act_c::Create() {
attention_info.distances[fopAc_Attn_TYPE_SPEAK_e] = 0x3D;
cLib_onBit<u32>(attention_info.flags, fopAc_Attn_ACTION_SPEAK_e | fopAc_Attn_TALKFLAG_CHECK_e);
if (!checkItemGet(mGiveItemNo, 1)) {
if (!checkItemGet(mGiveItemNo, TRUE)) {
m043F = 8;
eventInfo.setXyCheckCB(daObjMknjD_XyCheckCB);
eventInfo.setXyEventCB(daObjMknjD_XyEventCB);
@@ -895,7 +895,7 @@ BOOL daObjMknjD::Act_c::Execute(Mtx** i_mtx) {
privateCut();
if (!dComIfGp_event_runCheck()) {
if (checkItemGet(mGiveItemNo, 1)) {
if (checkItemGet(mGiveItemNo, TRUE)) {
m043F = 0;
}
else {
@@ -913,7 +913,7 @@ BOOL daObjMknjD::Act_c::Execute(Mtx** i_mtx) {
player->offPlayerNoDraw();
dComIfGp_event_reset();
if (checkItemGet(mGiveItemNo, 1)) {
if (checkItemGet(mGiveItemNo, TRUE)) {
m043F = 0;
}
else {
src/d/actor/d_a_shop_item.cpp
+2 -2
View File
@@ -47,8 +47,8 @@ s16 daShopItem_c::getShopBmdIdx() {
void daShopItem_c::CreateInit() {
fopAcM_SetMtx(this, field_0x64C);
fopAcM_setCullSizeBox(this, -100.0f, 0.0f, -100.0f, 100.0f, 200.0f, 100.0f);
if(mDoLib_clipper::mSystemFar > 1.0f) {
fopAcM_setCullSizeFar(this, 5000.0f / mDoLib_clipper::mSystemFar);
if(mDoLib_clipper::getFar() > 1.0f) {
fopAcM_setCullSizeFar(this, 5000.0f / mDoLib_clipper::getFar());
}
show();
src/d/d_particle.cpp
+1 -2
View File
@@ -479,8 +479,7 @@ void dPa_simpleEcallBack::executeAfter(JPABaseEmitter* param_1) {
dPa_simpleData_c* simpleData = mSimpleData;
param_1->playCreateParticle();
while (mCount != 0) {
Vec local_38 = simpleData->mPos;
if (mDoLib_clipper::mClipper.clip(j3dSys.getViewMtx(), local_38, 200.0f) == 0) {
if (mDoLib_clipper::clip(j3dSys.getViewMtx(), simpleData->mPos, 200.0f) == 0) {
param_1->setGlobalTranslation(simpleData->mPos.x, simpleData->mPos.y, simpleData->mPos.z);
param_1->setGlobalPrmColor(simpleData->mPrmColor.r, simpleData->mPrmColor.g, simpleData->mPrmColor.b);
param_1->setGlobalAlpha(simpleData->mPrmColor.a);