summaryrefslogtreecommitdiff
path: root/include/Map
diff options
context:
space:
mode:
Diffstat (limited to 'include/Map')
-rw-r--r--include/Map/Course.hpp16
-rw-r--r--include/Map/MapBase.hpp12
-rw-r--r--include/Map/MapManager.hpp12
-rw-r--r--include/Map/TriggerAABB.hpp2
-rw-r--r--include/Map/TriggerSphere.hpp2
5 files changed, 23 insertions, 21 deletions
diff --git a/include/Map/Course.hpp b/include/Map/Course.hpp
index 352cae1b..8f87379c 100644
--- a/include/Map/Course.hpp
+++ b/include/Map/Course.hpp
@@ -12,11 +12,11 @@
typedef unk32 CourseType;
enum CourseType_ {
- CourseType_Normal = 0,
- CourseType_Dungeon = 1,
- CourseType_Sea = 2,
+ CourseType_Normal = 0,
+ CourseType_Dungeon = 1,
+ CourseType_Sea = 2,
CourseType_TempleOfTheOceanKing = 3,
- CourseType_Battle = 4,
+ CourseType_Battle = 4,
};
struct CourseProgress {
@@ -64,12 +64,12 @@ class Course : public SysObject {
void GetDungeonProgress(CourseProgress *param_2);
void func_ov00_0207ca28(s32 param_2, unk32 param_3, unk32 param_4);
- char* SetCourseName(char *src);
+ char *SetCourseName(char *src);
void func_ov00_0207ca78(unk32 param_2, unk8 param_3, unk32 param_4);
bool func_ov00_0207caa8(s32 param_2, unk32 *param_3, unk8 *param_4);
unk32 func_ov00_0207cb30(s32 param_2);
static void FindMapGridPos(Vec2b *pos, Course *param_2, u32 map);
- Vec3p* FindMapCenter(unk32 map);
+ Vec3p *FindMapCenter(unk32 map);
void func_ov00_0207cbe8(s32 param_2);
unk8 func_ov00_0207cc24(s32 param_2);
unk32 FindMapData_Unk_08(unk32 map);
@@ -109,6 +109,6 @@ class Course : public SysObject {
bool GetMapDataFlag3(unk32 param_2);
void SetMapDataFlag4(unk32 param_2, unk32 param_3);
bool GetMapDataFlag4(unk32 param_2);
- MapData* FindMapData(u32 map);
- MapData* FindCurrentMapData();
+ MapData *FindMapData(u32 map);
+ MapData *FindCurrentMapData();
};
diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp
index c9497a0a..f9d08cac 100644
--- a/include/Map/MapBase.hpp
+++ b/include/Map/MapBase.hpp
@@ -7,11 +7,11 @@
#include "lib/math.h"
+#include "Map/CameraViewpoint.hpp"
#include "Map/Course.hpp"
#include "Map/Entrance.hpp"
-#include "Map/TriggerBase.hpp"
#include "Map/Exit.hpp"
-#include "Map/CameraViewpoint.hpp"
+#include "Map/TriggerBase.hpp"
#include "System/SysNew.hpp"
#define MAX_ENTRANCES 0x40
@@ -94,10 +94,10 @@ public:
/* 0e8 */ Vec3p mUnk_0e8;
/* 0f4 */ Vec3p mUnk_0f4;
/* 100 */ std::vector<Entrance> mEntrances;
- /* 10c */ std::vector<TriggerBase*> mTriggers;
+ /* 10c */ std::vector<TriggerBase *> mTriggers;
/* 118 */ std::vector<Exit> mExits;
/* 124 */ std::vector<CameraViewpoint> mViewpoints;
- /* 130 */ std::vector<TriggerBase*> mUnk_130;
+ /* 130 */ std::vector<TriggerBase *> mUnk_130;
/* 13c */ unk32 mUnk_13c;
/* 140 */ unk32 mUnk_140;
/* 144 */ void *mUnk_144;
@@ -144,7 +144,7 @@ public:
/* 68 */ virtual unk8 vfunc_68(unk32 param_2, unk32 param_3);
/* 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);
+ /* 74 */ virtual s32 *vfunc_74(Vec3p *param_2);
/* 78 */ virtual unk32 vfunc_78();
/* 7c */ virtual unk32 vfunc_7c();
/* 80 */ virtual unk32 vfunc_80();
@@ -206,7 +206,7 @@ public:
unk8 GetTriggerBoundingBoxes(unk32 param_2, AABB *param_3, unk32 param_4);
unk32 GetOverlappingTrigger(Vec3p *param_2);
unk8 FindTrigger(unk32 type);
- unk8 GetOverlappingTriggers(Vec3p *param_2, TriggerBase * *triggers, unk32 capacity);
+ unk8 GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity);
bool IsTriggerTypeOverlapped(unk32 type, Vec3p *param_3);
bool AnyTrigger_func_0c(unk32 type);
unk8 Trigger_vfunc_08();
diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp
index 3a7ab48b..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();
@@ -171,7 +171,7 @@ public:
void func_ov00_02083f44(Vec3p *param_2);
unk8 MapData_vfunc_6c();
unk8 MapData_vfunc_70();
- static unk8 func_ov00_02083fb0(unk32 param_1, MapManager *param_2, unk32 param_3);
+ static unk8 func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3);
void func_ov00_02084024(unk32 param_2, AABB *param_3);
unk8 MapData_vfunc_54();
unk8 func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4);
@@ -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;
diff --git a/include/Map/TriggerAABB.hpp b/include/Map/TriggerAABB.hpp
index 19ac0f55..a1d7e782 100644
--- a/include/Map/TriggerAABB.hpp
+++ b/include/Map/TriggerAABB.hpp
@@ -3,8 +3,8 @@
#include "global.h"
#include "types.h"
-#include "Physics/AABB.hpp"
#include "Map/TriggerBase.hpp"
+#include "Physics/AABB.hpp"
class TriggerAABB : public TriggerBase {
/* 00 (base) */
diff --git a/include/Map/TriggerSphere.hpp b/include/Map/TriggerSphere.hpp
index e6bb6b39..56a874df 100644
--- a/include/Map/TriggerSphere.hpp
+++ b/include/Map/TriggerSphere.hpp
@@ -3,8 +3,8 @@
#include "global.h"
#include "types.h"
-#include "Physics/Sphere.hpp"
#include "Map/TriggerBase.hpp"
+#include "Physics/Sphere.hpp"
class TriggerSphere : public TriggerBase {
/* 00 (base) */
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 12:54:31 +0000