From 06d5eda374676aaf46baa74b3f151bfad77fe76c Mon Sep 17 00:00:00 2001 From: Teddy Heidmann Date: Thu, 13 Aug 2026 21:19:57 -0700 Subject: [PATCH] different fix for d_map.h --- include/d/d_map.h | 1 - src/d/d_map.cpp | 2 +- src/d/d_menu_dmap.cpp | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/d/d_map.h b/include/d/d_map.h index 6b8274a15..7d5bda492 100644 --- a/include/d/d_map.h +++ b/include/d/d_map.h @@ -530,7 +530,6 @@ public: }; BOOL dMap_GetTopBottomFloorNo(dStage_dt_c* stag, u8* bottom_p, u8* top_p); -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 13faef716..53b045788 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 */ -u8 dMap_GetFloorNoForDmap(dStage_dt_c* stag, int param_2, f32 param_3) { +int 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); diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index 8199cdf77..b71905595 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -18,6 +18,8 @@ #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_controller_pad.h" +u8 dMap_GetFloorNoForDmap(dStage_dt_c*, int, f32); + dMd_HIO_c g_mdHIO; /* 801A86A4-801A87CC .text __ct__9dMd_HIO_cFv */