From e2fddadf320e8d35cbb3542645122e086efbfe9f Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 21 Nov 2025 18:52:16 -0500 Subject: Misc matches (#2845) * Misc debug matches * Fix d_map weak function order * Remove old nonmatching comments * d_menu_dmap and JASAudioThread OK, fix weak func order and rodata alignment * More misc matches --- src/d/d_map_path_dmap.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/d/d_map_path_dmap.cpp') diff --git a/src/d/d_map_path_dmap.cpp b/src/d/d_map_path_dmap.cpp index 469c9acfbc..97cfb74899 100644 --- a/src/d/d_map_path_dmap.cpp +++ b/src/d/d_map_path_dmap.cpp @@ -519,7 +519,7 @@ int dMpath_c::setPointer(dDrawPath_c::room_class* i_room, s8* param_1, s8* param #pragma optimization_level 2 void dMpath_c::setPointer(s8 i_roomNo, void* i_data, int i_mapLayerNo) { s32 roomNo; - dDrawPath_c::room_class* room = ((map_path_class*)i_data)->m_entries; + dDrawPath_c::room_class* room = (dDrawPath_c::room_class*)((map_path_class*)i_data)->m_entries; if (room != NULL) { roomNo = i_roomNo; @@ -954,17 +954,17 @@ bool renderingPlusDoor_c::checkDispDoorS(int param_0, int param_1, f32 param_2) return false; } +static Vec const l_100x100BoxVertexList[4] = { + {-50.0f, -50.0f, 0.0f}, + {50.0f, -50.0f, 0.0f}, + {50.0f, 50.0f, 0.0f}, + {-50.0f, 50.0f, 0.0f}, +}; + /* 80040838-800409B4 03B178 017C+00 1/1 0/0 0/0 .text * drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib */ void renderingPlusDoor_c::drawNormalDoorS(stage_tgsc_data_class const* i_doorData, int i_roomNo, int param_2, bool param_3) { - static Vec const l_100x100BoxVertexList[4] = { - {-50.0f, -50.0f, 0.0f}, - {50.0f, -50.0f, 0.0f}, - {50.0f, 50.0f, 0.0f}, - {-50.0f, 50.0f, 0.0f}, - }; - if (i_roomNo == dComIfGp_roomControl_getStayNo() || param_2 == dComIfGp_roomControl_getStayNo()) { GXSetTevColor(GX_TEVREG1, l_doorWhite); -- cgit v1.2.3