diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-23 18:53:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-23 15:53:10 -0800 |
| commit | 877889c5105e59ee3aa4e57e53d3b0c5ffcfca77 (patch) | |
| tree | 154eddaea39971210e088cb828f80d38b998f998 /include/d/actor | |
| parent | 6ef13c620a46aed5fea525699a4832a1ad6e4d1f (diff) | |
Clean up code, remove fakematches, add UNUSED, enable warnings (#2992)
* Remove NDEBUG_DEFINED fakematch, clean up getName temps
* Fix ifdef
* Fix bad JSystem pch ifdef breaking decomp.me
* Remove Acch Chk fakematches
* Private Acch fields
* Fix some clangd errors in headers
* Add UNUSED macro for matching debug parameters
* Enable clangd unused-parameter warning
* Remove extern from initializers
Probably added by dol2asm?
* Fix process profile definitions
* Remove leftover dol2asm address comments
* Remove some unnecessary double casts
* Enable some more clangd warnings
* Fix missing usages of fopAcM_ct
* Fix wrong enum usage
* Fix more fakematches
Diffstat (limited to 'include/d/actor')
| -rw-r--r-- | include/d/actor/d_a_npc_cdn3.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_npc_tk.h | 8 | ||||
| -rw-r--r-- | include/d/actor/d_a_obj_lv6SwGate.h | 1 | ||||
| -rw-r--r-- | include/d/actor/d_a_obj_stone.h | 2 |
4 files changed, 2 insertions, 11 deletions
diff --git a/include/d/actor/d_a_npc_cdn3.h b/include/d/actor/d_a_npc_cdn3.h index d20ddfdce5..890f362862 100644 --- a/include/d/actor/d_a_npc_cdn3.h +++ b/include/d/actor/d_a_npc_cdn3.h @@ -137,7 +137,7 @@ public: } void setSpeed(f32 param_0, f32 param_1, f32* param_2, int param_3) { - (void)param_3; + UNUSED(param_3); f32 target = field_0xb5c * (param_1 * field_0xb5c); f32 step = field_0xb5c * (param_0 * field_0xb5c); if (param_1 < target) { diff --git a/include/d/actor/d_a_npc_tk.h b/include/d/actor/d_a_npc_tk.h index 15489c9284..34833f7e0d 100644 --- a/include/d/actor/d_a_npc_tk.h +++ b/include/d/actor/d_a_npc_tk.h @@ -29,33 +29,26 @@ public: void setActionMode(int); f32 setAddCalcSpeedXZ(cXyz&, cXyz const&, f32, f32, f32); cXyz chaseTargetPos(cXyz, f32, f32, s16); - /* 80B01D84 */ fopAc_ac_c* getMasterPointer(); void setMasterShoulder(cXyz*); void setAwayAction(int); void setFlySE(); void executeFly(); void initPerchDemo(int); - /* 80B02B5C */ bool executePerchDemo(int); void executePerch(); void executeHandOn(); - /* 80B039A8 */ bool checkWaterSurface(f32); void executeAttack(); void executeAway(); void setCarryActorMtx(); - /* 80B04F64 */ f32 getTakePosY(); - /* 80B04FA8 */ f32 getTakeOffPosY(); void executeBack(); - /* 80B05BD0 */ cXyz getHanjoHandPos(); void executeStayHanjo(); void executeAttackLink(); void executeBackHanjo(); - /* 80B07114 */ bool checkAttackDemo(); void executeAttackDemo(); void executeBackHanjoDemo(); @@ -74,7 +67,6 @@ public: void cc_set(); int execute(); int _delete(); - /* 80B0B9AC */ int ctrlJoint(J3DJoint*, J3DModel*); static int JointCallBack(J3DJoint*, int); int CreateHeap(); diff --git a/include/d/actor/d_a_obj_lv6SwGate.h b/include/d/actor/d_a_obj_lv6SwGate.h index 9809cbcd63..964c073c1d 100644 --- a/include/d/actor/d_a_obj_lv6SwGate.h +++ b/include/d/actor/d_a_obj_lv6SwGate.h @@ -57,7 +57,6 @@ STATIC_ASSERT(sizeof(daLv6SwGate_c) == 0x14f8); class daLv6SwGate_HIO_c : public fOpAcm_HIO_entry_c { public: - /* 80C73F0C */ daLv6SwGate_HIO_c(); void genMessage(JORMContext*); diff --git a/include/d/actor/d_a_obj_stone.h b/include/d/actor/d_a_obj_stone.h index bad3bb5d61..b5f4da8c39 100644 --- a/include/d/actor/d_a_obj_stone.h +++ b/include/d/actor/d_a_obj_stone.h @@ -81,7 +81,7 @@ private: /* 0x094E */ bool mIsInWater; /* 0x094F */ u8 field_0x094f; /* 0x0950 */ u8 field_0x0950; - /* 0x0951 */ u8 field_0x0951; + /* 0x0951 */ bool field_0x0951; /* 0x0954 */ u32 field_0x0954; /* 0x0954 */ u32 field_0x0958; /* 0x0954 */ u32 field_0x095c; |