Decompile MapManager::GetMapCenterX

Decompile MapManager:GetMapCenterZ

5 files changed, 15 insertions, 9 deletions

diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt
index 41784a1e..61d9ed0d 100644
--- a/config/eur/arm9/overlays/ov000/symbols.txt
+++ b/config/eur/arm9/overlays/ov000/symbols.txt
@@ -558,8 +558,8 @@ _ZN10MapManager10GetMapMinXEv kind:function(arm,size=0xc) addr:0x20833c4
 _ZN10MapManager10GetMapMinZEv kind:function(arm,size=0xc) addr:0x20833d0
 _ZN10MapManager10GetMapMaxXEv kind:function(arm,size=0xc) addr:0x20833dc
 _ZN10MapManager10GetMapMaxZEv kind:function(arm,size=0xc) addr:0x20833e8
-_ZN10MapManager18Get_MapData_Unk_d0Ev kind:function(arm,size=0xc) addr:0x20833f4
-_ZN10MapManager18Get_MapData_Unk_d8Ev kind:function(arm,size=0xc) addr:0x2083400
+_ZN10MapManager13GetMapCenterXEv kind:function(arm,size=0xc) addr:0x20833f4
+_ZN10MapManager13GetMapCenterZEv kind:function(arm,size=0xc) addr:0x2083400
 _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p kind:function(arm,size=0x20) addr:0x208340c
 _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p kind:function(arm,size=0x20) addr:0x208342c
 _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p kind:function(arm,size=0x20) addr:0x208344c
diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt
index ca02bf44..7542a15b 100644
--- a/config/usa/arm9/overlays/ov000/symbols.txt
+++ b/config/usa/arm9/overlays/ov000/symbols.txt
@@ -558,8 +558,8 @@ _ZN10MapManager10GetMapMinXEv kind:function(arm,size=0xc) addr:0x2083364
 _ZN10MapManager10GetMapMinZEv kind:function(arm,size=0xc) addr:0x2083370
 _ZN10MapManager10GetMapMaxXEv kind:function(arm,size=0xc) addr:0x208337c
 _ZN10MapManager10GetMapMaxZEv kind:function(arm,size=0xc) addr:0x2083388
-_ZN10MapManager18Get_MapData_Unk_d0Ev kind:function(arm,size=0xc) addr:0x2083394
-_ZN10MapManager18Get_MapData_Unk_d8Ev kind:function(arm,size=0xc) addr:0x20833a0
+_ZN10MapManager13GetMapCenterXEv kind:function(arm,size=0xc) addr:0x2083394
+_ZN10MapManager13GetMapCenterZEv kind:function(arm,size=0xc) addr:0x20833a0
 _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p kind:function(arm,size=0x20) addr:0x20833ac
 _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p kind:function(arm,size=0x20) addr:0x20833cc
 _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p kind:function(arm,size=0x20) addr:0x20833ec
diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp
index f7d1b8e1..037b7749 100644
--- a/include/Map/MapBase.hpp
+++ b/include/Map/MapBase.hpp
@@ -89,7 +89,7 @@ public:
     /* 048 */ u32 mUnk_048;
     /* 04c */ unk32 mUnk_04c;
     /* 050 */ unk8 mUnk_050[0x80];
-    /* 0d0 */ Vec3p mUnk_0d0;
+    /* 0d0 */ Vec3p mCenter;
     /* 0dc */ AABB mBounds;
     /* 0f4 */ Vec3p mUnk_0f4;
     /* 100 */ std::vector<Entrance> mEntrances;
diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp
index 818df21b..890d62f3 100644
--- a/include/Map/MapManager.hpp
+++ b/include/Map/MapManager.hpp
@@ -110,8 +110,8 @@ public:
     q20 GetMapMinZ();
     q20 GetMapMaxX();
     q20 GetMapMaxZ();
-    unk8 Get_MapData_Unk_d0();
-    unk8 Get_MapData_Unk_d8();
+    q20 GetMapCenterX();
+    q20 GetMapCenterZ();
     unk8 GetMapData_Unk_dc(Vec3p *param_2);
     unk8 GetMapData_Unk_e8(Vec3p *param_2);
     unk8 GetMapData_Unk_d0(Vec3p *param_2);
diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp
index 7dd4f73f..614ae320 100644
--- a/src/00_Core/Map/MapManager.cpp
+++ b/src/00_Core/Map/MapManager.cpp
@@ -95,8 +95,14 @@ ARM q20 MapManager::GetMapMaxZ() {
     return (this->mMap->mBounds).max.z;
 }
 
-unk8 MapManager::Get_MapData_Unk_d0() {}
-unk8 MapManager::Get_MapData_Unk_d8() {}
+ARM q20 MapManager::GetMapCenterX() {
+    return (this->mMap->mCenter).x;
+}
+
+ARM q20 MapManager::GetMapCenterZ() {
+    return (this->mMap->mCenter).z;
+}
+
 unk8 MapManager::GetMapData_Unk_dc(Vec3p *param_2) {}
 unk8 MapManager::GetMapData_Unk_e8(Vec3p *param_2) {}
 unk8 MapManager::GetMapData_Unk_d0(Vec3p *param_2) {}