Use dComIfGp_event_runCheck instead of dComIfGp_event_getMode, remove some fakematches

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
+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();