mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-10 12:55:34 -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_gameover.cpp
+15 -15
View File
@@ -150,7 +150,7 @@ int dGameover_c::_create() {
if (!strcmp(dComIfGp_getLastPlayStageName(), "D_MN10A")) {
// Last stage was Stallord Arena
// Remove Ooccoo from inventory
dComIfGs_setItem(SLOT_18, fpcNm_ITEM_NONE);
dComIfGs_setItem(SLOT_18, dItemNo_NONE_e);
dComIfGs_resetLastWarpAcceptStage();
}
@@ -305,8 +305,8 @@ void dGameover_c::saveClose_proc() {
}
// Reset Lantern and oil status back into inventory if gameover during monkey steal sequence
if (dComIfGs_isItemFirstBit(fpcNm_ITEM_KANTERA) && dComIfGs_getItem(SLOT_1, true) == fpcNm_ITEM_NONE) {
dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA);
if (dComIfGs_isItemFirstBit(dItemNo_KANTERA_e) && dComIfGs_getItem(SLOT_1, true) == dItemNo_NONE_e) {
dComIfGs_setItem(SLOT_1, dItemNo_KANTERA_e);
dComIfGs_setOil(dMeter2Info_getOilGaugeBackUp());
}
@@ -476,7 +476,7 @@ static int dGameover_Create(msg_class* i_this) {
s32 d_GameOver_Create(u8 i_gameoverType) {
dMeter2Info_setGameOverType(i_gameoverType);
return fopMsgM_create(PROC_GAMEOVER, NULL, NULL, NULL, NULL, NULL);
return fopMsgM_create(fpcNm_GAMEOVER_e, NULL, NULL, NULL, NULL, NULL);
}
bool d_GameOver_Delete(fpc_ProcID& i_id) {
@@ -499,15 +499,15 @@ static leafdraw_method_class l_dGameover_Method = {
};
msg_process_profile_definition g_profile_GAMEOVER = {
fpcLy_CURRENT_e,
0x0C,
fpcPi_CURRENT_e,
PROC_GAMEOVER,
&g_fpcLf_Method.base,
sizeof(dGameover_c),
0,
0,
&g_fopMsg_Method,
0x303,
&l_dGameover_Method,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 12,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_GAMEOVER_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(dGameover_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopMsg_Method,
/* Draw Prio */ fpcDwPi_GAMEOVER_e,
/* Msg SubMtd */ &l_dGameover_Method,
};