Merge branch 'main' into actor

17 files changed, 1 insertions, 68 deletions

diff --git a/src/00_Core/Actor/ActorManager.cpp b/src/00_Core/Actor/ActorManager.cpp
index 613f5f42..472eede2 100644
--- a/src/00_Core/Actor/ActorManager.cpp
+++ b/src/00_Core/Actor/ActorManager.cpp
@@ -1,14 +1,12 @@
 #include "Actor/ActorManager.hpp"
 
-#ifdef STUBS
-
 void ActorManager::DeleteActor(u32 index, bool param2) {}
 void ActorManager::func_ov00_020c3484(ActorRef *ref, Actor *actor, unk32 param3) {}
 void ActorManager::Actor_vfunc_10(u32 param1) {}
 Actor* ActorManager::FindActorById(u32 id) {}
 Actor* ActorManager::GetActor(ActorRef *ref) {}
 bool FilterActor::Filter(Actor *actor) {}
-s32 ActorManager::FilterActors(ActorFilterBase *filter, ActorList *filteredActors) {}
+s32 ActorManager::FilterActors(FilterActorBase *filter, ActorList *filteredActors) {}
 void ActorManager::FindActorByType(ActorRef *ref, ActorManager *manager, ActorTypeId type) {}
 void ActorManager::FindNearestActorOfType(ActorRef *ref, ActorManager *manager, ActorTypeId type, Vec3p *pos) {}
 bool ActorManager::func_ov00_020c398c(u32 index) {}
@@ -20,4 +18,3 @@ void ActorManager::func_ov00_020c3ce8(unk32 param1, unk32 param2) {}
 void ActorManager::Actor_vfunc_28() {}
 bool ActorManager::ActorTypeIsOneOf(u32 type, ActorTypeId *types) {}
 
-#endif
diff --git a/src/00_Core/Item/Item.cpp b/src/00_Core/Item/Item.cpp
index 522dd51d..817d86db 100644
--- a/src/00_Core/Item/Item.cpp
+++ b/src/00_Core/Item/Item.cpp
@@ -1,8 +1,4 @@
 #include "Item/Item.hpp"
 
-#ifdef STUBS
-
 bool Item::func_ov00_020ad020(ItemId item) {}
 bool Item::func_ov00_020ad068(ItemId item) {}
-
-#endif
diff --git a/src/00_Core/Map/Course.cpp b/src/00_Core/Map/Course.cpp
index 560169e8..316b05ee 100644
--- a/src/00_Core/Map/Course.cpp
+++ b/src/00_Core/Map/Course.cpp
@@ -1,7 +1,5 @@
 #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) {}
