mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 04:31:37 -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 8e2545f2ec
commit 56890c32e8
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_lv6Tenbin.cpp
+22 -22
View File
@@ -157,25 +157,25 @@ void daTenbin_c::rideCallBackRight(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c*
UNUSED(i_dBgW);
daTenbin_c* i_tenbin = (daTenbin_c*)i_act1;
daPy_py_c* player = dComIfGp_getLinkPlayer();
if (fopAcM_GetName(i_act2) == PROC_SPINNER) {
if (fopAcM_GetName(i_act2) == fpcNm_SPINNER_e) {
if (player->checkSpinnerRide()) {
i_tenbin->field_0x5B2 += (u16)2;
}
}
if (fopAcM_GetName(i_act2) == PROC_ALINK && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) {
if (fopAcM_GetName(i_act2) == fpcNm_ALINK_e && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) {
i_tenbin->field_0x5B2 += (u16)2;
if (player->checkBootsOrArmorHeavy()) {
i_tenbin->field_0x5B2 += (u16)60000;
}
if (player->getGrabActorID() != -1) {
fopAc_ac_c* found = fopAcM_SearchByID(player->getGrabActorID());
if (fopAcM_GetName(found) == PROC_CSTATUE) {
if (fopAcM_GetName(found) == fpcNm_CSTATUE_e) {
i_tenbin->field_0x5B2++;
i_tenbin->field_0x650 = fopAcM_GetID(found);
}
}
}
if (fopAcM_GetName(i_act2) == PROC_CSTATUE) {
if (fopAcM_GetName(i_act2) == fpcNm_CSTATUE_e) {
daCstatue_c* i_statue = (daCstatue_c*)i_act2;
if (i_statue->checkNormalType()) {
i_tenbin->field_0x5B2 += (u16)4;
@@ -189,25 +189,25 @@ void daTenbin_c::rideCallBackLeft(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c*
UNUSED(i_dBgW);
daTenbin_c* i_tenbin = (daTenbin_c*)i_act1;
daPy_py_c* player = dComIfGp_getLinkPlayer();
if (fopAcM_GetName(i_act2) == PROC_SPINNER) {
if (fopAcM_GetName(i_act2) == fpcNm_SPINNER_e) {
if (player->checkSpinnerRide()) {
i_tenbin->field_0x5B4 += (u16)2;
}
}
if (fopAcM_GetName(i_act2) == PROC_ALINK && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) {
if (fopAcM_GetName(i_act2) == fpcNm_ALINK_e && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) {
i_tenbin->field_0x5B4 += (u16)2;
if (player->checkEquipHeavyBoots()) {
i_tenbin->field_0x5B4 += (u16)60000;
}
if (player->getGrabActorID() != -1) {
fopAc_ac_c* found = fopAcM_SearchByID(player->getGrabActorID());
if (fopAcM_GetName(found) == PROC_CSTATUE) {
if (fopAcM_GetName(found) == fpcNm_CSTATUE_e) {
i_tenbin->field_0x5B4++;
i_tenbin->field_0x650 = fopAcM_GetID(found);
}
}
}
if (fopAcM_GetName(i_act2) == PROC_CSTATUE) {
if (fopAcM_GetName(i_act2) == fpcNm_CSTATUE_e) {
daCstatue_c* i_statue = (daCstatue_c*)i_act2;
if (i_statue->checkNormalType()) {
i_tenbin->field_0x5B4 += (u16)4;
@@ -355,18 +355,18 @@ static actor_method_class l_daTenbin_Method = {
};
actor_process_profile_definition g_profile_Obj_Lv6Tenbin = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_Lv6Tenbin, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daTenbin_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
623, // mPriority
&l_daTenbin_Method, // sub_method
0x00060100, // 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_Lv6Tenbin_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daTenbin_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Obj_Lv6Tenbin_e,
/* Actor SubMtd */ &l_daTenbin_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_CULL_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};