mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-27 10:43:03 -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_msg_class.cpp
+9 -9
View File
@@ -1325,13 +1325,13 @@ bool jmessage_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_siz
return true;
}
case MSGTAG_BOMB_MAX: {
u8 bomb_type = fpcNm_ITEM_NORMAL_BOMB;
u8 bomb_type = dItemNo_NORMAL_BOMB_e;
const u8 type = *(u8*)i_data;
if (type == 1) {
bomb_type = fpcNm_ITEM_WATER_BOMB;
bomb_type = dItemNo_WATER_BOMB_e;
} else if (type == 2) {
bomb_type = fpcNm_ITEM_POKE_BOMB;
bomb_type = dItemNo_POKE_BOMB_e;
}
char buffer[40];
@@ -4090,11 +4090,11 @@ bool jmessage_string_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u3
break;
}
case MSGTAG_BOMB_MAX: {
u8 bombType = fpcNm_ITEM_NORMAL_BOMB;
u8 bombType = dItemNo_NORMAL_BOMB_e;
if ((*(u8*)i_data) == 1) {
bombType = fpcNm_ITEM_WATER_BOMB;
bombType = dItemNo_WATER_BOMB_e;
} else if ((*(s8*)i_data & 0xFFU) == 2) {
bombType = fpcNm_ITEM_POKE_BOMB;
bombType = dItemNo_POKE_BOMB_e;
}
char buffer[40];
@@ -4703,11 +4703,11 @@ bool jmessage_string_tRenderingProcessor::do_tag(u32 i_tag, void const* i_data,
break;
}
case MSGTAG_BOMB_MAX: {
u8 bombType = fpcNm_ITEM_NORMAL_BOMB;
u8 bombType = dItemNo_NORMAL_BOMB_e;
if ((*(u8*)i_data) == 1) {
bombType = fpcNm_ITEM_WATER_BOMB;
bombType = dItemNo_WATER_BOMB_e;
} else if ((*(s8*)i_data & 0xFFU) == 2) {
bombType = fpcNm_ITEM_POKE_BOMB;
bombType = dItemNo_POKE_BOMB_e;
}
char buffer[40];