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 /src/d/actor/d_a_npc_henna.cpp | |
| 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 'src/d/actor/d_a_npc_henna.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_henna.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 846cc6b1a1..072a3be72f 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -221,7 +221,7 @@ static void* s_npc_sub(void* param_0, void* param_1) { } static void* s_piro_sub(void* param_0, void* param_1) { - (void)param_1; // debug match + UNUSED(param_1); if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_NPC_INKO) { return param_0; } @@ -239,7 +239,7 @@ static void* s_du_sub(void* param_0, void* param_1) { } static void* s_shop_sub(void* param_0, void* param_1) { - (void)param_1; // debug match + UNUSED(param_1); if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_FSHOP && (s32)(fopAcM_GetParam(param_0) & 0xff) < 35) { @@ -249,7 +249,7 @@ static void* s_shop_sub(void* param_0, void* param_1) { } static void* s_koro2ball_sub(void* param_0, void* param_1) { - (void)param_1; // debug match + UNUSED(param_1); if (fopAcM_IsActor(param_0)) { if (fopAcM_GetName(param_0) == PROC_FSHOP && (fopAcM_GetParam(param_0) & 0xff) == 35) { return param_0; @@ -402,7 +402,7 @@ static void henna_shop(npc_henna_class* i_this) { } static void* s_rod_sub(void* param_0, void* param_1) { - (void)param_1; // debug match + UNUSED(param_1); if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_MG_ROD) { return param_0; } @@ -2833,7 +2833,7 @@ static actor_method_class l_daNpc_Henna_Method = { (process_method_func)daNpc_Henna_Draw, }; -extern actor_process_profile_definition g_profile_NPC_HENNA = { +actor_process_profile_definition g_profile_NPC_HENNA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio |