Decompile MapManager::GetMapMinBounds

Decompile MapManager::GetMapMaxBounds

Decompile MapManager::GetMapCenter

5 files changed, 48 insertions, 21 deletions

diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt
index 41784a1e..a577522c 100644
--- a/config/eur/arm9/overlays/ov000/symbols.txt
+++ b/config/eur/arm9/overlays/ov000/symbols.txt
@@ -558,11 +558,11 @@ _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
-_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
+_ZN10MapManager13GetMapCenterXEv kind:function(arm,size=0xc) addr:0x20833f4
+_ZN10MapManager13GetMapCenterZEv kind:function(arm,size=0xc) addr:0x2083400
+_ZN10MapManager15GetMapMinBoundsEP5Vec3p kind:function(arm,size=0x20) addr:0x208340c
+_ZN10MapManager15GetMapMaxBoundsEP5Vec3p kind:function(arm,size=0x20) addr:0x208342c
+_ZN10MapManager12GetMapCenterEP5Vec3p kind:function(arm,size=0x20) addr:0x208344c
 _ZN10MapManager18func_ov00_0208346cEP4AABB kind:function(arm,size=0x50) addr:0x208346c
 _ZN10MapManager18func_ov00_020834bcEP5Vec3pii kind:function(arm,size=0x68) addr:0x20834bc
 _ZN10MapManager18func_ov00_02083524EP5Vec3pii kind:function(arm,size=0x3c) addr:0x2083524
diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt
index ca02bf44..82b5aefa 100644
--- a/config/usa/arm9/overlays/ov000/symbols.txt
+++ b/config/usa/arm9/overlays/ov000/symbols.txt
@@ -558,11 +558,11 @@ _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
-_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
+_ZN10MapManager13GetMapCenterXEv kind:function(arm,size=0xc) addr:0x2083394
+_ZN10MapManager13GetMapCenterZEv kind:function(arm,size=0xc) addr:0x20833a0
+_ZN10MapManager15GetMapMinBoundsEP5Vec3p kind:function(arm,size=0x20) addr:0x20833ac
+_ZN10MapManager15GetMapMaxBoundsEP5Vec3p kind:function(arm,size=0x20) addr:0x20833cc
+_ZN10MapManager12GetMapCenterEP5Vec3p kind:function(arm,size=0x20) addr:0x20833ec
 _ZN10MapManager18func_ov00_0208346cEP4AABB kind:function(arm,size=0x50) addr:0x208340c
 _ZN10MapManager18func_ov00_020834bcEP5Vec3pii kind:function(arm,size=0x68) addr:0x208345c
 _ZN10MapManager18func_ov00_02083524EP5Vec3pii kind:function(arm,size=0x3c) addr:0x20834c4
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..74f18a51 100644
--- a/include/Map/MapManager.hpp
+++ b/include/Map/MapManager.hpp
@@ -110,11 +110,11 @@ public:
     q20 GetMapMinZ();
     q20 GetMapMaxX();
     q20 GetMapMaxZ();
-    unk8 Get_MapData_Unk_d0();
-    unk8 Get_MapData_Unk_d8();
-    unk8 GetMapData_Unk_dc(Vec3p *param_2);
-    unk8 GetMapData_Unk_e8(Vec3p *param_2);
-    unk8 GetMapData_Unk_d0(Vec3p *param_2);
+    q20 GetMapCenterX();
+    q20 GetMapCenterZ();
+    void GetMapMinBounds(Vec3p *param_2);
+    void GetMapMaxBounds(Vec3p *param_2);
+    void GetMapCenter(Vec3p *param_2);
     unk8 func_ov00_0208346c(AABB *param_2);
     unk8 func_ov00_020834bc(Vec3p *param_2, unk32 param_3, unk32 param_4);
     unk8 func_ov00_02083524(Vec3p *param_2, unk32 param_3, unk32 param_4);
diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp
index 7dd4f73f..3945e8c8 100644
--- a/src/00_Core/Map/MapManager.cpp
+++ b/src/00_Core/Map/MapManager.cpp
@@ -95,11 +95,38 @@ ARM q20 MapManager::GetMapMaxZ() {
     return (this->mMap->mBounds).max.z;
 }
 
-unk8 MapManager::Get_MapData_Unk_d0() {}
-unk8 MapManager::Get_MapData_Unk_d8() {}
-unk8 MapManager::GetMapData_Unk_dc(Vec3p *param_2) {}
-unk8 MapManager::GetMapData_Unk_e8(Vec3p *param_2) {}
-unk8 MapManager::GetMapData_Unk_d0(Vec3p *param_2) {}
+ARM q20 MapManager::GetMapCenterX() {
+    return (this->mMap->mCenter).x;
+}
+
+ARM q20 MapManager::GetMapCenterZ() {
+    return (this->mMap->mCenter).z;
+}
+
+ARM void MapManager::GetMapMinBounds(Vec3p *param_2) {
+    MapBase *mapBase = this->mMap;
+    param_2->x       = (mapBase->mBounds).min.x;
+    param_2->y       = (mapBase->mBounds).min.y;
+    param_2->z       = (mapBase->mBounds).min.z;
+    return;
+}
+
+ARM void MapManager::GetMapMaxBounds(Vec3p *param_2) {
+    MapBase *mapBase = this->mMap;
+    param_2->x       = (mapBase->mBounds).max.x;
+    param_2->y       = (mapBase->mBounds).max.y;
+    param_2->z       = (mapBase->mBounds).max.z;
+    return;
+}
+
+ARM void MapManager::GetMapCenter(Vec3p *param_2) {
+    MapBase *mapBase = this->mMap;
+    param_2->x       = (mapBase->mCenter).x;
+    param_2->y       = (mapBase->mCenter).y;
+    param_2->z       = (mapBase->mCenter).z;
+    return;
+}
+
 unk8 MapManager::func_ov00_0208346c(AABB *param_2) {}
 unk8 MapManager::func_ov00_020834bc(Vec3p *param_2, unk32 param_3, unk32 param_4) {}
 unk8 MapManager::func_ov00_02083524(Vec3p *param_2, unk32 param_3, unk32 param_4) {}