Merge remote-tracking branch 'upstream/main' into hammer

3 files changed, 82 insertions, 8 deletions

diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp
index c92060a3..4c061620 100644
--- a/include/Map/MapBase.hpp
+++ b/include/Map/MapBase.hpp
@@ -113,8 +113,7 @@ public:
     /* 188 */ unk8 mUnk_188[0x14];
     /* 19c */ unk32 mUnk_19c;
     /* 1a0 */ unk8 mUnk_1a0[0xc];
-    /* 1ac */ s16 mUnk_1ac;
-    /* 1ae */ unk8 mUnk_1ae[2];
+    /* 1ac */ unk32 mUnk_1ac;
     /* 1b0 */
 
     /* 00 */ virtual ~MapBase();
diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp
index 9363d408..9b9199ca 100644
--- a/include/Map/MapManager.hpp
+++ b/include/Map/MapManager.hpp
@@ -158,7 +158,7 @@ public:
     bool func_ov00_020839c4(s32 param_2);
     static unk8 func_ov00_020839d4();
     static unk8 func_ov00_020839f8();
-    static void func_ov00_02083a1c(unk32 param_1, MapManager *param_2, Vec3p *param_3);
+    static void func_ov00_02083a1c(Vec2b *param_1, MapManager *param_2, Vec3p *param_3);
     static unk8 func_ov00_02083a54(unk32 param_1, MapManager *param_2, unk32 param_3, unk32 param_4, unk32 param_5);
     static unk8 func_ov00_02083b84();
     static unk8 func_ov00_02083bac();
@@ -166,7 +166,7 @@ public:
     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);
+    unk8 func_ov00_02083c7c(Vec3p *param_2, Vec2b param_3);
     static unk8 func_ov00_02083ce8(unk8 param_1, unk8 param_2, unk8 param_3, unk8 param_4, unk32 param_5);
     unk8 func_ov00_02083e34(unk8 param_2, unk8 param_3, unk32 param_4);
     unk8 MapData_vfunc_60();
@@ -180,7 +180,7 @@ public:
     void GetTileWorldBounds(Vec2b *tile, AABB *tileBounds);
     unk8 MapData_vfunc_54();
     unk8 func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4);
-    unk8 MapData_vfunc_78();
+    unk32 MapData_vfunc_78(Vec2b *param1);
     static unk8 func_ov00_020840dc();
     static unk8 func_ov00_02084100(unk32 param_1, MapManager *param_2);
     unk8 GetMapData_Unk_48();
@@ -210,7 +210,7 @@ public:
     unk8 func_ov00_0208499c();
     unk8 func_ov00_020849c0();
     unk8 func_ov00_020849dc();
-    static bool func_ov00_020849f8(unk32 param_1);
+    bool func_ov00_020849f8();
     unk8 func_ov00_02084a50();
     void SpawnNPC(Vec3p *param_2, unk32 param_3, unk32 param_4);
     bool func_ov00_02084ac4(u32 actorId);
@@ -232,10 +232,10 @@ public:
     unk8 func_ov00_02084d24(unk8 param_2, unk8 param_3, unk32 param_4);
     s32 func_ov00_02084d4c(unk32 param_2, unk32 param_3, Vec3p *param_4);
     unk8 func_ov00_02084ebc(unk32 param_2);
-    s32 func_ov00_02085108(s32 *param_2);
+    s32 func_ov00_02085108(Vec3p *param_2);
     static unk8 func_ov00_0208527c();
     static unk8 func_ov00_020853fc();
-    static unk8 func_ov00_02085594();
+    unk8 func_ov00_02085594(Vec3p *param_1);
     static void func_ov00_0208583c(unk32 param_1, Vec3p *param_2, unk32 param_3);
     static unk8 func_ov00_020858b0(MapManager *param_1, Vec3p *param_2, s32 param_3);
     s32 func_ov00_02085a34(unk32 param_2, unk32 param_3);
