mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-08 18:13:02 -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_b_dre.cpp
+18 -18
View File
@@ -564,14 +564,14 @@ void daB_DRE_c::DrAction() {
sp90 = current.pos;
sp1C.set(0, shape_angle.y + 0x1000, 0);
fopAcM_createItemForBoss(&sp90, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(this), &sp1C,
fopAcM_createItemForBoss(&sp90, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(this), &sp1C,
NULL, 6.0f + TREG_F(9), 20.0f + TREG_F(10), -1);
mTimers[0] = 30;
}
break;
case 6:
fopAc_ac_c* lifecon;
fopAcM_SearchByName(PROC_Obj_LifeContainer, &lifecon);
fopAcM_SearchByName(fpcNm_Obj_LifeContainer_e, &lifecon);
if (lifecon != NULL) {
dComIfGp_event_setTalkPartner(lifecon);
player->changeDemoMode(0x2F, 3, 0, 0);
@@ -597,7 +597,7 @@ void daB_DRE_c::DrAction() {
cXyz sp6C(0.0f, 0.0f, 0.0f);
sp90.set(150.0f + aREG_F(0), 400.0f + XREG_F(4), 800.0f);
cLib_offsetPos(&sp90, &sp90, shape_angle.y + 0x5000, &sp6C);
fopAcM_create(PROC_OBJ_YSTONE, 0, &sp90, fopAcM_GetRoomNo(this), NULL, NULL, -1);
fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &sp90, fopAcM_GetRoomNo(this), NULL, NULL, -1);
sp90.set(-325.0f, 0.0f, 215.0f);
sp1C.set(0, 0, 0);
@@ -618,7 +618,7 @@ void daB_DRE_c::DrAction() {
}
fopAc_ac_c* ystone;
fopAcM_SearchByName(PROC_OBJ_YSTONE, &ystone);
fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e, &ystone);
if (ystone != NULL && field_0x638 == 0) {
field_0x638 = 1;
@@ -944,20 +944,20 @@ static actor_method_class l_daB_DRE_Method = {
};
actor_process_profile_definition g_profile_B_DRE = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_DRE, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daB_DRE_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
231, // mPriority
&l_daB_DRE_Method, // sub_method
0x00044100, // 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_B_DRE_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daB_DRE_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_DRE_e,
/* Actor SubMtd */ &l_daB_DRE_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;