Merge PR updates

6 files changed, 83 insertions, 9 deletions

diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp
index d7cac5ad..ba2b3c58 100644
--- a/src/00_Core/Map/MapBase.cpp
+++ b/src/00_Core/Map/MapBase.cpp
@@ -68,11 +68,11 @@ 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(s32 param_2, AABB *param_3) {}
-bool TriggerBase::GetBoundingBox() {}
-s32 MapBase::GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4) {}
-bool MapBase::GetOverlappingTrigger(Vec3p *param_2) {}
-bool TriggerBase::Overlaps() {}
+s32 MapBase::GetTriggerBoundingBox(unk32 param_2, AABB *param_3) {}
+bool TriggerBase::GetBoundingBox(AABB *bbox) {}
+unk8 MapBase::GetTriggerBoundingBoxes(unk32 param_2, AABB *param_3, unk32 param_4) {}
+unk32 MapBase::GetOverlappingTrigger(Vec3p *param_2) {}
+bool TriggerBase::Overlaps(Vec3p *point) {}
 unk8 MapBase::FindTrigger(unk32 type) {}
 unk8 MapBase::GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity) {}
 bool MapBase::IsTriggerTypeOverlapped(unk32 type, Vec3p *param_3) {}
diff --git a/src/00_Core/Map/MapData.cpp b/src/00_Core/Map/MapData.cpp
new file mode 100644
index 00000000..12e485e0
--- /dev/null
+++ b/src/00_Core/Map/MapData.cpp
@@ -0,0 +1,16 @@
+#include "Map/MapData.hpp"
+
+MapData::MapData(u8 *map, unk8 x, unk8 y, unk32 param4, unk32 param5) {}
+MapData::~MapData() {}
+void MapData::func_ov000_020972e4(u16 *param1, unk32 *param2, bool param3) {}
+void MapData::func_ov000_02097354() {}
+void MapData::SetFlag0(u32 index, bool value) {}
+bool MapData::GetFlag0(u32 index) {}
+void MapData::SetFlag1(u32 index, bool value) {}
+bool MapData::GetFlag1(u32 index) {}
+void MapData::SetFlag2(u32 index, bool value) {}
+bool MapData::GetFlag2(u32 index) {}
+void MapData::SetFlag3(u32 index, bool value) {}
+bool MapData::GetFlag3(u32 index) {}
+void MapData::SetFlag4(u32 index, bool value) {}
+bool MapData::GetFlag4(u32 index) {}
diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp
index c1f70e90..19df9b36 100644
--- a/src/00_Core/Map/MapManager.cpp
+++ b/src/00_Core/Map/MapManager.cpp
@@ -1294,17 +1294,17 @@ unk8 MapManager::func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *pa
     *param_1 = 0;
 }
 
