mirror of
https://github.com/zeldaret/tp
synced 2026-09-03 18:13:58 -04:00
Actor status consolidation & process profile definition editing (#3117)
* 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:
@@ -206,10 +206,10 @@ int dumpTagObject(void* i_object, void*) {
|
||||
}
|
||||
|
||||
u32 other_heap_size = 0;
|
||||
if (profname == PROC_ALINK) {
|
||||
if (profname == fpcNm_ALINK_e) {
|
||||
fopAc_ac_c* spC = a_actor;
|
||||
other_heap_size = daAlink_c::getOtherHeapSize();
|
||||
} else if (profname == PROC_MIDNA) {
|
||||
} else if (profname == fpcNm_MIDNA_e) {
|
||||
fopAc_ac_c* sp8 = a_actor;
|
||||
other_heap_size = daMidna_c::getOtherHeapSize();
|
||||
}
|
||||
@@ -236,10 +236,10 @@ int dumpObject(void* i_object, void* i_data) {
|
||||
u32 actor_size = a_actor->base.base.profile->process_size + (a_actor->heap == NULL ? 0 : a_actor->heap->getHeapSize());
|
||||
|
||||
u32 other_heap_size = 0;
|
||||
if (profname == PROC_ALINK) {
|
||||
if (profname == fpcNm_ALINK_e) {
|
||||
fopAc_ac_c* sp24 = a_actor;
|
||||
other_heap_size = daAlink_c::getOtherHeapSize();
|
||||
} else if (profname == PROC_MIDNA) {
|
||||
} else if (profname == fpcNm_MIDNA_e) {
|
||||
fopAc_ac_c* sp20 = a_actor;
|
||||
other_heap_size = daMidna_c::getOtherHeapSize();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user