mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-10 12:54:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink.cpp
+6 -6
View File
@@ -11663,20 +11663,20 @@ static actor_method_class l_daAlink_Method = {
/* 803B2DCC-803B2E20 -00001 0030+24 0/0 0/0 1/0 .data g_profile_ALINK */
extern actor_process_profile_definition g_profile_ALINK = {
-3,
fpcLy_CURRENT_e,
5,
-3,
fpcPi_CURRENT_e,
PROC_ALINK,
&g_fpcLf_Method.mBase,
sizeof(daAlink_c),
0,
0,
&g_fopAc_Method.base,
0x5B,
91,
&l_daAlink_Method,
0x00060400,
1,
0,
0x60400,
fopAc_PLAYER_e,
fopAc_CULLBOX_0_e,
};
// tons of extra padding? not sure what this is
src/d/a/d_a_alink_link.inc
+4 -4
View File
@@ -2536,7 +2536,7 @@ int daAlink_c::execute() {
}
if (checkDeadHP()) {
mEvtInfo.offCondition(2);
mEvtInfo.offCondition(fopAcCnd_NOEXEC_e);
} else if (!checkMagneBootsOn()) {
f32 var_f31_2;
if (mLinkAcch.ChkGroundHit()) {
@@ -2553,13 +2553,13 @@ int daAlink_c::execute() {
((checkReinRide() || checkCanoeRide() || checkSpinnerRide()) &&
!checkNoResetFlg3(FLG3_UNK_80000) && !checkModeFlg(MODE_JUMP)))
{
mEvtInfo.onCondition(1);
mEvtInfo.onCondition(dEvtCnd_CANTALK_e);
if (checkReinRide() || checkCanoeRide()) {
mEvtInfo.onCondition(8);
mEvtInfo.onCondition(dEvtCnd_CANGETITEM_e);
}
}
} else if (checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) {
mEvtInfo.onCondition(1);
mEvtInfo.onCondition(dEvtCnd_CANTALK_e);
}
if (checkEndResetFlg1(ERFLG1_UNK_40000) && checkMidnaRide() && checkWolf()) {
src/d/a/d_a_obj_item.cpp
+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);
}
}
}