diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Map/MapBase.hpp | 6 | ||||
| -rw-r--r-- | include/Map/MapManager.hpp | 12 | ||||
| -rw-r--r-- | include/Player/PlayerBase.hpp | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp index 2ca7a8ef..1ed55f8f 100644 --- a/include/Map/MapBase.hpp +++ b/include/Map/MapBase.hpp @@ -201,9 +201,9 @@ public: unk8 func_ov00_0207f934(); unk8 func_ov00_0207f948(unk32 param_2); void AddTrigger(TriggerParams *param_2); - s32 GetTriggerBoundingBox(unk32 param_2, AABB *param_3); - unk8 GetTriggerBoundingBoxes(unk32 param_2, AABB *param_3, unk32 param_4); - unk32 GetOverlappingTrigger(Vec3p *param_2); + s32 GetTriggerBoundingBox(s32 param_2, AABB *param_3); + s32 GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4); + bool GetOverlappingTrigger(Vec3p *param_2); unk8 FindTrigger(unk32 type); unk8 GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity); bool IsTriggerTypeOverlapped(unk32 type, Vec3p *param_3); diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index cd3a3187..d95417c1 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -118,7 +118,7 @@ public: void func_ov00_0208346c(AABB *param_2); void func_ov00_020834bc(Vec3p *param_2, unk32 param_3, unk32 param_4); void func_ov00_02083524(Vec3p *param_2, unk32 param_3, unk32 param_4); - static void func_ov00_02083560(unk32 param_1, MapManager *param_2, u32 param_3); + static void func_ov00_02083560(Vec2b *param_1, MapManager *param_2, u32 param_3); u8 func_ov00_02083570(unk32 param_2, unk32 param_3); unk32 func_ov00_02083588(); unk32 func_ov00_020835a4(); @@ -130,11 +130,11 @@ public: unk8 func_ov00_02083614(s32 param_2); bool GetEntrancePos(Vec3p *param_2, unk32 entranceId); bool func_ov00_02083664(Vec3p *param_2, unk32 entranceId); - s32 func_ov00_020836bc(u32 param_2, unk32 *param_3); - s32 GetTriggerBoundingBoxes(u32 param_2, AABB *param_3, u32 param_4); - unk8 func_ov00_020836dc(unk32 param_2, unk32 param_3); - bool func_ov00_02083770(u32 param_2, unk32 param_3); - bool func_ov00_02083780(unk32 param_2); + s32 func_ov00_020836bc(s32 param_2, AABB *param_3); + s32 GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4); + bool func_ov00_020836dc(u32 param_2, u32 actorId); + bool IsTriggerTypeOverlapped(u32 param_2, Vec3p *param_3); + bool GetOverlappingTrigger(Vec3p *param_2); bool func_ov00_02083790(unk32 param_2); unk8 func_ov00_02083840(unk32 param_2); bool func_ov00_020838c8(s32 param_2); diff --git a/include/Player/PlayerBase.hpp b/include/Player/PlayerBase.hpp index 578f3e27..84a7040b 100644 --- a/include/Player/PlayerBase.hpp +++ b/include/Player/PlayerBase.hpp @@ -60,6 +60,6 @@ public: }; extern PlayerBase *gPlayer; -extern Vec3p gPlayerPos; +extern Vec3p *gPlayerPos; extern Vec3p gPlayerVel; extern s16 gPlayerAngle; |