summaryrefslogtreecommitdiff
path: root/src/00_Core/Map/MapBase.cpp
diff options
context:
space:
mode:
authorAetias <aetias@outlook.com>2025-02-04 21:30:00 +0100
committerAetias <aetias@outlook.com>2025-02-04 21:30:00 +0100
commitc380ac51a48d17348b1cdcbb615ce22be22f409e (patch)
tree6713ed5a1cd172f665e52ea0f995fc905ca3db2d /src/00_Core/Map/MapBase.cpp
parent8cda3ca2d7f5fe424cc1a649baec2ff992368e62 (diff)
parent3f7197110627adbbe7ff1f69db1f5a15f9b6c598 (diff)
Merge remote-tracking branch 'zeldaret/main' into decomp-PlayerControl
Diffstat (limited to 'src/00_Core/Map/MapBase.cpp')
-rw-r--r--src/00_Core/Map/MapBase.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp
index 8d6d3c96..46f4e40b 100644
--- a/src/00_Core/Map/MapBase.cpp
+++ b/src/00_Core/Map/MapBase.cpp
@@ -69,10 +69,10 @@ 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() {}
+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() {}
+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) {}