diff --git a/include/Map/MapOverworld.hpp b/include/Map/MapOverworld.hpp
new file mode 100644
index 00000000..482b3ad1
--- /dev/null
+++ b/include/Map/MapOverworld.hpp
@@ -0,0 +1,75 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+#include "Map/MapBase.hpp"
+#include "Render/ModelRender.hpp"
+#include "Unknown/UnkStruct_ov000_020c0c08.hpp"
+
+class MapOverworld_Unk1 : public UnkStruct_ov000_020c0c08 {
+public:
+    /* 00 (base) */
+    /* 24 */
+
+    MapOverworld_Unk1(u32 param1, u8 *param2, unk32 param3);
+};
+
+class MapOverworld : public MapBase {
+public:
+    /* 000 (base) */
+    /* 1b0 */ void *mUnk_1b0;
+    /* 1b4 */ unk8 mUnk_1b4;
+    /* 1b5 */ unk8 mUnk_1b5;
+    /* 1b6 */ unk8 mUnk_1b6;
+    /* 1b7 */ unk8 mUnk_1b7;
+    /* 1b8 */ u8 mUnk_1b8;
+    /* 1b9 */ unk8 mUnk_1b9;
+    /* 1ba */ unk8 mUnk_1ba;
+    /* 1bb */ unk8 mUnk_1bb;
+    /* 1bc */ s32 mUnk_1bc;
+    /* 1c0 */ ModelRender *mUnk_1c0;
+    /* 1c4 */ void *mUnk_1c4;
+    /* 1c8 */ void *mUnk_1c8;
+    /* 1cc */ unk8 mUnk_1cc;
+    /* 1cd */ unk8 mUnk_1cd;
+    /* 1ce */ unk8 mUnk_1ce[0x2];
+    /* 1d0 */ unk32 mUnk_1d0;
+    /* 1d4 */ unk32 mUnk_1d4;
+    /* 1d8 */ s16 mUnk_1d8;
+    /* 1da */ s16 mUnk_1da;
+    /* 1dc */
+
+    /* 00 */ virtual ~MapOverworld() override;
+    /* 08 */ virtual void vfunc_08(u32 param_2, u32 param_3, Course *param_4) override;
+    /* 14 */ virtual void vfunc_14() override;
+    /* 1c */ virtual void vfunc_1c(bool param_2) override;
+    /* 20 */ virtual void vfunc_20(s32 param_2) override;
+    /* 2c */ virtual void vfunc_2c() override;
+    /* 4c */ virtual void vfunc_4c() override;
+    /* 54 */ virtual unk32 vfunc_54() override;
+    /* 58 */ virtual unk32 vfunc_58() override;
+    /* 5c */ virtual unk32 vfunc_5c() override;
+    /* 60 */ virtual unk32 vfunc_60() override;
+    /* 64 */ virtual unk32 vfunc_64() override;
+    /* 78 */ virtual unk32 vfunc_78() override;
+    /* 7c */ virtual unk32 vfunc_7c() override;
+    /* 80 */ virtual unk32 vfunc_80() override;
+    /* 94 */ virtual void vfunc_94() override;
+    /* 98 */ virtual void vfunc_98() override;
+    /* a4 */ virtual unk32 vfunc_a4() override;
+    /* b0 */ virtual unk8 vfunc_b0(unk32 param_2, unk32 param_3) override;
+    /* bc */ virtual void vfunc_bc() override;
+    /* c0 */ virtual void vfunc_c0() override;
+    /* c4 */
+
+    MapOverworld(u32 width, u32 height);
+    void func_ov018_0215bfc8();
+    u32 func_ov018_0215c34c();
+    u32 func_ov018_0215c368();
+    s32 func_ov018_0215c380(u8 *param1);
+    void func_ov018_0215c650();
+    void func_ov018_0215c6ac();
+    void func_ov018_0215c6d0();
+    void func_ov018_0215c9ac();
+};