mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-03 12:10:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use dComIfGp_event_runCheck instead of dComIfGp_event_getMode, remove some fakematches

Browse Source
This commit is contained in:
LagoLunatic
2026-03-31 23:05:57 -04:00
parent a4de4f08fb
commit ab41cc50bb
15 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JAZelAudio/JAIZelBasic.cpp
+1 -1
View File
@@ -157,7 +157,7 @@ void JAIZelBasic::heartGaugeOn() {
/* 802A2F54-802A3058 .text processHeartGaugeSound__11JAIZelBasicFv */
void JAIZelBasic::processHeartGaugeSound() {
if (dComIfGp_event_getMode() == dEvtMode_NONE_e && field_0x0040 != 0) {
if (!dComIfGp_event_runCheck() && field_0x0040 != 0) {
if (field_0x0034 != 0 && field_0x0206 == 0) {
if (field_0x0034 <= 2) {
seStart(JA_SE_ALMOST_DIE_ALERM_3, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
src/d/actor/d_a_agb.cpp
+1 -1
View File
@@ -1123,7 +1123,7 @@ void daAgb_c::FlagsSend(u32 stage_type) {
mFlags.field_0xa_7 = 1;
}
mFlags.field_0xa_6 = dMenu_flag();
mFlags.field_0xa_5 = dComIfGp_event_getMode() != dEvtMode_NONE_e;
mFlags.field_0xa_5 = dComIfGp_event_runCheck();
if (dStage_checkRestart() || dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK20000000_e)) {
mFlags.field_0xa_4 = 1;
} else {
src/d/actor/d_a_boomerang.cpp
+2 -2
View File
@@ -578,7 +578,7 @@ BOOL daBoomerang_c::procMove() {
return TRUE;
}
if (dComIfGp_event_getMode() == dEvtMode_NONE_e) {
if (!dComIfGp_event_runCheck()) {
daPy_lk_c* pPlayer = daPy_getPlayerLinkActorClass();
s16 s = mModelRotY;
mModelRotY -= 0x1F00;
@@ -700,7 +700,7 @@ BOOL daBoomerang_c::procMove() {
mCps.cM3dGCps::Set(old.pos, current.pos, 30.0f);
mCps.CalcAtVec();
if (dComIfGp_event_getMode() == dEvtMode_NONE_e) {
if (!dComIfGp_event_runCheck()) {
mBlur.copyBlur(mDoMtx_stack_c::get(), mModelRotY);
dComIfG_Ccsp()->Set(&mCps);
dComIfG_Ccsp()->SetMass(&mCps, 1);
src/d/actor/d_a_npc_ls1.cpp
+2 -3
View File
@@ -2145,8 +2145,7 @@ BOOL daNpc_Ls1_c::_execute() {
checkOrder();
if (!demo()) {
int staff_id = -1;
dBgS* bgs_p = dComIfG_Bgsp();
if (dComIfGp_event_getMode() != 0 && eventInfo.checkCommandTalk() == false) {
if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk() == false) {
staff_id = isEventEntry();
}
@@ -2160,7 +2159,7 @@ BOOL daNpc_Ls1_c::_execute() {
if (mType != 0) {
fopAcM_posMoveF(this, mStts.GetCCMoveP());
mObjAcch.CrrPos(*bgs_p);
mObjAcch.CrrPos(*dComIfG_Bgsp());
}
play_animation();
src/d/actor/d_a_npc_people.cpp
+2 -3
View File
@@ -4725,8 +4725,7 @@ bool daNpcPeople_c::_execute() {
chkAttention();
checkOrder();
dBgS* bgs = dComIfG_Bgsp(); // This is kinda weird, maybe fakematch
if(dComIfGp_event_getMode() == dEvtMode_NONE_e || (eventInfo.checkCommandTalk() && m79C != 0)) {
if(!dComIfGp_event_runCheck() || (eventInfo.checkCommandTalk() && m79C != 0)) {
(this->*moveProc[m78F])();
}
else {
@@ -4849,7 +4848,7 @@ bool daNpcPeople_c::_execute() {
}
fopAcM_posMoveF(this, mStts.GetCCMoveP());
mObjAcch.CrrPos(*bgs);
mObjAcch.CrrPos(*dComIfG_Bgsp());
}
setCollision(&mCyl, current.pos, m74C, mpNpcDat->field_0x40);
src/d/actor/d_a_npc_roten.cpp
+2 -4
View File
@@ -1848,9 +1848,7 @@ bool daNpcRoten_c::_execute() {
chkAttention();
checkOrder();
dBgS* bgs = dComIfG_Bgsp(); // fakematch?
if(dComIfGp_event_getMode() == dEvtMode_NONE_e || (eventInfo.checkCommandTalk() && (field_0x9B2 & 0x8000) == 0)) {
if(!dComIfGp_event_runCheck() || (eventInfo.checkCommandTalk() && (field_0x9B2 & 0x8000) == 0)) {
(this->*moveProc[field_0x9BB])();
}
else {
@@ -1863,7 +1861,7 @@ bool daNpcRoten_c::_execute() {
speedF = field_0x990;
fopAcM_posMoveF(this, mStts.GetCCMoveP());
mObjAcch.CrrPos(*bgs);
mObjAcch.CrrPos(*dComIfG_Bgsp());
setCollision(l_npc_dat[mNpcNo].field_0x2C, 200.0f);
setCollisionH();
src/d/actor/d_a_obj_rcloud.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ bool daObjRcloud_c::_delete() {
/* 00000494-00000500 .text wait_act_proc__13daObjRcloud_cFv */
void daObjRcloud_c::wait_act_proc() {
if (dComIfGp_event_getMode() != 0 && dComIfGp_evmng_startCheck(l_demo_name[mDemoNameIndex]) != 0) {
if (dComIfGp_event_runCheck() && dComIfGp_evmng_startCheck(l_demo_name[mDemoNameIndex]) != 0) {
setup_action(1);
}
src/d/actor/d_a_player_food.inc
+1 -3
View File
@@ -39,8 +39,6 @@ BOOL daPy_lk_c::procFoodThrow_init() {
return FALSE;
}
dBgS* bgs = dComIfG_Bgsp(); // This is kinda weird, maybe fakematch
if (!dComIfGp_event_runCheck()) {
if (!dComIfGp_event_compulsory(this)) {
return FALSE;
@@ -63,7 +61,7 @@ BOOL daPy_lk_c::procFoodThrow_init() {
cXyz end;
end.set(start.x + offset1, start.y, start.z + offset2);
mLinkLinChk.Set(&start, &end, this);
if (bgs->LineCross(&mLinkLinChk)) {
if (dComIfG_Bgsp()->LineCross(&mLinkLinChk)) {
end.x = start.x - offset1;
end.z = start.z - offset2;
mLinkLinChk.Set(&start, &end, this);
src/d/actor/d_a_player_particle.inc
+3 -3
View File
@@ -504,7 +504,7 @@ void daPy_lk_c::setAuraEffect() {
J3DAnmTevRegKey* pYmgcs00Brk;
if (checkEquipDragonShield()) {
if (dComIfGp_event_getMode() == 0) {
if (!dComIfGp_event_runCheck()) {
m3548 -= 1;
}
@@ -520,7 +520,7 @@ void daPy_lk_c::setAuraEffect() {
pYaura00Brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcName, LINK_BRK_YAURA00_R));
pYmgcs00Brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcName, LINK_BRK_YMGCS00_MS));
} else {
if (dComIfGp_event_getMode() == 0) {
if (!dComIfGp_event_runCheck()) {
mTinkleShieldTimer -= 1;
}
@@ -539,7 +539,7 @@ void daPy_lk_c::setAuraEffect() {
}
}
if (checkNoDamageMode() && (dComIfGp_event_getMode() == 0 || (eventInfo.checkCommandDoor() && !dComIfGp_event_chkEventFlag(dEvtFlag_TALK_e))) ) {
if (checkNoDamageMode() && (!dComIfGp_event_runCheck() || (eventInfo.checkCommandDoor() && !dComIfGp_event_chkEventFlag(dEvtFlag_TALK_e))) ) {
if (yauraFrame < 0.01f) {
for (int idx = 0; idx < (int)ARRAY_SIZE(mMagicArmorAuraEntries); idx++) {
mMagicArmorAuraEntries[idx].setFrame(cM_rndF(y00BtkFrameMax));
src/d/actor/d_a_player_swim.inc
+1 -1
View File
@@ -267,7 +267,7 @@ void daPy_lk_c::setSwimMoveAnime(daPy_ANM swimMoveAnm) {
/* 8013D638-8013D6B8 .text getSwimTimerRate__9daPy_lk_cFv */
f32 daPy_lk_c::getSwimTimerRate() {
f32 swimTimerRate;
if (dComIfGp_getItemSwimTimerStatus() && dComIfGp_event_getMode() == dEvtMode_NONE_e) {
if (dComIfGp_getItemSwimTimerStatus() && !dComIfGp_event_runCheck()) {
swimTimerRate = (1.0f - dComIfGp_getItemTimeCount() * 0.0011111111f);
}
else {
src/d/actor/d_a_player_whide.inc
+8 -8
View File
@@ -82,7 +82,7 @@ cM3dGPla* daPy_lk_c::getWHideModePolygon(cXyz* param_0, cXyz* param_1, cXyz* par
}
}
dBgS* bgs = dComIfG_Bgsp(); // Maybe fakematch? Fixes regalloc
dBgS* bgs = dComIfG_Bgsp(); // Maybe fakematch? Fixes regalloc for retail, but makes demo worse.
cM3dGPla* triPla = bgs->GetTriPla(mLinkLinChk);
s16 uVar3 = cM_atan2s(triPla->GetNP()->x, triPla->GetNP()->z);
@@ -100,7 +100,7 @@ cM3dGPla* daPy_lk_c::getWHideModePolygon(cXyz* param_0, cXyz* param_1, cXyz* par
local_3c.y = param_2->y;
local_3c.z = param_2->z + cM_ssin(uVar3) * m_HIO->mWall.m.field_0x50;
mGndChk.SetPos(&local_3c);
float f31 = bgs->GroundCross(&mGndChk);
f32 f31 = bgs->GroundCross(&mGndChk);
if (-G_CM3D_F_INF != f31 && (!cBgW_CheckBGround(bgs->GetTriPla(mGndChk)->GetNP()->y))) {
return NULL;
}
@@ -123,9 +123,9 @@ cM3dGPla* daPy_lk_c::getWHideModePolygon(cXyz* param_0, cXyz* param_1, cXyz* par
if (!bgs->LineCross(&mLinkLinChk)) {
return NULL;
}
cM3dGPla* pfVar5;
pfVar5 = bgs->GetTriPla(mLinkLinChk);
iVar4 = cM_atan2s(pfVar5->GetNP()->x, pfVar5->GetNP()->z);
cM3dGPla* triPla;
triPla = bgs->GetTriPla(mLinkLinChk);
iVar4 = cM_atan2s(triPla->GetNP()->x, triPla->GetNP()->z);
if (sVar7 != (s16)iVar4) {
return NULL;
}
@@ -142,9 +142,9 @@ cM3dGPla* daPy_lk_c::getWHideModePolygon(cXyz* param_0, cXyz* param_1, cXyz* par
if (!bgs->LineCross(&mLinkLinChk)) {
return NULL;
}
cM3dGPla* pfVar5;
pfVar5 = bgs->GetTriPla(mLinkLinChk);
iVar4 = cM_atan2s(pfVar5->GetNP()->x, pfVar5->GetNP()->z);
cM3dGPla* triPla;
triPla = bgs->GetTriPla(mLinkLinChk);
iVar4 = cM_atan2s(triPla->GetNP()->x, triPla->GetNP()->z);
if (sVar7 != (s16)iVar4) {
return NULL;
}
src/d/d_attention.cpp
+1 -1
View File
@@ -853,7 +853,7 @@ bool dAttention_c::Run(u32 interactMask) {
}
runDebugDisp0();
clrFlag(~(AttnFlag_80000000 | AttnFlag_40000000 | AttnFlag_20000000 | AttnFlag_10000000 | AttnFlag_08000000));
if (dComIfGp_event_getMode() != 0) {
if (dComIfGp_event_runCheck()) {
mLockOnState = LockState_NONE;
field_0x01a = 0;
field_0x01b = 0;
src/d/d_event_manager.cpp
+1 -1
View File
@@ -399,7 +399,7 @@ BOOL dEvent_manager_c::endCheckOld(const char* eventName) {
/* 800745E0-80074718 .text getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci */
int dEvent_manager_c::getMyStaffId(const char* name, fopAc_ac_c* actor, int tagId) {
if (dComIfGp_event_getMode() == dEvtMode_NONE_e)
if (!dComIfGp_event_runCheck())
return -1;
if (mList.getHeaderP() == NULL)
src/d/d_map.cpp
+1 -1
View File
@@ -1783,7 +1783,7 @@ void dMap_c::setGbaPoint(u8 param_1, f32 param_2, f32 param_3, s16 param_4, u8 p
/* 8004B8DC-8004B9C8 .text setArriveInfo__6dMap_cFff */
void dMap_c::setArriveInfo(f32 param_1, f32 param_2) {
/* Nonmatching */
if (dComIfGp_event_getMode() == 0 && strcmp(dComIfGp_getStartStageName(), "sea") == 0) {
if (!dComIfGp_event_runCheck() && strcmp(dComIfGp_getStartStageName(), "sea") == 0) {
s8 gridX;
s8 gridY;
s16 localX;
src/d/d_menu_window.cpp
+2 -2
View File
@@ -786,7 +786,7 @@ void dMs_telescopeMove(sub_ms_screen_class* i_Ms) {
/* 801DD5CC-801DD6D8 .text dMs_placenameMove__FP19sub_ms_screen_class */
void dMs_placenameMove(sub_ms_screen_class*) {
if (dComIfGp_event_getMode() == 0) {
if (!dComIfGp_event_runCheck()) {
return;
}
@@ -1450,7 +1450,7 @@ static BOOL dMs_Execute(sub_ms_screen_class* i_Ms) {
dMs_telescopeMove(i_Ms);
if (dMenu_flag() == 0 && !dComIfGp_event_getMode()) {
if (dMenu_flag() == 0 && !dComIfGp_event_runCheck()) {
dComIfGs_getpItemRecord()->decTimer();
}