mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 04:48:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Actor status consolidation & process profile definition editing (#3117)

Browse Source 
* Consolidate fopAcM_STATUS into fopAc_Status_e

* Add _e suffix to fopAcStts enums

* Prepare for profile enumeration
* Correct typo in scene_process_profile_definition
* Manually handle g_profile_Obj_DamCps (inline preprocessing)
* Correct g_profile_TAG_LV5SOUP procname to enum
* Create d_priority.h

* Update process profile definitions
* Moved inline comments to the left
* Add missing fopAcStts enums
* Add d_priority.h include in f_pc_leaf.h
* Manually update d_a_obj_damCps profile

* Replace fopAcStts enums replacing and anticipatory profile size correction
* Changed profile size from literal to sizeof() in anticipation of PR #3116
* Provided putative names to staff-related status enums
* Replaced appropriate literals with fopAcStts enums

* Fix borked merge

* Rename item number enums and move to d_item_data.h

* Rename process profile name & draw priority enums

* Move process profile name & draw priority enums to appropriate files
* Moved fpcNm_ enums from d/d_procname.h to f_pc/f_pc_name.h
* Moved fpcDwPi_ enums from d/d_priority.h to f_pc/f_pc_draw_priority.h

* ACTUALLY (whoops) stage merge

* Correct item mistranslation

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
This commit is contained in:
Huitzi
2026-03-09 21:33:31 -04:00
committed by GitHub
parent 30e839c28b
commit 0b0fdd1f60
873 changed files with 19721 additions and 18953 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_bhashi.cpp
+22 -22
View File
@@ -1,6 +1,6 @@
/**
* @file d_a_obj_bhashi.cpp
*
*
*/
#include "d/dolzel_rel.h" // IWYU pragma: keep
@@ -158,12 +158,12 @@ void daObjBHASHI_c::Obj_Damage() {
fopAc_ac_c* tg_hit_obj = dCc_GetAc(mCcCyl.GetTgHitObj()->GetAc());
cXyz* tg_hit_pos = mCcCyl.GetTgHitPosP();
s16 rot_y = cLib_targetAngleY(&current.pos, tg_hit_pos);
if (fopAcM_GetName(tg_hit_obj) == PROC_B_MGN) {
if (fopAcM_GetName(tg_hit_obj) == fpcNm_B_MGN_e) {
field_0x5a8++;
fpc_ProcID tg_hit_id = fopAcM_GetID(tg_hit_obj);
fopAc_ac_c* mgn_p;
if (fopAcM_SearchByName(PROC_B_MGN, &mgn_p) && mgn_p != NULL) {
if (fopAcM_SearchByName(fpcNm_B_MGN_e, &mgn_p) && mgn_p != NULL) {
field_0x11dc = cLib_targetAngleY(&fopAcM_GetPosition(mgn_p), &current.pos);
}
@@ -184,7 +184,7 @@ void daObjBHASHI_c::Obj_Damage() {
}
mCcCyl.ResetTgHit();
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
fopAcM_OffStatus(this, fopAcStts_CULL_e);
}
}
}
@@ -207,7 +207,7 @@ void daObjBHASHI_c::Obj_Damage(cXyz param_0) {
dComIfGp_particle_set(dPa_RM(ID_ZI_S_LV9PILLAR_BREAK_C), &eff_pos, &tevStr, &eff_rot, NULL);
dComIfGp_particle_set(dPa_RM(ID_ZI_S_LV9PILLAR_BREAK_D), &eff_pos, &tevStr, &eff_rot, NULL);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
fopAcM_OffStatus(this, fopAcStts_CULL_e);
}
Hahen_c::Hahen_c() {
@@ -308,7 +308,7 @@ void Hahen_c::Roll_Set(cXyz* i_pos, f32 param_1, s16 i_no) {
f32 speed_x = (-1.0f + nREG_F(12)) * param_1 * cM_ssin(angle);
f32 temp_f31 = scale.abs();
temp_f31 = 3.0f / temp_f31;
f32 speed_y = temp_f30 - 9.0f;
f32 speed_z = (-1.0f + nREG_F(13)) * param_1 * cM_scos(angle);
@@ -443,7 +443,7 @@ int daObjBHASHI_c::Execute(Mtx** param_0) {
}
fopAc_ac_c* mgn_p;
if (fopAcM_SearchByName(PROC_B_MGN, &mgn_p) && mgn_p != NULL && ((daB_MGN_c*)mgn_p)->isAppear()) {
if (fopAcM_SearchByName(fpcNm_B_MGN_e, &mgn_p) && mgn_p != NULL && ((daB_MGN_c*)mgn_p)->isAppear()) {
Rolling(&fopAcM_GetPosition(mgn_p), 400.0f, 90.0f + yREG_F(0));
}
}
@@ -503,18 +503,18 @@ static actor_method_class l_daObjBHASHI_Method = {
};
actor_process_profile_definition g_profile_Obj_BHASHI = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_BHASHI, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daObjBHASHI_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
463, // mPriority
&l_daObjBHASHI_Method, // sub_method
0x00044000, // 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_Obj_BHASHI_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daObjBHASHI_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Obj_BHASHI_e,
/* Actor SubMtd */ &l_daObjBHASHI_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};