mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-13 14:06: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/d_s_logo.cpp
+28 -28
View File
@@ -160,20 +160,20 @@ static execFunc l_execFunc[] = {
};
static s16 const l_preLoad_dylKeyTbl[14] = {
PROC_BG,
PROC_DEMO00,
PROC_NBOMB,
PROC_SPINNER,
PROC_Obj_LifeContainer,
PROC_CROD,
PROC_DISAPPEAR,
PROC_Tag_Attp,
PROC_MG_ROD,
PROC_BOOMERANG,
PROC_ARROW,
PROC_SUSPEND,
PROC_MIDNA,
PROC_Obj_Yousei,
fpcNm_BG_e,
fpcNm_DEMO00_e,
fpcNm_NBOMB_e,
fpcNm_SPINNER_e,
fpcNm_Obj_LifeContainer_e,
fpcNm_CROD_e,
fpcNm_DISAPPEAR_e,
fpcNm_Tag_Attp_e,
fpcNm_MG_ROD_e,
fpcNm_BOOMERANG_e,
fpcNm_ARROW_e,
fpcNm_SUSPEND_e,
fpcNm_MIDNA_e,
fpcNm_Obj_Yousei_e,
};
bool dScnLogo_c::preLoad_dyl() {
@@ -742,10 +742,10 @@ void dScnLogo_c::nextSceneChange() {
if (!mDoRst::isReset()) {
if (!isOpeningCut())
{
dComIfG_changeOpeningScene(this, PROC_OPENING_SCENE);
dComIfG_changeOpeningScene(this, fpcNm_OPENING_SCENE_e);
} else {
#if DEBUG
fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 30);
fopScnM_ChangeReq(this, fpcNm_MENU_SCENE_e, 0, 30);
dComIfGs_init();
dComIfG_playerStatusD();
return;
@@ -1441,7 +1441,7 @@ static int dScnLogo_Execute(dScnLogo_c* i_this) {
fpc_ProcID id = fpcM_GetID(i_this);
if (mDoRst::isReset()) {
fopScnM_ChangeReq(i_this, PROC_LOGO_SCENE, 0, 5);
fopScnM_ChangeReq(i_this, fpcNm_LOGO_SCENE_e, 0, 5);
}
return 1;
@@ -1605,15 +1605,15 @@ static scene_method_class l_dScnLogo_Method = {
};
scene_process_profile_definition g_profile_LOGO_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_LOGO_SCENE,
&g_fpcNd_Method.base,
sizeof(dScnLogo_c),
0,
0,
&g_fopScn_Method.base,
&l_dScnLogo_Method,
0,
/* Layer ID */ fpcLy_ROOT_e,
/* List ID */ 1,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_LOGO_SCENE_e,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(dScnLogo_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnLogo_Method,
0,
};