mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-25 14:06:03 -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_swchain.cpp
+17 -17
View File
@@ -119,7 +119,7 @@ static s16 GetActorName(cBgS_PolyInfo& param_0) {
}
}
return PROC_Obj_SwChain;
return fpcNm_Obj_SwChain_e;
}
static char* l_arcName = "P_Chain";
@@ -495,7 +495,7 @@ void daObjSwChain_c::chain_control() {
pos.y += 100.0f;
chains_p1->field_0x4c = 0;
if (fopAcM_gc_c::gndCheck(&pos) && GetActorName(*fopAcM_gc_c::getGroundCheck()) != PROC_Obj_Lv4DigSand) {
if (fopAcM_gc_c::gndCheck(&pos) && GetActorName(*fopAcM_gc_c::getGroundCheck()) != fpcNm_Obj_Lv4DigSand_e) {
fVar1 = fopAcM_gc_c::getGroundY() + 15.0f;
if (fVar1 > pcVar2->y) {
pcVar2->y = fVar1;
@@ -651,7 +651,7 @@ void daObjSwChain_c::chain_control2() {
cXyz spc0(*pcVar2);
spc0.y += 100.0f;
if (fopAcM_gc_c::gndCheck(&spc0) && GetActorName(*fopAcM_gc_c::getGroundCheck()) != PROC_Obj_Lv4DigSand) {
if (fopAcM_gc_c::gndCheck(&spc0) && GetActorName(*fopAcM_gc_c::getGroundCheck()) != fpcNm_Obj_Lv4DigSand_e) {
f32 fVar2 = fopAcM_gc_c::getGroundY() + 15.0f;
if (fVar2 > pcVar2->y) {
pcVar2->y = fVar2;
@@ -1191,18 +1191,18 @@ static actor_method_class l_daObjSwChain_Method = {
};
actor_process_profile_definition g_profile_Obj_SwChain = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_SwChain, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daObjSwChain_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
615, // mPriority
&l_daObjSwChain_Method, // sub_method
0x000C0000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Obj_SwChain_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daObjSwChain_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Obj_SwChain_e,
/* Actor SubMtd */ &l_daObjSwChain_Method,
/* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};