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_play.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/d/d_s_play.cpp') diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 7187d0229d..1a9932d502 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -61,10 +61,8 @@ static OSTime resPreLoadTime1; static dScnPly_preLoad_HIO_c g_preLoadHIO; -/* 80451124 0001+00 data_80451124 None */ s8 dScnPly_c::pauseTimer; -/* 80451125 0003+00 nextPauseTimer__9dScnPly_c None */ s8 dScnPly_c::nextPauseTimer; s8 dScnPly_c::calcPauseTimer() { @@ -732,7 +730,7 @@ static void dScnPly_Create(scene_class* i_this) { dComLbG_PhaseHandler(&static_cast(i_this)->field_0x1c4, l_method, i_this); } -static leafdraw_method_class l_dScnPly_Method = { +static scene_method_class l_dScnPly_Method = { (process_method_func)dScnPly_Create, (process_method_func)dScnPly_Delete, (process_method_func)dScnPly_Execute, (process_method_func)dScnPly_IsDelete, (process_method_func)dScnPly_Draw, @@ -748,7 +746,7 @@ scene_process_profile_definition g_profile_PLAY_SCENE = { 0, // mSizeOther 0, // mParameters &g_fopScn_Method.base, // sub_method - (process_method_class*)&l_dScnPly_Method, // mpMtd + &l_dScnPly_Method, // mpMtd }; scene_process_profile_definition g_profile_OPENING_SCENE = { @@ -761,5 +759,5 @@ scene_process_profile_definition g_profile_OPENING_SCENE = { 0, // mSizeOther 0, // mParameters &g_fopScn_Method.base, // sub_method - (process_method_class*)&l_dScnPly_Method, // mpMtd + &l_dScnPly_Method, // mpMtd }; -- cgit v1.2.3