diff options
| author | Aetias <aetias@outlook.com> | 2024-10-19 13:34:42 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-10-19 13:34:42 +0200 |
| commit | 4826a6e764b92d623b8517883cd8e901a4348f86 (patch) | |
| tree | bc8df7ba0805e37d1e44a18e755679f2ae1cc145 /include/Map/MapManager.hpp | |
| parent | 0d62c02f14bd122690306976d8a58c5449dd3040 (diff) | |
| parent | ffdfd609fb9bc8f968ddc6f187da1d50731cbf69 (diff) | |
Merge branch 'main' into match_actor_rupee
Diffstat (limited to 'include/Map/MapManager.hpp')
| -rw-r--r-- | include/Map/MapManager.hpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 632b9e25..4e969c5a 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -57,7 +57,7 @@ public: unk8 func_ov00_02082494(unk32 param_2); unk8 func_ov00_020824cc(unk32 param_2); unk8 func_ov00_02082504(); - unk8 * func_ov00_02082538(); + unk8 *func_ov00_02082538(); void func_ov00_02082594(); void func_ov00_020825ac(); s32 GetCourseFilePath(char *courseName, char *buf); @@ -79,7 +79,7 @@ public: unk8 GetCourseData_Unk_b0(); s32 func_ov00_02082914(unk32 param_2); unk8 func_ov00_02082acc(); - unk32 * func_ov00_02082adc(); + unk32 *func_ov00_02082adc(); unk8 func_ov00_02082af4(); bool func_ov00_02082b3c(s32 param_2); unk8 func_ov00_02082d08(); @@ -167,7 +167,7 @@ public: unk8 MapData_vfunc_60(); static unk8 func_ov00_02083e70(); unk8 MapData_vfunc_68(); - void func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3); + s32 func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3, unk32 param_4); void func_ov00_02083f44(Vec3p *param_2); unk8 MapData_vfunc_6c(); unk8 MapData_vfunc_70(); @@ -236,8 +236,10 @@ public: s32 func_ov00_02085a34(unk32 param_2, unk32 param_3); unk8 func_ov00_02085c60(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5); unk8 func_ov00_02086044(unk32 param_2, unk32 param_3, unk32 param_4); - bool func_ov00_02086284(s32 *param_2, Vec3p *param_3, Vec3p *param_4, s32 param_5, u16 param_6, Vec3p *param_7, Vec3p *param_8); - bool func_ov00_02086a84(s32 *param_2, Vec3p *param_3, Vec3p *param_4, s32 param_5, s32 param_6, unk32 param_7, Vec3p *param_8, Vec3p *param_9); + bool func_ov00_02086284(s32 *param_2, Vec3p *param_3, Vec3p *param_4, s32 param_5, u16 param_6, Vec3p *param_7, + Vec3p *param_8); + bool func_ov00_02086a84(s32 *param_2, Vec3p *param_3, Vec3p *param_4, s32 param_5, s32 param_6, unk32 param_7, + Vec3p *param_8, Vec3p *param_9); }; extern MapManager *gMapManager; |