summaryrefslogtreecommitdiff
path: root/include/Map
diff options
context:
space:
mode:
authorAetias <aetias@outlook.com>2025-07-01 22:04:31 +0200
committerAetias <aetias@outlook.com>2025-07-01 22:04:31 +0200
commitf3b92f5a6c57656f7b20924a6c61dbae07fa506a (patch)
tree8fbf2de0ce9c9b1d681cdbab20809e4288c9868a /include/Map
parenta7f149c3af206d90f046c6e7237ea701f0ce7b41 (diff)
FIx build
Diffstat (limited to 'include/Map')
-rw-r--r--include/Map/MapBase.hpp4
-rw-r--r--include/Map/MapManager.hpp12
-rw-r--r--include/Map/MapOverworld.hpp4
3 files changed, 10 insertions, 10 deletions
diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp
index a99658ac..d4602640 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);
@@ -144,7 +144,7 @@ public:
/* 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);
+ /* 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);
diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp
index d82694db..52be0786 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, 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);
@@ -178,9 +178,9 @@ 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);
- unk8 func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4);
- unk32 MapData_vfunc_78(bool *param_1);
+ unk32 MapData_vfunc_54(Vec2b *a);
+ unk32 func_ov00_020840a0(unk8 param_2, unk8 param_3);
+ unk32 MapData_vfunc_78(Vec2b *param_1);
unk8 func_ov00_020840dc();
static unk8 func_ov00_02084100(unk32 *param_1, MapManager *param_2);
u32 GetMapData_Unk_48();
@@ -232,10 +232,10 @@ public:
unk8 func_ov00_02084d24(unk8 param_2, unk8 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);
+ 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 unk8 func_ov00_020858b0(MapManager *param_1, Vec3p *param_2, s32 param_3);
s32 func_ov00_02085a34(Vec3p *param_2, unk32 param_3);
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 */