From 14f8187e5ce52b2be8baecb9af7915f4ce6d8df2 Mon Sep 17 00:00:00 2001 From: Teddy Heidmann Date: Thu, 13 Aug 2026 21:08:58 -0700 Subject: [PATCH] not matching GZLJ01 --- configure.py | 2 +- include/d/d_map.h | 2 +- src/d/d_map.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.py b/configure.py index bd1f3bd67..f85ee2c2d 100755 --- a/configure.py +++ b/configure.py @@ -628,7 +628,7 @@ config.libs = [ Object(Matching, "d/d_level_se.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_menu_cloth.cpp"), Object(NonMatching, "d/d_menu_collect.cpp"), - Object(MatchingFor("GZLJ01", "GZLE01"), "d/d_menu_dmap.cpp"), + Object(MatchingFor("GZLE01"), "d/d_menu_dmap.cpp"), Object(NonMatching, "d/d_menu_fmap.cpp"), Object(NonMatching, "d/d_menu_fmap2.cpp"), Object(NonMatching, "d/d_menu_item.cpp"), diff --git a/include/d/d_map.h b/include/d/d_map.h index fbff64a63..6b8274a15 100644 --- a/include/d/d_map.h +++ b/include/d/d_map.h @@ -530,7 +530,7 @@ public: }; BOOL dMap_GetTopBottomFloorNo(dStage_dt_c* stag, u8* bottom_p, u8* top_p); -int dMap_GetFloorNoForDmap(dStage_dt_c* stag, int param_2, f32 param_3); +u8 dMap_GetFloorNoForDmap(dStage_dt_c* stag, int param_2, f32 param_3); u8 dMap_GetFloorNo(dStage_dt_c*, f32); inline void dMap_drawPoint(u8 param_1, f32 param_2, f32 param_3, f32 param_4, s8 param_5, s16 param_6, u8 param_7, u8 param_8, u8 param_9) { diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp index 53b045788..13faef716 100644 --- a/src/d/d_map.cpp +++ b/src/d/d_map.cpp @@ -292,7 +292,7 @@ dStage_FloorInfo_dt_c* dMap_GetFloorInfoDtPFromFloorNo(dStage_FloorInfo_c* floor } /* 80045AEC-80045C24 .text dMap_GetFloorNoForDmap__FP11dStage_dt_cif */ -int dMap_GetFloorNoForDmap(dStage_dt_c* stag, int param_2, f32 param_3) { +u8 dMap_GetFloorNoForDmap(dStage_dt_c* stag, int param_2, f32 param_3) { dStage_FloorInfo_c* floor = stag->getFloorInfo(); int floorNo = Floor_1F; dStage_FloorInfo_dt_c* floorData = dMap_GetFloorInfoDtP(floor, param_3);