Decompile MapManager::func_ov00_02083790 (13%)

Decompile MapManager::func_ov00_02083840 (20%)

Decompile MapManager::AddTrigger

Decompile MapManager::func_ov00_020838d8

Decompile MapManager::func_ov00_020838e8

Decompile MapManager::func_ov00_020838f8

Decompile MapManager::func_ov00_02083908

Decompile MapManager::func_ov00_02083918

Decompile MapManager::func_ov00_02083928

Decompile MapManager::SetCurrentViewpointId

Decompile MapManager::func_ov00_02083958

Decompile MapManager::func_ov00_02083968

Decompile MapManager::func_ov00_02083978

Decompile MapManager::func_ov00_020839b4

Decompile MapManager::func_ov00_020839c4

Decompile MapManager::func_ov00_020839d4

Decompile MapManager::func_ov00_020839f8

Decompile MapManager::func_ov00_02083a1c (14%)

Decompile MapManager::GetTileStartX

Decompile MapManager::GetTileStartZ

Decompile MapManager::GetTileEndX

Decompile MapManager::GetTileEndZ

Decompile MapManager::func_ov00_02083c24

Decompile MapManager::func_ov00_02083c50

2 files changed, 37 insertions, 37 deletions

diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp
index f668956f..2d62a670 100644
--- a/include/Map/MapBase.hpp
+++ b/include/Map/MapBase.hpp
@@ -65,7 +65,7 @@ public:
     /* 013 */ unk8 mUnk_013;
     /* 014 */ unk8 mUnk_014;
     /* 015 */ unk8 mUnk_015;
-    /* 016 */ unk8 mUnk_016[2];
+    /* 016 */ unk8 mCurrViewpointId[2];
     /* 018 */ unk8 mUnk_018[2];
     /* 01a */ unk8 mUnk_01a;
     /* 01b */ unk8 mUnk_01b;
@@ -190,14 +190,14 @@ public:
     s32 GetTileEndX(unk32 x);
     s32 GetTileEndZ(unk32 z);
     void GetTileBounds(Vec2b *tilePos, AABB *bounds);
-    unk8 GetClampedTileX(unk32 worldX);
-    unk8 GetClampedTileY(unk32 worldZ);
-    unk8 GetTileX(unk32 worldX);
-    unk8 GetTileY(unk32 worldZ);
+    s32 GetClampedTileX(s32 worldX);
+    s32 GetClampedTileY(s32 worldZ);
+    unk8 GetTileX(s32 worldX);
+    unk8 GetTileY(s32 worldZ);
     bool IsInBounds(Vec3p *tileWorldPos);
     s32 AddEntrance(Entrance *param_2);
     Entrance *FindEntrance(unk32 id);
-    unk8 func_ov00_0207f924(unk32 param_2);
+    void func_ov00_0207f924(s32 param_2);
     unk8 func_ov00_0207f934();
     unk8 func_ov00_0207f948(unk32 param_2);
     void AddTrigger(TriggerParams *param_2);
@@ -210,22 +210,22 @@ public:
     bool AnyTrigger_func_0c(unk32 type);
     unk8 Trigger_vfunc_08();
     bool AddTrigger(unk32 param_2);
-    bool func_ov00_0207ff88(unk32 param_2);
+    bool func_ov00_0207ff88(s32 param_2);
     void func_ov00_0208005c(s32 param_2, s32 param_3, unk32 param_4);
     void func_ov00_0208006c(unk32 param_2, s32 param_3);
     void func_ov00_0208007c(s32 param_2, s32 param_3);
     void func_ov00_0208008c(u32 param_2);
     unk8 AddExit(Exit *param_2);
-    unk8 func_ov00_02080140(Exit *param_2);
-    bool FindExit(unk32 param_2, Exit *param_3);
+    char func_ov00_02080140(Exit *param_2);
+    bool FindExit(u32 param_2, Exit *param_3);
     unk8 AddCameraViewpoint(CameraViewpoint *param_2);
     bool FindViewpoint_Unk_4(unk8 id, CameraViewpoint *param_3);
-    bool FindViewpoint_Unk_0(unk32 param_2, CameraViewpoint *param_3);
-    void GetCurrentViewpoint(CameraViewpoint *param_2, unk32 param_3);
-    unk8 GetCurrentViewpoint_Unk_00(s32 param_2);
-    bool func_ov00_02080824(unk32 param_2, unk32 param_3);
-    bool AddUnk_130(unk32 param_2);
-    bool func_ov00_020809b8(unk32 param_2);
+    bool FindViewpoint_Unk_0(s32 param_2, CameraViewpoint *param_3);
+    void GetCurrentViewpoint(CameraViewpoint *param_2, s32 param_3);
+    unk32 GetCurrentViewpoint_Unk_00(s32 param_2);
+    bool func_ov00_02080824(u32 param_2, unk8 *param_3);
+    bool AddUnk_130(s32 param_2);
+    bool func_ov00_020809b8(s32 param_2);
     unk8 func_ov00_02080a78(Vec3p *param_2);
     unk8 func_ov00_02080b24(Vec2b *param_2);
     void func_ov00_02080d08(unk32 param_2);
diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp
index ea8854c0..7c3bd859 100644
--- a/include/Map/MapManager.hpp
+++ b/include/Map/MapManager.hpp
@@ -135,34 +135,34 @@ public:
     bool func_ov00_020836dc(u32 param_2, u32 actorId);
     bool IsTriggerTypeOverlapped(u32 param_2, Vec3p *param_3);
     bool GetOverlappingTrigger(Vec3p *param_2);
-    bool func_ov00_02083790(unk32 param_2);
-    unk8 func_ov00_02083840(unk32 param_2);
-    bool func_ov00_020838c8(s32 param_2);
+    bool func_ov00_02083790(s32 param_2);
+    bool func_ov00_02083840(s32 param_2);
+    bool AddTrigger(s32 param_2);
     bool func_ov00_020838d8(s32 param_2);
-    bool func_ov00_020838e8(u32 param_2, unk32 *param_3);
-    char func_ov00_020838f8(unk32 *param_2);
-    bool func_ov00_02083908(char param_2, unk32 *param_3);
-    void func_ov00_02083918(s32 param_2, s32 *param_3);
-    void func_ov00_02083928(unk8 *param_2, s32 param_3);
+    bool FindExit(u32 param_2, Exit *param_3);
+    char func_ov00_020838f8(Exit *param_2);
+    bool func_ov00_02083908(char param_2, CameraViewpoint *param_3);
+    void func_ov00_02083918(s32 param_2, CameraViewpoint *param_3);
+    void GetCurrentViewpoint(CameraViewpoint *param_2, s32 param_3);
     unk32 func_ov00_02083938(s32 param_2);
-    unk8 Set_MapData_Unk_16(unk8 value, unk32 index);
+    void SetCurrentViewpointId(unk8 value, s32 index);
     void func_ov00_02083958(s32 param_2);
     void func_ov00_02083968(u32 param_2, unk8 *param_3);
-    bool func_ov00_02083978(unk32 param_2, Vec3p *param_3);
+    bool func_ov00_02083978(Vec3p *param_2, Vec3p *param_3);
     bool func_ov00_020839b4(s32 param_2);
     bool func_ov00_020839c4(s32 param_2);
-    static unk8 func_ov00_020839d4();
-    static unk8 func_ov00_020839f8();
-    static void func_ov00_02083a1c(unk8 *param_1, MapManager *param_2, Vec3p *param_3);
-    static unk8 func_ov00_02083a54(u8 *param_1, MapManager *param_2, s32 *param_3, u8 param_4, u8 param_5);
-    static unk8 func_ov00_02083b84();
-    static unk8 func_ov00_02083bac();
-    static unk8 func_ov00_02083bd4();
-    static unk8 func_ov00_02083bfc();
-    unk8 func_ov00_02083c24(unk32 param_2);
-    unk8 func_ov00_02083c50(unk32 param_2);
-    unk8 func_ov00_02083c7c(Vec3p *param_2, unk32 param_3);
-    static unk8 func_ov00_02083ce8(unk8 param_1, unk8 param_2, unk8 param_3, unk8 param_4, unk32 param_5);
+    s32 func_ov00_020839d4(s32 param_2);
+    s32 func_ov00_020839f8(s32 param_2);
+    static void func_ov00_02083a1c(s32 *param_1, MapManager *param_2, Vec3p *param_3);
+    static void func_ov00_02083a54(u8 *param_1, MapManager *param_2, s32 *param_3, s32 param_4, s32 *param_5);
+    s32 GetTileStartX(unk32 x);
+    s32 GetTileStartZ(unk32 z);
+    s32 GetTileEndX(unk32 x);
+    s32 GetTileEndZ(unk32 z);
+    s32 func_ov00_02083c24(unk32 x);
+    s32 func_ov00_02083c50(unk32 z);
+    void func_ov00_02083c7c(Vec3p *param_2, u32 param_3);
+    static void func_ov00_02083ce8(MapManager *param_1, s32 *param_2, u32 param_3, s32 param_4, u32 param_5);
     unk8 func_ov00_02083e34(unk8 param_2, unk8 param_3, unk32 param_4);
     unk8 MapData_vfunc_60();
     static unk8 func_ov00_02083e70();