mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-19 21:11:59 -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_saru.cpp
+17 -17
View File
@@ -436,7 +436,7 @@ int daNpc_Saru_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
void* daNpc_Saru_c::srchYm(void* i_actor, void* i_data) {
if (mFindCount < 50 && i_actor != NULL && i_actor != i_data) {
if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_YM && ((daE_YM_c*)i_actor)->isHide() == 0) {
if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_YM_e && ((daE_YM_c*)i_actor)->isHide() == 0) {
mFindActorPtrs[mFindCount] = (fopAc_ac_c*)i_actor;
mFindCount++;
}
@@ -647,10 +647,10 @@ void daNpc_Saru_c::action() {
}
void daNpc_Saru_c::beforeMove() {
fopAcM_OffStatus(this, 0x8000000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e);
if (checkHide()) {
fopAcM_OnStatus(this, 0x8000000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e);
}
if ((checkHide() || mNoDraw != 0) && mSpeakEvent == false) {
@@ -1232,18 +1232,18 @@ static actor_method_class daNpc_Saru_MethodTable = {
};
actor_process_profile_definition g_profile_NPC_SARU = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_NPC_SARU, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daNpc_Saru_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
357, // mPriority
&daNpc_Saru_MethodTable, // sub_method
0x00040107, // 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_SARU_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daNpc_Saru_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_NPC_SARU_e,
/* Actor SubMtd */ &daNpc_Saru_MethodTable,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e,
/* Group */ fopAc_NPC_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};