diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 63208160..41784a1e 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -554,10 +554,10 @@ _ZN10MapManager13GetCourseMinXEv kind:function(arm,size=0xc) addr:0x2083394 _ZN10MapManager13GetCourseMinZEv kind:function(arm,size=0xc) addr:0x20833a0 _ZN10MapManager13GetCourseMaxXEv kind:function(arm,size=0xc) addr:0x20833ac _ZN10MapManager13GetCourseMaxZEv kind:function(arm,size=0xc) addr:0x20833b8 -_ZN10MapManager18func_ov00_020833c4Ev kind:function(arm,size=0xc) addr:0x20833c4 -_ZN10MapManager18func_ov00_020833d0Ev kind:function(arm,size=0xc) addr:0x20833d0 -_ZN10MapManager18func_ov00_020833dcEv kind:function(arm,size=0xc) addr:0x20833dc -_ZN10MapManager18func_ov00_020833e8Ev kind:function(arm,size=0xc) addr:0x20833e8 +_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 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index b8a5116b..ca02bf44 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -554,10 +554,10 @@ _ZN10MapManager13GetCourseMinXEv kind:function(arm,size=0xc) addr:0x2083334 _ZN10MapManager13GetCourseMinZEv kind:function(arm,size=0xc) addr:0x2083340 _ZN10MapManager13GetCourseMaxXEv kind:function(arm,size=0xc) addr:0x208334c _ZN10MapManager13GetCourseMaxZEv kind:function(arm,size=0xc) addr:0x2083358 -_ZN10MapManager18func_ov00_020833c4Ev kind:function(arm,size=0xc) addr:0x2083364 -_ZN10MapManager18func_ov00_020833d0Ev kind:function(arm,size=0xc) addr:0x2083370 -_ZN10MapManager18func_ov00_020833dcEv kind:function(arm,size=0xc) addr:0x208337c -_ZN10MapManager18func_ov00_020833e8Ev kind:function(arm,size=0xc) addr:0x2083388 +_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 diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp index f9d08cac..f7d1b8e1 100644 --- a/include/Map/MapBase.hpp +++ b/include/Map/MapBase.hpp @@ -90,8 +90,7 @@ public: /* 04c */ unk32 mUnk_04c; /* 050 */ unk8 mUnk_050[0x80]; /* 0d0 */ Vec3p mUnk_0d0; - /* 0dc */ Vec3p mUnk_0dc; - /* 0e8 */ Vec3p mUnk_0e8; + /* 0dc */ AABB mBounds; /* 0f4 */ Vec3p mUnk_0f4; /* 100 */ std::vector mEntrances; /* 10c */ std::vector mTriggers; diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 10c57c40..818df21b 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -106,10 +106,10 @@ public: q20 GetCourseMinZ(); q20 GetCourseMaxX(); q20 GetCourseMaxZ(); - unk8 func_ov00_020833c4(); - unk8 func_ov00_020833d0(); - unk8 func_ov00_020833dc(); - unk8 func_ov00_020833e8(); + q20 GetMapMinX(); + q20 GetMapMinZ(); + q20 GetMapMaxX(); + q20 GetMapMaxZ(); unk8 Get_MapData_Unk_d0(); unk8 Get_MapData_Unk_d8(); unk8 GetMapData_Unk_dc(Vec3p *param_2); diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp index 161b7301..7dd4f73f 100644 --- a/src/00_Core/Map/MapManager.cpp +++ b/src/00_Core/Map/MapManager.cpp @@ -79,10 +79,22 @@ ARM q20 MapManager::GetCourseMaxZ() { return (this->mCourse->mBounds).max.z; } -unk8 MapManager::func_ov00_020833c4() {} -unk8 MapManager::func_ov00_020833d0() {} -unk8 MapManager::func_ov00_020833dc() {} -unk8 MapManager::func_ov00_020833e8() {} +ARM q20 MapManager::GetMapMinX() { + return (this->mMap->mBounds).min.x; +} + +ARM q20 MapManager::GetMapMinZ() { + return (this->mMap->mBounds).min.z; +} + +ARM q20 MapManager::GetMapMaxX() { + return (this->mMap->mBounds).max.x; +} + +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) {}