Decompile MapManager::func_ov00_020824cc (28%)

Decompile MapManager::func_ov00_02082504

Decompile MapManager::func_ov00_02082538 (43%)

Decompile MapManager::func_ov00_02082614

Decompile MapManager::MapData_vfunc_b0

Decompile MapManager::func_ov00_02082650

Decompile MapManager::func_ov00_02082660

Decompile MapManager::func_ov00_02082670

Decompile MapManager::func_ov00_02082680

Decompile MapManager::

Decompile MapManager::func_ov00_020826a0 (100% but needs verifying)

Decompile MapManager::CreateMap (3%)

Decompile MapManager::DestroyMap (8%)

Decompile MapManager::MapData_vfunc_44

Decompile MapManager::MapData_vfunc_7c (25%)

Decompile MapManager::MapData_vfunc_84

Decompile MapManager::func_ov00_020828f8

Decompile MapManager::GetNumMaps

Decompile MapManager::func_ov00_02082914 (21%)

Decompile MapManager::func_ov00_02082acc

Decompile MapManager::func_ov00_02082af4 (55%)

4 files changed, 22 insertions, 21 deletions

diff --git a/include/Map/Course.hpp b/include/Map/Course.hpp
index 5d2017f8..e1aa4210 100644
--- a/include/Map/Course.hpp
+++ b/include/Map/Course.hpp
@@ -43,7 +43,7 @@ public:
     /* 090 */ unk32 mUnk_090;
     /* 094 */ unk32 mUnk_094;
     /* 098 */ AABB mBounds;
-    /* 0b0 */ s8 mNumMaps;
+    /* 0b0 */ u8 mNumMaps;
     /* 0b1 */ unk8 mUnk_0b1;
     /* 0b2 */ unk8 mUnk_0b2;
     /* 0b3 */ unk8 mUnk_0b3;
