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/d/d_s_menu.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/d/d_s_menu.cpp') diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 6f8ef0d3f3..da6d9d5918 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -1988,7 +1988,7 @@ bool dScnMenu_setPlayerDebugModeDungeon() { myFontClass::~myFontClass() {} f32 myFontClass::drawChar_scale(f32 param_0, f32 param_1, f32 param_2, f32 param_3, int param_4, bool param_5) { - param_2; + UNUSED(param_2); if (param_4 < 0xFF) { return field_0x70.drawChar_scale(param_0, param_1, 8.75f, param_3, param_4, param_5); @@ -1997,13 +1997,13 @@ f32 myFontClass::drawChar_scale(f32 param_0, f32 param_1, f32 param_2, f32 param } } -static leafdraw_method_class l_dScnMenu_Method = { +static scene_method_class l_dScnMenu_Method = { (process_method_func)dScnMenu_Create, (process_method_func)dScnMenu_Delete, (process_method_func)dScnMenu_Execute, (process_method_func)dScnMenu_IsDelete, (process_method_func)dScnMenu_Draw, }; -extern scene_process_profile_definition g_profile_MENU_SCENE = { +scene_process_profile_definition g_profile_MENU_SCENE = { fpcLy_ROOT_e, // mLayerID 1, // mListID fpcPi_CURRENT_e, // mListPrio @@ -2013,10 +2013,10 @@ extern scene_process_profile_definition g_profile_MENU_SCENE = { 0, // mSizeOther 0, // mParameters &g_fopScn_Method.base, // sub_method - (process_method_class*)&l_dScnMenu_Method, // mpMtd + &l_dScnMenu_Method, // mpMtd }; #else -extern scene_process_profile_definition g_profile_MENU_SCENE = { +scene_process_profile_definition g_profile_MENU_SCENE = { fpcLy_ROOT_e, // mLayerID 1, // mListID fpcPi_CURRENT_e, // mListPrio -- cgit v1.2.3