Merge branch 'main' into fix-build

5 files changed, 378 insertions, 3 deletions

diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp
index 614f9a50..a9c5ae5d 100644
--- a/src/00_Core/Item/ItemManager.cpp
+++ b/src/00_Core/Item/ItemManager.cpp
@@ -235,8 +235,7 @@ extern "C" unk32 func_ov00_02078b40(UnkStruct_027e0d38 *param1);
 extern void *data_027e10a4;

 extern "C" bool func_ov15_02136670(void *param1);

 extern unk8 data_ov29_0217a4ac[];

-extern void *data_027e0e60;

-extern "C" bool func_ov00_020849f8(void *param1);

+extern "C" bool _ZN10MapManager18func_ov00_020849f8Ei(void *param1);

 extern unk32 data_027e0fc8;

 extern "C" bool func_ov00_020bbd80(unk32 param1, unk32 param2);

 extern "C" bool _ZNK11ItemManager7HasItemEi();

@@ -254,7 +253,7 @@ ARM bool NONMATCH(ItemManager::func_ov00_020ad790)(unk32 param1) {
     }

     

     ItemFlag equipId = mForcedItem;

-    bool unk2 = !func_ov00_020849f8(data_027e0e60);

+    bool unk2 = !gMapManager->func_ov00_020849f8();

     if (

         mEquippedItem != ItemFlag_None &&

         (unk2 || (u32) mEquippedItem - 9 <= 1) &&

diff --git a/src/00_Core/Map/Course.cpp b/src/00_Core/Map/Course.cpp
new file mode 100644
index 00000000..560169e8
--- /dev/null
+++ b/src/00_Core/Map/Course.cpp
@@ -0,0 +1,55 @@
+#include "Map/Course.hpp"
+
+#ifdef STUBS
+
+void Course::GetDungeonProgress(CourseProgress *param_2) {}
+void Course::func_ov00_0207ca28(s32 param_2, unk32 param_3, unk32 param_4) {}
+char* Course::SetCourseName(char *src) {}
+void Course::func_ov00_0207ca78(unk32 param_2, unk8 param_3, unk32 param_4) {}
+bool Course::func_ov00_0207caa8(s32 param_2, unk32 *param_3, unk8 *param_4) {}
+unk32 Course::func_ov00_0207cb30(s32 param_2) {}
+void Course::FindMapGridPos(Vec2b *pos, Course *param_2, u32 map) {}
+Vec3p* Course::FindMapCenter(unk32 map) {}
+void Course::func_ov00_0207cbe8(s32 param_2) {}
+unk8 Course::func_ov00_0207cc24(s32 param_2) {}
+unk32 Course::FindMapData_Unk_08(unk32 map) {}
+void Course::GetMCSFilePath(unk32 buf, s32 fileIndex, unk32 fileType) {}
+void Course::GetMRCFilePath(unk32 param_2, unk32 buf, unk32 param_4) {}
+void Course::func_ov00_0207ce20(unk32 param_2, unk32 param_3, char *param_4, unk32 param_5) {}
+void Course::func_ov00_0207ce4c(s32 param_2, s32 param_3, unk32 param_4, char *param_5, unk32 param_6) {}
+bool Course::func_ov00_0207d404(s32 param_2, unk32 param_3, unk32 param_4) {}
+bool Course::IsCurrentMapInMainGrid() {}
+bool Course::IsInMainGrid(s32 x, s32 y) {}
+bool Course::IsMapInMainGrid(u32 map) {}
+bool Course::GetMapScreenPos(s32 map, s32 *x, s32 *y) {}
+u32 Course::GetScreenMapCellSizeX() {}
+u32 Course::GetScreenMapCellSizeY() {}
+unk32 Course::Get_Unk_c8_00() {}
+unk32 Course::Get_Unk_c8_04() {}
+bool Course::IsAdjacentMapOnMainGrid(unk32 dir) {}
+bool Course::HasGridMap(s32 x, s32 y) {}
+unk8 Course::GetAdjacentMap(unk32 dir) {}
+u32 Course::GetAdjacentMapX(s32 ir) {}
+u32 Course::GetAdjacentMapY(s32 dir) {}
+u16 Course::FindCurrentMapData_Unk_04() {}
+u32 Course::FindMapData_Unk_04(unk32 param_2) {}
+unk32 Course::FindMapData_Unk_0c(unk32 map) {}
+void Course::func_ov00_0207d7bc() {}
+void Course::SetFlag0(u32 index, bool value) {}
+bool Course::GetFlag0(u32 index) {}
+void Course::SetFlag1(u32 index, bool value) {}
+bool Course::SetFlag1(u32 index) {}
+void Course::SetMapDataFlag0(unk32 index, bool value) {}
+bool Course::GetMapDataFlag0(unk32 param_2) {}
+void Course::SetMapDataFlag1(unk32 param_2, bool param_3) {}
+bool Course::GetMapDataFlag1(unk32 param_2) {}
+void Course::SetMapDataFlag2(unk32 param_2, bool param_3) {}
+bool Course::GetMapDataFlag2(unk32 param_2) {}
+void Course::SetMapDataFlag3(unk32 param_2, bool param_3) {}
+bool Course::GetMapDataFlag3(unk32 param_2) {}
+void Course::SetMapDataFlag4(unk32 param_2, unk32 param_3) {}
+bool Course::GetMapDataFlag4(unk32 param_2) {}
+MapData* Course::FindMapData(u32 map) {}
+MapData* Course::FindCurrentMapData() {}
+
+#endif
diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp
new file mode 100644
index 00000000..5a5ed636
--- /dev/null
+++ b/src/00_Core/Map/MapBase.cpp
@@ -0,0 +1,116 @@
+#include "Map/MapBase.hpp"
+#include "Map/MapManager.hpp"
+
+#ifdef STUBS
+
+MapBase::~MapBase() {}
+MapBase_Unk_180::~MapBase_Unk_180() {}
+void MapBase::SetBounds(unk32 map, unk32 course) {}
+MapManager_Unk2::~MapManager_Unk2() {}
+void MapBase::GetMapFilePath(char *courseName, unk32 num1, unk32 buf) {}
+void MapBase::vfunc_18() {}
+void MapBase::func_ov00_0207ddf8(bool param_2) {}
+void MapBase::func_ov00_0207de68(unk32 param_2) {}
+void MapBase::func_ov00_0207de88() {}
+void MapBase::func_ov00_0207dea0(bool param_2) {}
+unk8 MapBase::vfunc_b0(unk32 param_2, unk32 param_3) {}
+bool MapBase::func_ov00_0207e08c(unk32 param_2, unk32 param_3) {}
+s32 MapBase::func_ov00_0207e0f0(unk32 param_2) {}
+s32 MapBase::func_ov00_0207e28c(unk32 param_2) {}
+void MapBase::vfunc_b4() {}
+void MapBase::vfunc_48() {}
+unk32 MapBase::vfunc_50() {}
+unk32 MapBase::vfunc_54() {}
+unk32 MapBase::vfunc_58() {}
+unk32 MapBase::vfunc_5c() {}
+unk32 MapBase::vfunc_60() {}
+unk32 MapBase::vfunc_64() {}
+unk8 MapBase::vfunc_68(unk32 param_2, unk32 param_3) {}
+unk8 MapBase::func_ov00_0207e940(unk8 *param_1) {}
+unk8 MapBase::func_ov00_0207e968() {}
+unk8 MapBase::func_ov00_0207e96c() {}
+unk8 MapBase::vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4) {}
+unk32 MapBase::vfunc_70(Vec3p *param_2) {}
+s32* MapBase::vfunc_74(Vec3p *param_2) {}
+unk8 MapBase::func_ov00_0207f100() {}
+bool MapBase::func_ov00_0207f104(unk32 param_2, unk32 param_3) {}
+unk32 MapBase::func_ov00_0207f1f4(Vec3p *param_2, unk32 *param_3) {}
+unk32 MapBase::vfunc_88() {}
+unk32 MapBase::vfunc_8c() {}
+void MapBase::vfunc_9c() {}
+void MapBase::vfunc_a0() {}
+unk32 MapBase::vfunc_a4() {}
+void MapBase::vfunc_a8() {}
+void MapBase::vfunc_ac() {}
+unk32 MapBase::vfunc_78() {}
+unk32 MapBase::vfunc_7c() {}
+unk32 MapBase::vfunc_80() {}
+void MapBase::vfunc_84(unk32 param_2) {}
+unk8 MapBase::func_ov00_0207f38c(unk32 param_2) {}
+unk8 MapBase::vfunc_90(unk32 param_2, unk32 param_3, unk32 param_4) {}
+void MapBase::vfunc_94() {}
+void MapBase::func_ov00_0207f4a4(Vec2s *param_2, unk32 param_3) {}
+void MapBase::func_ov00_0207f53c(Vec2s *param_1, MapBase *param_2, Vec3p *param_3) {}
+void MapBase::func_ov00_0207f588(Vec2s *param_1, MapBase *param_2, Vec2b *param_3, unk32 param_4) {}
+void MapBase::func_ov00_0207f630(Vec2s *param_2, Vec3p *param_3) {}
+unk8 MapBase::GetTileStartX(unk32 x) {}
+unk8 MapBase::GetTileStartZ(unk32 z) {}
+s32 MapBase::GetTileEndX(unk32 x) {}
+s32 MapBase::GetTileEndZ(unk32 z) {}
+void MapBase::GetTileBounds(Vec2b *tilePos, AABB *bounds) {}
+unk8 MapBase::GetClampedTileX(unk32 worldX) {}
+unk8 MapBase::GetClampedTileY(unk32 worldZ) {}
+unk8 MapBase::GetTileX(unk32 worldX) {}
+unk8 MapBase::GetTileY(unk32 worldZ) {}
+bool MapBase::IsInBounds(Vec3p *tileWorldPos) {}
+s32 MapBase::AddEntrance(Entrance *param_2) {}
+unk8 MapBase::FindEntrance(unk32 id) {}
+unk8 MapBase::func_ov00_0207f924(unk32 param_2) {}
+unk8 MapBase::func_ov00_0207f934() {}
+unk8 MapBase::func_ov00_0207f948(unk32 param_2) {}
+void MapBase::AddTrigger(TriggerParams *param_2) {}
+void TriggerBase::vfunc_08() {}
+s32 MapBase::GetTriggerBoundingBox(unk32 param_2, AABB *param_3) {}
+bool TriggerBase::GetBoundingBox() {}
+unk8 MapBase::GetTriggerBoundingBoxes(unk32 param_2, AABB *param_3, unk32 param_4) {}
+unk32 MapBase::GetOverlappingTrigger(Vec3p *param_2) {}
+bool TriggerBase::Overlaps() {}
+unk8 MapBase::FindTrigger(unk32 type) {}
+unk8 MapBase::GetOverlappingTriggers(Vec3p *param_2, TriggerBase * *triggers, unk32 capacity) {}
+bool MapBase::IsTriggerTypeOverlapped(unk32 type, Vec3p *param_3) {}
+bool MapBase::AnyTrigger_func_0c(unk32 type) {}
+unk32 TriggerBase::vfunc_0c() {}
+unk8 MapBase::Trigger_vfunc_08() {}
+bool MapBase::AddTrigger(unk32 param_2) {}
+bool MapBase::func_ov00_0207ff88(unk32 param_2) {}
+void MapBase::func_ov00_0208005c(s32 param_2, s32 param_3, unk32 param_4) {}
+void MapBase::func_ov00_0208006c(unk32 param_2, s32 param_3) {}
+void MapBase::func_ov00_0208007c(s32 param_2, s32 param_3) {}
+void MapBase::func_ov00_0208008c(u32 param_2) {}
+unk8 MapBase::AddExit(Exit *param_2) {}
+unk8 MapBase::func_ov00_02080140(Exit *param_2) {}
+void MapBase_Unk1::func_ov00_02080324(s32 param_2, s32 param_3, s32 param_4) {}
+bool MapBase::FindExit(unk32 param_2, Exit *param_3) {}
+unk8 MapBase::AddCameraViewpoint(CameraViewpoint *param_2) {}
+bool MapBase::FindViewpoint_Unk_4(unk8 id, CameraViewpoint *param_3) {}
+bool MapBase::FindViewpoint_Unk_0(unk32 param_2, CameraViewpoint *param_3) {}
+void MapBase::GetCurrentViewpoint(CameraViewpoint *param_2, unk32 param_3) {}
+unk8 MapBase::GetCurrentViewpoint_Unk_00(s32 param_2) {}
+unk32 MapBase::vfunc_b8() {}
+bool MapBase::func_ov00_02080824(unk32 param_2, unk32 param_3) {}
+bool MapBase::AddUnk_130(unk32 param_2) {}
+bool MapBase::func_ov00_020809b8(unk32 param_2) {}
+unk8 MapBase::func_ov00_02080a78(Vec3p *param_2) {}
+void MapBase_Unk2::func_ov00_02080ad0(TriggerBase * *param_2, TriggerBase * *param_3) {}
+unk8 MapBase::func_ov00_02080b24(Vec2b *param_2) {}
+void MapBase::func_ov00_02080d08(unk32 param_2) {}
+void MapBase::vfunc_bc() {}
+void MapBase::vfunc_98() {}
+void MapBase::vfunc_c0() {}
+bool MapBase::TriggerOfType_vfunc_10(unk32 type) {}
+unk32 TriggerBase::vfunc_10() {}
+void MapBase::func_ov00_02080de4() {}
+unk8 MapBase::func_ov00_02080de8(unk32 param_2) {}
+void MapBase::func_ov00_02080edc() {}
+
+#endif
diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp
new file mode 100644
index 00000000..802043ac
--- /dev/null
+++ b/src/00_Core/Map/MapManager.cpp
@@ -0,0 +1,204 @@
+#include "Map/MapManager.hpp"
+
+#ifdef STUBS
+
+void MapManager::func_ov00_020820ec(unk32 *param_2) {}
+void MapManager::func_ov00_020820fc(s32 param_2, unk32 param_3, unk32 param_4) {}
+unk8 MapManager::func_ov00_0208210c(unk32 param_2, unk32 param_3) {}
+unk8 MapManager::func_ov00_0208230c(unk32 param_2) {}
+unk8 MapManager::func_ov00_02082348(unk32 param_2) {}
+void MapManager::func_ov00_020823a4(unk32 param_2) {}
+unk8 MapManager::func_ov00_020823b4() {}
+bool MapManager::func_ov00_020823c4(unk32 *param_2, s32 param_3) {}
+s32 MapManager::func_ov00_020823d4(s32 param_2) {}
+s32 MapManager::func_ov00_020823e4(s32 param_2) {}
+unk8 MapManager::MapData_vfunc_b4() {}
+unk8 MapManager::MapData_vfunc_9c() {}
+s32 MapManager::func_ov00_02082424() {}
+unk8 MapManager::func_ov00_02082454(unk32 param_2, unk32 param_3) {}
+unk8 MapManager::func_ov00_02082494(unk32 param_2) {}
+unk8 MapManager::func_ov00_020824cc(unk32 param_2) {}
+unk8 MapManager::func_ov00_02082504() {}
+unk8 * MapManager::func_ov00_02082538() {}
+void MapManager::func_ov00_02082594() {}
+void MapManager::func_ov00_020825ac() {}
+s32 MapManager::GetCourseFilePath(char *courseName, char *buf) {}
+unk8 MapManager::func_ov00_020825e4(unk32 param_2, unk32 param_3) {}
+unk8 MapManager::func_ov00_02082614(unk32 param_2, unk32 param_3) {}
+unk8 MapManager::MapData_vfunc_b0() {}
+void MapManager::func_ov00_02082650(s32 param_2, s32 param_3, unk32 param_4) {}
+void MapManager::func_ov00_02082660(s32 param_2, s32 param_3) {}
+void MapManager::func_ov00_02082670(unk32 param_2, s32 param_3) {}
+void MapManager::func_ov00_02082680(unk32 param_2, unk32 param_3) {}
+unk8 MapManager::func_ov00_020826a0(unk32 param_2, unk32 param_3, unk32 param_4) {}
+unk8 MapManager::CreateMap(unk32 mapType, unk32 param_3, unk32 param_4) {}
+unk8 MapManager::DestroyMap() {}
+unk8 MapManager::MapData_vfunc_44() {}
+unk8 MapManager::func_ov00_02082808() {}
+unk8 MapManager::MapData_vfunc_7c() {}
+unk8 MapManager::MapData_vfunc_84() {}
+bool MapManager::func_ov00_020828f8(s32 *param_2) {}
+unk8 MapManager::GetCourseData_Unk_b0() {}
+s32 MapManager::func_ov00_02082914(unk32 param_2) {}
+unk8 MapManager::func_ov00_02082acc() {}
+unk32 * MapManager::func_ov00_02082adc() {}
+unk8 MapManager::func_ov00_02082af4() {}
+bool MapManager::func_ov00_02082b3c(s32 param_2) {}
+unk8 MapManager::func_ov00_02082d08() {}
+unk8 MapManager::GetCourseData_Unk_1c() {}
+unk8 MapManager::GetCourseData_Unk_1d() {}
+unk8 MapManager::func_ov00_02082d40() {}
+u32 MapManager::func_ov00_02082d74(unk32 param_2) {}
+unk8 MapManager::func_ov00_02082d84() {}
+bool MapManager::func_ov00_02082e1c(s32 *param_2, s32 *param_3) {}
+unk8 MapManager::func_ov00_0208306c() {}
+void MapManager::func_ov00_0208315c(s32 *param_2, s32 *param_3) {}
+void MapManager::func_ov00_02083244(u32 param_2, s32 *param_3, s32 *param_4, s32 *param_5) {}
+void MapManager::func_ov00_02083298(u32 param_2, s32 *param_3, s32 *param_4, s32 *param_5) {}
+unk8 MapManager::GetCourseData_Unk_25c() {}
+bool MapManager::func_ov00_02083318(unk32 param_2) {}
+unk8 MapManager::func_ov00_02083328() {}
+unk8 MapManager::GetCourseData_Unk_86() {}
+unk8 MapManager::GetCourseData_Unk_87() {}
+unk8 MapManager::Get_MapData_Unk28() {}
+unk8 MapManager::Get_MapData_Unk2a() {}
+unk8 MapManager::func_ov00_02083374() {}
+unk8 MapManager::func_ov00_02083384() {}
+unk8 MapManager::GetCourseMinX() {}
+unk8 MapManager::GetCourseMinZ() {}
+unk8 MapManager::GetCourseMaxX() {}
+unk8 MapManager::GetCourseMaxZ() {}
+unk8 MapManager::func_ov00_020833c4() {}
+unk8 MapManager::func_ov00_020833d0() {}
+unk8 MapManager::func_ov00_020833dc() {}
+unk8 MapManager::func_ov00_020833e8() {}
+unk8 MapManager::Get_MapData_Unk_d0() {}
+unk8 MapManager::Get_MapData_Unk_d8() {}
+unk8 MapManager::GetMapData_Unk_dc(Vec3p *param_2) {}
+unk8 MapManager::GetMapData_Unk_e8(Vec3p *param_2) {}
+unk8 MapManager::GetMapData_Unk_d0(Vec3p *param_2) {}
+unk8 MapManager::func_ov00_0208346c(AABB *param_2) {}
+unk8 MapManager::func_ov00_020834bc(Vec3p *param_2, unk32 param_3, unk32 param_4) {}
+unk8 MapManager::func_ov00_02083524(Vec3p *param_2, unk32 param_3, unk32 param_4) {}
+void MapManager::func_ov00_02083560(unk32 param_1, MapManager *param_2, u32 param_3) {}
+unk8 MapManager::func_ov00_02083570(unk32 param_2, unk32 param_3) {}
+unk32 MapManager::func_ov00_02083588() {}
+unk32 MapManager::func_ov00_020835a4() {}
+unk32 MapManager::func_ov00_020835b4() {}
+unk8 MapManager::func_ov00_020835c4(unk32 param_2, unk32 param_3) {}
+bool MapManager::func_ov00_020835e4(s32 param_2, unk32 *param_3, unk32 *param_4) {}
+unk32 MapManager::func_ov00_020835f4(s32 param_2) {}
+void MapManager::func_ov00_02083604(s32 param_2) {}
+unk8 MapManager::func_ov00_02083614(s32 param_2) {}
+bool MapManager::GetEntrancePos(Vec3p *param_2, unk32 entranceId) {}
+bool MapManager::func_ov00_02083664(Vec3p *param_2, unk32 entranceId) {}
+s32 MapManager::func_ov00_020836bc(u32 param_2, unk32 *param_3) {}
+u32 MapManager::func_ov00_020836cc(u32 param_2, AABB *param_3, u32 param_4) {}
+unk8 MapManager::func_ov00_020836dc(unk32 param_2, unk32 param_3) {}
+bool MapManager::func_ov00_02083770(u32 param_2, unk32 param_3) {}
+bool MapManager::func_ov00_02083780(unk32 param_2) {}
+bool MapManager::func_ov00_02083790(unk32 param_2) {}
+unk8 MapManager::func_ov00_02083840(unk32 param_2) {}
+bool MapManager::func_ov00_020838c8(s32 param_2) {}
+bool MapManager::func_ov00_020838d8(s32 param_2) {}
+bool MapManager::func_ov00_020838e8(u32 param_2, unk32 *param_3) {}
+char MapManager::func_ov00_020838f8(unk32 *param_2) {}
+bool MapManager::func_ov00_02083908(char param_2, unk32 *param_3) {}
+void MapManager::func_ov00_02083918(s32 param_2, s32 *param_3) {}
+void MapManager::func_ov00_02083928(unk8 *param_2, s32 param_3) {}
+unk32 MapManager::func_ov00_02083938(s32 param_2) {}
+unk8 MapManager::Set_MapData_Unk_16(unk8 value, unk32 index) {}
+void MapManager::func_ov00_02083958(s32 param_2) {}
+void MapManager::func_ov00_02083968(u32 param_2, unk8 *param_3) {}
+bool MapManager::func_ov00_02083978(unk32 param_2, Vec3p *param_3) {}
+bool MapManager::func_ov00_020839b4(s32 param_2) {}
+bool MapManager::func_ov00_020839c4(s32 param_2) {}
+unk8 MapManager::func_ov00_020839d4() {}
+unk8 MapManager::func_ov00_020839f8() {}
+void MapManager::func_ov00_02083a1c(unk32 param_1, MapManager *param_2, Vec3p *param_3) {}
+unk8 MapManager::func_ov00_02083a54(unk32 param_1, MapManager *param_2, unk32 param_3, unk32 param_4, unk32 param_5) {}
+unk8 MapManager::func_ov00_02083b84() {}
+unk8 MapManager::func_ov00_02083bac() {}
+unk8 MapManager::func_ov00_02083bd4() {}
+unk8 MapManager::func_ov00_02083bfc() {}
+unk8 MapManager::func_ov00_02083c24(unk32 param_2) {}
+unk8 MapManager::func_ov00_02083c50(unk32 param_2) {}
+unk8 MapManager::func_ov00_02083c7c(Vec3p *param_2, unk32 param_3) {}
+unk8 MapManager::func_ov00_02083ce8(unk8 param_1, unk8 param_2, unk8 param_3, unk8 param_4, unk32 param_5) {}
+unk8 MapManager::func_ov00_02083e34(unk8 param_2, unk8 param_3, unk32 param_4) {}
+unk8 MapManager::MapData_vfunc_60() {}
+unk8 MapManager::func_ov00_02083e70() {}
+unk8 MapManager::MapData_vfunc_68() {}
+void MapManager::func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3) {}
+void MapManager::func_ov00_02083f44(Vec3p *param_2) {}
+unk8 MapManager::MapData_vfunc_6c() {}
+unk8 MapManager::MapData_vfunc_70() {}
+unk8 MapManager::func_ov00_02083fb0(unk32 param_1, MapManager *param_2, unk32 param_3) {}
+void MapManager::func_ov00_02084024(unk32 param_2, AABB *param_3) {}
+unk8 MapManager::MapData_vfunc_54() {}
+unk8 MapManager::func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4) {}
+unk8 MapManager::MapData_vfunc_78() {}
+unk8 MapManager::func_ov00_020840dc() {}
+unk8 MapManager::func_ov00_02084100(unk32 param_1, MapManager *param_2) {}
+unk8 MapManager::GetMapData_Unk_48() {}
+unk8 MapManager::GetMapData_Unk_4c() {}
+unk32 MapManager::func_ov00_0208412c() {}
+void MapManager::func_ov00_0208413c(unk32 param_2) {}
+unk8 MapManager::MapData_vfunc_58() {}
+unk8 MapManager::func_ov00_02084164() {}
+unk8 MapManager::GetMapData_Unk_0a() {}
+unk8 MapManager::GetMapData_Unk_0b() {}
+unk8 MapManager::MapData_vfunc_a4() {}
+unk8 MapManager::func_ov00_0208433c(Vec3p *param_2, unk32 param_3) {}
+unk8 MapManager::func_ov00_0208439c() {}
+void MapManager::func_ov00_020843ec(s32 *param_2) {}
+unk8 MapManager::GetMapData_Unk_38() {}
+unk8 MapManager::func_ov00_020846a4() {}
+unk8 MapManager::func_ov00_02084700() {}
+unk8 MapManager::func_ov00_02084740() {}
+unk8 MapManager::func_ov00_020847e0() {}
+unk8 MapManager::func_ov00_020847f0() {}
+bool MapManager::func_ov00_02084838() {}
+bool MapManager::func_ov00_020848b8() {}
+void MapManager::func_ov00_02084924(u32 param_2) {}
+unk8 MapManager::func_ov00_02084934() {}
+unk8 MapManager::GetMapData_Unk_06() {}
+unk8 MapManager::GetMapData_Unk_07() {}
+unk8 MapManager::func_ov00_0208499c() {}
+unk8 MapManager::func_ov00_020849c0() {}
+unk8 MapManager::func_ov00_020849dc() {}
+bool MapManager::func_ov00_020849f8(unk32 param_1) {}
+unk8 MapManager::func_ov00_02084a50() {}
+void MapManager::SpawnNPC(Vec3p *param_2, unk32 param_3, unk32 param_4) {}
+bool MapManager::func_ov00_02084ac4(u32 actorId) {}
+unk8 MapManager::SetNumKeys(unk32 keys) {}
+unk8 MapManager::GetNumKeys() {}
+unk8 MapManager::SetCourseData_Unk_25c(unk8 param_2) {}
+unk8 MapManager::GetCourseData_Unk_25d() {}
+unk8 MapManager::func_ov00_02084b38(unk32 param_2, unk32 param_3, unk32 param_4) {}
+bool MapManager::func_ov00_02084be0(unk32 param_2, unk32 param_3) {}
+void MapManager::func_ov00_02084c5c(unk32 param_2, unk32 param_3) {}
+bool MapManager::func_ov00_02084c6c(unk32 param_2) {}
+unk8 MapManager::func_ov00_02084c7c(unk32 param_2) {}
+unk8 MapManager::func_ov00_02084c94(unk32 param_2) {}
+unk8 MapManager::func_ov00_02084cb0(unk32 param_2) {}
+unk8 MapManager::func_ov00_02084cc8(unk32 param_2) {}
+unk8 MapManager::func_ov00_02084ce4(unk32 param_2) {}
+unk8 MapManager::func_ov00_02084cfc(unk32 param_2) {}
+unk8 MapManager::GetMapData_Unk_09() {}
+unk8 MapManager::func_ov00_02084d24(unk8 param_2, unk8 param_3, unk32 param_4) {}
+s32 MapManager::func_ov00_02084d4c(unk32 param_2, unk32 param_3, Vec3p *param_4) {}
+unk8 MapManager::func_ov00_02084ebc(unk32 param_2) {}
+s32 MapManager::func_ov00_02085108(s32 *param_2) {}
+unk8 MapManager::func_ov00_0208527c() {}
+unk8 MapManager::func_ov00_020853fc() {}
+unk8 MapManager::func_ov00_02085594() {}
+void MapManager::func_ov00_0208583c(unk32 param_1, Vec3p *param_2, unk32 param_3) {}
+unk8 MapManager::func_ov00_020858b0() {}
+s32 MapManager::func_ov00_02085a34(unk32 param_2, unk32 param_3) {}
+unk8 MapManager::func_ov00_02085c60(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5) {}
+unk8 MapManager::func_ov00_02086044(unk32 param_2, unk32 param_3, unk32 param_4) {}
+bool MapManager::func_ov00_02086284(s32 *param_2, Vec3p *param_3, Vec3p *param_4, s32 param_5, u16 param_6, Vec3p *param_7, Vec3p *param_8) {}
+bool MapManager::func_ov00_02086a84(s32 *param_2, Vec3p *param_3, Vec3p *param_4, s32 param_5, s32 param_6, unk32 param_7, Vec3p *param_8, Vec3p *param_9) {}
+
+#endif
diff --git a/src/00_Core/Player/TouchControl.cpp b/src/00_Core/Player/TouchControl.cpp
index 6eba289c..df8bbfe0 100644
--- a/src/00_Core/Player/TouchControl.cpp
+++ b/src/00_Core/Player/TouchControl.cpp
@@ -10,5 +10,6 @@ void TouchControl::Update(TouchState *state, u16 speed) {}
 bool TouchControl::func_ov00_0207aeac() {}
 void TouchControl::UpdateConditionally(TouchState *state, u16 speed) {}
 void TouchControl::func_ov00_0207af38(u16 speed, bool param2) {}
+TouchControl::~TouchControl() {}
 
 #endif