k_wmark / k_wpillar OK, fop actor enums / debug building (#1946)

* d_k_wmark / d_k_wpillar OK

* make debug buildable / add assert functionality

* add more fop actor enums

* remove asm
This commit is contained in:
TakaRikka
2023-09-28 12:01:42 -07:00
committed by GitHub
parent 673e69386a
commit 89ed2b8a26
206 changed files with 1612 additions and 2472 deletions
+3 -3
View File
@@ -1009,7 +1009,7 @@ void daItem_c::procInitGetDemoEvent() {
field_0x9c1 = 10;
fopAcM_orderItemEvent(this, 0, 0);
mEvtInfo.i_onCondition(8);
mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
m_item_id = fopAcM_createItemForTrBoxDemo(&current.pos, m_itemNo, -1, fopAcM_GetRoomNo(this),
NULL, NULL);
@@ -1027,7 +1027,7 @@ void daItem_c::procWaitGetDemoEvent() {
} else {
if (m_itemNo == BOOMERANG) {
fopAcM_orderItemEvent(this, 0, 0);
mEvtInfo.i_onCondition(8);
mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
return;
}
@@ -1042,7 +1042,7 @@ void daItem_c::procWaitGetDemoEvent() {
}
} else {
fopAcM_orderItemEvent(this, 0, 0);
mEvtInfo.i_onCondition(8);
mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
}
}
}