From efa6ea43cbc7dcd6993fc422f282c3c948afc4ba Mon Sep 17 00:00:00 2001 From: compugab Date: Tue, 2 Jun 2026 17:54:49 -0400 Subject: [PATCH] correcting build problems --- config/SOUE01/symbols.txt | 8 ++++---- include/d/d_stage.h | 1 + include/d/lyt/d_lyt_map_capture.h | 1 + src/d/lyt/d_lyt_map_capture.cpp | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index c426f7a3..dc8e34b6 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -7489,7 +7489,7 @@ initializeState_RenderingWaitStep2__16dLytMapCapture_cFv = .text:0x8012D550; // executeState_RenderingWaitStep2__16dLytMapCapture_cFv = .text:0x8012D560; // type:function size:0x94 finalizeState_RenderingWaitStep2__16dLytMapCapture_cFv = .text:0x8012D600; // type:function size:0x4 fn_8012D610__16dLytMapCapture_cFP7mVec3_c = .text:0x8012D610; // type:function size:0x5C -executeState__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x8012D670; // type:function size:0x5C +fn_8012D670__16dLytMapCapture_cFP7mVec3_c = .text:0x8012D670; // type:function size:0x5C fn_8012D6D0__16dLytMapCapture_cFP7mVec3_c = .text:0x8012D6D0; // type:function size:0x20 fn_8012D6F0__16dLytMapCapture_cFv = .text:0x8012D6F0; // type:function size:0xE4 execute__16dLytMapCapture_cFv = .text:0x8012D7E0; // type:function size:0x10 @@ -8116,7 +8116,7 @@ getState__85sStateMgr_c<16dLytMapPinIcon_c,20sStateMethodUsr_FI_c,12sFStateFct_c getNewStateID__85sStateMgr_c<16dLytMapPinIcon_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144660; // type:function size:0x10 getOldStateID__85sStateMgr_c<16dLytMapPinIcon_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144670; // type:function size:0x10 initializeState__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144680; // type:function size:0x10 -executeState__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144690; // type:function size:0x10 +lbl_80144690 = .text:0x80144690; // type:label finalizeState__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801446A0; // type:function size:0x10 refreshState__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801446B0; // type:function size:0x10 getState__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801446C0; // type:function size:0x10 @@ -8709,10 +8709,10 @@ fn_80158290 = .text:0x80158290; // type:function size:0x4 fn_801582A0 = .text:0x801582A0; // type:function size:0x134 fn_801583E0 = .text:0x801583E0; // type:function size:0x4 fn_801583F0 = .text:0x801583F0; // type:function size:0x4 -fn_80158400 = .text:0x80158400; // type:function size:0x78 +fn_80158400__15dLytBossGauge_cFv = .text:0x80158400; // type:function size:0x78 fn_80158480 = .text:0x80158480; // type:function size:0x4 fn_80158490 = .text:0x80158490; // type:function size:0x4 -fn_801584A0 = .text:0x801584A0; // type:function size:0x78 +fn_801584A0__15dLytBossGauge_cFv = .text:0x801584A0; // type:function size:0x78 fn_80158520 = .text:0x80158520; // type:function size:0x4 fn_80158530 = .text:0x80158530; // type:function size:0x4 fn_80158540 = .text:0x80158540; // type:function size:0x80 diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 506fa868..60c79aa5 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -92,6 +92,7 @@ public: void fn_801B4B80(u32 mapParams, const mVec3_c ¢er, const mVec3_c &size); void fn_801B4C70(const mVec3_c &); void fn_801B50C0(s32); + const mVec3_c &fn_801B4C90() const; const mVec3_c &fn_801B4CB0() const; s32 fn_801B4F10(s32 roomid, const mVec3_c &position) const; }; diff --git a/include/d/lyt/d_lyt_map_capture.h b/include/d/lyt/d_lyt_map_capture.h index d47e1265..4dec80a2 100644 --- a/include/d/lyt/d_lyt_map_capture.h +++ b/include/d/lyt/d_lyt_map_capture.h @@ -33,6 +33,7 @@ public: void execute(); bool isBusyRendering() const; void fn_8012D610(mVec3_c *out); + void fn_8012D670(mVec3_c *out); void fn_8012D6D0(mVec3_c *out); private: diff --git a/src/d/lyt/d_lyt_map_capture.cpp b/src/d/lyt/d_lyt_map_capture.cpp index 785c5774..20936865 100644 --- a/src/d/lyt/d_lyt_map_capture.cpp +++ b/src/d/lyt/d_lyt_map_capture.cpp @@ -49,6 +49,11 @@ void dLytMapCapture_c::fn_8012D610(mVec3_c *out){ *out = dStage_c::GetInstance()->getMapRelated()->fn_801B4CB0(); } +void dLytMapCapture_c::fn_8012D670(mVec3_c *out){ + dStage_c::GetInstance()->getMapRelated()->fn_801B50C0(0); + *out = dStage_c::GetInstance()->getMapRelated()->fn_801B4C90(); +} + void dLytMapCapture_c::fn_8012D800(nw4r::lyt::Pane *param_2, const GXTexObj *param_3) { if (param_3 != nullptr && dStage_c::GetInstance() != nullptr && dStage_c::GetInstance()->getMapRelated()->fn_801B5970(param_3)) {