Merge pull request #58 from SammygoodTunes/decomp/MapManager

Decomp `src/00_Core/Map/MapManager.cpp`

1 files changed, 42 insertions, 43 deletions

diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp
index 4c061620..f9768a81 100644
--- a/include/Map/MapBase.hpp
+++ b/include/Map/MapBase.hpp
@@ -66,7 +66,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;
@@ -76,8 +76,8 @@ public:
     /* 01f */ unk8 mUnk_01f;
     /* 020 */ unk32 mUnk_020;
     /* 024 */ unk32 mUnk_024;
-    /* 028 */ s16 mUnk_028;
-    /* 02a */ s16 mUnk_02a;
+    /* 028 */ s16 mWidth;
+    /* 02a */ s16 mHeight;
     /* 02c */ unk16 mUnk_02c;
     /* 02e */ unk16 mUnk_02e;
     /* 030 */ s16 mUnk_030;
@@ -90,9 +90,8 @@ public:
     /* 048 */ u32 mUnk_048;
     /* 04c */ unk32 mUnk_04c;
     /* 050 */ unk8 mUnk_050[0x80];
-    /* 0d0 */ Vec3p mUnk_0d0;
-    /* 0dc */ Vec3p mUnk_0dc;
-    /* 0e8 */ Vec3p mUnk_0e8;
+    /* 0d0 */ Vec3p mCenter;
+    /* 0dc */ AABB mBounds;
     /* 0f4 */ Vec3p mUnk_0f4;
     /* 100 */ std::vector<Entrance> mEntrances;
     /* 10c */ std::vector<TriggerBase *> mTriggers;
@@ -112,8 +111,8 @@ public:
     /* 180 */ MapBase_Unk_180 mUnk_180[2];
     /* 188 */ unk8 mUnk_188[0x14];
     /* 19c */ unk32 mUnk_19c;
-    /* 1a0 */ unk8 mUnk_1a0[0xc];
-    /* 1ac */ unk32 mUnk_1ac;
+    /* 1a0 */ Vec3p mUnk_1a0;
+    /* 1ac */ s16 mUnk_1ac;
     /* 1b0 */
 
     /* 00 */ virtual ~MapBase();
@@ -134,32 +133,32 @@ public:
     /* 40 */ virtual void vfunc_40();
     /* 44 */ virtual void vfunc_44();
     /* 48 */ virtual void vfunc_48();
-    /* 4c */ virtual void vfunc_4c() = 0;
+    /* 4c */ virtual s32 vfunc_4c();
     /* 50 */ virtual unk32 vfunc_50();
-    /* 54 */ virtual unk32 vfunc_54();
-    /* 58 */ virtual unk32 vfunc_58();
+    /* 54 */ virtual unk32 vfunc_54(Vec2b *param_1);
+    /* 58 */ virtual unk32 vfunc_58(Vec2b *param_1, int param_2);
     /* 5c */ virtual unk32 vfunc_5c();
-    /* 60 */ virtual unk32 vfunc_60();
+    /* 60 */ virtual unk32 vfunc_60(Vec2b *param_1);
     /* 64 */ virtual unk32 vfunc_64();
-    /* 68 */ virtual unk8 vfunc_68(unk32 param_2, unk32 param_3);
+    /* 68 */ virtual unk32 vfunc_68(Vec3p *param_1, bool param_2);
     /* 6c */ virtual unk8 vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4);
     /* 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();
+    /* 74 */ virtual unk32 *vfunc_74(Vec3p *param_2);
+    /* 78 */ virtual unk32 *vfunc_78(Vec2b *param_1);
+    /* 7c */ virtual s32 vfunc_7c(s32 param_1, unk32 *param_2, s32 param_3, short param_4[4]);
     /* 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);
+    /* 90 */ virtual unk8 vfunc_90(Vec2b *param_2, unk32 param_3);
     /* 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();
+    /* a4 */ virtual unk32 vfunc_a4(unk8 *param_1);
     /* 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();
@@ -172,16 +171,16 @@ public:
     void func_ov00_0207de68(unk32 param_2);
     void func_ov00_0207de88();
     void func_ov00_0207dea0(bool param_2);
-    bool func_ov00_0207e08c(unk32 param_2, unk32 param_3);
-    s32 func_ov00_0207e0f0(unk32 param_2);
-    s32 func_ov00_0207e28c(unk32 param_2);
+    bool func_ov00_0207e08c(s32 *param_2, s32 param_3);
+    s32 func_ov00_0207e0f0(s32 param_2);
+    s32 func_ov00_0207e28c(s32 param_2);
     static unk8 func_ov00_0207e940(unk8 *param_1);
     static unk8 func_ov00_0207e968();
     static unk8 func_ov00_0207e96c();
     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);
@@ -191,42 +190,42 @@ 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);
-    unk8 FindEntrance(unk32 id);
-    unk8 func_ov00_0207f924(unk32 param_2);
+    Entrance *FindEntrance(unk32 id);
+    void func_ov00_0207f924(s32 param_2);
     unk8 func_ov00_0207f934();
     unk8 func_ov00_0207f948(unk32 param_2);
     void AddTrigger(TriggerParams *param_2);
-    s32 GetTriggerBoundingBox(unk32 param_2, AABB *param_3);
-    unk8 GetTriggerBoundingBoxes(unk32 param_2, AABB *param_3, unk32 param_4);
-    unk32 GetOverlappingTrigger(Vec3p *param_2);
-    unk8 FindTrigger(unk32 type);
+    s32 GetTriggerBoundingBox(s32 param_2, AABB *param_3);
+    s32 GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4);
+    bool GetOverlappingTrigger(Vec3p *param_2);
+    TriggerBase *FindTrigger(unk32 type);
     unk8 GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity);
     bool IsTriggerTypeOverlapped(unk32 type, Vec3p *param_3);
     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);