mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 12:52:51 -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_ob.cpp
+28 -28
View File
@@ -595,7 +595,7 @@ static void core_hand_move(b_ob_class* i_this) {
static int bf_ct;
static void* s_bf_sub(void* i_this, void* i_data) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_E_OctBg) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_E_OctBg_e) {
bf_ct++;
}
@@ -603,7 +603,7 @@ static void* s_bf_sub(void* i_this, void* i_data) {
}
static void* s_bfdel_sub(void* i_this, void* i_data) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_E_OctBg) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_E_OctBg_e) {
fopAcM_delete((fopAc_ac_c*)i_this);
}
@@ -611,7 +611,7 @@ static void* s_bfdel_sub(void* i_this, void* i_data) {
}
static void* s_kaisoudel_sub(void* i_this, void* i_data) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_Obj_Kaisou) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_Obj_Kaisou_e) {
fopAcM_delete((fopAc_ac_c*)i_this);
}
@@ -647,7 +647,7 @@ static void bombfishset(b_ob_class* i_this) {
csXyz angle(-0x3800, 0, 0);
angle.y = cM_rndF(0x10000);
fopAcM_createChild(PROC_E_OctBg, fopAcM_GetID(a_this), 0xFFFFFFFF, &pos,
fopAcM_createChild(fpcNm_E_OctBg_e, fopAcM_GetID(a_this), 0xFFFFFFFF, &pos,
fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL);
i_this->mOISound.startCreatureVoice(Z2SE_EN_OI_BG_APPEAR, -1);
}
@@ -862,7 +862,7 @@ static void core_end(b_ob_class* i_this) {
for (int i = 0; i < 8; i++) {
i_this->mTentacleActorIDs[i] =
fopAcM_createChild(PROC_B_OH2, fopAcM_GetID(a_this), i, &a_this->current.pos,
fopAcM_createChild(fpcNm_B_OH2_e, fopAcM_GetID(a_this), i, &a_this->current.pos,
fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL);
}
}
@@ -1493,7 +1493,7 @@ static int fish_end(b_ob_class* i_this) {
i_this->mDemoActionTimer = 1;
obj_lv3WaterB_class* water =
(obj_lv3WaterB_class*)fopAcM_SearchByName(PROC_OBJ_LV3WATERB);
(obj_lv3WaterB_class*)fopAcM_SearchByName(fpcNm_OBJ_LV3WATERB_e);
water->mAction = LV3WATERB_ACT_REMOVE;
a_this->home.pos.set(0.0f, -23580.0f, 10300.0f);
@@ -1986,7 +1986,7 @@ static void cam_3d_morf(b_ob_class* i_this, f32 i_scale) {
}
static void* s_hasidel_sub(void* i_this, void* i_data) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_OCTHASHI) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_OCTHASHI_e) {
fopAcM_delete((fopAc_ac_c*)i_this);
}
@@ -2602,7 +2602,7 @@ static void demo_camera(b_ob_class* i_this) {
i_this->mDemoActionTimer = 0;
i_this->field_0x5dd8 = 4;
obj_lv3WaterB_class* water = (obj_lv3WaterB_class*)fopAcM_SearchByName(PROC_OBJ_LV3WATERB);
obj_lv3WaterB_class* water = (obj_lv3WaterB_class*)fopAcM_SearchByName(fpcNm_OBJ_LV3WATERB_e);
water->mAction = LV3WATERB_ACT_END;
water->field_0x586 = 0;
var_r27 = 2;
@@ -2645,7 +2645,7 @@ static void demo_camera(b_ob_class* i_this) {
csXyz sp17C(player->shape_angle);
sp17C.y += KREG_S(3) + -0x7060;
fopAcM_createItemForBoss(&a_this->eyePos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this), &sp17C,
fopAcM_createItemForBoss(&a_this->eyePos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(a_this), &sp17C,
NULL, KREG_F(19) + 10.0f, 10.0f, -1);
dComIfGp_getVibration().StartShock(5, 1, cXyz(0.0f, 1.0f, 0.0f));
}
@@ -2749,11 +2749,11 @@ static void demo_camera(b_ob_class* i_this) {
sp64 += player->current.pos;
OS_REPORT("///YSTONE POS %d,%d,%d\n", sp64.x, sp64.y, sp64.z);
fopAcM_create(PROC_OBJ_YSTONE, 0, &sp64, fopAcM_GetRoomNo(a_this), NULL, NULL, -1);
fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &sp64, fopAcM_GetRoomNo(a_this), NULL, NULL, -1);
}
if (i_this->mDemoActionTimer == 120) {
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE);
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e);
if (ystone != NULL) {
ystone->field_0x59b = 0;
}
@@ -2782,7 +2782,7 @@ static void demo_camera(b_ob_class* i_this) {
cLib_addCalc2(&i_this->field_0x5cd8, 210.0f, 0.05f, 0.5f);
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE);
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e);
if (ystone != NULL) {
ystone->setCurrentPos(sp64);
}
@@ -3494,7 +3494,7 @@ static int daB_OB_Create(fopAc_ac_c* i_this) {
if (!dComIfGs_isStageLife()) {
cXyz scale(1.0f, 1.0f, 1.0f);
pos.set(-916.0f, -23954.0f, 8916.0f);
fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this),
fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(a_this),
&a_this->shape_angle, &scale, 0.0f, 0.0f, -1);
}
@@ -3610,7 +3610,7 @@ static int daB_OB_Create(fopAc_ac_c* i_this) {
for (int i = 0; i < 8; i++) {
a_this->mTentacleActorIDs[i] =
fopAcM_createChild(PROC_B_OH, fopAcM_GetID(i_this), i, &i_this->current.pos,
fopAcM_createChild(fpcNm_B_OH_e, fopAcM_GetID(i_this), i, &i_this->current.pos,
fopAcM_GetRoomNo(i_this), NULL, NULL, -1, NULL);
}
@@ -3649,18 +3649,18 @@ static actor_method_class l_daB_OB_Method = {
};
actor_process_profile_definition g_profile_B_OB = {
fpcLy_CURRENT_e,
4,
fpcPi_CURRENT_e,
PROC_B_OB,
&g_fpcLf_Method.base,
sizeof(b_ob_class),
0,
0,
&g_fopAc_Method.base,
217,
&l_daB_OB_Method,
0xC4000,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_OB_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(b_ob_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_OB_e,
/* Actor SubMtd */ &l_daB_OB_Method,
/* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};