From baa508795496e8c13b5e8648d219f7f37b029fd6 Mon Sep 17 00:00:00 2001 From: robojumper Date: Sun, 5 Oct 2025 01:27:09 +0200 Subject: [PATCH] apply --- config/SOUE01/symbols.txt | 16 ++++++++-------- src/d/lyt/d_lyt_map_markers.cpp | 5 ++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 3052cd3b..4ad206c6 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -9894,8 +9894,8 @@ fn_80179240 = .text:0x80179240; // type:function size:0x4 fn_80179250 = .text:0x80179250; // type:function size:0x34 fn_80179290 = .text:0x80179290; // type:function size:0x18 ActorDoorBase__initList = .text:0x801792B0; // type:function size:0x14 -checkHasMap = .text:0x801792D0; // type:function size:0x68 -projectForMapMaybe2 = .text:0x80179340; // type:function size:0x2C +checkHasMap__Fv = .text:0x801792D0; // type:function size:0x68 +projectOntoMap__FRC7mVec3_cR7mVec2_c = .text:0x80179340; // type:function size:0x2C build__14dLytMapPopup_cFPQ23d2d10ResAccIf_c = .text:0x80179370; // type:function size:0x16C remove__14dLytMapPopup_cFv = .text:0x801794E0; // type:function size:0x58 execute__14dLytMapPopup_cFv = .text:0x80179540; // type:function size:0x104 @@ -9929,10 +9929,10 @@ draw__15dLytMapIcon01_cFv = .text:0x8017B360; // type:function size:0x704 resetDrawCommands__15dLytMapIcon01_cFv = .text:0x8017BA70; // type:function size:0x4FC setMapIcons = .text:0x8017BF70; // type:function size:0x2C8 setLinkTunic__15dLytMapIcon01_cFl = .text:0x8017C240; // type:function size:0x98 -fn_8017C2E0 = .text:0x8017C2E0; // type:function size:0xA0 -fn_8017C380 = .text:0x8017C380; // type:function size:0xA0 +drawAreaLight__15dLytMapIcon01_cFlPQ34nw4r3lyt4Pane = .text:0x8017C2E0; // type:function size:0xA0 +drawCloud__15dLytMapIcon01_cFlPQ34nw4r3lyt4Pane = .text:0x8017C380; // type:function size:0xA0 setGoddessStatue__15dLytMapIcon01_cFb = .text:0x8017C420; // type:function size:0x74 -fn_8017C4A0 = .text:0x8017C4A0; // type:function size:0xA0 +drawSaveObj__15dLytMapIcon01_cFlPQ34nw4r3lyt4Pane = .text:0x8017C4A0; // type:function size:0xA0 fn_8017C540 = .text:0x8017C540; // type:function size:0x1C fn_8017C560 = .text:0x8017C560; // type:function size:0x80 fn_8017C5E0 = .text:0x8017C5E0; // type:function size:0x80 @@ -9949,9 +9949,9 @@ fn_8017CAF0 = .text:0x8017CAF0; // type:function size:0xC fn_8017CB00 = .text:0x8017CB00; // type:function size:0xC fn_8017CB10 = .text:0x8017CB10; // type:function size:0xC fn_8017CB20 = .text:0x8017CB20; // type:function size:0xC -drawWithAnimIn = .text:0x8017CB30; // type:function size:0xB8 -drawWithAnimOut = .text:0x8017CBF0; // type:function size:0xB8 -drawFullyIn = .text:0x8017CCB0; // type:function size:0xAC +drawWithAnimIn__15dLytMapIcon01_cFUlPQ34nw4r3lyt4Panef = .text:0x8017CB30; // type:function size:0xB8 +drawWithAnimOut__15dLytMapIcon01_cFUlPQ34nw4r3lyt4Panef = .text:0x8017CBF0; // type:function size:0xB8 +drawFullyIn__15dLytMapIcon01_cFUlPQ34nw4r3lyt4Pane = .text:0x8017CCB0; // type:function size:0xAC checkMapMode__15dLytMapIcon01_cFv = .text:0x8017CD60; // type:function size:0xAC setupActorDrawCommands__15dLytMapIcon01_cFv = .text:0x8017CE10; // type:function size:0x150 fn_8017CF60 = .text:0x8017CF60; // type:function size:0xFC diff --git a/src/d/lyt/d_lyt_map_markers.cpp b/src/d/lyt/d_lyt_map_markers.cpp index 72e11718..7c866d6b 100644 --- a/src/d/lyt/d_lyt_map_markers.cpp +++ b/src/d/lyt/d_lyt_map_markers.cpp @@ -827,13 +827,12 @@ void dLytMapIcon01_c::draw() { // Maybe compiler-generated u8 *idxes = mPassIdxes; for (int pass = 0; pass < 35; pass++, idxes++) { - u8 idx = *idxes; + s32 idx = *idxes; if (mNumCommandsPerPass[idx]) { for (int cmd = 0; cmd < mNumCommands; cmd++) { // Maybe compiler-generated const mAng &commandRot = mCommands[cmd].rotation; - // Suspicious cast - if (idx == (int)mCommands[cmd].passIdx) { + if (idx == mCommands[cmd].passIdx) { s32 paneIdx = mCommands[cmd].paneIdx; nw4r::lyt::Pane *pane = mpPanes[paneIdx]; switch (paneIdx) {