diff options
| author | SammygoodTunes <56520787+SammygoodTunes@users.noreply.github.com> | 2025-09-21 14:21:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-21 14:21:31 +0200 |
| commit | 5b15874c4d2d7c185c98f2791cf8fa6a9d86a440 (patch) | |
| tree | 65907fc6750e076a3d354e577f2281eef0841b5a /include/Map/TriggerBase.hpp | |
| parent | cb52c8c23f5de5ba8509f9471025b4fa995e3b65 (diff) | |
Decomp `src/00_Core/Map/MapBase.cpp` (57%) (#129)
* Comments
* Lay out theoretical code
* Externalise func_020196bc & func_020196fc
* Pull merge
* Pull merge
* Decomp MapBase::func_ov00_02080edc
* Fix MapManager TilePos params
* Decomp progress
* Fix MapManager param issue
* Decomp progress
* Update MapManager var pointer type
* Fix function defs
* Update symbols
* Update
* Match MapBase_Unk2::func_ov00_02080ad0 (thx 2 dt mow & yanis)
* Update
* Decomp progress 26%
* Decomp progress 28%
* Fix struct overlap
* Fix unknown members
* Uncomment and fix rest of methods (most still non-matching)
* Decomp progress
* Corrections
Diffstat (limited to 'include/Map/TriggerBase.hpp')
| -rw-r--r-- | include/Map/TriggerBase.hpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/Map/TriggerBase.hpp b/include/Map/TriggerBase.hpp index 49311e1e..dd5a9961 100644 --- a/include/Map/TriggerBase.hpp +++ b/include/Map/TriggerBase.hpp @@ -23,10 +23,15 @@ struct TriggerParams { /* b */ }; -class TriggerBase : public SysObject { +class UnkStruct_TriggerBase : public SysObject { +public: + virtual unk32 vfunc_00(void *); +}; + +class TriggerBase : public UnkStruct_TriggerBase { public: /* 00 (vtable) */ - /* 04 */ unk8 mUnk_04; + /* 04 */ bool mUnk_04; /* 05 */ u8 mId; /* 06 */ unk8 mUnk_06[2]; /* 08 */ u32 mUnk_08; @@ -36,7 +41,7 @@ public: /* 00 */ virtual ~TriggerBase(); /* 08 */ virtual void vfunc_08(); - /* 0c */ virtual unk32 vfunc_0c(); + /* 0c */ virtual bool vfunc_0c(bool param_2); /* 10 */ virtual unk32 vfunc_10(); /* 14 */ virtual bool Overlaps(Vec3p *point); /* 18 */ virtual bool GetBoundingBox(AABB *bbox); |