From acc72371ed17936435d9da11b32eef383b13f8b7 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Sun, 12 Jan 2025 15:15:38 +0100 Subject: Decompile MapManager::func_ov00_020835e4 Decompile MapManager::func_ov00_020835f4 Decompile MapManager::func_ov00_02083604 Decompile MapManager::func_ov00_02083614 Decompile MapManager::GetEntrancePos (43%) Decompile MapManager::func_ov00_02083664 (68%) --- src/00_Core/Map/MapBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index 8d6d3c96..50ba0ab8 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -62,7 +62,7 @@ unk8 MapBase::GetTileX(unk32 worldX) {} unk8 MapBase::GetTileY(unk32 worldZ) {} bool MapBase::IsInBounds(Vec3p *tileWorldPos) {} s32 MapBase::AddEntrance(Entrance *param_2) {} -unk8 MapBase::FindEntrance(unk32 id) {} +Entrance *MapBase::FindEntrance(unk32 id) {} unk8 MapBase::func_ov00_0207f924(unk32 param_2) {} unk8 MapBase::func_ov00_0207f934() {} unk8 MapBase::func_ov00_0207f948(unk32 param_2) {} -- cgit v1.2.3 From a4a9bb5dfdc9d1b3c4e024f631ced1d5d22097d1 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Sun, 12 Jan 2025 19:50:41 +0100 Subject: Decompile MapManager::func_ov00_020836bc Decompile MapManager::GetTriggerBoundingBoxes Decompile MapManager::func_ov00_020836dc (60%) Decompile MapManager::IsTriggerTypeOverlapped Decompile MapManager::GetOverlappingTrigger Decompile MapManager::func_ov00_02083560 gPlayerPos type Vec3p* from Vec3p --- src/00_Core/Map/MapBase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index 50ba0ab8..99fdb7c6 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -68,10 +68,10 @@ unk8 MapBase::func_ov00_0207f934() {} unk8 MapBase::func_ov00_0207f948(unk32 param_2) {} void MapBase::AddTrigger(TriggerParams *param_2) {} void TriggerBase::vfunc_08() {} -s32 MapBase::GetTriggerBoundingBox(unk32 param_2, AABB *param_3) {} +s32 MapBase::GetTriggerBoundingBox(s32 param_2, AABB *param_3) {} bool TriggerBase::GetBoundingBox() {} -unk8 MapBase::GetTriggerBoundingBoxes(unk32 param_2, AABB *param_3, unk32 param_4) {} -unk32 MapBase::GetOverlappingTrigger(Vec3p *param_2) {} +s32 MapBase::GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4) {} +bool MapBase::GetOverlappingTrigger(Vec3p *param_2) {} bool TriggerBase::Overlaps() {} unk8 MapBase::FindTrigger(unk32 type) {} unk8 MapBase::GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity) {} -- cgit v1.2.3 From 3cca73e1c1c0c0beba6f4864126220c478643ffc Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Mon, 13 Jan 2025 22:13:47 +0100 Subject: Decompile MapManager::IsMapInMainGrid Decompile MapManager::GetCourseDungeonProgress Decompile MapManager::func_ov00_020820fc Decompile MapManager::func_ov00_0208230c (93%) Decompile MapManager::func_ov00_020823a4 Decompile MapManager::func_ov00_020823b4 Decompile MapManager::func_ov00_020823c4 Decompile MapManager::func_ov00_020823d4 Decompile MapManager::func_ov00_020823e4 Decompile MapManager::MapData_vfunc_b4 Decompile MapManager::MapData_vfunc_9c Decompile MapManager::func_ov00_02082424 (41%) Decompile MapManager::func_ov00_02082454 (25%) Decompile MapManager::func_ov00_02082494 (28%) --- src/00_Core/Map/MapBase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index 99fdb7c6..e4de4c74 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -12,9 +12,9 @@ void MapBase::func_ov00_0207de68(unk32 param_2) {} void MapBase::func_ov00_0207de88() {} void MapBase::func_ov00_0207dea0(bool param_2) {} unk8 MapBase::vfunc_b0(unk32 param_2, unk32 param_3) {} -bool MapBase::func_ov00_0207e08c(unk32 param_2, unk32 param_3) {} -s32 MapBase::func_ov00_0207e0f0(unk32 param_2) {} -s32 MapBase::func_ov00_0207e28c(unk32 param_2) {} +bool MapBase::func_ov00_0207e08c(s32 *param_2, s32 param_3) {} +s32 MapBase::func_ov00_0207e0f0(s32 param_2) {} +s32 MapBase::func_ov00_0207e28c(s32 param_2) {} void MapBase::vfunc_b4() {} void MapBase::vfunc_48() {} unk32 MapBase::vfunc_50() {} -- cgit v1.2.3 From b7be672733b79c460d3f72bc13fd181f3652d8a8 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Tue, 14 Jan 2025 15:27:50 +0100 Subject: Decompile MapManager::func_ov00_020824cc (28%) Decompile MapManager::func_ov00_02082504 Decompile MapManager::func_ov00_02082538 (43%) Decompile MapManager::func_ov00_02082614 Decompile MapManager::MapData_vfunc_b0 Decompile MapManager::func_ov00_02082650 Decompile MapManager::func_ov00_02082660 Decompile MapManager::func_ov00_02082670 Decompile MapManager::func_ov00_02082680 Decompile MapManager:: Decompile MapManager::func_ov00_020826a0 (100% but needs verifying) Decompile MapManager::CreateMap (3%) Decompile MapManager::DestroyMap (8%) Decompile MapManager::MapData_vfunc_44 Decompile MapManager::MapData_vfunc_7c (25%) Decompile MapManager::MapData_vfunc_84 Decompile MapManager::func_ov00_020828f8 Decompile MapManager::GetNumMaps Decompile MapManager::func_ov00_02082914 (21%) Decompile MapManager::func_ov00_02082acc Decompile MapManager::func_ov00_02082af4 (55%) --- src/00_Core/Map/MapBase.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index e4de4c74..01020023 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -11,7 +11,7 @@ void MapBase::func_ov00_0207ddf8(bool param_2) {} void MapBase::func_ov00_0207de68(unk32 param_2) {} void MapBase::func_ov00_0207de88() {} void MapBase::func_ov00_0207dea0(bool param_2) {} -unk8 MapBase::vfunc_b0(unk32 param_2, unk32 param_3) {} +void MapBase::vfunc_b0(unk32 param_2, unk32 param_3) {} bool MapBase::func_ov00_0207e08c(s32 *param_2, s32 param_3) {} s32 MapBase::func_ov00_0207e0f0(s32 param_2) {} s32 MapBase::func_ov00_0207e28c(s32 param_2) {} @@ -41,10 +41,10 @@ unk32 MapBase::vfunc_a4() {} void MapBase::vfunc_a8() {} void MapBase::vfunc_ac() {} unk32 MapBase::vfunc_78() {} -unk32 MapBase::vfunc_7c() {} +void MapBase::vfunc_7c() {} unk32 MapBase::vfunc_80() {} void MapBase::vfunc_84(unk32 param_2) {} -unk8 MapBase::func_ov00_0207f38c(unk32 param_2) {} +bool MapBase::func_ov00_0207f38c(s32 *param_2) {} unk8 MapBase::vfunc_90(unk32 param_2, unk32 param_3, unk32 param_4) {} void MapBase::vfunc_94() {} void MapBase::func_ov00_0207f4a4(Vec2s *param_2, unk32 param_3) {} @@ -103,7 +103,7 @@ void MapBase_Unk2::func_ov00_02080ad0(TriggerBase **param_2, TriggerBase **param unk8 MapBase::func_ov00_02080b24(Vec2b *param_2) {} void MapBase::func_ov00_02080d08(unk32 param_2) {} void MapBase::vfunc_bc() {} -void MapBase::vfunc_98() {} +void MapBase::vfunc_98(unk32 param_2, unk32 param_3, unk32 param_4) {} void MapBase::vfunc_c0() {} bool MapBase::TriggerOfType_vfunc_10(unk32 type) {} unk32 TriggerBase::vfunc_10() {} -- cgit v1.2.3 From a025951d6722598082b15700c13ae96bccb38201 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Wed, 15 Jan 2025 23:31:21 +0100 Subject: Decompile MapManager::func_ov00_02083790 (13%) Decompile MapManager::func_ov00_02083840 (20%) Decompile MapManager::AddTrigger Decompile MapManager::func_ov00_020838d8 Decompile MapManager::func_ov00_020838e8 Decompile MapManager::func_ov00_020838f8 Decompile MapManager::func_ov00_02083908 Decompile MapManager::func_ov00_02083918 Decompile MapManager::func_ov00_02083928 Decompile MapManager::SetCurrentViewpointId Decompile MapManager::func_ov00_02083958 Decompile MapManager::func_ov00_02083968 Decompile MapManager::func_ov00_02083978 Decompile MapManager::func_ov00_020839b4 Decompile MapManager::func_ov00_020839c4 Decompile MapManager::func_ov00_020839d4 Decompile MapManager::func_ov00_020839f8 Decompile MapManager::func_ov00_02083a1c (14%) Decompile MapManager::GetTileStartX Decompile MapManager::GetTileStartZ Decompile MapManager::GetTileEndX Decompile MapManager::GetTileEndZ Decompile MapManager::func_ov00_02083c24 Decompile MapManager::func_ov00_02083c50 --- src/00_Core/Map/MapBase.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index 01020023..76703c4f 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -56,14 +56,14 @@ unk8 MapBase::GetTileStartZ(unk32 z) {} s32 MapBase::GetTileEndX(unk32 x) {} s32 MapBase::GetTileEndZ(unk32 z) {} void MapBase::GetTileBounds(Vec2b *tilePos, AABB *bounds) {} -unk8 MapBase::GetClampedTileX(unk32 worldX) {} -unk8 MapBase::GetClampedTileY(unk32 worldZ) {} -unk8 MapBase::GetTileX(unk32 worldX) {} -unk8 MapBase::GetTileY(unk32 worldZ) {} +s32 MapBase::GetClampedTileX(s32 worldX) {} +s32 MapBase::GetClampedTileY(s32 worldZ) {} +unk8 MapBase::GetTileX(s32 worldX) {} +unk8 MapBase::GetTileY(s32 worldZ) {} bool MapBase::IsInBounds(Vec3p *tileWorldPos) {} s32 MapBase::AddEntrance(Entrance *param_2) {} Entrance *MapBase::FindEntrance(unk32 id) {} -unk8 MapBase::func_ov00_0207f924(unk32 param_2) {} +void MapBase::func_ov00_0207f924(s32 param_2) {} unk8 MapBase::func_ov00_0207f934() {} unk8 MapBase::func_ov00_0207f948(unk32 param_2) {} void MapBase::AddTrigger(TriggerParams *param_2) {} @@ -80,24 +80,24 @@ bool MapBase::AnyTrigger_func_0c(unk32 type) {} unk32 TriggerBase::vfunc_0c() {} unk8 MapBase::Trigger_vfunc_08() {} bool MapBase::AddTrigger(unk32 param_2) {} -bool MapBase::func_ov00_0207ff88(unk32 param_2) {} +bool MapBase::func_ov00_0207ff88(s32 param_2) {} void MapBase::func_ov00_0208005c(s32 param_2, s32 param_3, unk32 param_4) {} void MapBase::func_ov00_0208006c(unk32 param_2, s32 param_3) {} void MapBase::func_ov00_0208007c(s32 param_2, s32 param_3) {} void MapBase::func_ov00_0208008c(u32 param_2) {} unk8 MapBase::AddExit(Exit *param_2) {} -unk8 MapBase::func_ov00_02080140(Exit *param_2) {} +char MapBase::func_ov00_02080140(Exit *param_2) {} void MapBase_Unk1::func_ov00_02080324(s32 param_2, s32 param_3, s32 param_4) {} -bool MapBase::FindExit(unk32 param_2, Exit *param_3) {} +bool MapBase::FindExit(u32 param_2, Exit *param_3) {} unk8 MapBase::AddCameraViewpoint(CameraViewpoint *param_2) {} -bool MapBase::FindViewpoint_Unk_4(unk8 id, CameraViewpoint *param_3) {} -bool MapBase::FindViewpoint_Unk_0(unk32 param_2, CameraViewpoint *param_3) {} -void MapBase::GetCurrentViewpoint(CameraViewpoint *param_2, unk32 param_3) {} -unk8 MapBase::GetCurrentViewpoint_Unk_00(s32 param_2) {} +bool MapBase::FindViewpoint_Unk_4(char id, CameraViewpoint *param_3) {} +bool MapBase::FindViewpoint_Unk_0(s32 param_2, CameraViewpoint *param_3) {} +void MapBase::GetCurrentViewpoint(CameraViewpoint *param_2, s32 param_3) {} +unk32 MapBase::GetCurrentViewpoint_Unk_00(s32 param_2) {} unk32 MapBase::vfunc_b8() {} -bool MapBase::func_ov00_02080824(unk32 param_2, unk32 param_3) {} -bool MapBase::AddUnk_130(unk32 param_2) {} -bool MapBase::func_ov00_020809b8(unk32 param_2) {} +bool MapBase::func_ov00_02080824(u32 param_2, unk8 *param_3) {} +bool MapBase::AddUnk_130(s32 param_2) {} +bool MapBase::func_ov00_020809b8(s32 param_2) {} unk8 MapBase::func_ov00_02080a78(Vec3p *param_2) {} void MapBase_Unk2::func_ov00_02080ad0(TriggerBase **param_2, TriggerBase **param_3) {} unk8 MapBase::func_ov00_02080b24(Vec2b *param_2) {} -- cgit v1.2.3 From 0672d06a7f3b639666bbda545ab49452e0539278 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Thu, 16 Jan 2025 13:55:44 +0100 Subject: Decompile MapManager::MapData_vfunc_60 (33%) Decompile MapManager::MapData_vfunc_60 (50%) Decompile MapManager::func_ov00_02083e70 (21%) Decompile MapManager::MapData_vfunc_68 (50%) Decompile MapManager::func_ov00_02083f44 (20%) Decompile MapManager::MapData_vfunc_6c Decompile MapManager::MapData_vfunc_70 Decompile MapManager::func_ov00_02083fb0 (24%) Decompile MapManager::func_ov00_02084024 Decompile MapManager::MapData_vfunc_54 (50%) Decompile MapManager::MapData_vfunc_78 (50%) Decompile MapManager::func_ov00_02084100 Decompile MapManager::GetMapData_Unk_48 Decompile MapManager::GetMapData_Unk_4c Decompile MapManager::func_ov00_0208412c Decompile MapManager::func_ov00_0208413c Decompile MapManager::MapData_vfunc_58 (50%) Decompile MapManager::func_ov00_02084164 (1% lol) Decompile MapManager::GetMapData_Unk_0a Decompile MapManager::GetMapData_Unk_0b Decompile MapManager::MapData_vfunc_a4 (50%) Decompile MapManager::func_ov00_0208433c (38%) Decompile MapManager::func_ov00_0208439c (90%) Decompile MapManager::func_ov00_020843ec (7%) Decompile MapManager::GetMapData_Unk_38 Decompile MapManager::func_ov00_020846a4 (61%) Decompile MapManager::func_ov00_02084700 (82%) Decompile MapManager::func_ov00_020847e0 Decompile MapManager::func_ov00_020847f0 (11%) Decompile MapManager::func_ov00_02084838 (15%) Decompile MapManager::func_ov00_020848b8 (22%) Decompile MapManager::func_ov00_02084924 Decompile MapManager::func_ov00_02084934 (18%) Decompile MapManager::GetMapData_Unk_06 Decompile MapManager::GetMapData_Unk_07 --- src/00_Core/Map/MapBase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index 76703c4f..2d9ca7d9 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -23,13 +23,13 @@ unk32 MapBase::vfunc_58() {} unk32 MapBase::vfunc_5c() {} unk32 MapBase::vfunc_60() {} unk32 MapBase::vfunc_64() {} -unk8 MapBase::vfunc_68(unk32 param_2, unk32 param_3) {} +unk8 MapBase::vfunc_68() {} unk8 MapBase::func_ov00_0207e940(unk8 *param_1) {} unk8 MapBase::func_ov00_0207e968() {} unk8 MapBase::func_ov00_0207e96c() {} unk8 MapBase::vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4) {} unk32 MapBase::vfunc_70(Vec3p *param_2) {} -s32 *MapBase::vfunc_74(Vec3p *param_2) {} +s32 MapBase::vfunc_74(Vec3p *param_2) {} unk8 MapBase::func_ov00_0207f100() {} bool MapBase::func_ov00_0207f104(unk32 param_2, unk32 param_3) {} unk32 MapBase::func_ov00_0207f1f4(Vec3p *param_2, unk32 *param_3) {} -- cgit v1.2.3 From a4d82cfa6fe4ef394123bd96331f353b7fc6f9c4 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Thu, 23 Jan 2025 21:09:13 +0100 Subject: Decomp progress 28% --- src/00_Core/Map/MapBase.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index 2d9ca7d9..6e9de875 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -18,12 +18,12 @@ s32 MapBase::func_ov00_0207e28c(s32 param_2) {} void MapBase::vfunc_b4() {} void MapBase::vfunc_48() {} unk32 MapBase::vfunc_50() {} -unk32 MapBase::vfunc_54() {} -unk32 MapBase::vfunc_58() {} +unk32 MapBase::vfunc_54(unk8 *param_1) {} +unk32 MapBase::vfunc_58(Vec2b *param_1, int param_2) {} unk32 MapBase::vfunc_5c() {} -unk32 MapBase::vfunc_60() {} +unk32 MapBase::vfunc_60(unk8 *param_1) {} unk32 MapBase::vfunc_64() {} -unk8 MapBase::vfunc_68() {} +unk8 MapBase::vfunc_68(Vec3p *param_1, bool *param_2) {} unk8 MapBase::func_ov00_0207e940(unk8 *param_1) {} unk8 MapBase::func_ov00_0207e968() {} unk8 MapBase::func_ov00_0207e96c() {} @@ -37,10 +37,10 @@ unk32 MapBase::vfunc_88() {} unk32 MapBase::vfunc_8c() {} void MapBase::vfunc_9c() {} void MapBase::vfunc_a0() {} -unk32 MapBase::vfunc_a4() {} +unk32 MapBase::vfunc_a4(unk8 *param_1) {} void MapBase::vfunc_a8() {} void MapBase::vfunc_ac() {} -unk32 MapBase::vfunc_78() {} +unk32 MapBase::vfunc_78(bool *param_1) {} void MapBase::vfunc_7c() {} unk32 MapBase::vfunc_80() {} void MapBase::vfunc_84(unk32 param_2) {} -- cgit v1.2.3 From 5b3bc3313eb9d424657e6eb888ad741494484d03 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Tue, 4 Feb 2025 16:06:04 +0100 Subject: Decomp update --- src/00_Core/Map/MapBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index 6e9de875..d7cac5ad 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -23,7 +23,7 @@ unk32 MapBase::vfunc_58(Vec2b *param_1, int param_2) {} unk32 MapBase::vfunc_5c() {} unk32 MapBase::vfunc_60(unk8 *param_1) {} unk32 MapBase::vfunc_64() {} -unk8 MapBase::vfunc_68(Vec3p *param_1, bool *param_2) {} +unk8 MapBase::vfunc_68(Vec3p *param_1, bool param_2) {} unk8 MapBase::func_ov00_0207e940(unk8 *param_1) {} unk8 MapBase::func_ov00_0207e968() {} unk8 MapBase::func_ov00_0207e96c() {} -- cgit v1.2.3 From fdaf2b17909b191ea6694cc93e63aa77c6991079 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Tue, 4 Feb 2025 22:06:24 +0100 Subject: Fix build errors --- src/00_Core/Map/MapBase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index ba2b3c58..629886d2 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -70,8 +70,8 @@ void MapBase::AddTrigger(TriggerParams *param_2) {} void TriggerBase::vfunc_08() {} s32 MapBase::GetTriggerBoundingBox(unk32 param_2, AABB *param_3) {} bool TriggerBase::GetBoundingBox(AABB *bbox) {} -unk8 MapBase::GetTriggerBoundingBoxes(unk32 param_2, AABB *param_3, unk32 param_4) {} -unk32 MapBase::GetOverlappingTrigger(Vec3p *param_2) {} +s32 MapBase::GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4) {} +bool MapBase::GetOverlappingTrigger(Vec3p *param_2) {} bool TriggerBase::Overlaps(Vec3p *point) {} unk8 MapBase::FindTrigger(unk32 type) {} unk8 MapBase::GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity) {} -- cgit v1.2.3 From 6b9df2f4701f6790739bba8b07badcf002c7f72e Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Tue, 1 Apr 2025 21:22:24 +0200 Subject: Function fixes (still 29%) --- src/00_Core/Map/MapBase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index 629886d2..f4182b96 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -21,7 +21,7 @@ unk32 MapBase::vfunc_50() {} unk32 MapBase::vfunc_54(unk8 *param_1) {} unk32 MapBase::vfunc_58(Vec2b *param_1, int param_2) {} unk32 MapBase::vfunc_5c() {} -unk32 MapBase::vfunc_60(unk8 *param_1) {} +unk32 MapBase::vfunc_60(u8 *param_1) {} unk32 MapBase::vfunc_64() {} unk8 MapBase::vfunc_68(Vec3p *param_1, bool param_2) {} unk8 MapBase::func_ov00_0207e940(unk8 *param_1) {} @@ -41,7 +41,7 @@ unk32 MapBase::vfunc_a4(unk8 *param_1) {} void MapBase::vfunc_a8() {} void MapBase::vfunc_ac() {} unk32 MapBase::vfunc_78(bool *param_1) {} -void MapBase::vfunc_7c() {} +s32 MapBase::vfunc_7c(s32 param_1, unk32 *param_2, s32 param_3, short param_4[4]) {} unk32 MapBase::vfunc_80() {} void MapBase::vfunc_84(unk32 param_2) {} bool MapBase::func_ov00_0207f38c(s32 *param_2) {} -- 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% --- src/00_Core/Map/MapBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index f4182b96..8672e0de 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -18,7 +18,7 @@ s32 MapBase::func_ov00_0207e28c(s32 param_2) {} void MapBase::vfunc_b4() {} void MapBase::vfunc_48() {} unk32 MapBase::vfunc_50() {} -unk32 MapBase::vfunc_54(unk8 *param_1) {} +unk32 MapBase::vfunc_54(Vec2b *param_1) {} unk32 MapBase::vfunc_58(Vec2b *param_1, int param_2) {} unk32 MapBase::vfunc_5c() {} unk32 MapBase::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% --- src/00_Core/Map/MapBase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index 8672e0de..6821df52 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -29,7 +29,7 @@ unk8 MapBase::func_ov00_0207e968() {} unk8 MapBase::func_ov00_0207e96c() {} unk8 MapBase::vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4) {} unk32 MapBase::vfunc_70(Vec3p *param_2) {} -s32 MapBase::vfunc_74(Vec3p *param_2) {} +s32 *MapBase::vfunc_74(Vec3p *param_2) {} unk8 MapBase::func_ov00_0207f100() {} bool MapBase::func_ov00_0207f104(unk32 param_2, unk32 param_3) {} unk32 MapBase::func_ov00_0207f1f4(Vec3p *param_2, unk32 *param_3) {} @@ -40,12 +40,12 @@ void MapBase::vfunc_a0() {} unk32 MapBase::vfunc_a4(unk8 *param_1) {} void MapBase::vfunc_a8() {} void MapBase::vfunc_ac() {} -unk32 MapBase::vfunc_78(bool *param_1) {} +unk32 *MapBase::vfunc_78(Vec2b *param_1) {} s32 MapBase::vfunc_7c(s32 param_1, unk32 *param_2, s32 param_3, short param_4[4]) {} unk32 MapBase::vfunc_80() {} void MapBase::vfunc_84(unk32 param_2) {} bool MapBase::func_ov00_0207f38c(s32 *param_2) {} -unk8 MapBase::vfunc_90(unk32 param_2, unk32 param_3, unk32 param_4) {} +unk8 MapBase::vfunc_90(Vec2b *param_2, unk32 param_3) {} void MapBase::vfunc_94() {} void MapBase::func_ov00_0207f4a4(Vec2s *param_2, unk32 param_3) {} void MapBase::func_ov00_0207f53c(Vec2s *param_1, MapBase *param_2, Vec3p *param_3) {} -- 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% --- src/00_Core/Map/MapBase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index 6821df52..fbf010e9 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -21,9 +21,9 @@ unk32 MapBase::vfunc_50() {} unk32 MapBase::vfunc_54(Vec2b *param_1) {} unk32 MapBase::vfunc_58(Vec2b *param_1, int param_2) {} unk32 MapBase::vfunc_5c() {} -unk32 MapBase::vfunc_60(u8 *param_1) {} +unk32 MapBase::vfunc_60(Vec2b *param_1) {} unk32 MapBase::vfunc_64() {} -unk8 MapBase::vfunc_68(Vec3p *param_1, bool param_2) {} +unk32 MapBase::vfunc_68(Vec3p *param_1, bool param_2) {} unk8 MapBase::func_ov00_0207e940(unk8 *param_1) {} unk8 MapBase::func_ov00_0207e968() {} unk8 MapBase::func_ov00_0207e96c() {} -- 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 --- src/00_Core/Map/MapBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index fbf010e9..ec6e497f 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -29,7 +29,7 @@ unk8 MapBase::func_ov00_0207e968() {} unk8 MapBase::func_ov00_0207e96c() {} unk8 MapBase::vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4) {} unk32 MapBase::vfunc_70(Vec3p *param_2) {} -s32 *MapBase::vfunc_74(Vec3p *param_2) {} +unk32 *MapBase::vfunc_74(Vec3p *param_2) {} unk8 MapBase::func_ov00_0207f100() {} bool MapBase::func_ov00_0207f104(unk32 param_2, unk32 param_3) {} unk32 MapBase::func_ov00_0207f1f4(Vec3p *param_2, unk32 *param_3) {} -- 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% --- src/00_Core/Map/MapBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/00_Core/Map/MapBase.cpp') diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index ec6e497f..b923de8d 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -73,7 +73,7 @@ bool TriggerBase::GetBoundingBox(AABB *bbox) {} s32 MapBase::GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4) {} bool MapBase::GetOverlappingTrigger(Vec3p *param_2) {} bool TriggerBase::Overlaps(Vec3p *point) {} -unk8 MapBase::FindTrigger(unk32 type) {} +TriggerBase *MapBase::FindTrigger(unk32 type) {} unk8 MapBase::GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity) {} bool MapBase::IsTriggerTypeOverlapped(unk32 type, Vec3p *param_3) {} bool MapBase::AnyTrigger_func_0c(unk32 type) {} -- cgit v1.2.3