diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-05-26 00:11:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-26 00:11:58 -0400 |
| commit | 102042628fa139f4e509251bdd9095493f031e28 (patch) | |
| tree | a5b37fcd76d8c0105f2e9b379b7e2daa7eae2266 /include/d/actor/d_a_player.h | |
| parent | 79277cb2b2672104b87172d8ff620f923f450658 (diff) | |
Process profiles and enums cleanup (#1031)
* Fix some profile comments
* Add missing static for local visibility data
* Move proc name and draw priority enums to f_pc
* Add _e suffix to daObjBarrier_c proc enum
* Change proc name enum format to match TP
* Change draw prio enum format to match TP
* Change ItemNo enum format, finish fixing item names
* Revert static for cb1 hio
* Clean up formatting of profile comments
* Fix comment alignment
Diffstat (limited to 'include/d/actor/d_a_player.h')
| -rw-r--r-- | include/d/actor/d_a_player.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index 525d0ae5..58cda40d 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -595,15 +595,15 @@ public: BOOL checkGrabWear() const { return field_0x2b0 < 0.0f; } BOOL checkNormalSwordEquip() const { - return dComIfGs_getSelectEquip(0) == dItem_SWORD_e || checkSwordMiniGame(); + return dComIfGs_getSelectEquip(0) == dItemNo_SWORD_e || checkSwordMiniGame(); } BOOL checkMasterSwordEquip() const { - return dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_1_e || - dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_2_e || - dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e; + return dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_1_e || + dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_2_e || + dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_3_e; } BOOL checkFinalMasterSwordEquip() const { - return dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e; + return dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_3_e; } void setFace(daPy_FACE face) { mFace = face; } |