From 9e69f5de93e8805bccf69307eb08c8fab8519e8c Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Sun, 6 Apr 2025 18:22:42 +0200 Subject: Fix type mismatch in MapOverworld --- include/Map/MapOverworld.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/Map') diff --git a/include/Map/MapOverworld.hpp b/include/Map/MapOverworld.hpp index 482b3ad1..4ce6d91a 100644 --- a/include/Map/MapOverworld.hpp +++ b/include/Map/MapOverworld.hpp @@ -46,7 +46,7 @@ public: /* 1c */ virtual void vfunc_1c(bool param_2) override; /* 20 */ virtual void vfunc_20(s32 param_2) override; /* 2c */ virtual void vfunc_2c() override; - /* 4c */ virtual void vfunc_4c() override; + /* 4c */ virtual s32 vfunc_4c() override; /* 54 */ virtual unk32 vfunc_54() override; /* 58 */ virtual unk32 vfunc_58() override; /* 5c */ virtual unk32 vfunc_5c() override; @@ -58,7 +58,7 @@ public: /* 94 */ virtual void vfunc_94() override; /* 98 */ virtual void vfunc_98() override; /* a4 */ virtual unk32 vfunc_a4() override; - /* b0 */ virtual unk8 vfunc_b0(unk32 param_2, unk32 param_3) override; + /* b0 */ virtual void vfunc_b0(unk32 param_2, unk32 param_3) override; /* bc */ virtual void vfunc_bc() override; /* c0 */ virtual void vfunc_c0() override; /* c4 */ -- cgit v1.2.3 From d5a2e0f57e469d780eb0e2ab1183aa40f93cf23c Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Sun, 6 Apr 2025 22:32:49 +0200 Subject: Decomp progress 30% Change gPlayerPos from Vec3p* to Vec3p (thx lago) --- include/Map/MapBase.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/Map') diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp index a99658ac..ecf92c08 100644 --- a/include/Map/MapBase.hpp +++ b/include/Map/MapBase.hpp @@ -112,7 +112,7 @@ public: /* 188 */ unk8 mUnk_188[0x14]; /* 19c */ unk32 mUnk_19c; /* 1a0 */ Vec3p mUnk_1a0; - /* 1ac */ unk32 mUnk_1ac; + /* 1ac */ s16 mUnk_1ac; /* 1b0 */ /* 00 */ virtual ~MapBase(); -- cgit v1.2.3 From 96e2380df560dd3d9898f41f6caaa08e5eeaa56e Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Mon, 7 Apr 2025 21:06:29 +0200 Subject: Decomp progress 33% --- include/Map/MapBase.hpp | 2 +- include/Map/MapManager.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include/Map') diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp index ecf92c08..1750cc6b 100644 --- a/include/Map/MapBase.hpp +++ b/include/Map/MapBase.hpp @@ -135,7 +135,7 @@ public: /* 48 */ virtual void vfunc_48(); /* 4c */ virtual s32 vfunc_4c() = 0; /* 50 */ virtual unk32 vfunc_50(); - /* 54 */ virtual unk32 vfunc_54(unk8 *param_1); + /* 54 */ virtual unk32 vfunc_54(Vec2b *param_1); /* 58 */ virtual unk32 vfunc_58(Vec2b *param_1, int param_2); /* 5c */ virtual unk32 vfunc_5c(); /* 60 */ virtual unk32 vfunc_60(u8 *param_1); diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index d82694db..39e15b88 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -178,7 +178,7 @@ public: unk32 MapData_vfunc_70(Vec3p *param_2); static void func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3); void GetTileWorldBounds(Vec2b *tile, AABB *tileBounds); - unk32 MapData_vfunc_54(unk8 *a); + unk32 MapData_vfunc_54(Vec2b *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(); -- cgit v1.2.3 From 2c6ffc5abc822a1333438ea4e22e0b640bd421c1 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Mon, 7 Apr 2025 23:01:16 +0200 Subject: Add rodata --- include/Map/MapManager.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/Map') diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 39e15b88..f40e4eed 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -188,7 +188,7 @@ public: unk32 func_ov00_0208412c(); void func_ov00_0208413c(unk32 param_2); unk8 MapData_vfunc_58(Vec2b *param_1, int param_2); - unk8 func_ov00_02084164(Vec2b *param_2); + s32 func_ov00_02084164(Vec2b *param_2); u8 GetMapData_Unk_0a(); u8 GetMapData_Unk_0b(); unk8 MapData_vfunc_a4(unk8 *param_1); -- cgit v1.2.3 From a76a91ad1374913127446307f48028be1fcd4deb Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Sat, 12 Apr 2025 17:36:12 +0200 Subject: Decomp progress 35% --- include/Map/Course.hpp | 2 +- include/Map/Entrance.hpp | 2 +- include/Map/MapManager.hpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'include/Map') diff --git a/include/Map/Course.hpp b/include/Map/Course.hpp index 38ca1a87..b01ff5ea 100644 --- a/include/Map/Course.hpp +++ b/include/Map/Course.hpp @@ -78,7 +78,7 @@ public: void GetMRCFilePath(unk32 param_2, unk32 buf, unk32 param_4); void func_ov00_0207ce20(unk32 param_2, unk32 param_3, char *param_4, unk32 param_5); void func_ov00_0207ce4c(s32 param_2, s32 param_3, unk32 param_4, char *param_5, unk32 param_6); - bool func_ov00_0207d404(s32 param_2, unk32 param_3, unk32 param_4); + bool func_ov00_0207d404(s32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); bool IsCurrentMapInMainGrid(); bool IsInMainGrid(s32 x, s32 y); bool IsMapInMainGrid(u32 map); diff --git a/include/Map/Entrance.hpp b/include/Map/Entrance.hpp index 1ff69575..d8d1b751 100644 --- a/include/Map/Entrance.hpp +++ b/include/Map/Entrance.hpp @@ -12,7 +12,7 @@ public: /* 00 */ Vec3p mPos; /* 0c */ unk16 mAngle; /* 0e */ u8 mId; - /* 0f */ unk8 mUnk_0f; + /* 0f */ // unk8 mUnk_0f; /* 10 */ s32 mUnk_10; /* 14 */ }; diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index f40e4eed..1d9c9dd4 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -73,7 +73,7 @@ public: 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, unk32 param_4); + void func_ov00_020826a0(unk32 param_2, unk32 param_3); void CreateMap(unk32 mapType, unk32 param_3, unk32 param_4); void DestroyMap(); void MapData_vfunc_44(); @@ -128,7 +128,7 @@ public: unk32 func_ov00_02083588(); unk32 func_ov00_020835a4(); unk32 func_ov00_020835b4(); - unk8 func_ov00_020835c4(MapManager *param_1, s32 param_2, unk32 param_3); + bool func_ov00_020835c4(s32 param_2, unk32 param_3); bool func_ov00_020835e4(s32 param_2, unk32 *param_3, unk8 *param_4); unk32 func_ov00_020835f4(s32 param_2); void func_ov00_02083604(s32 param_2); @@ -204,7 +204,7 @@ public: bool func_ov00_02084838(); bool func_ov00_020848b8(); void func_ov00_02084924(u32 param_2); - bool func_ov00_02084934(s32 *param_2); + bool func_ov00_02084934(Vec3p *param_2); u8 GetMapData_Unk_06(); u8 GetMapData_Unk_07(); bool func_ov00_0208499c(); @@ -229,7 +229,7 @@ public: void func_ov00_02084ce4(unk32 param_2); bool func_ov00_02084cfc(unk32 param_2); u8 GetMapData_Unk_09(); - unk8 func_ov00_02084d24(unk8 param_2, unk8 param_3, unk32 param_4); + void func_ov00_02084d24(unk32 param_2, unk32 param_3, unk32 param_4); s32 func_ov00_02084d4c(unk32 param_2, unk32 param_3, Vec3p *param_4); unk32 func_ov00_02084ebc(Vec3p *param_2); s32 func_ov00_02085108(s32 *param_2); -- cgit v1.2.3 From 71ef8b58aad0315d839c3b2a4e996028d90952e6 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Mon, 21 Apr 2025 23:07:04 +0200 Subject: Decomp progress 36% --- include/Map/MapBase.hpp | 6 +++--- include/Map/MapManager.hpp | 8 ++++---- include/Map/MapOverworld.hpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'include/Map') diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp index 1750cc6b..06efee36 100644 --- a/include/Map/MapBase.hpp +++ b/include/Map/MapBase.hpp @@ -143,14 +143,14 @@ public: /* 68 */ virtual unk8 vfunc_68(Vec3p *param_1, bool param_2); /* 6c */ virtual unk8 vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4); /* 70 */ virtual unk32 vfunc_70(Vec3p *param_2); - /* 74 */ virtual s32 vfunc_74(Vec3p *param_2); - /* 78 */ virtual unk32 vfunc_78(bool *param_1); + /* 74 */ virtual s32 *vfunc_74(Vec3p *param_2); + /* 78 */ virtual unk32 *vfunc_78(Vec2b *param_1); /* 7c */ virtual s32 vfunc_7c(s32 param_1, unk32 *param_2, s32 param_3, short param_4[4]); /* 80 */ virtual unk32 vfunc_80(); /* 84 */ virtual void vfunc_84(unk32 param_2); /* 88 */ virtual unk32 vfunc_88(); /* 8c */ virtual unk32 vfunc_8c(); - /* 90 */ virtual unk8 vfunc_90(unk32 param_2, unk32 param_3, unk32 param_4); + /* 90 */ virtual unk8 vfunc_90(Vec2b *param_2, unk32 param_3); /* 94 */ virtual void vfunc_94(); /* 98 */ virtual void vfunc_98(unk32 param_2, unk32 param_3, unk32 param_4); /* 9c */ virtual void vfunc_9c(); diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 1d9c9dd4..870a9696 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -179,9 +179,9 @@ public: static void func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3); void GetTileWorldBounds(Vec2b *tile, AABB *tileBounds); unk32 MapData_vfunc_54(Vec2b *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(); + unk32 func_ov00_020840a0(unk8 param_2, unk8 param_3, unk16 param_4); + unk32 *MapData_vfunc_78(Vec2b *param_1); + unk8 func_ov00_020840dc(Vec2b *param_1); static unk8 func_ov00_02084100(unk32 *param_1, MapManager *param_2); u32 GetMapData_Unk_48(); unk32 GetMapData_Unk_4c(); @@ -229,7 +229,7 @@ public: void func_ov00_02084ce4(unk32 param_2); bool func_ov00_02084cfc(unk32 param_2); u8 GetMapData_Unk_09(); - void func_ov00_02084d24(unk32 param_2, unk32 param_3, unk32 param_4); + void func_ov00_02084d24(unk8 param_2, unk8 param_3, unk16 param_4); s32 func_ov00_02084d4c(unk32 param_2, unk32 param_3, Vec3p *param_4); unk32 func_ov00_02084ebc(Vec3p *param_2); s32 func_ov00_02085108(s32 *param_2); diff --git a/include/Map/MapOverworld.hpp b/include/Map/MapOverworld.hpp index 4ce6d91a..2fda60af 100644 --- a/include/Map/MapOverworld.hpp +++ b/include/Map/MapOverworld.hpp @@ -52,7 +52,7 @@ public: /* 5c */ virtual unk32 vfunc_5c() override; /* 60 */ virtual unk32 vfunc_60() override; /* 64 */ virtual unk32 vfunc_64() override; - /* 78 */ virtual unk32 vfunc_78() override; + /* 78 */ virtual unk32 *vfunc_78() override; /* 7c */ virtual unk32 vfunc_7c() override; /* 80 */ virtual unk32 vfunc_80() override; /* 94 */ virtual void vfunc_94() override; -- cgit v1.2.3 From 2025fdf4604ba6db6391ab8354352b707c5a9359 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Mon, 21 Apr 2025 23:26:30 +0200 Subject: Restore usa overlay symbols --- include/Map/MapManager.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/Map') diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 870a9696..6e7ea945 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -192,7 +192,7 @@ public: u8 GetMapData_Unk_0a(); u8 GetMapData_Unk_0b(); unk8 MapData_vfunc_a4(unk8 *param_1); - unk8 func_ov00_0208433c(Vec3p *param_2, Vec3p *param_3); + unk8 func_ov00_0208433c(Vec3p *param_2, Vec2s *param_3); unk8 func_ov00_0208439c(Vec2s *param_2, Vec3p *param_3); void func_ov00_020843ec(s32 *param_2); unk32 GetMapData_Unk_38(); -- cgit v1.2.3 From a9af655856b791d5a6d4bf1b75c123a855e646bb Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Tue, 29 Apr 2025 22:12:35 +0200 Subject: Decomp progress 38% --- include/Map/Course.hpp | 2 +- include/Map/MapBase.hpp | 2 +- include/Map/MapManager.hpp | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'include/Map') diff --git a/include/Map/Course.hpp b/include/Map/Course.hpp index b01ff5ea..ee8af277 100644 --- a/include/Map/Course.hpp +++ b/include/Map/Course.hpp @@ -108,7 +108,7 @@ public: bool GetMapDataFlag2(unk32 param_2); void SetMapDataFlag3(unk32 param_2, bool param_3); bool GetMapDataFlag3(unk32 param_2); - void SetMapDataFlag4(unk32 param_2, unk32 param_3); + void SetMapDataFlag4(unk32 param_2, bool param_3); bool GetMapDataFlag4(unk32 param_2); MapData *FindMapData(u32 map); MapData *FindCurrentMapData(); diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp index 06efee36..e3731194 100644 --- a/include/Map/MapBase.hpp +++ b/include/Map/MapBase.hpp @@ -133,7 +133,7 @@ public: /* 40 */ virtual void vfunc_40(); /* 44 */ virtual void vfunc_44(); /* 48 */ virtual void vfunc_48(); - /* 4c */ virtual s32 vfunc_4c() = 0; + /* 4c */ virtual s32 vfunc_4c(); /* 50 */ virtual unk32 vfunc_50(); /* 54 */ virtual unk32 vfunc_54(Vec2b *param_1); /* 58 */ virtual unk32 vfunc_58(Vec2b *param_1, int param_2); diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 6e7ea945..d169614f 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -92,7 +92,7 @@ public: u8 GetCurrentMapPosY(); u8 func_ov00_02082d40(); u32 func_ov00_02082d74(unk32 param_2); - void func_ov00_02082d84(unk8 *param_2, s32 *param_3, s32 *param_4); + void func_ov00_02082d84(Vec2b *param_2, s32 *param_3, s32 *param_4); bool func_ov00_02082e1c(s32 *param_2, s32 *param_3); void func_ov00_0208306c(s32 *param_2, s32 *param_3); void func_ov00_0208315c(s32 *param_2, s32 *param_3); @@ -166,14 +166,14 @@ public: s32 GetTileEndZ(unk32 z); s32 func_ov00_02083c24(unk32 x); s32 func_ov00_02083c50(unk32 z); - void func_ov00_02083c7c(Vec3p *param_2, u32 param_3); + void func_ov00_02083c7c(Vec3p *param_2, Vec2b *param_3); static void func_ov00_02083ce8(MapManager *param_1, s32 *param_2, u32 param_3, s32 param_4, u32 param_5); s32 func_ov00_02083e34(unk8 param_2, unk8 param_3, unk32 param_4); unk32 MapData_vfunc_60(u8 *param_1); bool func_ov00_02083e70(); unk32 MapData_vfunc_68(Vec3p *param_1, bool param_2); s32 func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3); - void func_ov00_02083f44(Vec3p *param_2); + unk32 func_ov00_02083f44(Vec3p *param_2); unk8 MapData_vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4); unk32 MapData_vfunc_70(Vec3p *param_2); static void func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3); @@ -181,7 +181,7 @@ public: unk32 MapData_vfunc_54(Vec2b *a); unk32 func_ov00_020840a0(unk8 param_2, unk8 param_3, unk16 param_4); unk32 *MapData_vfunc_78(Vec2b *param_1); - unk8 func_ov00_020840dc(Vec2b *param_1); + unk32 func_ov00_020840dc(Vec2b *param_1); static unk8 func_ov00_02084100(unk32 *param_1, MapManager *param_2); u32 GetMapData_Unk_48(); unk32 GetMapData_Unk_4c(); @@ -192,7 +192,7 @@ public: u8 GetMapData_Unk_0a(); u8 GetMapData_Unk_0b(); unk8 MapData_vfunc_a4(unk8 *param_1); - unk8 func_ov00_0208433c(Vec3p *param_2, Vec2s *param_3); + void func_ov00_0208433c(Vec3p *param_2, Vec2s *param_3); unk8 func_ov00_0208439c(Vec2s *param_2, Vec3p *param_3); void func_ov00_020843ec(s32 *param_2); unk32 GetMapData_Unk_38(); @@ -222,11 +222,11 @@ public: bool func_ov00_02084be0(u32 param_2, unk32 param_3); void SetMapDataFlag1(unk32 param_2, bool param_3); bool GetMapDataFlag1(unk32 param_2); - void func_ov00_02084c7c(unk32 param_2); + void func_ov00_02084c7c(unk32 param_2, bool param_3); bool func_ov00_02084c94(unk32 param_2); - void func_ov00_02084cb0(unk32 param_2); + void func_ov00_02084cb0(unk32 param_2, bool param_3); bool func_ov00_02084cc8(unk32 param_2); - void func_ov00_02084ce4(unk32 param_2); + void func_ov00_02084ce4(unk32 param_2, bool param_3); bool func_ov00_02084cfc(unk32 param_2); u8 GetMapData_Unk_09(); void func_ov00_02084d24(unk8 param_2, unk8 param_3, unk16 param_4); -- cgit v1.2.3 From 780ed17043d22941ce1a8142ffc8683d3a35159b Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Sun, 4 May 2025 17:05:56 +0200 Subject: Decomp progress 42% --- include/Map/MapManager.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/Map') diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index d169614f..b1bce31f 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -31,7 +31,7 @@ public: /* 00 */ Course *mCourse; /* 04 */ MapBase *mMap; /* 08 */ unk8 mUnk_08; - /* 09 */ unk8 mUnk_09; + /* 09 */ u8 mUnk_09; /* 0a */ unk8 mUnk_0a; /* 0b */ unk8 mUnk_0b; /* 0c */ u8 mUnk_0c; @@ -47,7 +47,7 @@ public: void GetCourseDungeonProgress(CourseProgress *param_2); void func_ov00_020820fc(s32 param_2, unk32 param_3, unk32 param_4); - unk8 func_ov00_0208210c(unk32 param_2, unk32 *param_3); + void func_ov00_0208210c(unk32 param_2, unk32 *param_3); void func_ov00_0208230c(s32 *param_2); void func_ov00_02082348(unk32 *param_2); void func_ov00_020823a4(unk32 param_2); @@ -198,7 +198,7 @@ public: unk32 GetMapData_Unk_38(); s32 func_ov00_020846a4(); static s32 func_ov00_02084700(MapManager *pMapManager); - unk8 func_ov00_02084740(); + unk32 func_ov00_02084740(); unk32 func_ov00_020847e0(); unk8 func_ov00_020847f0(); bool func_ov00_02084838(); @@ -218,7 +218,7 @@ public: unk32 GetNumKeys(); void SetBlueWarpOpen(bool state); bool GetBlueWarpOpen(); - unk8 func_ov00_02084b38(unk32 param_2, unk32 param_3, unk32 param_4); + unk8 func_ov00_02084b38(unk32 param_2, unk32 param_3, bool param_4); bool func_ov00_02084be0(u32 param_2, unk32 param_3); void SetMapDataFlag1(unk32 param_2, bool param_3); bool GetMapDataFlag1(unk32 param_2); -- cgit v1.2.3 From 0d060f1d81066b141bba92578c7f839130dc1b2b Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Thu, 8 May 2025 14:10:16 +0200 Subject: Decomp progress 43% --- include/Map/MapBase.hpp | 4 ++-- include/Map/MapManager.hpp | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'include/Map') diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp index e3731194..e3152676 100644 --- a/include/Map/MapBase.hpp +++ b/include/Map/MapBase.hpp @@ -138,9 +138,9 @@ public: /* 54 */ virtual unk32 vfunc_54(Vec2b *param_1); /* 58 */ virtual unk32 vfunc_58(Vec2b *param_1, int param_2); /* 5c */ virtual unk32 vfunc_5c(); - /* 60 */ virtual unk32 vfunc_60(u8 *param_1); + /* 60 */ virtual unk32 vfunc_60(Vec2b *param_1); /* 64 */ virtual unk32 vfunc_64(); - /* 68 */ virtual unk8 vfunc_68(Vec3p *param_1, bool param_2); + /* 68 */ virtual unk32 vfunc_68(Vec3p *param_1, bool param_2); /* 6c */ virtual unk8 vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4); /* 70 */ virtual unk32 vfunc_70(Vec3p *param_2); /* 74 */ virtual s32 *vfunc_74(Vec3p *param_2); diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index b1bce31f..6a4598d1 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -32,8 +32,8 @@ public: /* 04 */ MapBase *mMap; /* 08 */ unk8 mUnk_08; /* 09 */ u8 mUnk_09; - /* 0a */ unk8 mUnk_0a; - /* 0b */ unk8 mUnk_0b; + /* 0a */ bool mUnk_0a; + /* 0b */ bool mUnk_0b; /* 0c */ u8 mUnk_0c; /* 0d */ unk8 mUnk_0d; /* 0e */ unk8 mUnk_0e; @@ -77,7 +77,7 @@ public: void CreateMap(unk32 mapType, unk32 param_3, unk32 param_4); void DestroyMap(); void MapData_vfunc_44(); - void func_ov00_02082808(s32 param_2); + 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); @@ -86,7 +86,7 @@ public: void func_ov00_02082acc(); unk32 *func_ov00_02082adc(); void func_ov00_02082af4(); - bool func_ov00_02082b3c(s32 param_2); + bool func_ov00_02082b3c(unk32 *param_2); u8 func_ov00_02082d08(); u8 GetCurrentMapPosX(); u8 GetCurrentMapPosY(); @@ -96,7 +96,7 @@ public: bool func_ov00_02082e1c(s32 *param_2, s32 *param_3); void func_ov00_0208306c(s32 *param_2, s32 *param_3); void func_ov00_0208315c(s32 *param_2, s32 *param_3); - void func_ov00_02083244(u32 param_2, s32 *param_3, s32 *param_4, s32 *param_5); + void func_ov00_02083244(u32 param_2, Vec3p *param_3, s32 *param_4, s32 *param_5); void func_ov00_02083298(u32 param_2, Vec3p *param_3, s32 *param_4, s32 *param_5); bool GetCourseData_Unk_25c(); bool IsMapInMainGrid(u32 map); @@ -124,7 +124,7 @@ public: 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(Vec2b *param_1, MapManager *param_2, u32 param_3); - u8 func_ov00_02083570(unk32 param_2, unk32 param_3); + u8 func_ov00_02083570(u8 param_2, u8 param_3); unk32 func_ov00_02083588(); unk32 func_ov00_020835a4(); unk32 func_ov00_020835b4(); @@ -169,11 +169,11 @@ public: void func_ov00_02083c7c(Vec3p *param_2, Vec2b *param_3); static void func_ov00_02083ce8(MapManager *param_1, s32 *param_2, u32 param_3, s32 param_4, u32 param_5); s32 func_ov00_02083e34(unk8 param_2, unk8 param_3, unk32 param_4); - unk32 MapData_vfunc_60(u8 *param_1); - bool func_ov00_02083e70(); + unk32 MapData_vfunc_60(Vec2b *param_1); + bool func_ov00_02083e70(Vec2b *param_2); unk32 MapData_vfunc_68(Vec3p *param_1, bool param_2); - s32 func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3); - unk32 func_ov00_02083f44(Vec3p *param_2); + s32 func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3, bool param_4); + unk32 func_ov00_02083f44(Vec3p *param_2, bool param_3); unk8 MapData_vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4); unk32 MapData_vfunc_70(Vec3p *param_2); static void func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3); @@ -253,7 +253,7 @@ public: static void LoadMapTexSprites(s32 param1); void func_ov004_02102260(); void func_ov004_02102264(unk32 *param1, char *param2); - void func_ov004_021024c4(s32 param1, unk32 param2, unk32 param3); + void func_ov004_021024c4(unk32 *param1, unk32 param2, bool param3); void func_ov004_021025d8(); }; -- cgit v1.2.3 From ef6c7422a9e33b2870aaec64c45b00c243452b85 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Sun, 11 May 2025 12:09:39 +0200 Subject: Update --- include/Map/MapBase.hpp | 2 +- include/Map/MapManager.hpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include/Map') diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp index e3152676..4c8fb1b4 100644 --- a/include/Map/MapBase.hpp +++ b/include/Map/MapBase.hpp @@ -143,7 +143,7 @@ public: /* 68 */ virtual unk32 vfunc_68(Vec3p *param_1, bool param_2); /* 6c */ virtual unk8 vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4); /* 70 */ virtual unk32 vfunc_70(Vec3p *param_2); - /* 74 */ virtual s32 *vfunc_74(Vec3p *param_2); + /* 74 */ virtual unk32 *vfunc_74(Vec3p *param_2); /* 78 */ virtual unk32 *vfunc_78(Vec2b *param_1); /* 7c */ virtual s32 vfunc_7c(s32 param_1, unk32 *param_2, s32 param_3, short param_4[4]); /* 80 */ virtual unk32 vfunc_80(); diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 6a4598d1..a4bd9d6d 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -30,8 +30,8 @@ class MapManager : public SysObject { public: /* 00 */ Course *mCourse; /* 04 */ MapBase *mMap; - /* 08 */ unk8 mUnk_08; - /* 09 */ u8 mUnk_09; + /* 08 */ bool mUnk_08; + /* 09 */ bool mUnk_09; /* 0a */ bool mUnk_0a; /* 0b */ bool mUnk_0b; /* 0c */ u8 mUnk_0c; @@ -166,7 +166,7 @@ public: s32 GetTileEndZ(unk32 z); s32 func_ov00_02083c24(unk32 x); s32 func_ov00_02083c50(unk32 z); - void func_ov00_02083c7c(Vec3p *param_2, Vec2b *param_3); + void func_ov00_02083c7c(Vec3p *param_2, Vec2s *param_3); static void func_ov00_02083ce8(MapManager *param_1, s32 *param_2, u32 param_3, s32 param_4, u32 param_5); s32 func_ov00_02083e34(unk8 param_2, unk8 param_3, unk32 param_4); unk32 MapData_vfunc_60(Vec2b *param_1); @@ -237,7 +237,7 @@ public: static s32 func_ov00_020853fc(MapManager *param_1, Vec3p *param_2, s32 *param_3); static unk32 func_ov00_02085594(MapManager *param_1, Vec3p *param_2, unk32 param_3, unk32 param_4); static void func_ov00_0208583c(MapManager *param_1, Vec3p *param_2, unk32 param_3); - static unk8 func_ov00_020858b0(MapManager *param_1, Vec3p *param_2, s32 param_3); + static unk32 func_ov00_020858b0(MapManager *param_1, Vec3p *param_2, s32 param_3); s32 func_ov00_02085a34(Vec3p *param_2, unk32 param_3); unk8 func_ov00_02085c60(Vec3p *param_2, unk32 *param_3, unk32 *param_4, u32 param_5); unk8 func_ov00_02086044(Vec3p *param_2, Vec3p *param_3, unk32 param_4); -- cgit v1.2.3 From bed4fb43a7796a232731c8226a6eac3cb2c49ba1 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Wed, 4 Jun 2025 00:07:45 +0200 Subject: Post-conflict update --- include/Map/Course.hpp | 2 +- include/Map/MapManager.hpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include/Map') diff --git a/include/Map/Course.hpp b/include/Map/Course.hpp index ee8af277..c09cbb4d 100644 --- a/include/Map/Course.hpp +++ b/include/Map/Course.hpp @@ -59,7 +59,7 @@ public: /* 25e */ unk8 mUnk_25e; /* 25f */ unk8 mUnk_25f; /* 260 */ unk32 mNumKeys; - /* 260 */ unk32 mFlags0[1]; + /* 264 */ unk32 mFlags0[1]; /* 268 */ unk32 mFlags1[1]; // knows which doors are open in a dungeon /* 26c */ diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index a4bd9d6d..49ec315b 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -166,7 +166,7 @@ public: s32 GetTileEndZ(unk32 z); s32 func_ov00_02083c24(unk32 x); s32 func_ov00_02083c50(unk32 z); - void func_ov00_02083c7c(Vec3p *param_2, Vec2s *param_3); + void func_ov00_02083c7c(Vec3p *param_2, Vec2b param_3); static void func_ov00_02083ce8(MapManager *param_1, s32 *param_2, u32 param_3, s32 param_4, u32 param_5); s32 func_ov00_02083e34(unk8 param_2, unk8 param_3, unk32 param_4); unk32 MapData_vfunc_60(Vec2b *param_1); @@ -179,7 +179,7 @@ public: static void func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3); void GetTileWorldBounds(Vec2b *tile, AABB *tileBounds); unk32 MapData_vfunc_54(Vec2b *a); - unk32 func_ov00_020840a0(unk8 param_2, unk8 param_3, unk16 param_4); + unk32 func_ov00_020840a0(unk8 param_2, unk8 param_3); unk32 *MapData_vfunc_78(Vec2b *param_1); unk32 func_ov00_020840dc(Vec2b *param_1); static unk8 func_ov00_02084100(unk32 *param_1, MapManager *param_2); @@ -232,10 +232,10 @@ public: void func_ov00_02084d24(unk8 param_2, unk8 param_3, unk16 param_4); s32 func_ov00_02084d4c(unk32 param_2, unk32 param_3, Vec3p *param_4); unk32 func_ov00_02084ebc(Vec3p *param_2); - s32 func_ov00_02085108(s32 *param_2); + s32 func_ov00_02085108(Vec3p *param_2); static s32 func_ov00_0208527c(MapManager *param_1, unk32 param_2, unk32 *param_3); static s32 func_ov00_020853fc(MapManager *param_1, Vec3p *param_2, s32 *param_3); - static unk32 func_ov00_02085594(MapManager *param_1, Vec3p *param_2, unk32 param_3, unk32 param_4); + unk32 func_ov00_02085594(Vec3p *param_2); static void func_ov00_0208583c(MapManager *param_1, Vec3p *param_2, unk32 param_3); static unk32 func_ov00_020858b0(MapManager *param_1, Vec3p *param_2, s32 param_3); s32 func_ov00_02085a34(Vec3p *param_2, unk32 param_3); -- cgit v1.2.3 From c763d7e281a93fbf5c8d87d53f1ba9edd5ee2b2c Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Sat, 28 Jun 2025 12:01:17 +0200 Subject: Update --- include/Map/MapManager.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/Map') diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 49ec315b..3b14687d 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -218,7 +218,7 @@ public: unk32 GetNumKeys(); void SetBlueWarpOpen(bool state); bool GetBlueWarpOpen(); - unk8 func_ov00_02084b38(unk32 param_2, unk32 param_3, bool param_4); + void func_ov00_02084b38(u32 param_2, unk32 param_3, bool param_4); bool func_ov00_02084be0(u32 param_2, unk32 param_3); void SetMapDataFlag1(unk32 param_2, bool param_3); bool GetMapDataFlag1(unk32 param_2); -- cgit v1.2.3 From d733ef8b005cc5d8e865c58543d9bb473d08b7e8 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Sat, 28 Jun 2025 14:37:36 +0200 Subject: Decomp progress 44% --- include/Map/MapManager.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/Map') diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 3b14687d..74526c0a 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -167,7 +167,7 @@ public: s32 func_ov00_02083c24(unk32 x); s32 func_ov00_02083c50(unk32 z); void func_ov00_02083c7c(Vec3p *param_2, Vec2b param_3); - static void func_ov00_02083ce8(MapManager *param_1, s32 *param_2, u32 param_3, s32 param_4, u32 param_5); + void func_ov00_02083ce8(Vec3p *param_2, u32 param_3, s32 param_4, u32 param_5); s32 func_ov00_02083e34(unk8 param_2, unk8 param_3, unk32 param_4); unk32 MapData_vfunc_60(Vec2b *param_1); bool func_ov00_02083e70(Vec2b *param_2); -- cgit v1.2.3 From f446227797e5bc5e338d51e2e23a026360f484a5 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Sat, 28 Jun 2025 23:19:29 +0200 Subject: Decomp progress 46% --- include/Map/MapBase.hpp | 2 +- include/Map/MapManager.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include/Map') 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); -- cgit v1.2.3 From 18f940fde40ed6263b82c2b7e7f9e3cd348ba750 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Mon, 30 Jun 2025 23:29:42 +0200 Subject: Update --- include/Map/MapManager.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/Map') diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 4ef12645..b1018279 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -86,7 +86,7 @@ public: void func_ov00_02082acc(); unk32 *func_ov00_02082adc(); void func_ov00_02082af4(); - bool func_ov00_02082b3c(unk32 *param_2); + void func_ov00_02082b3c(unk32 *param_2, Vec2b *param3); u8 func_ov00_02082d08(); u8 GetCurrentMapPosX(); u8 GetCurrentMapPosY(); -- cgit v1.2.3