mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-13 13:56:49 -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_e_ms.cpp
+15 -15
View File
@@ -119,7 +119,7 @@ static int target_info_count;
static void* s_d_sub(void* param_1, void* param_2) {
daObjCarry_c* i_this = (daObjCarry_c*)param_1;
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && i_this->getType() == daObjCarry_c::TYPE_DOKURO &&
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Carry_e && i_this->getType() == daObjCarry_c::TYPE_DOKURO &&
target_info_count < 20)
{
target_info[target_info_count] = (fopAc_ac_c*)param_1;
@@ -1063,20 +1063,20 @@ static actor_method_class l_daE_MS_Method = {
};
actor_process_profile_definition g_profile_E_MS = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_MS, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(e_ms_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
177, // mPriority
&l_daE_MS_Method, // sub_method
0x00050100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_MS_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_ms_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_MS_e,
/* Actor SubMtd */ &l_daE_MS_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
AUDIO_INSTANCES;