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_e_yk.cpp
+17 -17
View File
@@ -150,7 +150,7 @@ static int daE_YK_Draw(e_yk_class* i_this) {
*
* Checks if the given actor is:
* - A valid actor
* - A boomerang (PROC_BOOMERANG)
* - A boomerang (fpcNm_BOOMERANG_e)
* - Player is not in a certain state (0x80000)
* - Boomerang is charged
* - Boomerang parameter is 1
@@ -159,7 +159,7 @@ static int daE_YK_Draw(e_yk_class* i_this) {
* by a charged boomerang's wind effect.
*/
static void* shot_b_sub(void* i_actor, void* param_1) {
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) &&
daPy_py_c::checkBoomerangCharge() &&
fopAcM_GetParam(i_actor) == 1) {
@@ -1473,7 +1473,7 @@ static int daE_YK_Create(fopAc_ac_c* i_this) {
yk->mPlayerTrigger = 100.0f * yk->mPlayerTriggerBase;
if (fopAcM_SearchByName(PROC_E_PZ)) {
if (fopAcM_SearchByName(fpcNm_E_PZ_e)) {
// For phantom zant fights. Used in pl_check above
yk->mPlayerTrigger = 100000.0f;
}
@@ -1558,18 +1558,18 @@ static actor_method_class l_daE_YK_Method = {
};
actor_process_profile_definition g_profile_E_YK = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_YK, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(e_yk_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
188, // mPriority
&l_daE_YK_Method, // sub_method
0x10050100, // 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_YK_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_yk_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_YK_e,
/* Actor SubMtd */ &l_daE_YK_Method,
/* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};