mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-20 13:24:40 -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_ks.cpp
+30 -30
View File
@@ -289,7 +289,7 @@ static int daNpc_Ks_Draw(npc_ks_class* i_this) {
static void* s_resq_sub(void* i_actor, void* i_data) {
(void) i_data;
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) {
((npc_ks_class*)i_actor)->anm_time = cM_rndF(50.0f) + 220.0f;
}
return NULL;
@@ -528,7 +528,7 @@ static fopAc_ac_c* en_search_test(npc_ks_class* i_this) {
static void* s_ori_sub(void* i_actor, void* i_data) {
(void) i_data;
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_SO) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_SO_e) {
return i_actor;
}
return NULL;
@@ -741,7 +741,7 @@ static int npc_ks_ori(npc_ks_class* i_this) {
static void* shot_bo_sub(void* i_actor, void* i_data) {
(void) i_data;
fopAc_ac_c* player = dComIfGp_getPlayer(0);
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG &&
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e &&
dComIfGp_checkPlayerStatus0(0, 0x80000) == 0 && fopAcM_GetParam(i_actor) == 1) {
cXyz ato(((daBoomerang_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos);
if (ato.abs() < 1000.0f) {
@@ -1053,7 +1053,7 @@ static void npc_ks_home(npc_ks_class* i_this) {
}
static void* s_sw_sub(void* i_actor, void* i_data) {
if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_SW)) {
if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_SW_e)) {
if (fopAcM_GetRoomNo((fopAc_ac_c*)i_data) == 0) {
if (((npc_ks_class*)i_data)->set_id == ((obj_sw_class*)i_actor)->field_0x570) {
return i_actor;
@@ -1067,7 +1067,7 @@ static void* s_sw_sub(void* i_actor, void* i_data) {
static void* s_ha_sub(void* i_actor, void* i_data) {
(void) i_data;
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Pillar) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Pillar_e) {
return i_actor;
}
return NULL;
@@ -1075,7 +1075,7 @@ static void* s_ha_sub(void* i_actor, void* i_data) {
static void* s_01_sub(void* i_actor, void* i_data) {
(void) i_data;
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS && ((npc_ks_class*)i_actor)->action == 4) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e && ((npc_ks_class*)i_actor)->action == 4) {
return i_actor;
}
return NULL;
@@ -1097,7 +1097,7 @@ static int npc_ks_demo_02(npc_ks_class* i_this) {
int rv = 1;
int iVar1 = 0;
obj_so_class* cage_p = (obj_so_class*)fopAcM_SearchByName(PROC_OBJ_SO);
obj_so_class* cage_p = (obj_so_class*)fopAcM_SearchByName(fpcNm_OBJ_SO_e);
if (cage_p == NULL) {
return 0;
}
@@ -1388,7 +1388,7 @@ static int npc_ks_demo_02(npc_ks_class* i_this) {
static void* s_dn_sub(void* i_actor, void* i_data) {
(void) i_data;
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_OC) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_OC_e) {
return i_actor;
}
return NULL;
@@ -1740,7 +1740,7 @@ static void npc_ks_to_hang(npc_ks_class* i_this) {
}
static void* s_next_do_sub(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) {
npc_ks_class* mon_data = (npc_ks_class*) i_data;
npc_ks_class* monkey_actor = (npc_ks_class*) i_actor;
if (monkey_actor->field_0x5b5 != 0 && mon_data->order == (monkey_actor->order - 1 & 0xFF)) {
@@ -1753,7 +1753,7 @@ static void* s_next_do_sub(void* i_actor, void* i_data) {
}
static void* s_next_get_sub(void* actor, void* i_data) {
if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == PROC_NPC_KS) {
if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_NPC_KS_e) {
npc_ks_class* mon_data = (npc_ks_class*) i_data;
npc_ks_class* monkey_actor = (npc_ks_class*) actor;
if (monkey_actor->field_0x5b5 != 0 &&
@@ -2518,7 +2518,7 @@ static void cam_3d_morf(npc_ks_class* i_this, f32 param_2) {
static void* s_fs_sub(void* i_actor, void* i_data) {
(void) i_data;
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_FS) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_FS_e) {
((e_fs_class*)i_actor)->mAction = 10;
((e_fs_class*)i_actor)->mMode = 0;
}
@@ -2527,7 +2527,7 @@ static void* s_fs_sub(void* i_actor, void* i_data) {
static void* s_fsdown_sub(void* i_actor, void* i_data) {
(void) i_data;
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_FS) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_FS_e) {
((e_fs_class*)i_actor)->mTimer[0] = (fopAcM_GetID(i_actor) & 0x3) << 3;
((e_fs_class*)i_actor)->mMode++;
}
@@ -5974,7 +5974,7 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) {
}
}
if ((i_this->mode == 40 || i_this->mode == 41) && fopAcM_SearchByName(PROC_E_FS) == NULL && i_this->demo_mode == 0) {
if ((i_this->mode == 40 || i_this->mode == 41) && fopAcM_SearchByName(fpcNm_E_FS_e) == NULL && i_this->demo_mode == 0) {
i_this->mode = 42;
i_this->timer[1] = 30;
}
@@ -6592,7 +6592,7 @@ static void action(npc_ks_class* i_this) {
static void* s_kago_sub(void* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_KAGO) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_KAGO_e) {
if (((daObj_Kago_c*)i_actor)->getType() == 0) {
return i_actor;
}
@@ -7243,7 +7243,7 @@ static BOOL start_check(npc_ks_class* i_this) {
break;
case 20:
fopAcM_OnStatus(actor, 0x20000);
fopAcM_OnStatus(actor, fopAcStts_NOPAUSE_e);
i_this->action = 300;
i_this->field_0xc17 = 1;
iVar2 = 1;
@@ -7299,7 +7299,7 @@ static BOOL start_check(npc_ks_class* i_this) {
}
static void* s_check_sub(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) {
if (fopAcM_GetID(i_actor) != fopAcM_GetID(i_data) && ((npc_ks_class*)i_actor)->set_id == ((npc_ks_class*)i_data)->set_id) {
return i_actor;
}
@@ -7458,18 +7458,18 @@ static actor_method_class l_daNpc_Ks_Method = {
};
actor_process_profile_definition g_profile_NPC_KS = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_NPC_KS, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(npc_ks_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
701, // mPriority
&l_daNpc_Ks_Method, // sub_method
0x00044100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_NPC_KS_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(npc_ks_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_NPC_KS_e,
/* Actor SubMtd */ &l_daNpc_Ks_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};