Merge branch 'main' into match_actor_rupee

3 files changed, 14 insertions, 24 deletions

diff --git a/src/00_Core/Map/Course.cpp b/src/00_Core/Map/Course.cpp
index 560169e8..4771048d 100644
--- a/src/00_Core/Map/Course.cpp
+++ b/src/00_Core/Map/Course.cpp
@@ -1,15 +1,13 @@
 #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) {}
+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) {}
+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) {}
@@ -49,7 +47,5 @@ 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
+MapData *Course::FindMapData(u32 map) {}
+MapData *Course::FindCurrentMapData() {}
diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp
index 5a5ed636..8d6d3c96 100644
--- a/src/00_Core/Map/MapBase.cpp
+++ b/src/00_Core/Map/MapBase.cpp
@@ -1,8 +1,6 @@
 #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) {}
@@ -31,7 +29,7 @@ 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) {}
+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) {}
@@ -76,7 +74,7 @@ unk8 MapBase::GetTriggerBoundingBoxes(unk32 param_2, AABB *param_3, unk32 param_
 unk32 MapBase::GetOverlappingTrigger(Vec3p *param_2) {}
 bool TriggerBase::Overlaps() {}
 unk8 MapBase::FindTrigger(unk32 type) {}
-unk8 MapBase::GetOverlappingTriggers(Vec3p *param_2, TriggerBase * *triggers, unk32 capacity) {}
+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() {}
@@ -101,7 +99,7 @@ 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) {}
+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() {}
@@ -112,5 +110,3 @@ 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
index 409dc9bd..3dc72153 100644
--- a/src/00_Core/Map/MapManager.cpp
+++ b/src/00_Core/Map/MapManager.cpp
@@ -1,7 +1,5 @@
 #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) {}
@@ -19,7 +17,7 @@ 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() {}
+unk8 *MapManager::func_ov00_02082538() {}
 void MapManager::func_ov00_02082594() {}
 void MapManager::func_ov00_020825ac() {}
 s32 MapManager::GetCourseFilePath(char *courseName, char *buf) {}
@@ -41,7 +39,7 @@ 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() {}
+unk32 *MapManager::func_ov00_02082adc() {}
 unk8 MapManager::func_ov00_02082af4() {}
 bool MapManager::func_ov00_02082b3c(s32 param_2) {}
 unk8 MapManager::func_ov00_02082d08() {}
@@ -129,7 +127,7 @@ 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) {}
+s32 MapManager::func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3, unk32 param_4) {}
 void MapManager::func_ov00_02083f44(Vec3p *param_2) {}
 unk8 MapManager::MapData_vfunc_6c() {}
 unk8 MapManager::MapData_vfunc_70() {}
@@ -198,7 +196,7 @@ 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
+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) {}