diff options
| author | SammygoodTunes <sygamerz@gmail.com> | 2025-06-28 23:19:29 +0200 |
|---|---|---|
| committer | SammygoodTunes <sygamerz@gmail.com> | 2025-06-28 23:19:29 +0200 |
| commit | f446227797e5bc5e338d51e2e23a026360f484a5 (patch) | |
| tree | cb60b851e939c75092ee75f1759983e78af366d7 /include | |
| parent | d733ef8b005cc5d8e865c58543d9bb473d08b7e8 (diff) | |
Decomp progress 46%
Diffstat (limited to 'include')
| -rw-r--r-- | include/DTCM/UnkStruct_027e0d38.hpp | 4 | ||||
| -rw-r--r-- | include/Map/MapBase.hpp | 2 | ||||
| -rw-r--r-- | include/Map/MapManager.hpp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/DTCM/UnkStruct_027e0d38.hpp b/include/DTCM/UnkStruct_027e0d38.hpp index b2e50a89..5bb21575 100644 --- a/include/DTCM/UnkStruct_027e0d38.hpp +++ b/include/DTCM/UnkStruct_027e0d38.hpp @@ -6,7 +6,9 @@ struct UnkStruct_027e0d38_Unk28 { /* 00 */ unk8 mUnk_00[0x34]; /* 34 */ bool mUnk_34; - /* 35 */ + /* 35 */ unk8 mUnk_35[0x27]; + /* 5c */ Vec3p mUnk_5c; + /* 68 */ }; struct UnkStruct_027e0d38 { diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp index 4c8fb1b4..f9768a81 100644 --- a/include/Map/MapBase.hpp +++ b/include/Map/MapBase.hpp @@ -204,7 +204,7 @@ public: 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); + TriggerBase *FindTrigger(unk32 type); unk8 GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity); bool IsTriggerTypeOverlapped(unk32 type, Vec3p *param_3); bool AnyTrigger_func_0c(unk32 type); diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 74526c0a..4ef12645 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -197,10 +197,10 @@ public: void func_ov00_020843ec(s32 *param_2); unk32 GetMapData_Unk_38(); s32 func_ov00_020846a4(); - static s32 func_ov00_02084700(MapManager *pMapManager); + s32 func_ov00_02084700(); unk32 func_ov00_02084740(); unk32 func_ov00_020847e0(); - unk8 func_ov00_020847f0(); + unk32 func_ov00_020847f0(unk32 type); bool func_ov00_02084838(); bool func_ov00_020848b8(); void func_ov00_02084924(u32 param_2); |