mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 15:23:01 -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_rdy.cpp
+44 -43
View File
@@ -1,6 +1,6 @@
/**
* @file d_a_e_rdy.cpp
*
*
*/
#include "d/dolzel_rel.h" // IWYU pragma: keep
@@ -154,7 +154,7 @@ enum Animation {
/* 0x4C */ ANM_WAIT01,
/* 0x4D */ ANM_WALK,
};
enum Joint {
/* 0x00 */ JNT_KOSI,
/* 0x01 */ JNT_HIP1,
@@ -383,7 +383,7 @@ static int daE_RDY_Draw(e_rdy_class* i_this) {
&& !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[239])) {
return 1;
}
if (i_this->mKargarokDeleteTimer != 0) {
return 1;
}
@@ -522,7 +522,7 @@ static dBomb_c* search_bomb(e_rdy_class* i_this, BOOL param_1) {
vec2.z = bomb->current.pos.z - a_this->current.pos.z;
f32 dist1 = JMAFastSqrt(vec1.x * vec1.x + vec1.z * vec1.z);
f32 dist2 = JMAFastSqrt(vec2.x * vec2.x + vec2.z * vec2.z);
if (dist1 < threshold && !(dist2 > i_this->mPlayerDist + 30.0f)
&& (!other_bg_check(i_this, bomb) || !param_1))
{
@@ -530,7 +530,7 @@ static dBomb_c* search_bomb(e_rdy_class* i_this, BOOL param_1) {
f32 abs_res = fabsf(50.0f + bomb->current.pos.y - a_this->eyePos.y);
if (abs_res <= 300.0f) {
s16 ang_y = a_this->shape_angle.y - cM_atan2s(vec1.x, vec1.z);
if (ang_y < 0) {
ang_y = (-1 * ang_y);
}
@@ -1104,7 +1104,7 @@ static void e_rdy_fight(e_rdy_class* i_this) {
if (i_this->field_0xa7b != 0) {
fopAc_ac_c* hit_actor = at_hit_check(i_this);
if (hit_actor != NULL && fopAcM_GetName(hit_actor) == PROC_ALINK
if (hit_actor != NULL && fopAcM_GetName(hit_actor) == fpcNm_ALINK_e
&& daPy_getPlayerActorClass()->checkPlayerGuard())
{
i_this->mpMorf->setPlaySpeed(-1.0f);
@@ -1293,7 +1293,7 @@ static void e_rdy_bow(e_rdy_class* i_this) {
}
static void* s_command3_sub(void* i_proc, void* i_this) {
if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) {
if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_RDY_e) {
if (i_proc != i_this && ((e_rdy_class*)i_proc)->mAction == ACT_COMMANDER) {
return i_proc;
}
@@ -1550,7 +1550,7 @@ static void e_rdy_avoid(e_rdy_class* i_this) {
}
static void* s_kusa_sub(void* i_proc, void* i_this) {
if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_Yobikusa) {
if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_Obj_Yobikusa_e) {
cXyz delta = ((fopAc_ac_c*)i_proc)->current.pos - ((fopAc_ac_c*)i_this)->current.pos;
if (delta.abs() < 1000.0f) {
return i_proc;
@@ -1566,7 +1566,7 @@ static void e_rdy_tkusa(e_rdy_class* i_this) {
i_this->mIFrameTimer = 20;
if (i_this->mKargarokID == fpcM_ERROR_PROCESS_ID_e) {
i_this->mKargarokID = fopAcM_GetID(fopAcM_SearchByName(PROC_E_YC));
i_this->mKargarokID = fopAcM_GetID(fopAcM_SearchByName(fpcNm_E_YC_e));
}
fopAc_ac_c* a_karg = (fopAc_ac_c*) fopAcM_SearchByID(i_this->mKargarokID);
@@ -1788,10 +1788,10 @@ static void e_rdy_yc_ride(e_rdy_class* i_this) {
i_this->mIFrameTimer = 20;
if (kargarok2 == NULL) {
i_this->mKargarokID = fopAcM_GetID((e_yc_class*)fopAcM_SearchByName(PROC_E_YC));
i_this->mKargarokID = fopAcM_GetID((e_yc_class*)fopAcM_SearchByName(fpcNm_E_YC_e));
return;
}
if (i_this->field_0xa6e != 0) {
return;
}
@@ -2029,7 +2029,7 @@ static void e_rdy_s_damage(e_rdy_class* i_this) {
i_this->mMode = 0;
}
}
cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f);
}
@@ -2039,7 +2039,7 @@ static int kado_check(e_rdy_class* i_this) {
cXyz vec1, vec2, vec3;
int ret = 0;
cMtx_YrotS(*calc_mtx, i_this->field_0xadc.y);
static int kado_bit[2] = {1, 2};
static f32 kado_check_x[2] = {80.0f, -80.0f};
@@ -2057,7 +2057,7 @@ static int kado_check(e_rdy_class* i_this) {
vec1.x = kado_check_x[i] * (1.0f + JREG_F(6));
MtxPosition(&vec1, &vec3);
vec3 += vec2;
lin_chk.Set(&vec2, &vec3, _this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
ret |= kado_bit[i];
@@ -2423,7 +2423,7 @@ static s16 gake_check(e_rdy_class* i_this, f32 i_dist) {
}
static void* s_bikkuri_sub(void* i_proc, void* i_this) {
if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) {
if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_RDY_e) {
if (i_proc != i_this && ((e_rdy_class*)i_proc)->mAction == ACT_BOW3 && ((e_rdy_class*)i_proc)->mMode <= 2) {
cXyz delta = ((fopAc_ac_c*)i_proc)->current.pos - ((fopAc_ac_c*)i_this)->current.pos;
if (delta.abs() < 350.0f + KREG_F(11)) {
@@ -2680,7 +2680,7 @@ static s8 e_rdy_bow3(e_rdy_class* i_this) {
static void* s_command2_sub(void* i_proc, void* i_this) {
UNUSED(i_this);
if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) {
if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_RDY_e) {
if (((e_rdy_class*)i_proc)->mAction == ACT_BOW3 && ((e_rdy_class*)i_proc)->mMode < 10) {
((e_rdy_class*)i_proc)->mTimer[0] = cM_rndF(10.0f) + 10.0f;
((e_rdy_class*)i_proc)->mMode = 10;
@@ -2690,7 +2690,7 @@ static void* s_command2_sub(void* i_proc, void* i_this) {
}
static void* s_command4_sub(void* i_proc, void* i_this) {
if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) {
if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_RDY_e) {
if (((e_rdy_class*)i_proc) != i_this && ((e_rdy_class*)i_proc)->mAction == ACT_BOW3) {
return i_proc;
}
@@ -2912,7 +2912,7 @@ static void e_rdy_jyunkai(e_rdy_class* i_this) {
case 0: {
anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
dPnt* point = i_this->mpPath->m_points;
point += i_this->mPathIndex;
@@ -3048,7 +3048,7 @@ static void big_damage(e_rdy_class* i_this) {
i_this->field_0xac6 = -(cM_rndFX(2000.0f) + 4000.0f);
} else if (i_this->mRideState != 0) {
i_this->field_0xac6 = cM_rndFX(3000.0f);
} else if (fopAcM_GetName(i_this->mAtInfo.mpActor) == PROC_E_WB) {
} else if (fopAcM_GetName(i_this->mAtInfo.mpActor) == fpcNm_E_WB_e) {
i_this->field_0xac6 = cM_rndFX(8000.0f);
a_this->speed.y = cM_rndF(15.0f) + (35.0f + TREG_F(17));
i_this->field_0xabc = -(i_this->mAtInfo.mpActor->speedF * 0.5f);
@@ -3784,12 +3784,13 @@ static void cam_3d_morf(e_rdy_class* i_this, f32 i_scale) {
static void* s_adel_sub(void* i_proc, void* i_this) {
UNUSED(i_this);
if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_ARROW) {
if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_ARROW_e) {
fopAcM_delete((fopAc_ac_c*)i_proc);
}
return NULL;
}
// DEBUG NONMATCHING: regalloc hell
static void demo_camera(e_rdy_class* i_this) {
fopAc_ac_c* a_this = &i_this->actor;
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -4186,7 +4187,7 @@ static void demo_camera(e_rdy_class* i_this) {
i_this->mDemoTimer = 0;
i_this->mMode = 4;
i_this->mCamDist = 0.0f;
e_arrow_class* arrow = (e_arrow_class*)fopAcM_SearchByName(PROC_E_ARROW);
e_arrow_class* arrow = (e_arrow_class*)fopAcM_SearchByName(fpcNm_E_ARROW_e);
arrow->field_0xa00.z = 30000.0f + AREG_F(18);
cVar12 = 0;
}
@@ -4238,7 +4239,7 @@ static void demo_camera(e_rdy_class* i_this) {
}
if (cVar12 != 0) {
fopAc_ac_c* a_arr = (fopAc_ac_c*) fopAcM_SearchByName(PROC_E_ARROW);
fopAc_ac_c* a_arr = (fopAc_ac_c*)fopAcM_SearchByName(fpcNm_E_ARROW_e);
if (a_arr != NULL) {
e_arrow_class* arrow = (e_arrow_class*) a_arr;
if (cVar12 == 3) {
@@ -4285,17 +4286,17 @@ static void demo_camera(e_rdy_class* i_this) {
vec2.set(-93666.0f, -5951.0f, 39000.0f);
player->setPlayerPosAndAngle(&vec2, 0, 0);
fpcM_Search(s_adel_sub, i_this);
#if VERSION != VERSION_SHIELD_DEBUG
#if PLATFORM_GCN
i_this->mMode = 2;
anm_init(i_this, ANM_WAIT01, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
#endif
u32 child_params = 0x80000011;
csXyz angle(0, 0x4000, 0);
vec2.set(-93652.0f, -5875.0f, 46674.0f);
fopAcM_createChild(PROC_E_ARROW, fopAcM_GetID(a_this), child_params, &vec2,
fopAcM_createChild(fpcNm_E_ARROW_e, fopAcM_GetID(a_this), child_params, &vec2,
fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL);
vec2.set(-93659.0f, -5875.0f, 32500.0f);
fopAcM_createChild(PROC_E_ARROW, fopAcM_GetID(a_this), child_params, &vec2,
fopAcM_createChild(fpcNm_E_ARROW_e, fopAcM_GetID(a_this), child_params, &vec2,
fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL);
Z2GetAudioMgr()->bgmStop(30, 0);
mDoGph_gInf_c::fadeOut(1.0f, g_blackColor);
@@ -4353,7 +4354,7 @@ static int daE_RDY_Execute(e_rdy_class* i_this) {
if (i_this->mKargarokDeleteTimer != 0) {
i_this->mKargarokDeleteTimer--;
if (i_this->mKargarokDeleteTimer == 0) {
daKago_c* kago = (daKago_c*)fopAcM_SearchByName(PROC_KAGO);
daKago_c* kago = (daKago_c*)fopAcM_SearchByName(fpcNm_KAGO_e);
kago->setEvent2();
fopAcM_delete(a_this);
fopAcM_delete(fopAcM_SearchByID(i_this->mKargarokID));
@@ -4702,7 +4703,7 @@ static int daE_RDY_Execute(e_rdy_class* i_this) {
if (i_this->field_0x5b8 == 11) {
params |= 0x10;
}
fopAcM_createChild(PROC_E_ARROW, fopAcM_GetID(a_this), params, &vec2,
fopAcM_createChild(fpcNm_E_ARROW_e, fopAcM_GetID(a_this), params, &vec2,
fopAcM_GetRoomNo(a_this), &arrow_angle, NULL, -1, NULL);
i_this->mArrowFired = false;
i_this->mBowRotationTimer = 15 + TREG_S(8);
@@ -4795,7 +4796,7 @@ static dJntColData_c jc_data[11] = {
static int useHeapInit(fopAc_ac_c* i_this) {
e_rdy_class* _this = (e_rdy_class*)i_this;
_this->mpMorf = JKR_NEW mDoExt_McaMorfSO(
(J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 81), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes(_this->mpArcName, 76),
@@ -4943,7 +4944,7 @@ static cPhs_Step daE_RDY_Create(fopAc_ac_c* i_this) {
pos.y += 5000.0f + YREG_F(0);
}
_this->mKargarokID = fpcM_ERROR_PROCESS_ID_e;
fopAcM_create(PROC_E_YC, 0xffffff00, &pos, fopAcM_GetRoomNo(i_this),
fopAcM_create(fpcNm_E_YC_e, 0xffffff00, &pos, fopAcM_GetRoomNo(i_this),
&i_this->shape_angle, NULL, 0xff);
}
@@ -5078,18 +5079,18 @@ static actor_method_class l_daE_RDY_Method = {
};
actor_process_profile_definition g_profile_E_RDY = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_RDY, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(e_rdy_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
157, // mPriority
&l_daE_RDY_Method, // sub_method
0x00044000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_RDY_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_rdy_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_RDY_e,
/* Actor SubMtd */ &l_daE_RDY_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};