From 4c799ec3f32e5bd06463f88fa036d8208d6bcb02 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Thu, 6 Feb 2025 14:00:27 +0100 Subject: Decomp progress 29% --- include/Map/Entrance.hpp | 2 +- include/Map/MapManager.hpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include/Map') diff --git a/include/Map/Entrance.hpp b/include/Map/Entrance.hpp index 1e09d022..1ff69575 100644 --- a/include/Map/Entrance.hpp +++ b/include/Map/Entrance.hpp @@ -11,7 +11,7 @@ class Entrance : public SysObject { public: /* 00 */ Vec3p mPos; /* 0c */ unk16 mAngle; - /* 0e */ s8 mId; + /* 0e */ u8 mId; /* 0f */ unk8 mUnk_0f; /* 10 */ s32 mUnk_10; /* 14 */ diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 8916d41f..12f873d1 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -176,9 +176,9 @@ public: void func_ov00_02083f44(Vec3p *param_2); unk8 MapData_vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4); unk8 MapData_vfunc_70(Vec3p *param_2); - static unk8 func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3); + static void func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3); void GetTileWorldBounds(Vec2b *tile, AABB *tileBounds); - unk32 MapData_vfunc_54(); + unk32 MapData_vfunc_54(unk8 *a); unk8 func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4); unk32 MapData_vfunc_78(bool *param_1); unk8 func_ov00_020840dc(); @@ -196,8 +196,8 @@ public: unk8 func_ov00_0208439c(Vec2s *param_2, Vec3p *param_3); void func_ov00_020843ec(s32 *param_2); unk32 GetMapData_Unk_38(); - unk8 func_ov00_020846a4(); - static unk8 func_ov00_02084700(s32 *param_1); + s32 func_ov00_020846a4(); + static s32 func_ov00_02084700(MapManager *pMapManager); unk8 func_ov00_02084740(); unk32 func_ov00_020847e0(); unk8 func_ov00_020847f0(); -- cgit v1.2.3