@@ -51,5 +49,3 @@ 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
index 5a5ed636..1afc8c29 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) {}
@@ -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 61dd5564..6305418e 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) {}
@@ -200,5 +198,3 @@ unk8 MapManager::func_ov00_02085c60(unk32 param_2, unk32 param_3, unk32 param_4,
 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/LinkStateBase.cpp b/src/00_Core/Player/LinkStateBase.cpp
index 482a8371..abe7bd34 100644
--- a/src/00_Core/Player/LinkStateBase.cpp
+++ b/src/00_Core/Player/LinkStateBase.cpp
@@ -1,7 +1,5 @@
 #include "Player/LinkStateBase.hpp"
 
-#ifdef STUBS
-
 void LinkStateBase::vfunc_00() {}
 void LinkStateBase::OnStateEnter() {}
 void LinkStateBase::OnStateLeave(s32 param1) {}
@@ -85,5 +83,3 @@ unk32 LinkStateBase::Get_PlayerControlData_Unk120() {}
 s32 LinkStateBase::Get_PlayerLinkBase_Unk38() {}
 DebugHierarchy* LinkStateBase::GetDebugHierarchy0() {}
 DebugHierarchy* LinkStateBase::GetDebugHierarchy1() {}
-
-#endif
diff --git a/src/00_Core/Player/LinkStateDamage.cpp b/src/00_Core/Player/LinkStateDamage.cpp
index 84674461..c544b154 100644
--- a/src/00_Core/Player/LinkStateDamage.cpp
+++ b/src/00_Core/Player/LinkStateDamage.cpp
@@ -1,7 +1,5 @@
 #include "Player/LinkStateDamage.hpp"
 
-#ifdef STUBS
-
 void LinkStateDamage::vfunc_00() {}
 void LinkStateDamage::CreateDebugHierarchy() {}
 void LinkStateDamage::OnStateEnter() {}
@@ -16,5 +14,3 @@ bool LinkStateDamage::vfunc_24(s32 param1) {}
 bool LinkStateDamage::vfunc_20(s32 param1) {}
 void LinkStateDamage::func_ov00_020acfe8(bool param1) {}
 LinkStateId LinkStateDamage::GetId() {}
-
-#endif
diff --git a/src/00_Core/Player/LinkStateFollow.cpp b/src/00_Core/Player/LinkStateFollow.cpp
index 54e87938..69d173dd 100644
--- a/src/00_Core/Player/LinkStateFollow.cpp
+++ b/src/00_Core/Player/LinkStateFollow.cpp
@@ -1,7 +1,5 @@
 #include "Player/LinkStateFollow.hpp"
 
-#ifdef STUBS
-
 void LinkStateFollow::vfunc_00() {}
 LinkStateId LinkStateFollow::GetId() {}
 void LinkStateFollow::MoveTowardTarget() {}
@@ -12,5 +10,3 @@ LinkStateCutscene* LinkStateFollow::GetLinkStateCutscene() {}
 bool LinkStateFollow::vfunc_34(Vec3p *param1) {}
 bool LinkStateFollow::func_ov00_020a9180(Vec3p *param1) {}
 bool LinkStateFollow::func_ov00_020a9210(Vec3p *param1, Actor *param2) {}
-
-#endif
diff --git a/src/00_Core/Player/LinkStateInteract.cpp b/src/00_Core/Player/LinkStateInteract.cpp
index a3a7ddca..6cbda713 100644
--- a/src/00_Core/Player/LinkStateInteract.cpp
+++ b/src/00_Core/Player/LinkStateInteract.cpp
@@ -1,7 +1,5 @@
 #include "Player/LinkStateInteract.hpp"
 
-#ifdef STUBS
-
 void LinkStateInteract::vfunc_00() {}
 LinkStateId LinkStateInteract::GetId() {}
 void LinkStateInteract::CreateDebugHierarchy() {}
@@ -30,5 +28,3 @@ void LinkStateInteract::func_ov00_020abbdc(ActorRef *ref) {}
 void LinkStateInteract::func_ov00_020abc18(ActorRef *ref) {}
 bool LinkStateInteract::func_ov00_020abc40() {}
 bool LinkStateInteract::func_ov00_020abc78(ActorRef *ref) {}
-
-#endif
diff --git a/src/00_Core/Player/LinkStateItem.cpp b/src/00_Core/Player/LinkStateItem.cpp
index 1faf16ab..eaf3c8b6 100644
--- a/src/00_Core/Player/LinkStateItem.cpp
+++ b/src/00_Core/Player/LinkStateItem.cpp
@@ -1,7 +1,5 @@
 #include "Player/LinkStateItem.hpp"
 
-#ifdef STUBS
-
 void LinkStateItem::vfunc_00() {}
 LinkStateId LinkStateItem::GetId() {}
 s32 LinkStateItem::IsHammerEquipped() {}
@@ -10,5 +8,3 @@ EquipBombchu* LinkStateItem::GetEquipBombchu() {}
 LinkStateMove* LinkStateItem::GetLinkStateMove() {}
 bool LinkStateItem::func_ov00_020abf70() {}
 bool LinkStateItem::vfunc_28() {}
-
-#endif
diff --git a/src/00_Core/Player/LinkStateMove.cpp b/src/00_Core/Player/LinkStateMove.cpp
index 586a331e..918a92fe 100644
--- a/src/00_Core/Player/LinkStateMove.cpp
+++ b/src/00_Core/Player/LinkStateMove.cpp
@@ -1,7 +1,5 @@
 #include "Player/LinkStateMove.hpp"
 
-#ifdef STUBS
-
 void LinkStateMove::vfunc_00() {}
 LinkStateId LinkStateMove::GetId() {}
 void LinkStateMove::CreateDebugHierarchy() {}
@@ -10,5 +8,3 @@ void LinkStateMove::OnStateLeave(s32 param1) {}
 bool LinkStateMove::vfunc_24(s32 param1) {}
 bool LinkStateMove::func_ov00_020a8f2c() {}
 bool LinkStateMove::func_ov00_020a8f4c() {}
-
-#endif
diff --git a/src/00_Core/Player/LinkStateRoll.cpp b/src/00_Core/Player/LinkStateRoll.cpp
index d6a93463..91044e21 100644
--- a/src/00_Core/Player/LinkStateRoll.cpp
+++ b/src/00_Core/Player/LinkStateRoll.cpp
@@ -1,7 +1,5 @@
 #include "Player/LinkStateRoll.hpp"
 
-#ifdef STUBS
-
 void LinkStateRoll::vfunc_00() {}
 LinkStateId LinkStateRoll::GetId() {}
 void LinkStateRoll::CreateDebugHierarchy() {}
@@ -12,5 +10,3 @@ bool LinkStateRoll::vfunc_24(s32 param1) {}
 void LinkStateRoll::func_ov00_020aee58(s16 param1, u16 param2) {}
 void LinkStateRoll::func_ov00_020aee84() {}
 bool LinkStateRoll::func_ov00_020aeeac() {}
-
-#endif
diff --git a/src/00_Core/Player/PlayerBase.cpp b/src/00_Core/Player/PlayerBase.cpp
index dfdb4eb5..fc5c92fb 100644
--- a/src/00_Core/Player/PlayerBase.cpp
+++ b/src/00_Core/Player/PlayerBase.cpp
@@ -1,7 +1,5 @@
 #include "Player/PlayerLinkBase.hpp"
 
-#ifdef STUBS
-
 bool PlayerBase::vfunc_04() {}
 ItemFlag PlayerBase::GetEquipId() {}
 bool PlayerBase::CanMove() {}
@@ -20,5 +18,3 @@ void PlayerBase::AddHealth(s16 amount) {}
 bool PlayerBase::Teleport(Vec3p *pos, s16 angle, unk32 param3, bool param4, bool param5) {}
 bool PlayerBase::TeleportToEntrance(unk32 entranceId, bool param2) {}
 bool PlayerBase::TeleportToLastEntrance(bool param1) {}
-
-#endif
diff --git a/src/00_Core/Player/PlayerControl.cpp b/src/00_Core/Player/PlayerControl.cpp
index 48c52e7a..f51d0a89 100644
--- a/src/00_Core/Player/PlayerControl.cpp
+++ b/src/00_Core/Player/PlayerControl.cpp
@@ -1,7 +1,5 @@
 #include "Player/PlayerControl.hpp"
 
-#ifdef STUBS
-
 bool PlayerControl::func_ov00_020aeeac() {}
 void PlayerControl::func_ov00_020aeef8() {}
 void PlayerControl::func_ov00_020aef30() {}
@@ -52,5 +50,3 @@ bool PlayerControl::IsNotTouching() {}
 bool PlayerControl::IsTouchingFast() {}
 bool PlayerControl::IsTappedNow() {}
 bool PlayerControl::func_ov00_020b13c4() {}
-
-#endif
diff --git a/src/00_Core/Player/TouchControl.cpp b/src/00_Core/Player/TouchControl.cpp
index df8bbfe0..5cae75a5 100644
--- a/src/00_Core/Player/TouchControl.cpp
+++ b/src/00_Core/Player/TouchControl.cpp
@@ -1,7 +1,5 @@
 #include "Player/TouchControl.hpp"
 
-#ifdef STUBS
-
 TouchControl::TouchControl() {}
 void TouchControl::IncreaseSpeed(s16 increase) {}
 void TouchControl::UpdateFlags(u16 speed) {}
@@ -11,5 +9,3 @@ bool TouchControl::func_ov00_0207aeac() {}
 void TouchControl::UpdateConditionally(TouchState *state, u16 speed) {}
 void TouchControl::func_ov00_0207af38(u16 speed, bool param2) {}
 TouchControl::~TouchControl() {}
-
-#endif
diff --git a/src/00_Core/Player/TouchGesture.cpp b/src/00_Core/Player/TouchGesture.cpp
index 83879415..027e3e0a 100644
--- a/src/00_Core/Player/TouchGesture.cpp
+++ b/src/00_Core/Player/TouchGesture.cpp
@@ -1,7 +1,5 @@
 #include "Player/TouchGesture.hpp"
 
-#ifdef STUBS
-
 TouchGesture::TouchGesture() {}
 void TouchGesture::ResetTouchHistory() {}
 void TouchGesture::Update(void *param1) {}
@@ -9,5 +7,3 @@ TouchGesture::~TouchGesture() {}
 
 void TouchGestureBase::ResetTouchHistory() {}
 TouchGestureBase::~TouchGestureBase() {}
-
-#endif STUBS
diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp
index dd05dff6..14f377c1 100644
--- a/src/00_Core/Save/AdventureFlags.cpp
+++ b/src/00_Core/Save/AdventureFlags.cpp
@@ -1,7 +1,5 @@
 #include "Save/AdventureFlags.hpp"
 
-#ifdef STUBS
-
 bool AdventureFlags::Exists() {}
 void AdventureFlags::CopyTo(unk32 *flags) {}
 void AdventureFlags::func_ov00_02097674() {}
@@ -50,5 +48,3 @@ bool AdventureFlags::func_ov00_0209809c() {}
 bool AdventureFlags::func_ov00_020980ac() {}
 void AdventureFlags::func_ov00_020980bc(s32 param1) {}
 void AdventureFlags::func_ov00_020980d0() {}
-
-#endif