mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-16 06:45:54 -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_attention.cpp
+4 -4
View File
@@ -635,7 +635,7 @@ int dAttention_c::makeList() {
void dAttention_c::setOwnerAttentionPos() {
mOwnerAttnPos = mpPlayer->attention_info.position;
if (fopAcM_GetName(mpPlayer) == PROC_ALINK) {
if (fopAcM_GetName(mpPlayer) == fpcNm_ALINK_e) {
mOwnerAttnPos.y -= ((daPy_py_c*)mpPlayer)->getAttentionOffsetY();
}
}
@@ -829,7 +829,7 @@ bool dAttention_c::chaseAttention() {
f32 dAttention_c::EnemyDistance(fopAc_ac_c* i_actor) {
if (i_actor == mpPlayer || mpPlayer == NULL) {
return -1.0f;
} else if (fopAcM_GetProfName(i_actor) == PROC_ALINK) {
} else if (fopAcM_GetProfName(i_actor) == fpcNm_ALINK_e) {
return -1.0f;
} else if (!(i_actor->attention_info.flags & fopAc_AttnFlag_BATTLE_e) &&
!(i_actor->attention_info.flags & fopAc_AttnFlag_ENEMY_NOLOCK_e)) {
@@ -1748,7 +1748,7 @@ fopAc_ac_c* dAttCatch_c::convPId(fpc_ProcID i_id) {
}
void dAttCatch_c::init() {
mCatchItemNo = fpcNm_ITEM_WATER_BOTTLE;
mCatchItemNo = dItemNo_WATER_BOTTLE_e;
mRequestActorID = fpcM_ERROR_PROCESS_ID_e;
mCatghTargetID = fpcM_ERROR_PROCESS_ID_e;
field_0x4 = 3;
@@ -1759,7 +1759,7 @@ void dAttCatch_c::proc() {
mChangeItem = mCatchItemNo;
mRequestActorID = fpcM_ERROR_PROCESS_ID_e;
field_0x4 = 3;
mCatchItemNo = fpcNm_ITEM_WATER_BOTTLE;
mCatchItemNo = dItemNo_WATER_BOTTLE_e;
}
int dAttCatch_c::request(fopAc_ac_c* i_reqActor, u8 i_itemNo, f32 i_horizontalDist, f32 i_upDist,