From ff550da0b2f3aef1a7434e5360c169b0a58fcfaa Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 28 Nov 2025 14:28:27 -0500 Subject: [PATCH] d_map_path_dmap OK (#2884) --- configure.py | 2 +- include/d/d_map_path_dmap.h | 1 - src/d/d_map_path_dmap.cpp | 6 ++---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/configure.py b/configure.py index d7a983ee0c6..9b3ef8e93c8 100755 --- a/configure.py +++ b/configure.py @@ -625,7 +625,7 @@ config.libs = [ Object(NonMatching, "d/d_resorce.cpp"), Object(MatchingFor(ALL_GCN), "d/d_map_path.cpp"), Object(MatchingFor(ALL_GCN), "d/d_map_path_fmap.cpp"), - Object(NonMatching, "d/d_map_path_dmap.cpp"), + Object(MatchingFor(ALL_GCN), "d/d_map_path_dmap.cpp"), Object(MatchingFor(ALL_GCN), "d/d_event.cpp"), Object(MatchingFor(ALL_GCN), "d/d_event_data.cpp"), Object(MatchingFor(ALL_GCN), "d/d_event_manager.cpp"), diff --git a/include/d/d_map_path_dmap.h b/include/d/d_map_path_dmap.h index 4b9c5b1407f..fbe6c92daaf 100644 --- a/include/d/d_map_path_dmap.h +++ b/include/d/d_map_path_dmap.h @@ -126,7 +126,6 @@ public: /* 800402E0 */ virtual int getFirstDrawLayerNo(); /* 800402E8 */ virtual int getNextDrawLayerNo(int); - // See cpp for argument type change comment /* 800409E0 */ virtual bool isDrawIconSingle(dTres_c::data_s const*, int, int, bool, bool, Vec const*) const; /* 80040AE4 */ virtual int getIconGroupNumber(u8) const; diff --git a/src/d/d_map_path_dmap.cpp b/src/d/d_map_path_dmap.cpp index 97cfb748997..821c83717d4 100644 --- a/src/d/d_map_path_dmap.cpp +++ b/src/d/d_map_path_dmap.cpp @@ -1005,8 +1005,6 @@ bool renderingDAmap_c::isDrawRoomIcon(int param_0, int param_1) const { /* 800409E0-80040A94 03B320 00B4+00 3/0 3/0 0/0 .text * isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siiibPC3Vec */ -// drawTreasure and drawTreasureAfterPlayer match required a change of param_3 to int rather than bool. -// Nothing else made sense considering the assembly generated. bool renderingDAmap_c::isDrawIconSingle(dTres_c::data_s const* data, int param_1, int param_2, bool param_3, bool param_4, Vec const* param_5) const { bool draw_room_icon = isDrawRoomIcon(data->mRoomNo, param_1); @@ -1096,7 +1094,7 @@ void renderingPlusDoorAndCursor_c::drawTreasure() { {5, 3, &l_destinationStartColor}, }; - bool rend_all_room = isRendAllRoom(); + const bool rend_all_room = isRendAllRoom(); GXClearVtxDesc(); GXSetVtxDesc(GX_VA_POS, GX_DIRECT); @@ -1172,7 +1170,7 @@ void renderingPlusDoorAndCursor_c::drawTreasureAfterPlayer() { static const u8 l_iconTex0[8] = {0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00}; static const GXColor tboxNotStayColor = {0x80, 0x00, 0x00, 0x00}; - bool rend_all_room = isRendAllRoom(); + const bool rend_all_room = isRendAllRoom(); GXClearVtxDesc(); GXSetVtxDesc(GX_VA_POS, GX_DIRECT);