mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-24 05:46:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/zeldaret/tp

Browse Source
This commit is contained in:
TakaRikka
2026-03-12 17:56:51 -07:00
parent 875b849c30 bc9bf9d062
commit cb85da153c
931 changed files with 25778 additions and 24285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_nan.cpp
+17 -17
View File
@@ -313,7 +313,7 @@ void daObjNAN_c::walk() {
void daObjNAN_c::bin_wait() {
if (field_0x7d0 == 0) {
fopAcM_OnStatus(this, 0x4000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e);
mDraw = false;
field_0x7d0++;
} else if (field_0x7d0 != -1 && field_0x56c != 0) {
@@ -406,7 +406,7 @@ void daObjNAN_c::hook() {
if (mDraw) {
nan_setParticle();
}
if (!fopAcM_CheckStatus(this, 0x100000)) {
if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) {
setAction(&daObjNAN_c::drop);
}
dBgS_LinChk linkChk;
@@ -538,7 +538,7 @@ void daObjNAN_c::action() {
}
static u8 const l_nan_itemno[2] = {
fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI,
dItemNo_M_NANAFUSHI_e, dItemNo_F_NANAFUSHI_e,
};
int daObjNAN_c::execute() {
@@ -729,18 +729,18 @@ static actor_method_class l_daObjNAN_Method = {
};
actor_process_profile_definition g_profile_Obj_Nan = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_Nan, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daObjNAN_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
480, // mPriority
&l_daObjNAN_Method, // sub_method
0x000C0120, // mStatus
fopAc_ENV_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Obj_Nan_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daObjNAN_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Obj_Nan_e,
/* Actor SubMtd */ &l_daObjNAN_Method,
/* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e,
/* Group */ fopAc_ENV_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};