mirror
/
tp
mirror of https://github.com/zeldaret/tp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_map_path_dmap OK (#2884)

This commit is contained in:
LagoLunatic 2025-11-28 14:28:27 -05:00 committed by GitHub
parent 4fb3af91b8
commit ff550da0b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -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"),

1
include/d/d_map_path_dmap.h
View File

@ -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;

6
src/d/d_map_path_dmap.cpp
View File

@ -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);