mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-26 18:32:08 -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_event.cpp
+14 -14
View File
@@ -231,9 +231,9 @@ int dEvt_control_c::commonCheck(dEvt_order_c* order, u16 condition, u16 command)
int dEvt_control_c::talkCheck(dEvt_order_c* order) {
char* eventname = "DEFAULT_TALK";
fopAc_ac_c* actor = order->mpTargetActor;
if ((fopAcM_GetName(actor) == PROC_Tag_Mhint && ((daTagMhint_c*)actor)->checkNoAttention()) ||
(fopAcM_GetName(actor) == PROC_Tag_Mstop && ((daTagMstop_c*)actor)->checkNoAttention()) ||
fopAcM_GetName(actor) == PROC_MIDNA)
if ((fopAcM_GetName(actor) == fpcNm_Tag_Mhint_e && ((daTagMhint_c*)actor)->checkNoAttention()) ||
(fopAcM_GetName(actor) == fpcNm_Tag_Mstop_e && ((daTagMstop_c*)actor)->checkNoAttention()) ||
fopAcM_GetName(actor) == fpcNm_MIDNA_e)
{
daMidna_c* midna = (daMidna_c*)daPy_py_c::getMidnaActor();
if (!daPy_py_c::checkNowWolf() || midna->checkNoDraw()) {
@@ -303,7 +303,7 @@ int dEvt_control_c::talkXyCheck(dEvt_order_c* order) {
return 0;
}
if (dComIfGp_getSelectItem(itemIndex) == fpcNm_ITEM_NONE) {
if (dComIfGp_getSelectItem(itemIndex) == dItemNo_NONE_e) {
return 0;
}
@@ -381,7 +381,7 @@ int dEvt_control_c::talkEnd() {
}
daItemBase_c* item = (daItemBase_c*)fopAcM_getItemEventPartner(NULL);
if (item != NULL && fopAcM_GetName(item) == PROC_ITEM) {
if (item != NULL && fopAcM_GetName(item) == fpcNm_ITEM_e) {
item->dead();
}
@@ -580,7 +580,7 @@ int dEvt_control_c::endProc() {
field_0xec = 0xFF;
mTalkXyType = 0;
mUnkEventId = 255;
mPreItemNo = fpcNm_ITEM_NONE;
mPreItemNo = dItemNo_NONE_e;
dComIfGp_getEventManager().setStartDemo(-2);
return 1;
}
@@ -1133,7 +1133,7 @@ int dEvt_control_c::Step() {
int dEvt_control_c::moveApproval(void* param_0) {
fopAc_ac_c* actor = (fopAc_ac_c*)param_0;
if (fopAcM_CheckStatus(actor, 0x20000)) {
if (fopAcM_CheckStatus(actor, fopAcStts_NOPAUSE_e)) {
return 2;
}
@@ -1163,11 +1163,11 @@ int dEvt_control_c::moveApproval(void* param_0) {
break;
}
if (fopAcM_CheckStatus(actor, 0x8000)) {
if (fopAcM_CheckStatus(actor, fopAcStts_STAFF_PRIMARY_e)) {
return 2;
}
if (fopAcM_CheckStatus(actor, 0x800)) {
if (fopAcM_CheckStatus(actor, fopAcStts_STAFF_EXTRA_e)) {
return 1;
}
@@ -1176,7 +1176,7 @@ int dEvt_control_c::moveApproval(void* param_0) {
return 0;
}
if (mMode == dEvt_mode_TALK_e && fopAcM_CheckStatus(actor, 0x40)) {
if (mMode == dEvt_mode_TALK_e && fopAcM_CheckStatus(actor, fopAcStts_UNK_0x40_e)) {
return 1;
}
@@ -1184,15 +1184,15 @@ int dEvt_control_c::moveApproval(void* param_0) {
return 1;
}
if ((getMode() == 3 || getMode() == dEvt_mode_TALK_e) && fopAcM_CheckStatus(actor, 0x4000000)) {
if ((getMode() == 3 || getMode() == dEvt_mode_TALK_e) && fopAcM_CheckStatus(actor, fopAcStts_BOSS_e)) {
return 0;
}
if (fopAcM_CheckStatus(actor, 0x4000)) {
if (fopAcM_CheckStatus(actor, fopAcStts_UNK_0x4000_e)) {
return 1;
}
if (fopAcM_CheckStatus(actor, 0x2000)) {
if (fopAcM_CheckStatus(actor, fopAcStts_CARRY_NOW_e)) {
return 1;
}
@@ -1222,7 +1222,7 @@ void dEvt_control_c::remove() {
mStageEventDt = NULL;
mUnkEventId = 255;
mTalkXyType = 0;
mPreItemNo = fpcNm_ITEM_NONE;
mPreItemNo = dItemNo_NONE_e;
mEventFlag = 0;
mFlag2 = 0;
mChangeActor = NULL;