Merge branch 'decomp/MapManager' of github-aetias-hax:SammygoodTunes/ph into decomp/MapManager

1 files changed, 32 insertions, 32 deletions

diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp
index 52be0786..b1018279 100644
--- a/include/Map/MapManager.hpp
+++ b/include/Map/MapManager.hpp
@@ -30,10 +30,10 @@ class MapManager : public SysObject {
 public:
     /* 00 */ Course *mCourse;
     /* 04 */ MapBase *mMap;
-    /* 08 */ unk8 mUnk_08;
-    /* 09 */ unk8 mUnk_09;
-    /* 0a */ unk8 mUnk_0a;
-    /* 0b */ unk8 mUnk_0b;
+    /* 08 */ bool mUnk_08;
+    /* 09 */ bool mUnk_09;
+    /* 0a */ bool mUnk_0a;
+    /* 0b */ bool mUnk_0b;
     /* 0c */ u8 mUnk_0c;
     /* 0d */ unk8 mUnk_0d;
     /* 0e */ unk8 mUnk_0e;
@@ -47,7 +47,7 @@ public:
 
     void GetCourseDungeonProgress(CourseProgress *param_2);
     void func_ov00_020820fc(s32 param_2, unk32 param_3, unk32 param_4);
-    unk8 func_ov00_0208210c(unk32 param_2, unk32 *param_3);
+    void func_ov00_0208210c(unk32 param_2, unk32 *param_3);
     void func_ov00_0208230c(s32 *param_2);
     void func_ov00_02082348(unk32 *param_2);
     void func_ov00_020823a4(unk32 param_2);
@@ -73,11 +73,11 @@ public:
     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);
-    void func_ov00_020826a0(unk32 param_2, unk32 param_3, unk32 param_4);
+    void func_ov00_020826a0(unk32 param_2, unk32 param_3);
     void CreateMap(unk32 mapType, unk32 param_3, unk32 param_4);
     void DestroyMap();
     void MapData_vfunc_44();
-    void func_ov00_02082808(s32 param_2);
+    void func_ov00_02082808(bool param_2);
     s32 MapData_vfunc_7c(s32 param_1, unk32 *param_2, s32 param_3, short param_4[4]);
     void MapData_vfunc_84(unk32 param_2);
     bool func_ov00_020828f8(s32 *param_2);
@@ -86,17 +86,17 @@ public:
     void func_ov00_02082acc();
     unk32 *func_ov00_02082adc();
     void func_ov00_02082af4();
-    bool func_ov00_02082b3c(s32 param_2);
+    void func_ov00_02082b3c(unk32 *param_2, Vec2b *param3);
     u8 func_ov00_02082d08();
     u8 GetCurrentMapPosX();
     u8 GetCurrentMapPosY();
     u8 func_ov00_02082d40();
     u32 func_ov00_02082d74(unk32 param_2);
-    void func_ov00_02082d84(unk8 *param_2, s32 *param_3, s32 *param_4);
+    void func_ov00_02082d84(Vec2b *param_2, s32 *param_3, s32 *param_4);
     bool func_ov00_02082e1c(s32 *param_2, s32 *param_3);
     void func_ov00_0208306c(s32 *param_2, s32 *param_3);
     void func_ov00_0208315c(s32 *param_2, s32 *param_3);
-    void func_ov00_02083244(u32 param_2, s32 *param_3, s32 *param_4, s32 *param_5);
+    void func_ov00_02083244(u32 param_2, Vec3p *param_3, s32 *param_4, s32 *param_5);
     void func_ov00_02083298(u32 param_2, Vec3p *param_3, s32 *param_4, s32 *param_5);
     bool GetCourseData_Unk_25c();
     bool IsMapInMainGrid(u32 map);
@@ -124,11 +124,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(Vec2b *param_1, MapManager *param_2, u32 param_3);
-    u8 func_ov00_02083570(unk32 param_2, unk32 param_3);
+    u8 func_ov00_02083570(u8 param_2, u8 param_3);
     unk32 func_ov00_02083588();
     unk32 func_ov00_020835a4();
     unk32 func_ov00_020835b4();
-    unk8 func_ov00_020835c4(MapManager *param_1, s32 param_2, unk32 param_3);
+    bool func_ov00_020835c4(s32 param_2, unk32 param_3);
     bool func_ov00_020835e4(s32 param_2, unk32 *param_3, unk8 *param_4);
     unk32 func_ov00_020835f4(s32 param_2);
     void func_ov00_02083604(s32 param_2);
@@ -167,44 +167,44 @@ public:
     s32 func_ov00_02083c24(unk32 x);
     s32 func_ov00_02083c50(unk32 z);
     void func_ov00_02083c7c(Vec3p *param_2, Vec2b param_3);
-    static void func_ov00_02083ce8(MapManager *param_1, s32 *param_2, u32 param_3, s32 param_4, u32 param_5);
+    void func_ov00_02083ce8(Vec3p *param_2, u32 param_3, s32 param_4, u32 param_5);
     s32 func_ov00_02083e34(unk8 param_2, unk8 param_3, unk32 param_4);
-    unk32 MapData_vfunc_60(u8 *param_1);
-    bool func_ov00_02083e70();
+    unk32 MapData_vfunc_60(Vec2b *param_1);
+    bool func_ov00_02083e70(Vec2b *param_2);
     unk32 MapData_vfunc_68(Vec3p *param_1, bool param_2);
