mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-30 07:34:37 -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_e_st.cpp
+18 -18
View File
@@ -863,7 +863,7 @@ static void e_st_shoot(e_st_class* i_this) {
if (frame >= 0x1E && frame <= 0x2A) {
for (int i = 0; i < TREG_S(2) + 5; i++) {
fopAcM_createChild(PROC_E_ST_LINE, fopAcM_GetID(a_this), i_this->mParameters,
fopAcM_createChild(fpcNm_E_ST_LINE_e, fopAcM_GetID(a_this), i_this->mParameters,
&i_this->field_0x704, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL);
i_this->mParameters++;
}
@@ -1249,7 +1249,7 @@ static void e_st_hang_shoot(e_st_class* i_this) {
if (frame >= 0x1E && frame <= 0x2A) {
for (int i = 0; i < TREG_S(2) + 5; i++) {
fopAcM_createChild(PROC_E_ST_LINE, fopAcM_GetID(a_this), i_this->mParameters,
fopAcM_createChild(fpcNm_E_ST_LINE_e, fopAcM_GetID(a_this), i_this->mParameters,
&i_this->field_0x704, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL);
i_this->mParameters++;
}
@@ -1490,7 +1490,7 @@ static void e_st_hang_2_shoot(e_st_class* i_this) {
if (frame >= 0x1E && frame <= 0x2A) {
for (int i = 0; i < TREG_S(2) + 5; i++) {
fopAcM_createChild(PROC_E_ST_LINE, fopAcM_GetID(a_this), i_this->mParameters,
fopAcM_createChild(fpcNm_E_ST_LINE_e, fopAcM_GetID(a_this), i_this->mParameters,
&i_this->field_0x704, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL);
i_this->mParameters++;
}
@@ -1924,7 +1924,7 @@ static s8 e_st_g_fight(e_st_class* i_this) {
if (i_this->mAtSph.ChkAtHit()) {
cCcD_Obj* at_hit_obj_p = i_this->mAtSph.GetAtHitObj();
fopAc_ac_c* actor_p = dCc_GetAc(at_hit_obj_p->GetAc());
if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK) {
if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e) {
dComIfGp_getVibration().StartShock(VIBMODE_S_POWER4, 31, cXyz(0.0f, 1.0f, 0.0f));
}
}
@@ -3207,18 +3207,18 @@ static actor_method_class l_daE_ST_Method = {
};
actor_process_profile_definition g_profile_E_ST = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_ST, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(e_st_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
129, // mPriority
&l_daE_ST_Method, // sub_method
0x10040100, // 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_ST_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_st_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_ST_e,
/* Actor SubMtd */ &l_daE_ST_Method,
/* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};