diff options
Diffstat (limited to 'include/Map/MapManager.hpp')
| -rw-r--r-- | include/Map/MapManager.hpp | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index a6fd03fe..9989f31f 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -16,6 +16,9 @@ struct MapManager_Unk1 { /* 4 */ unk32 mUnk_4; /* 8 */ + inline MapManager_Unk1(unk32 unk0, unk32 unk4) : + mUnk_0(unk0), + mUnk_4(unk4) {} ~MapManager_Unk1(); }; @@ -24,9 +27,20 @@ struct MapManager_Unk2 { /* 4 */ unk32 mUnk_4; /* 8 */ + inline MapManager_Unk2(unk32 unk0, unk32 unk4) : + mUnk_0(unk0), + mUnk_4(unk4) {} ~MapManager_Unk2(); }; +struct MapManager_Unk3 { + /* 0 */ unk32 mUnk_0; + /* 4 */ + + inline MapManager_Unk3(unk32 unk0) : + mUnk_0(unk0) {} +}; + struct UnkStruct_0208210c_param3 { /* 000 */ unk32 mUnk_00; /* 004 */ unk8 mUnk_04; @@ -117,7 +131,7 @@ public: u8 GetCurrentMapPosY(); u8 func_ov00_02082d40(); u32 func_ov00_02082d74(unk32 param_2); - void func_ov00_02082d84(Vec2b *param_2, s32 *param_3, s32 *param_4); + void func_ov00_02082d84(TilePos *param_2, s32 *param_3, s32 *param_4); bool func_ov00_02082e1c(s32 *param_2, s32 *param_3); void func_ov00_0208306c(s32 *param_2, s32 *param_3); void func_ov00_0208315c(s32 *param_2, s32 *param_3); @@ -148,7 +162,7 @@ public: void func_ov00_0208346c(AABB *param_2); void func_ov00_020834bc(Vec3p *param_2, unk32 param_3, unk32 param_4); void func_ov00_02083524(Vec3p *param_2, unk32 param_3, unk32 param_4); - static void func_ov00_02083560(Vec2b *param_1, MapManager *param_2, u32 param_3); + TilePos func_ov00_02083560(u32 param_3); u8 func_ov00_02083570(u8 param_2, u8 param_3); unk32 func_ov00_02083588(); unk32 func_ov00_020835a4(); @@ -183,37 +197,37 @@ public: bool func_ov00_020839c4(s32 param_2); s32 func_ov00_020839d4(s32 param_2); s32 func_ov00_020839f8(s32 param_2); - static void func_ov00_02083a1c(Vec2b *param_1, MapManager *param_2, Vec3p *param_3); - static void func_ov00_02083a54(Vec2b *param_1, MapManager *param_2, Vec3p *param_3, s32 param_4, unk32 param_5); + TilePos func_ov00_02083a1c(Vec3p *param_3); + TilePos func_ov00_02083a54(Vec3p *param_3, s32 param_4, unk32 param_5); s32 GetTileStartX(unk32 x); s32 GetTileStartZ(unk32 z); s32 GetTileEndX(unk32 x); s32 GetTileEndZ(unk32 z); s32 func_ov00_02083c24(unk32 x); s32 func_ov00_02083c50(unk32 z); - void func_ov00_02083c7c(Vec3p *param_2, Vec2b param_3); - void func_ov00_02083ce8(Vec3p *param_2, Vec2b param_3, s32 param_4, u32 param_5); + void func_ov00_02083c7c(Vec3p *param_2, TilePos param_3); + void func_ov00_02083ce8(Vec3p *param_2, TilePos 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(Vec2b *param_1); - bool func_ov00_02083e70(Vec2b *param_2); + unk32 MapData_vfunc_60(TilePos *param_1); + bool func_ov00_02083e70(TilePos *param_2); unk32 MapData_vfunc_68(Vec3p *param_1, bool param_2); s32 func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3, bool param_4); unk32 func_ov00_02083f44(Vec3p *param_2, bool param_3); unk8 MapData_vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4); 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(Vec2b *a); + void GetTileWorldBounds(TilePos *tile, AABB *tileBounds); + unk32 MapData_vfunc_54(TilePos *a); unk32 func_ov00_020840a0(u8 param_2, u8 param_3); - unk32 *MapData_vfunc_78(Vec2b *param_1); - unk32 func_ov00_020840dc(Vec2b *param_1); + unk32 *MapData_vfunc_78(TilePos *param_1); + unk32 func_ov00_020840dc(TilePos *param_1); static unk8 func_ov00_02084100(unk32 *param_1, MapManager *param_2); unk32 GetMapData_Unk_48(); unk32 GetMapData_Unk_4c(); unk32 func_ov00_0208412c(); void func_ov00_0208413c(unk32 param_2); - unk8 MapData_vfunc_58(Vec2b *param_1, int param_2); - s32 func_ov00_02084164(Vec2b *param_2); + unk8 MapData_vfunc_58(TilePos *param_1, int param_2); + s32 func_ov00_02084164(TilePos *param_2); u8 GetMapData_Unk_0a(); u8 GetMapData_Unk_0b(); unk8 MapData_vfunc_a4(unk8 *param_1); |