summaryrefslogtreecommitdiff
path: root/include/Map
diff options
context:
space:
mode:
authorSammygoodTunes <sygamerz@gmail.com>2025-04-21 23:07:04 +0200
committerSammygoodTunes <sygamerz@gmail.com>2025-04-21 23:07:04 +0200
commit71ef8b58aad0315d839c3b2a4e996028d90952e6 (patch)
tree55b73dfb5daf703d77b9a3acea4b7616d571ba25 /include/Map
parent60e6b907127bbd84bd65cd569249cca42edb306c (diff)
Decomp progress 36%
Diffstat (limited to 'include/Map')
-rw-r--r--include/Map/MapBase.hpp6
-rw-r--r--include/Map/MapManager.hpp8
-rw-r--r--include/Map/MapOverworld.hpp2
3 files changed, 8 insertions, 8 deletions
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;