diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Map/MapBase.hpp | 6 | ||||
| -rw-r--r-- | include/Map/MapManager.hpp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp index fc74ed50..0675c1e4 100644 --- a/include/Map/MapBase.hpp +++ b/include/Map/MapBase.hpp @@ -111,7 +111,7 @@ public: /* 180 */ MapBase_Unk_180 mUnk_180[2]; /* 188 */ unk8 mUnk_188[0x14]; /* 19c */ unk32 mUnk_19c; - /* 1a0 */ unk8 mUnk_1a0[0xc]; + /* 1a0 */ Vec3p mUnk_1a0; /* 1ac */ s16 mUnk_1ac; /* 1ae */ unk8 mUnk_1ae[2]; /* 1b0 */ @@ -139,14 +139,14 @@ public: /* 54 */ virtual unk32 vfunc_54(unk8 *param_1); /* 58 */ virtual unk32 vfunc_58(Vec2b *param_1, int param_2); /* 5c */ virtual unk32 vfunc_5c(); - /* 60 */ virtual unk32 vfunc_60(unk8 *param_1); + /* 60 */ virtual unk32 vfunc_60(u8 *param_1); /* 64 */ virtual unk32 vfunc_64(); /* 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); - /* 7c */ virtual void vfunc_7c(); + /* 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(); diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 12f873d1..d82694db 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -62,7 +62,7 @@ public: bool func_ov00_02082494(s32 param_2); bool func_ov00_020824cc(s32 param_2); s32 func_ov00_02082504(); - unk8 *func_ov00_02082538(); + Vec3p *func_ov00_02082538(); void func_ov00_02082594(); void func_ov00_020825ac(); s32 GetCourseFilePath(char *courseName, char *buf); @@ -78,7 +78,7 @@ public: void DestroyMap(); void MapData_vfunc_44(); void func_ov00_02082808(s32 param_2); - void MapData_vfunc_7c(); + 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); u8 GetNumMaps(); @@ -168,14 +168,14 @@ public: s32 func_ov00_02083c50(unk32 z); void func_ov00_02083c7c(Vec3p *param_2, u32 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_02083e34(unk8 param_2, unk8 param_3, unk32 param_4); - unk32 MapData_vfunc_60(unk8 *param_1); + 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); unk8 MapData_vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4); - unk8 MapData_vfunc_70(Vec3p *param_2); + 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); |