-    s32 func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3);
-    void func_ov00_02083f44(Vec3p *param_2);
+    s32 func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3, bool param_4);
+    unk32 func_ov00_02083f44(Vec3p *param_2, bool param_3);
     unk8 MapData_vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4);
     unk32 MapData_vfunc_70(Vec3p *param_2);
     static void func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3);
     void GetTileWorldBounds(Vec2b *tile, AABB *tileBounds);
     unk32 MapData_vfunc_54(Vec2b *a);
     unk32 func_ov00_020840a0(unk8 param_2, unk8 param_3);
-    unk32 MapData_vfunc_78(Vec2b *param_1);
-    unk8 func_ov00_020840dc();
+    unk32 *MapData_vfunc_78(Vec2b *param_1);
+    unk32 func_ov00_020840dc(Vec2b *param_1);
     static unk8 func_ov00_02084100(unk32 *param_1, MapManager *param_2);
     u32 GetMapData_Unk_48();
     unk32 GetMapData_Unk_4c();
     unk32 func_ov00_0208412c();
     void func_ov00_0208413c(unk32 param_2);
     unk8 MapData_vfunc_58(Vec2b *param_1, int param_2);
-    unk8 func_ov00_02084164(Vec2b *param_2);
+    s32 func_ov00_02084164(Vec2b *param_2);
     u8 GetMapData_Unk_0a();
     u8 GetMapData_Unk_0b();
     unk8 MapData_vfunc_a4(unk8 *param_1);
-    unk8 func_ov00_0208433c(Vec3p *param_2, Vec3p *param_3);
+    void func_ov00_0208433c(Vec3p *param_2, Vec2s *param_3);
     unk8 func_ov00_0208439c(Vec2s *param_2, Vec3p *param_3);
     void func_ov00_020843ec(s32 *param_2);
     unk32 GetMapData_Unk_38();
     s32 func_ov00_020846a4();
-    static s32 func_ov00_02084700(MapManager *pMapManager);
-    unk8 func_ov00_02084740();
+    s32 func_ov00_02084700();
+    unk32 func_ov00_02084740();
     unk32 func_ov00_020847e0();
-    unk8 func_ov00_020847f0();
+    unk32 func_ov00_020847f0(unk32 type);
     bool func_ov00_02084838();
     bool func_ov00_020848b8();
     void func_ov00_02084924(u32 param_2);
-    bool func_ov00_02084934(s32 *param_2);
+    bool func_ov00_02084934(Vec3p *param_2);
     u8 GetMapData_Unk_06();
     u8 GetMapData_Unk_07();
     bool func_ov00_0208499c();
@@ -218,18 +218,18 @@ public:
     unk32 GetNumKeys();
     void SetBlueWarpOpen(bool state);
     bool GetBlueWarpOpen();
-    unk8 func_ov00_02084b38(unk32 param_2, unk32 param_3, unk32 param_4);
+    void func_ov00_02084b38(u32 param_2, unk32 param_3, bool param_4);
     bool func_ov00_02084be0(u32 param_2, unk32 param_3);
     void SetMapDataFlag1(unk32 param_2, bool param_3);
     bool GetMapDataFlag1(unk32 param_2);
-    void func_ov00_02084c7c(unk32 param_2);
+    void func_ov00_02084c7c(unk32 param_2, bool param_3);
     bool func_ov00_02084c94(unk32 param_2);
-    void func_ov00_02084cb0(unk32 param_2);
+    void func_ov00_02084cb0(unk32 param_2, bool param_3);
     bool func_ov00_02084cc8(unk32 param_2);
-    void func_ov00_02084ce4(unk32 param_2);
+    void func_ov00_02084ce4(unk32 param_2, bool param_3);
     bool func_ov00_02084cfc(unk32 param_2);
     u8 GetMapData_Unk_09();
-    unk8 func_ov00_02084d24(unk8 param_2, unk8 param_3, unk32 param_4);
+    void func_ov00_02084d24(unk8 param_2, unk8 param_3, unk16 param_4);
     s32 func_ov00_02084d4c(unk32 param_2, unk32 param_3, Vec3p *param_4);
     unk32 func_ov00_02084ebc(Vec3p *param_2);
     s32 func_ov00_02085108(Vec3p *param_2);
@@ -237,7 +237,7 @@ public:
     static s32 func_ov00_020853fc(MapManager *param_1, Vec3p *param_2, s32 *param_3);
     unk32 func_ov00_02085594(Vec3p *param_2);
     static void func_ov00_0208583c(MapManager *param_1, Vec3p *param_2, unk32 param_3);
-    static unk8 func_ov00_020858b0(MapManager *param_1, Vec3p *param_2, s32 param_3);
+    static unk32 func_ov00_020858b0(MapManager *param_1, Vec3p *param_2, s32 param_3);
     s32 func_ov00_02085a34(Vec3p *param_2, unk32 param_3);
     unk8 func_ov00_02085c60(Vec3p *param_2, unk32 *param_3, unk32 *param_4, u32 param_5);
     unk8 func_ov00_02086044(Vec3p *param_2, Vec3p *param_3, unk32 param_4);
@@ -253,7 +253,7 @@ public:
     static void LoadMapTexSprites(s32 param1);
     void func_ov004_02102260();
     void func_ov004_02102264(unk32 *param1, char *param2);
-    void func_ov004_021024c4(s32 param1, unk32 param2, unk32 param3);
+    void func_ov004_021024c4(unk32 *param1, unk32 param2, bool param3);
     void func_ov004_021025d8();
 };