mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-03 11:00:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Regalloc/debug/misc fixes (#2794)

Browse Source 
* Fix "0" asserts

* More debug and regalloc fixes

* Fix PTMF syntax for compatibility with other compilers

* Fix some fakematches, link more TUs for J/P
This commit is contained in:
LagoLunatic
2025-11-10 21:25:00 -05:00
committed by GitHub
parent a02f72d8f3
commit 23a1c94063
87 changed files with 314 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_ashB.cpp
+15 -9
View File
@@ -99,7 +99,7 @@ static char* l_myName = "AshB";
/* 809625B0-809625C8 000198 0018+00 1/2 0/0 0/0 .data mEvtSeqList__11daNpcAshB_c */
daNpcAshB_c::EventFn daNpcAshB_c::mEvtSeqList[2] = {
NULL,
&EvCut_Appear,
&daNpcAshB_c::EvCut_Appear,
};
/* 8095DE4C-8095DFD0 0000EC 0184+00 1/1 0/0 0/0 .text __ct__11daNpcAshB_cFv */
@@ -605,7 +605,7 @@ void daNpcAshB_c::reset() {
field_0xded = 0;
field_0xdee = 0;
setAction(&wait);
setAction(&daNpcAshB_c::wait);
}
/* 8095F21C-8095F2C4 0014BC 00A8+00 1/1 0/0 0/0 .text
@@ -734,7 +734,7 @@ bool daNpcAshB_c::wait(void* param_0) {
u8 preitemno = dComIfGp_event_getPreItemNo();
if (preitemno == fpcNm_ITEM_ASHS_SCRIBBLING) {
mFlowID = 504;
setAction(&talk);
setAction(&daNpcAshB_c::talk);
} else {
s16 evt_idx =
dComIfGp_getEventManager().getEventIdx(this, "NO_RESPONSE", 0xff);
@@ -743,12 +743,12 @@ bool daNpcAshB_c::wait(void* param_0) {
}
}
} else {
setAction(&talk);
setAction(&daNpcAshB_c::talk);
}
} else {
int mystaffid = dComIfGp_getEventManager().getMyStaffId(l_myName, NULL, 0);
if (mystaffid != -1) {
setAction(&demo);
setAction(&daNpcAshB_c::demo);
}
}
} else {
@@ -857,10 +857,10 @@ bool daNpcAshB_c::talk(void* param_0) {
dComIfGp_getEvent().reset(this);
fopAcM_orderChangeEventId(this, evt_idx, 1, -1);
field_0x9ec = 1;
setAction(&wait);
setAction(&daNpcAshB_c::wait);
}
} else {
setAction(&wait);
setAction(&daNpcAshB_c::wait);
}
ret = true;
@@ -906,6 +906,7 @@ bool daNpcAshB_c::talk(void* param_0) {
// NONMATCHING - extra instruction at dComIfGp_event_runCheck() causing regalloc issues?
bool daNpcAshB_c::demo(void* param_0) {
dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
BOOL r26 = FALSE;
switch (mMode) {
case 0:
@@ -915,13 +916,15 @@ bool daNpcAshB_c::demo(void* param_0) {
// fallthrough
case 2:
if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) {
s32 staff_id = evtmgr.getMyStaffId(l_myName, NULL, 0);
if (staff_id != -1) {
mStaffID = staff_id;
JUT_ASSERT(1523, mEvtSeqList[mOrderEvtNo] != 0);
if ((this->*(mEvtSeqList[mOrderEvtNo]))(staff_id)) {
evtmgr.cutEnd(staff_id);
}
r26 = TRUE;
}
if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && evtmgr.endCheck(mEventIdx))
@@ -929,7 +932,7 @@ bool daNpcAshB_c::demo(void* param_0) {
dComIfGp_event_reset();
mOrderEvtNo = 0;
mEventIdx = -1;
setAction(&wait);
setAction(&daNpcAshB_c::wait);
}
}
@@ -937,6 +940,9 @@ bool daNpcAshB_c::demo(void* param_0) {
case 3:
break;
default:
JUT_ASSERT(1551, FALSE);
}
return true;