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/MapManager.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/MapManager.hpp')
| -rw-r--r-- | include/Map/MapManager.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 37b6ce13..10b8d532 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -165,15 +165,15 @@ public: void func_ov00_02082650(s32 param_2, s32 param_3, unk32 param_4); void func_ov00_02082660(s32 param_2, s32 param_3); void func_ov00_02082670(unk32 param_2, s32 param_3); - void func_ov00_02082680(unk32 param_2, unk32 param_3); - void func_ov00_020826a0(unk32 param_2, unk32 param_3); + void func_ov00_02082680(TilePos *param_2, unk32 param_3); + void func_ov00_020826a0(TilePos *param_2, unk32 param_3); void CreateMap(unk32 mapType, unk32 param_3, unk32 param_4); void DestroyMap(); void MapData_vfunc_44(); void func_ov00_02082808(bool param_2); s32 MapData_vfunc_7c(s32 param_1, unk32 *param_2, s32 param_3, short param_4[4]); - void MapData_vfunc_84(unk32 param_2); - bool func_ov00_020828f8(s32 *param_2); + void MapData_vfunc_84(UnkStruct_0207f38c *param_2); + bool func_ov00_020828f8(UnkStruct_0207f38c *param_2); u8 GetNumMaps(); s32 func_ov00_02082914(unk32 param_2); void func_ov00_02082acc(); @@ -235,8 +235,8 @@ public: unk8 GetOverlappingTrigger(Vec3p *param_2); bool func_ov00_02083790(s32 param_2); bool func_ov00_02083840(s32 param_2); - bool AddTrigger(s32 param_2); - bool func_ov00_020838d8(s32 param_2); + bool AddTrigger(TriggerBase *param_2); + bool func_ov00_020838d8(TriggerBase *param_2); bool FindExit(u32 param_2, Exit *param_3); char func_ov00_020838f8(Exit *param_2); bool func_ov00_02083908(char param_2, CameraViewpoint *param_3); @@ -247,8 +247,8 @@ public: void func_ov00_02083958(s32 param_2); void func_ov00_02083968(u32 param_2, unk8 *param_3); bool func_ov00_02083978(Vec3p *param_2, Vec3p *param_3); - bool func_ov00_020839b4(s32 param_2); - bool func_ov00_020839c4(s32 param_2); + bool func_ov00_020839b4(TriggerBase *param_2); + bool func_ov00_020839c4(TriggerBase *param_2); s32 func_ov00_020839d4(s32 param_2); s32 func_ov00_020839f8(s32 param_2); TilePos func_ov00_02083a1c(Vec3p *param_3); @@ -278,8 +278,8 @@ public: static unk8 func_ov00_02084100(unk32 *param_1, MapManager *param_2); unk32 GetMapData_Unk_48(); unk32 GetMapData_Unk_4c(); - unk32 func_ov00_0208412c(); - void func_ov00_0208413c(unk32 param_2); + unk32 *func_ov00_0208412c(); + void func_ov00_0208413c(unk32 *param_2); unk8 MapData_vfunc_58(TilePos *param_1, int param_2); s32 func_ov00_02084164(TilePos *param_2); u8 GetMapData_Unk_0a(); |