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/MapBase.hpp') 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/Map/MapBase.hpp') 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); -- 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 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/Map/MapBase.hpp') 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(); -- 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/MapBase.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/Map/MapBase.hpp') 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); -- 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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/Map/MapBase.hpp') 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); -- 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/Map/MapBase.hpp') 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(); -- 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/Map/MapBase.hpp') 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); -- cgit v1.2.3