mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-12 20:02: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
include/d/actor/d_a_alink.h
+10 -10
View File
@@ -3232,7 +3232,7 @@ public:
virtual bool checkChainBlockPushPull();
virtual BOOL checkElecDamage() const { return mProcID == PROC_ELEC_DAMAGE; }
virtual BOOL checkEmptyBottleSwing() const {
return mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE && mProcID == PROC_BOTTLE_SWING;
return mEquipItem == dItemNo_EMPTY_BOTTLE_e && mProcID == PROC_BOTTLE_SWING;
}
virtual BOOL checkBottleSwingMode() const { return mProcID == PROC_BOTTLE_SWING; }
virtual BOOL checkHawkWait() const { return mProcID == PROC_HAWK_SUBJECT; }
@@ -3334,7 +3334,7 @@ public:
virtual u32 checkBoardRide() const;
virtual u32 checkSpinnerRide() const;
virtual bool checkArrowChargeEnd() const;
virtual bool checkNoEquipItem() const { return mEquipItem == fpcNm_ITEM_NONE; }
virtual bool checkNoEquipItem() const { return mEquipItem == dItemNo_NONE_e; }
virtual bool checkKandelaarSwing(int) const;
virtual s16 getBoardCutTurnOffsetAngleY() const {
if (mProcID == PROC_BOARD_CUT_TURN) {
@@ -3402,7 +3402,7 @@ public:
}
virtual BOOL checkWolfDownAttackPullOut() const { return mProcID == PROC_WOLF_DOWN_AT_LAND; }
virtual cXyz* getMidnaAtnPos() const { return (cXyz*)&mMidnaAtnPos; }
virtual bool checkCopyRodEquip() const { return mEquipItem == fpcNm_ITEM_COPY_ROD; }
virtual bool checkCopyRodEquip() const { return mEquipItem == dItemNo_COPY_ROD_e; }
virtual void setKandelaarMtx(Mtx i_mtx, int, int);
virtual bool getStickAngleFromPlayerShape(s16* o_angle) const;
virtual bool checkSpinnerPathMove();
@@ -3487,11 +3487,11 @@ public:
return checkHookshotReadyAnime() || checkHookshotShootAnime();
}
BOOL checkBoomerangReadyAnime() const {
return (mEquipItem == fpcNm_ITEM_BOOMERANG || mEquipItem == 0x102) && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e);
return (mEquipItem == dItemNo_BOOMERANG_e || mEquipItem == 0x102) && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e);
}
bool checkDkCaught2Anime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_WAITHDB_e); }
BOOL checkCopyRodThrowAnime() const {
return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMTHROW_e);
return mEquipItem == dItemNo_COPY_ROD_e && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMTHROW_e);
}
BOOL checkCutDashChargeAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_CUTDTP_e); }
BOOL checkBoomerangAnimeAndReturnWait() const { return checkBoomerangAnime(); }
@@ -3526,7 +3526,7 @@ public:
bool checkDashDamageAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_DAMD_e); }
bool checkBoomerangCatchAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_BOOMCATCH_e); }
BOOL checkCopyRodReadyAnime() const {
return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e);
return mEquipItem == dItemNo_COPY_ROD_e && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e);
}
BOOL checkCanoeFishingWaitAnime() const {
return checkUpperAnime(dRes_ID_ALANM_BCK_CANOEREELINGR_e) || checkUpperAnime(dRes_ID_ALANM_BCK_WAITFISHR_e);
@@ -3685,12 +3685,12 @@ public:
}
bool checkFisingRodJewl() const {
return (mEquipItem == fpcNm_ITEM_JEWEL_ROD || mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD) || mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD;
return (mEquipItem == dItemNo_JEWEL_ROD_e || mEquipItem == dItemNo_JEWEL_WORM_ROD_e) || mEquipItem == dItemNo_JEWEL_BEE_ROD_e;
}
bool checkFisingRodWorm() const { return mItemMode == fpcNm_ITEM_WORM; }
bool checkFisingRodWorm() const { return mItemMode == dItemNo_WORM_e; }
bool checkFisingRodBee() const { return mItemMode == fpcNm_ITEM_BEE_CHILD; }
bool checkFisingRodBee() const { return mItemMode == dItemNo_BEE_CHILD_e; }
void fishingCastWaitAnimeStart() {
if (mProcID == PROC_FISHING_CAST) {
@@ -3772,7 +3772,7 @@ public:
void setGrassCancelStatus(u8 i_status) { setBStatus(i_status); }
void seStartSystem(u32 i_soundID) { mDoAud_seStart(i_soundID, NULL, 0, 0); }
bool checkIronBallEquip() const { return mEquipItem == fpcNm_ITEM_IRONBALL; }
bool checkIronBallEquip() const { return mEquipItem == dItemNo_IRONBALL_e; }
BOOL checkFishingRodEquip() const { return checkFishingRodItem(mEquipItem); }
f32 getAnmSpeedStickRate(f32 param_0, f32 param_1) const {
include/d/actor/d_a_arrow.h
+2 -2
View File
@@ -74,7 +74,7 @@ public:
void deleteArrow() { field_0x93f = 1; }
static fopAc_ac_c* makeArrow(fopAc_ac_c* i_actor, u16 param_1) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_ARROW,
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_ARROW_e,
param_1 << 8,
&i_actor->current.pos,
fopAcM_GetRoomNo(i_actor),
@@ -86,7 +86,7 @@ public:
}
static fopAc_ac_c* makeSlingStone(fopAc_ac_c* i_actor, cXyz* i_pos) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_ARROW,
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_ARROW_e,
0x401,
i_pos,
fopAcM_GetRoomNo(i_actor),
include/d/actor/d_a_npc_ins.h
+1 -1
View File
@@ -107,7 +107,7 @@ public:
bool isInsect(int type) {
bool rv = false;
if (type >= fpcNm_ITEM_M_BEETLE && type <= fpcNm_ITEM_F_MAYFLY) {
if (type >= dItemNo_M_BEETLE_e && type <= dItemNo_F_MAYFLY_e) {
rv = true;
}
include/d/actor/d_a_npc_jagar.h
+1 -1
View File
@@ -206,7 +206,7 @@ public:
int crashPumpkin(fopAc_ac_c* pumpkin_p) {
int reg_r30;
if (mType == 0 && fopAcM_GetName(pumpkin_p) == PROC_OBJ_PUMPKIN && !daNpcT_chkEvtBit(0xAE)
if (mType == 0 && fopAcM_GetName(pumpkin_p) == fpcNm_OBJ_PUMPKIN_e && !daNpcT_chkEvtBit(0xAE)
&& daNpcT_chkEvtBit(0x25B) && !daNpcT_chkEvtBit(0x235)) {
++field_0xffc;
reg_r30 = chkPointInArea(pumpkin_p->current.pos, current.pos, mpHIO->m.pumpkin_watch_range,
include/d/actor/d_a_npc_shad.h
+3 -3
View File
@@ -214,15 +214,15 @@ public:
void searchActors() {
if (mMode == 0) {
if (mActorMngr[1].getActorP() == NULL) {
mActorMngr[1].entry(fopAcM_SearchByName(PROC_NPC_ASH));
mActorMngr[1].entry(fopAcM_SearchByName(fpcNm_NPC_ASH_e));
}
if (mActorMngr[2].getActorP() == NULL) {
mActorMngr[2].entry(fopAcM_SearchByName(PROC_NPC_RAFREL));
mActorMngr[2].entry(fopAcM_SearchByName(fpcNm_NPC_RAFREL_e));
}
if (mActorMngr[3].getActorP() == NULL) {
mActorMngr[3].entry(fopAcM_SearchByName(PROC_NPC_MOIR));
mActorMngr[3].entry(fopAcM_SearchByName(fpcNm_NPC_MOIR_e));
}
if (mActorMngr[4].getActorP() == NULL) {
include/d/actor/d_a_obj_eff.h
+1 -1
View File
@@ -32,7 +32,7 @@ public:
static void make_land_smoke(cXyz* i_pos, f32 i_scale) {
cXyz scale(i_scale, i_scale, i_scale);
scale *= 1.6666666f;
fopAcM_create(PROC_Obj_Eff, 3, i_pos, -1, NULL, &scale, -1);
fopAcM_create(fpcNm_Obj_Eff_e, 3, i_pos, -1, NULL, &scale, -1);
}
};
}; // namespace daObjEff
include/d/actor/d_a_player.h
+10 -10
View File
@@ -687,8 +687,8 @@ public:
static void setMidnaMotionNum(int i_motionNum);
static void setMidnaFaceNum(int i_faceNum);
static BOOL checkShieldGet() { return dComIfGs_getSelectEquipShield() != fpcNm_ITEM_NONE; }
static BOOL checkSwordGet() { return dComIfGs_getSelectEquipSword() != fpcNm_ITEM_NONE; }
static BOOL checkShieldGet() { return dComIfGs_getSelectEquipShield() != dItemNo_NONE_e; }
static BOOL checkSwordGet() { return dComIfGs_getSelectEquipSword() != dItemNo_NONE_e; }
cXyz getHeadTopPos() const { return mHeadTopPos; }
u32 checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
@@ -1123,40 +1123,40 @@ public:
static int getLastSceneDamage() { return (dComIfGs_getLastSceneMode() >> 4) & 0x7F; }
static u32 getLastSceneSwordAtUpTime() { return (dComIfGs_getLastSceneMode() >> 11) & 0xFF; }
static BOOL checkNormalSwordEquip() { return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_SWORD; }
static BOOL checkNormalSwordEquip() { return dComIfGs_getSelectEquipSword() == dItemNo_SWORD_e; }
static u32 getLastSceneMode() {
return dComIfGs_getLastSceneMode() & 0xF;
}
static bool checkWoodSwordEquip() {
return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_WOOD_STICK;
return dComIfGs_getSelectEquipSword() == dItemNo_WOOD_STICK_e;
}
static bool checkLightMasterSwordEquip() {
return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD;
return dComIfGs_getSelectEquipSword() == dItemNo_LIGHT_SWORD_e;
}
static bool checkCasualWearFlg() {
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_CASUAL;
return dComIfGs_getSelectEquipClothes() == dItemNo_WEAR_CASUAL_e;
}
static u32 checkNowWolf() { return ((daPy_py_c*)dComIfGp_getLinkPlayer())->checkWolf(); }
static bool checkZoraWearFlg() {
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_ZORA;
return dComIfGs_getSelectEquipClothes() == dItemNo_WEAR_ZORA_e;
}
static bool checkMagicArmorWearFlg() {
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_ARMOR;
return dComIfGs_getSelectEquipClothes() == dItemNo_ARMOR_e;
}
static bool checkCarvingWoodShieldEquip() {
return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_WOOD_SHIELD;
return dComIfGs_getSelectEquipShield() == dItemNo_WOOD_SHIELD_e;
}
static bool checkShopWoodShieldEquip() {
return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_SHIELD;
return dComIfGs_getSelectEquipShield() == dItemNo_SHIELD_e;
}
static BOOL checkPowerGloveGet() { return false; }
include/d/actor/d_a_tag_lantern.h
+1 -1
View File
@@ -45,7 +45,7 @@ public:
BOOL rt = false;
if (fopAcM_searchPlayerDistanceXZ(this) < scale.x && 0.0f <= var_f31 && var_f31 < scale.y) {
rt = dComIfGp_checkItemGet(fpcNm_ITEM_KANTERA, 1) && dComIfGs_getOil() != 0;
rt = dComIfGp_checkItemGet(dItemNo_KANTERA_e, 1) && dComIfGs_getOil() != 0;
field_0x5f8 = rt == true ? 0 : 1;
} else {
rt = true;
include/d/actor/d_a_tag_mhint.h
+1 -1
View File
@@ -21,7 +21,7 @@ public:
static void createPortalWarpMissTag(u16 param_0, fpc_ProcID i_parentID) {
csXyz sp18(-1, -1, param_0);
fopAcM_createChild(PROC_Tag_Mhint, i_parentID, 0x800FFFFF,
fopAcM_createChild(fpcNm_Tag_Mhint_e, i_parentID, 0x800FFFFF,
&daPy_getLinkPlayerActorClass()->current.pos, dComIfGp_roomControl_getStayNo(), &sp18, NULL, -1,
NULL);
}