diff --git a/include/Map/Entrance.hpp b/include/Map/Entrance.hpp
index d9bea6ef..3bc5d8d9 100644
--- a/include/Map/Entrance.hpp
+++ b/include/Map/Entrance.hpp
@@ -8,9 +8,10 @@
 #include "System/SysNew.hpp"
 
 class Entrance : public SysObject {
+public:
     /* 00 */ Vec3p mPos;
     /* 0c */ unk16 mAngle;
-    /* 0e */ s8 mUnk_0e;
+    /* 0e */ s8 mId;
     /* 0f */ unk8 mUnk_0f;
     /* 10 */ s32 mUnk_10;
     /* 14 */
diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp
index c94081d9..f668956f 100644
--- a/include/Map/MapBase.hpp
+++ b/include/Map/MapBase.hpp
@@ -145,20 +145,20 @@ public:
     /* 70 */ virtual unk32 vfunc_70(Vec3p *param_2);
     /* 74 */ virtual s32 *vfunc_74(Vec3p *param_2);
     /* 78 */ virtual unk32 vfunc_78();
-    /* 7c */ virtual unk32 vfunc_7c();
+    /* 7c */ virtual void vfunc_7c();
     /* 80 */ virtual unk32 vfunc_80();
     /* 84 */ virtual void vfunc_84(unk32 param_2);
     /* 88 */ virtual unk32 vfunc_88();
     /* 8c */ virtual unk32 vfunc_8c();
     /* 90 */ virtual unk8 vfunc_90(unk32 param_2, unk32 param_3, unk32 param_4);
     /* 94 */ virtual void vfunc_94();
-    /* 98 */ virtual void vfunc_98();
+    /* 98 */ virtual void vfunc_98(unk32 param_2, unk32 param_3, unk32 param_4);
     /* 9c */ virtual void vfunc_9c();
     /* a0 */ virtual void vfunc_a0();
     /* a4 */ virtual unk32 vfunc_a4();
     /* a8 */ virtual void vfunc_a8();
     /* ac */ virtual void vfunc_ac();
-    /* b0 */ virtual unk8 vfunc_b0(unk32 param_2, unk32 param_3);
+    /* b0 */ virtual void vfunc_b0(unk32 param_2, unk32 param_3);
     /* b4 */ virtual void vfunc_b4();
     /* b8 */ virtual unk32 vfunc_b8();
     /* bc */ virtual void vfunc_bc();
@@ -180,7 +180,7 @@ public:
     static unk8 func_ov00_0207f100();
     bool func_ov00_0207f104(unk32 param_2, unk32 param_3);
     unk32 func_ov00_0207f1f4(Vec3p *param_2, unk32 *param_3);
-    unk8 func_ov00_0207f38c(unk32 param_2);
+    bool func_ov00_0207f38c(s32 *param_2);
     void func_ov00_0207f4a4(Vec2s *param_2, unk32 param_3);
     static void func_ov00_0207f53c(Vec2s *param_1, MapBase *param_2, Vec3p *param_3);
     static void func_ov00_0207f588(Vec2s *param_1, MapBase *param_2, Vec2b *param_3, unk32 param_4);
diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp
index dc286644..94f4254b 100644
--- a/include/Map/MapManager.hpp
+++ b/include/Map/MapManager.hpp
@@ -55,32 +55,32 @@ public:
     s32 func_ov00_02082424();
     bool func_ov00_02082454(Vec3p *param_2, Vec3p *param_3);
     bool func_ov00_02082494(s32 param_2);
-    unk8 func_ov00_020824cc(unk32 param_2);
-    unk8 func_ov00_02082504();
+    bool func_ov00_020824cc(s32 param_2);
+    s32 func_ov00_02082504();
     unk8 *func_ov00_02082538();
     void func_ov00_02082594();
     void func_ov00_020825ac();
     s32 GetCourseFilePath(char *courseName, char *buf);
-    unk8 func_ov00_020825e4(unk32 param_2, unk32 param_3);
-    unk8 func_ov00_02082614(unk32 param_2, unk32 param_3);
-    unk8 MapData_vfunc_b0();
+    void func_ov00_020825e4(unk32 param_2, char *buf);
+    void func_ov00_02082614(char *param_2, unk32 param_3);
+    void MapData_vfunc_b0(unk32 param_2, unk32 param_3);
     void func_ov00_02082650(s32 param_2, s32 param_3, unk32 param_4);
     void func_ov00_02082660(s32 param_2, s32 param_3);
     void func_ov00_02082670(unk32 param_2, s32 param_3);
     void func_ov00_02082680(unk32 param_2, unk32 param_3);
-    unk8 func_ov00_020826a0(unk32 param_2, unk32 param_3, unk32 param_4);
-    unk8 CreateMap(unk32 mapType, unk32 param_3, unk32 param_4);
-    unk8 DestroyMap();
-    unk8 MapData_vfunc_44();
-    static unk8 func_ov00_02082808();
-    unk8 MapData_vfunc_7c();
-    unk8 MapData_vfunc_84();
+    void func_ov00_020826a0(unk32 param_2, unk32 param_3, unk32 param_4);
+    void CreateMap(unk32 mapType, unk32 param_3, unk32 param_4);
+    void DestroyMap();
+    void MapData_vfunc_44();
+    void func_ov00_02082808(s32 param_2, unk32 param_3, unk32 param_4);
+    void MapData_vfunc_7c();
+    void MapData_vfunc_84(unk32 param_2);
     bool func_ov00_020828f8(s32 *param_2);
-    unk8 GetCourseData_Unk_b0();
+    u8 GetNumMaps();
     s32 func_ov00_02082914(unk32 param_2);
-    unk8 func_ov00_02082acc();
+    void func_ov00_02082acc();
     unk32 *func_ov00_02082adc();
-    unk8 func_ov00_02082af4();
+    void func_ov00_02082af4();
     bool func_ov00_02082b3c(s32 param_2);
     u8 func_ov00_02082d08();
     unk8 GetCourseData_Unk_1c();