-void MapManager::func_ov00_02084024(Vec2b *param_2, AABB *param_3) {
+void MapManager::GetTileWorldBounds(Vec2b *tile, AABB *tileBounds) {
     int iVar1;
     Vec3p local_20;
 
-    this->mMap->GetTileBounds(param_2, param_3);
+    this->mMap->GetTileBounds(tile, tileBounds);
     iVar1      = this->GetMapCenterZ();
     local_20.x = this->GetMapCenterX();
     local_20.y = 0;
     local_20.z = iVar1;
-    Vec3p_Add(&param_3->min, &local_20, &param_3->min);
-    Vec3p_Add(&param_3->max, &local_20, &param_3->max);
+    Vec3p_Add(&tileBounds->min, &local_20, &tileBounds->min);
+    Vec3p_Add(&tileBounds->max, &local_20, &tileBounds->max);
 }
 
 unk32 MapManager::MapData_vfunc_54(unk8 *param_1) { // what type is this param?
diff --git a/src/00_Core/Map/Trigger.cpp b/src/00_Core/Map/Trigger.cpp
new file mode 100644
index 00000000..7e1bb785
--- /dev/null
+++ b/src/00_Core/Map/Trigger.cpp
@@ -0,0 +1,40 @@
+#include "Map/TriggerAABB.hpp"
+#include "Map/TriggerAABB_Unk1.hpp"
+#include "Map/TriggerAABB_Unk2.hpp"
+#include "Map/TriggerBase.hpp"
+#include "Map/TriggerSphere.hpp"
+
+TriggerBase::TriggerBase(TriggerParams *params) {}
+TriggerBase::TriggerBase(u8 id, u32 param2, u32 param3, u32 param4) {}
+TriggerBase::~TriggerBase() {}
+
+TriggerAABB::TriggerAABB(TriggerParams *params) :
+    TriggerBase(params) {}
+TriggerAABB::TriggerAABB(u8 id, u32 param2, u32 param3, u32 param4) :
+    TriggerBase(id, param2, param3, param4) {}
+TriggerAABB::~TriggerAABB() {}
+
+TriggerSphere::TriggerSphere(TriggerParams *params) :
+    TriggerBase(params) {}
+TriggerSphere::TriggerSphere(u8 id, u32 param2, u32 param3, u32 param4) :
+    TriggerBase(id, param2, param3, param4) {}
+TriggerSphere::~TriggerSphere() {}
+bool TriggerSphere::GetBoundingBox(AABB *bbox) {}
+
+TriggerAABB_Unk2::TriggerAABB_Unk2(TriggerParams *params) :
+    TriggerAABB(params) {}
+TriggerAABB_Unk2_Unk1::TriggerAABB_Unk2_Unk1() {}
+TriggerAABB_Unk2::~TriggerAABB_Unk2() {}
+void TriggerAABB_Unk2::vfunc_08() {}
+unk32 TriggerAABB_Unk2::vfunc_0c() {}
+unk32 TriggerAABB_Unk2::vfunc_10() {}
+
+TriggerAABB_Unk1::TriggerAABB_Unk1(TriggerParams *params) :
+    TriggerAABB(params) {}
+TriggerAABB_Unk1::~TriggerAABB_Unk1() {}
+void TriggerAABB_Unk1::vfunc_08() {}
+
+bool TriggerSphere::Overlaps(Vec3p *point) {}
+
+bool TriggerAABB::Overlaps(Vec3p *point) {}
+bool TriggerAABB::GetBoundingBox(AABB *bbox) {}
diff --git a/src/00_Core/Map/TriggerAABB_Unk2_Unk1_1.cpp b/src/00_Core/Map/TriggerAABB_Unk2_Unk1_1.cpp
new file mode 100644
index 00000000..6a44f466
--- /dev/null
+++ b/src/00_Core/Map/TriggerAABB_Unk2_Unk1_1.cpp
@@ -0,0 +1,6 @@
+#include "Map/TriggerAABB_Unk2.hpp"
+
+bool TriggerAABB_Unk2_Unk1::ContainsInXZ(Vec3p *pos) {}
+bool TriggerAABB_Unk2_Unk1::Contains(Vec3p *pos) {}
+bool TriggerAABB_Unk2_Unk1::IntersectsCube(Cube *cube) {}
+void TriggerAABB_Unk2_Unk1::vfunc_54(Cube *param1, Vec3p *param2, u32 *param3) {}
diff --git a/src/00_Core/Map/TriggerAABB_Unk2_Unk1_2.cpp b/src/00_Core/Map/TriggerAABB_Unk2_Unk1_2.cpp
new file mode 100644
index 00000000..0879387b
--- /dev/null
+++ b/src/00_Core/Map/TriggerAABB_Unk2_Unk1_2.cpp
@@ -0,0 +1,12 @@
+#include "Map/TriggerAABB_Unk2.hpp"
+
+unk32 TriggerAABB_Unk2_Unk1::vfunc_08() {}
+void TriggerAABB_Unk2_Unk1::SetBoundingBox(AABB *param1) {}
+void TriggerAABB_Unk2_Unk1::GetBoundingBox(AABB *bbox) {}
+void TriggerAABB_Unk2_Unk1::SetPosition(Vec3p *pos) {}
+void TriggerAABB_Unk2_Unk1::vfunc_34() {}
+void TriggerAABB_Unk2_Unk1::vfunc_38() {}
+void TriggerAABB_Unk2_Unk1::GetPosition(Vec3p *pos) {}
+q20 TriggerAABB_Unk2_Unk1::GetSizeXZ() {}
+q20 TriggerAABB_Unk2_Unk1::GetHeight() {}
+TriggerAABB_Unk2_Unk1::~TriggerAABB_Unk2_Unk1() {}