Decompile MapManager::func_ov00_02083570

Decompile MapManager::func_ov00_02083588

Decompile MapManager::func_ov00_020835a4

Decompile MapManager::func_ov00_020835b4

Decompile MapManager::func_ov00_020835c4 (50%)

4 files changed, 28 insertions, 12 deletions

diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt
index c5eb98c0..e773e16d 100644
--- a/config/eur/arm9/overlays/ov000/symbols.txt
+++ b/config/eur/arm9/overlays/ov000/symbols.txt
@@ -530,7 +530,7 @@ _ZN10MapManager18func_ov00_02082accEv kind:function(arm,size=0x10) addr:0x2082ac
 _ZN10MapManager18func_ov00_02082adcEv kind:function(arm,size=0x18) addr:0x2082adc
 _ZN10MapManager18func_ov00_02082af4Ev kind:function(arm,size=0x48) addr:0x2082af4
 _ZN10MapManager18func_ov00_02082b3cEi kind:function(arm,size=0x1cc) addr:0x2082b3c
-_ZN10MapManager13UpdateMapGridEv kind:function(arm,size=0x20) addr:0x2082d08
+_ZN10MapManager18func_ov00_02082d08Ev kind:function(arm,size=0x20) addr:0x2082d08
 _ZN10MapManager20GetCourseData_Unk_1cEv kind:function(arm,size=0xc) addr:0x2082d28
 _ZN10MapManager20GetCourseData_Unk_1dEv kind:function(arm,size=0xc) addr:0x2082d34
 _ZN10MapManager18func_ov00_02082d40Ev kind:function(arm,size=0x34) addr:0x2082d40
diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt
index 0092c0b0..6debf1e9 100644
--- a/config/usa/arm9/overlays/ov000/symbols.txt
+++ b/config/usa/arm9/overlays/ov000/symbols.txt
@@ -530,7 +530,7 @@ _ZN10MapManager18func_ov00_02082accEv kind:function(arm,size=0x10) addr:0x2082a6
 _ZN10MapManager18func_ov00_02082adcEv kind:function(arm,size=0x18) addr:0x2082a7c
 _ZN10MapManager18func_ov00_02082af4Ev kind:function(arm,size=0x48) addr:0x2082a94
 _ZN10MapManager18func_ov00_02082b3cEi kind:function(arm,size=0x1cc) addr:0x2082adc
-_ZN10MapManager13UpdateMapGridEv kind:function(arm,size=0x20) addr:0x2082ca8
+_ZN10MapManager18func_ov00_02082d08Ev kind:function(arm,size=0x20) addr:0x2082ca8
 _ZN10MapManager20GetCourseData_Unk_1cEv kind:function(arm,size=0xc) addr:0x2082cc8
 _ZN10MapManager20GetCourseData_Unk_1dEv kind:function(arm,size=0xc) addr:0x2082cd4
 _ZN10MapManager18func_ov00_02082d40Ev kind:function(arm,size=0x34) addr:0x2082ce0
diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp
index ea4049ca..7c00e1aa 100644
--- a/include/Map/MapManager.hpp
+++ b/include/Map/MapManager.hpp
@@ -82,7 +82,7 @@ public:
     unk32 *func_ov00_02082adc();
     unk8 func_ov00_02082af4();
     bool func_ov00_02082b3c(s32 param_2);
-    u8 UpdateMapGrid();
+    u8 func_ov00_02082d08();
     unk8 GetCourseData_Unk_1c();
     unk8 GetCourseData_Unk_1d();
     unk8 func_ov00_02082d40();
@@ -119,11 +119,11 @@ public:
     void func_ov00_020834bc(Vec3p *param_2, unk32 param_3, unk32 param_4);
     void func_ov00_02083524(Vec3p *param_2, unk32 param_3, unk32 param_4);
     static void func_ov00_02083560(unk32 param_1, MapManager *param_2, u32 param_3);
-    unk8 func_ov00_02083570(unk32 param_2, unk32 param_3);
+    u8 func_ov00_02083570(unk32 param_2, unk32 param_3);
     unk32 func_ov00_02083588();
     unk32 func_ov00_020835a4();
     unk32 func_ov00_020835b4();
-    unk8 func_ov00_020835c4(unk32 param_2, unk32 param_3);
+    s8 func_ov00_020835c4(s32 param_2, unk32 param_3);
     bool func_ov00_020835e4(s32 param_2, unk32 *param_3, unk32 *param_4);
     unk32 func_ov00_020835f4(s32 param_2);
     void func_ov00_02083604(s32 param_2);
diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp
index 879cba2d..35671c7d 100644
--- a/src/00_Core/Map/MapManager.cpp
+++ b/src/00_Core/Map/MapManager.cpp
@@ -43,7 +43,7 @@ unk32 *MapManager::func_ov00_02082adc() {}
 unk8 MapManager::func_ov00_02082af4() {}
 bool MapManager::func_ov00_02082b3c(s32 param_2) {}
 
-ARM u8 MapManager::UpdateMapGrid() {
+ARM u8 MapManager::func_ov00_02082d08() {
     Course *course = this->mCourse;
     return course->mMapGrid[(u8) course->mCurrMapPos.x][(u8) course->mCurrMapPos.y];
 }
@@ -66,7 +66,7 @@ ARM bool MapManager::GetCourseData_Unk_25c() {
 ARM bool MapManager::func_ov00_02083318(unk32 param_2) {}
 
 ARM bool MapManager::func_ov00_02083328() {
-    u32 map = (u32) this->UpdateMapGrid();
+    u32 map = (u32) this->func_ov00_02082d08();
     return this->mCourse->IsMapInMainGrid(map);
 }
 
@@ -184,11 +184,27 @@ ARM void MapManager::func_ov00_02083524(Vec3p *param_2, unk32 param_3, unk32 par
 }
 
 void MapManager::func_ov00_02083560(unk32 param_1, MapManager *param_2, u32 param_3) {}
-unk8 MapManager::func_ov00_02083570(unk32 param_2, unk32 param_3) {}
-unk32 MapManager::func_ov00_02083588() {}
-unk32 MapManager::func_ov00_020835a4() {}
-unk32 MapManager::func_ov00_020835b4() {}
-unk8 MapManager::func_ov00_020835c4(unk32 param_2, unk32 param_3) {}
+
+ARM u8 MapManager::func_ov00_02083570(unk32 param_2, unk32 param_3) {
+    return this->mCourse->mMapGrid[param_2][param_3];
+}
+
+ARM unk32 MapManager::func_ov00_02083588() {
+    return this->mCourse->FindMapData_Unk_08(this->func_ov00_02082d08());
+}
+
+ARM unk32 MapManager::func_ov00_020835a4() {
+    return this->mCourse->Get_Unk_c8_00();
+}
+
+ARM unk32 MapManager::func_ov00_020835b4() {
+    return this->mCourse->Get_Unk_c8_04();
+}
+
+ARM s8 MapManager::func_ov00_020835c4(s32 param_2, unk32 param_3) {
+    return this->mCourse->func_ov00_0207d404(param_2, 0, param_3);
+}
+
 bool MapManager::func_ov00_020835e4(s32 param_2, unk32 *param_3, unk32 *param_4) {}
 unk32 MapManager::func_ov00_020835f4(s32 param_2) {}
 void MapManager::func_ov00_02083604(s32 param_2) {}