mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-13 05:49: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_obj_smallkey.cpp
+22 -22
View File
@@ -34,18 +34,18 @@ static void* searchParentSub(void* i_actor, void* i_data) {
fopAc_ac_c* a_other = (fopAc_ac_c*)i_data;
if (a_actor != NULL && fopAcM_IsActor(a_actor)) {
if (fopAcM_GetProfName(a_actor) == PROC_OBJ_GM) {
if (fopAcM_GetProfName(a_actor) == fpcNm_OBJ_GM_e) {
if (a_other->home.pos.abs(a_actor->home.pos) < 1.0f) {
return a_actor;
}
} else if (fopAcM_GetProfName(a_actor) == PROC_E_GB) {
} else if (fopAcM_GetProfName(a_actor) == fpcNm_E_GB_e) {
if (a_other->home.pos.abs(a_actor->home.pos) < 50.0f) {
return a_actor;
}
// “Small Key: position isn't synced with Big Baba!\n”
OS_REPORT("\x1b[43;30m小さい鍵：デカババと位置がずれています！\n\x1b[m");
} else if (fopAcM_GetProfName(a_actor) == PROC_E_ZM) {
} else if (fopAcM_GetProfName(a_actor) == fpcNm_E_ZM_e) {
f32 other_dist = a_other->home.pos.abs(a_actor->home.pos);
u8 temp_r27 = fopAcM_GetParamBit(a_actor, 0, 8);
if (other_dist < 10.0f && temp_r27 < 10) {
@@ -155,7 +155,7 @@ int daKey_c::create() {
mIsPrmInit = TRUE;
}
m_itemNo = fpcNm_ITEM_SMALL_KEY;
m_itemNo = dItemNo_SMALL_KEY_e;
if (strcmp(dComIfGp_getStartStageName(), "F_SP118") == 0) {
OS_REPORT(" SMKEY 0\n");
@@ -222,10 +222,10 @@ int daKey_c::actionInit() {
void* pparent = fpcM_Search(searchParentSub, this);
if (pparent != NULL) {
parentActorID = fopAcM_GetID(pparent);
if (fopAcM_GetProfName(pparent) == PROC_OBJ_GM || fopAcM_GetProfName(pparent) == PROC_E_ZM) {
if (fopAcM_GetProfName(pparent) == fpcNm_OBJ_GM_e || fopAcM_GetProfName(pparent) == fpcNm_E_ZM_e) {
hide();
actionParentWaitInit();
} else if (fopAcM_GetProfName(pparent) == PROC_E_GB) {
} else if (fopAcM_GetProfName(pparent) == fpcNm_E_GB_e) {
show();
actionInitE_GB();
}
@@ -250,7 +250,7 @@ int daKey_c::actionParentWait() {
if (pparent == NULL) {
show();
actionWaitInit();
} else if (fopAcM_GetProfName(pparent) == PROC_E_ZM) {
} else if (fopAcM_GetProfName(pparent) == fpcNm_E_ZM_e) {
current.pos = pparent->home.pos;
} else {
current.pos = pparent->current.pos;
@@ -399,7 +399,7 @@ int daKey_c::actionInitBoomerangCarry() {
}
int daKey_c::actionBoomerangCarry() {
fopAc_ac_c* pboomerang = fopAcM_SearchByName(PROC_BOOMERANG);
fopAc_ac_c* pboomerang = fopAcM_SearchByName(fpcNm_BOOMERANG_e);
if (pboomerang != NULL) {
current.pos = pboomerang->current.pos;
} else {
@@ -559,18 +559,18 @@ static actor_method_class l_daKey_Method = {
};
actor_process_profile_definition g_profile_Obj_SmallKey = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_SmallKey, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daKey_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
237, // mPriority
&l_daKey_Method, // sub_method
0x00040100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Obj_SmallKey_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daKey_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Obj_SmallKey_e,
/* Actor SubMtd */ &l_daKey_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};