mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 23:27:25 -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_name.cpp
+36 -36
View File
@@ -86,7 +86,7 @@ s32 dScnName_c::create() {
dFs_c->_create();
if (fpcM_GetName(this) == PROC_NAME_SCENE) {
if (fpcM_GetName(this) == fpcNm_NAME_SCENE_e) {
dFs_c->setUseType(0);
#if !PLATFORM_SHIELD
@@ -193,7 +193,7 @@ static void setBaseCsrColor(int i_no) {
#if VERSION == VERSION_GCN_PAL
void dScnName_c::bmg_data_set() {
if (fopAcM_GetName(this) == PROC_NAMEEX_SCENE) {
if (fopAcM_GetName(this) == fpcNm_NAMEEX_SCENE_e) {
mBmgStatus = 10;
}
}
@@ -220,7 +220,7 @@ s32 dScnName_c::execute() {
#if DEBUG
if (!fopOvlpM_IsPeek() && dComIfG_isSceneResetButton()) {
fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 5);
fopScnM_ChangeReq(this, fpcNm_MENU_SCENE_e, 0, 5);
dComIfGs_init();
dComIfG_playerStatusD();
}
@@ -285,7 +285,7 @@ void dScnName_c::FileSelectOpen() {
void dScnName_c::FileSelectMain() {
dFs_c->_move();
if (fpcM_GetName(this) == PROC_NAME_SCENE) {
if (fpcM_GetName(this) == fpcNm_NAME_SCENE_e) {
FileSelectMainNormal();
}
}
@@ -336,13 +336,13 @@ void dScnName_c::brightCheck() {
mProc = dScnName_PROC_ChangeGameScene;
// Reset rupee "first-time collection" flags so the collection cutscene will play again
dComIfGs_offItemFirstBit(fpcNm_ITEM_GREEN_RUPEE);
dComIfGs_offItemFirstBit(fpcNm_ITEM_BLUE_RUPEE);
dComIfGs_offItemFirstBit(fpcNm_ITEM_YELLOW_RUPEE);
dComIfGs_offItemFirstBit(fpcNm_ITEM_RED_RUPEE);
dComIfGs_offItemFirstBit(fpcNm_ITEM_PURPLE_RUPEE);
dComIfGs_offItemFirstBit(fpcNm_ITEM_ORANGE_RUPEE);
dComIfGs_offItemFirstBit(fpcNm_ITEM_SILVER_RUPEE);
dComIfGs_offItemFirstBit(dItemNo_GREEN_RUPEE_e);
dComIfGs_offItemFirstBit(dItemNo_BLUE_RUPEE_e);
dComIfGs_offItemFirstBit(dItemNo_YELLOW_RUPEE_e);
dComIfGs_offItemFirstBit(dItemNo_RED_RUPEE_e);
dComIfGs_offItemFirstBit(dItemNo_PURPLE_RUPEE_e);
dComIfGs_offItemFirstBit(dItemNo_ORANGE_RUPEE_e);
dComIfGs_offItemFirstBit(dItemNo_SILVER_RUPEE_e);
}
}
@@ -353,7 +353,7 @@ void dScnName_c::changeGameScene() {
#if DEBUG
// Goto Map Select debug menu if opening File 1 with development mode on
if (dFs_c->getSelectNum() == 0 && mDoMain::developmentMode) {
fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 5);
fopScnM_ChangeReq(this, fpcNm_MENU_SCENE_e, 0, 5);
dComIfGs_init();
dComIfG_playerStatusD();
return;
@@ -361,9 +361,9 @@ void dScnName_c::changeGameScene() {
#endif
#if VERSION == VERSION_SHIELD_DEBUG
fopScnM_ChangeReq(this, PROC_PLAY_SCENE, 0, 5);
fopScnM_ChangeReq(this, fpcNm_PLAY_SCENE_e, 0, 5);
#else
fopScnM_ChangeReq(this, field_0x41f == 0 ? PROC_PLAY_SCENE : PROC_PLAY_SCENE, 0, 5);
fopScnM_ChangeReq(this, field_0x41f == 0 ? fpcNm_PLAY_SCENE_e : fpcNm_PLAY_SCENE_e, 0, 5);
#endif
dComIfGp_offEnableNextStage();
@@ -418,29 +418,29 @@ static scene_method_class l_dScnName_Method = {
};
scene_process_profile_definition g_profile_NAME_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_NAME_SCENE,
&g_fpcNd_Method.base,
sizeof(dScnName_c),
0,
0,
&g_fopScn_Method.base,
&l_dScnName_Method,
0,
/* Layer ID */ fpcLy_ROOT_e,
/* List ID */ 1,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_NAME_SCENE_e,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(dScnName_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnName_Method,
0,
};
scene_process_profile_definition g_profile_NAMEEX_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_NAMEEX_SCENE,
&g_fpcNd_Method.base,
sizeof(dScnName_c),
0,
0,
&g_fopScn_Method.base,
&l_dScnName_Method,
0,
/* Layer ID */ fpcLy_ROOT_e,
/* List ID */ 1,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_NAMEEX_SCENE_e,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(dScnName_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnName_Method,
0,
};