diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index f627f789..0c18db81 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -7995,7 +7995,7 @@ fn_80142D10__13dLytMapMain_cFlbR4mAng = .text:0x80142D10; // type:function size: fn_80142D90__13dLytMapMain_cFl = .text:0x80142D90; // type:function size:0x170 fn_80142F00__13dLytMapMain_cFR7mVec3_clUcRC7mVec3_cRC4mAng = .text:0x80142F00; // type:function size:0x158 fn_80143060__13dLytMapMain_cFR7mVec3_cRC7mVec3_cRC7mVec3_cRC4mAng = .text:0x80143060; // type:function size:0xBC -fn_80143120 = .text:0x80143120; // type:function size:0xC0 +fn_80143120__13dLytMapMain_cFl = .text:0x80143120; // type:function size:0xC0 fn_801431E0__13dLytMapMain_cFv = .text:0x801431E0; // type:function size:0x11C fn_80143300__13dLytMapMain_cFv = .text:0x80143300; // type:function size:0x54 fn_80143360__13dLytMapMain_cFv = .text:0x80143360; // type:function size:0x1D4 diff --git a/include/d/lyt/d_lyt_map.h b/include/d/lyt/d_lyt_map.h index ddad8a60..e1f6a1a6 100644 --- a/include/d/lyt/d_lyt_map.h +++ b/include/d/lyt/d_lyt_map.h @@ -651,7 +651,6 @@ private: void fn_80140B90(); void fn_80143300(); void fn_80143120(s32); - void fn_80138D80(); void fn_801431E0(); void fn_8013AD50(); void fn_80143360(); diff --git a/src/d/lyt/d_lyt_map.cpp b/src/d/lyt/d_lyt_map.cpp index 76acf752..e7357640 100644 --- a/src/d/lyt/d_lyt_map.cpp +++ b/src/d/lyt/d_lyt_map.cpp @@ -2722,7 +2722,7 @@ void dLytMapMain_c::draw() { mLyt.getLayout()->GetRootPane()->Draw(mLyt.getDrawInfo()); if ((mCurrentMapMode == dLytMapGlobal_c::MAPMODE_PROVINCE || mNextMapMode == dLytMapGlobal_c::MAPMODE_PROVINCE) && mMapEvent == MAP_EVENT_SAVE_OBJ_MSG_WINDOW) { - fn_80138D80(); + initSaveObjs(); } fn_80143120(-2); mMarkers.drawPopups(); @@ -3867,12 +3867,12 @@ void dLytMapMain_c::executeState_Active() { if (mPointerOnMap && (field_0x8D5C < 2 || !mFloorBtnMgr.hasPointedAtABtnIdx())) { // Can zoom in around cursor, use the cursor pos getGlobal()->unprojectFromMap(field_0x8CF4, dCsGame_c::GetInstance()->getCursorIf()->getCursorPos()); - f32 tmp = fn_80142D90(dLytMapGlobal_c::MAPMODE_STAGE); + f32 tmp = fn_80142D90(dLytMapGlobal_c::MAPMODE_ZOOM); fn_8013FB70(field_0x8CF4, getGlobal()->getField_0x44() / tmp); mDrawScaleFrame = true; } else { // Cannot zoom in around cursor, use the player pos - f32 tmp = fn_80142D90(dLytMapGlobal_c::MAPMODE_STAGE); + f32 tmp = fn_80142D90(dLytMapGlobal_c::MAPMODE_ZOOM); f32 val = getGlobal()->getField_0x44() / tmp; fn_8013FB70(getGlobal()->getPlayerPos(), val); mDrawScaleFrame = true;