mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-06 01:18:13 -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_npc_hoz.cpp
+17 -17
View File
@@ -446,7 +446,7 @@ int daNpc_Hoz_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
}
static void* s_sub(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_START_AND_GOAL) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_START_AND_GOAL_e) {
return i_actor;
}
@@ -454,7 +454,7 @@ static void* s_sub(void* i_actor, void* i_data) {
}
static void* s_subCanoe(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_CANOE) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_CANOE_e) {
return i_actor;
}
@@ -524,7 +524,7 @@ void daNpc_Hoz_c::reset() {
}
static void* s_subBomb(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW && ((daArrow_c*)i_actor)->checkBombArrow()) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && ((daArrow_c*)i_actor)->checkBombArrow()) {
return i_actor;
}
@@ -1695,18 +1695,18 @@ static actor_method_class daNpc_Hoz_MethodTable = {
};
actor_process_profile_definition g_profile_NPC_HOZ = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_NPC_HOZ, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daNpc_Hoz_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
344, // mPriority
&daNpc_Hoz_MethodTable, // sub_method
0x00044108, // mStatus
fopAc_NPC_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_NPC_HOZ_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daNpc_Hoz_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_NPC_HOZ_e,
/* Actor SubMtd */ &daNpc_Hoz_MethodTable,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e,
/* Group */ fopAc_NPC_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};