mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-30 15:43:19 -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_ihasi.cpp
+21 -21
View File
@@ -168,15 +168,15 @@ static int daObj_Ihasi_Create(fopAc_ac_c* i_actor) {
pos.set(34750.0f, -300.0f, -44000.0f);
param1 = fopAcM_GetParam(i_actor) & 0xff000000 | 0xfffe00;
fopAcM_create(PROC_E_S1, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1);
fopAcM_create(fpcNm_E_S1_e, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1);
pos.set(35250.0f, -300.0f, -43500.0f);
ANGLE_ADD(angle.y, 0x5555);
fopAcM_create(PROC_E_S1, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1);
fopAcM_create(fpcNm_E_S1_e, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1);
pos.set(34250.0f, -300.0f, -43500.0f);
ANGLE_ADD(angle.y, 0x5555);
fopAcM_create(PROC_E_S1, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1);
fopAcM_create(fpcNm_E_S1_e, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1);
return cPhs_ERROR_e;
}
@@ -196,18 +196,18 @@ static int daObj_Ihasi_Create(fopAc_ac_c* i_actor) {
if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") && fopAcM_GetRoomNo(i_actor) == 0) {
pos.set(34800.0f, 5700.0f, -26735.0f);
fopAcM_create(PROC_E_WAP, 0xffffff35, &pos, fopAcM_GetRoomNo(i_actor), NULL, NULL, -1);
fopAcM_create(fpcNm_E_WAP_e, 0xffffff35, &pos, fopAcM_GetRoomNo(i_actor), NULL, NULL, -1);
angle.set(0x0, -0x8000, 0x0);
pos.set(34800.0f, -300.0f, -30340.0f);
param2 = fopAcM_GetParam(i_actor) & 0xff000000 | 0xfffe00;
fopAcM_create(PROC_E_S1, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1);
fopAcM_create(fpcNm_E_S1_e, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1);
pos.set(35087.0f, -300.0f, -29879.0f);
fopAcM_create(PROC_E_S1, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1);
fopAcM_create(fpcNm_E_S1_e, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1);
pos.set(34500.0f, -300.0f, -29879.0f);
fopAcM_create(PROC_E_S1, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1);
fopAcM_create(fpcNm_E_S1_e, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1);
}
daObj_Ihasi_Execute(i_this);
@@ -223,18 +223,18 @@ static actor_method_class l_daObj_Ihasi_Method = {
};
actor_process_profile_definition g_profile_OBJ_IHASI = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_OBJ_IHASI, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(obj_ihasi_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
533, // mPriority
&l_daObj_Ihasi_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_IHASI_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(obj_ihasi_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_OBJ_IHASI_e,
/* Actor SubMtd */ &l_daObj_Ihasi_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};