From 877889c5105e59ee3aa4e57e53d3b0c5ffcfca77 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Tue, 23 Dec 2025 18:53:10 -0500 Subject: 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 --- src/Z2AudioLib/Z2Audience.cpp | 3 --- src/Z2AudioLib/Z2Creature.cpp | 2 -- src/Z2AudioLib/Z2Param.cpp | 3 --- src/Z2AudioLib/Z2SoundObject.cpp | 4 ++-- src/Z2AudioLib/Z2WolfHowlMgr.cpp | 2 +- 5 files changed, 3 insertions(+), 11 deletions(-) (limited to 'src/Z2AudioLib') diff --git a/src/Z2AudioLib/Z2Audience.cpp b/src/Z2AudioLib/Z2Audience.cpp index fa466f962b..26f79ebbe4 100644 --- a/src/Z2AudioLib/Z2Audience.cpp +++ b/src/Z2AudioLib/Z2Audience.cpp @@ -778,9 +778,6 @@ u32 Z2Audience::calcDeltaPriority_(f32 param_0, int distVolBit, bool param_2) co return mSetting.field_0xac[distVolBit] * (param_0 - mSetting.field_0x3c); } -/* 802BDCB0-802BDD00 2B85F0 0050+00 1/1 0/0 0/0 .text - * calcPitchDoppler___10Z2AudienceCFRCQ29JGeometry8TVec3RCQ29JGeometry8TVec3RCQ29JGeometry8TVec3f - */ f32 Z2Audience::calcPitchDoppler_(const JGeometry::TVec3& param_0, const JGeometry::TVec3& param_1, const JGeometry::TVec3& param_2, f32 param_3) const { diff --git a/src/Z2AudioLib/Z2Creature.cpp b/src/Z2AudioLib/Z2Creature.cpp index db9f521507..e02d1abcd5 100644 --- a/src/Z2AudioLib/Z2Creature.cpp +++ b/src/Z2AudioLib/Z2Creature.cpp @@ -8,8 +8,6 @@ static void Z2_E_ms_modVol(Z2SoundHandlePool*, u32); static void Z2_E_mm_modPitch(Z2SoundHandlePool*, u32); static void Z2_B_zan_modPitch(Z2SoundHandlePool*, u32); -/* 80451358 0001+00 data_80451358 None */ -/* 80451359 0007+00 data_80451359 None */ s8 data_80451358; s8 data_80451359; diff --git a/src/Z2AudioLib/Z2Param.cpp b/src/Z2AudioLib/Z2Param.cpp index 201f6f5e89..064a1e0521 100644 --- a/src/Z2AudioLib/Z2Param.cpp +++ b/src/Z2AudioLib/Z2Param.cpp @@ -103,11 +103,8 @@ f32 Z2Param::MIN_DISTANCE_VOLUME; f32 Z2Param::ENEMY_LASTHIT_MUTE_VOLUME; -/* 80451340 0001+00 data_80451340 None */ u8 Z2Param::DARK_SE_FILTER_ON; -/* 80451341 0001+00 data_80451341 None */ u8 Z2Param::DARK_SE_LOW_PASS_FILTER_SETTING; -/* 80451342 0006+00 data_80451342 None */ u8 Z2Param::SYSTEM_SE_USE_DARK_SE_SETTING; diff --git a/src/Z2AudioLib/Z2SoundObject.cpp b/src/Z2AudioLib/Z2SoundObject.cpp index b2738d2549..bc92476846 100644 --- a/src/Z2AudioLib/Z2SoundObject.cpp +++ b/src/Z2AudioLib/Z2SoundObject.cpp @@ -528,8 +528,8 @@ u32 Z2SoundObjAnime::getSoundID(const JAUSoundAnimationSound* animationSound, bool Z2SoundObjAnime::playsSound(const JAUSoundAnimationSound* animationSound, const JGeometry::TVec3& param_1, f32 param_2) { - (void)param_1; - (void)param_2; + UNUSED(param_1); + UNUSED(param_2); if (animationSound->playsOnlyOnce()) { if (field_0x3c != animationSound->field_0x16) { diff --git a/src/Z2AudioLib/Z2WolfHowlMgr.cpp b/src/Z2AudioLib/Z2WolfHowlMgr.cpp index 2350c90129..5f34fab19c 100644 --- a/src/Z2AudioLib/Z2WolfHowlMgr.cpp +++ b/src/Z2AudioLib/Z2WolfHowlMgr.cpp @@ -206,7 +206,7 @@ f32 Z2WolfHowlMgr::getNowInputValue() { } void Z2WolfHowlMgr::calcPitchMod(f32 param_0, f32 param_1) { - (void)param_0; + UNUSED(param_0); f32 pitch = 1.0f; field_0x20 = getNowPitch(); -- cgit v1.2.3