summaryrefslogtreecommitdiff
path: root/include/Map
diff options
context:
space:
mode:
Diffstat (limited to 'include/Map')
-rw-r--r--include/Map/Course.hpp3
-rw-r--r--include/Map/Entrance.hpp2
-rw-r--r--include/Map/MapBase.hpp13
-rw-r--r--include/Map/MapManager.hpp50
4 files changed, 50 insertions, 18 deletions
diff --git a/include/Map/Course.hpp b/include/Map/Course.hpp
index c09cbb4d..569f3765 100644
--- a/include/Map/Course.hpp
+++ b/include/Map/Course.hpp
@@ -33,8 +33,7 @@ public:
/* 008 */ unk32 mUnk_008;
/* 00c */ char mName[0x10];
/* 01c */ Vec2b mCurrMapPos; // position in the map grid
- /* 01e */ unk8 mUnk_01e;
- /* 01f */ unk8 mUnk_01f;
+ /* 01e */ Vec2b mUnk_01e;
/* 020 */ u8 mMapGrid[10][10];
/* 084 */ Vec2b mMainGrid; // part of the grid where you can walk off screen to another map
/* 086 */ Vec2b mMainGridSize;
diff --git a/include/Map/Entrance.hpp b/include/Map/Entrance.hpp
index af40f6ad..79e511f4 100644
--- a/include/Map/Entrance.hpp
+++ b/include/Map/Entrance.hpp
@@ -12,7 +12,7 @@ public:
/* 00 */ Vec3p mPos;
/* 0c */ unk16 mAngle;
/* 0e */ u8 mId;
- /* 0f */ // unk8 mUnk_0f;
+ /* 0f (padding) */
/* 10 */ s32 mUnk_10;
/* 14 */
diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp
index f9768a81..f711dbbb 100644
--- a/include/Map/MapBase.hpp
+++ b/include/Map/MapBase.hpp
@@ -203,7 +203,7 @@ public:
void AddTrigger(TriggerParams *param_2);
s32 GetTriggerBoundingBox(s32 param_2, AABB *param_3);
s32 GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4);
- bool GetOverlappingTrigger(Vec3p *param_2);
+ unk8 GetOverlappingTrigger(Vec3p *param_2);
TriggerBase *FindTrigger(unk32 type);
unk8 GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity);
bool IsTriggerTypeOverlapped(unk32 type, Vec3p *param_3);
@@ -228,7 +228,7 @@ public:
bool func_ov00_020809b8(s32 param_2);
unk8 func_ov00_02080a78(Vec3p *param_2);
unk8 func_ov00_02080b24(Vec2b *param_2);
- void func_ov00_02080d08(unk32 param_2);
+ void func_ov00_02080d08(Vec2b *param_2);
bool TriggerOfType_vfunc_10(unk32 type);
void func_ov00_02080de4();
unk8 func_ov00_02080de8(unk32 param_2);
@@ -240,4 +240,13 @@ public:
void func_ov004_0210cb38();
void func_ov004_0210cc20(Course *course);
void func_ov004_0210cc58(Course *course, u32 map);
+
+ MapBase *func_ov012_0212b358(unk32 param_2, unk32 param_3);
+ MapBase *func_ov015_02128dd8(unk32 param_2, unk32 param_3);
+ s32 func_ov015_02129c14();
+ bool func_ov015_02129c24(Vec3p *param_2, Vec3p *param_3);
+ bool func_ov015_02129c34(s32 param_2);
+ bool func_ov015_02129c44(s32 param_2);
+ MapBase *func_ov017_0215b4a0(unk32 param_2, unk32 param_3);
+ MapBase *func_ov017_0215b4e8(unk32 param_2, unk32 param_3);
};
diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp
index aa13a0f1..a6fd03fe 100644
--- a/include/Map/MapManager.hpp
+++ b/include/Map/MapManager.hpp
@@ -27,6 +27,30 @@ struct MapManager_Unk2 {
~MapManager_Unk2();
};
+struct UnkStruct_0208210c_param3 {
+ /* 000 */ unk32 mUnk_00;
+ /* 004 */ unk8 mUnk_04;
+ /* 005 */ unk8 mUnk_05;
+ /* 006 */ unk8 mUnk_06;
+ /* 007 */ bool mUnk_07;
+ /* 008 */ unk32 mUnk_08;
+ /* 00c */ unk32 mUnk_0c;
+ /* 010 */ u8 mUnk_10;
+ /* 011 */ unk8 mUnk_11;
+ /* 012 */ unk16 mUnk_12;
+ /* 014 */ unk16 mUnk_14;
+ /* 016 */ unk16 mUnk_16;
+ /* 018 */ Vec3p mUnk_18;
+ /* 024 */ Vec3p mUnk_24;
+ /* 030 */ unk8 mUnk_30[0x18C];
+ /* 1bc */ bool mUnk_1bc;
+ /* 1bd */ unk8 mUnk_1bd;
+ /* 1be */ u8 mUnk_1be;
+ /* 1bf */ u8 mUnk_1bf;
+ /* 1c0 */ unk32 mUnk_1c0;
+ /* 1c4 */
+};
+
class MapManager : public SysObject {
public:
/* 00 */ Course *mCourse;
@@ -48,9 +72,9 @@ public:
void GetCourseDungeonProgress(CourseProgress *param_2);
void func_ov00_020820fc(s32 param_2, unk32 param_3, unk32 param_4);
- void func_ov00_0208210c(unk32 param_2, unk32 *param_3);
- void func_ov00_0208230c(s32 *param_2);
- void func_ov00_02082348(unk32 *param_2);
+ void func_ov00_0208210c(unk32 param_2, UnkStruct_0208210c_param3 *param_3);
+ void func_ov00_0208230c(struct FlagsUnk2 *param_2);
+ void func_ov00_02082348(struct FlagsUnk2 *param_2);
void func_ov00_020823a4(unk32 param_2);
void func_ov00_020823b4();
bool func_ov00_020823c4(unk32 *param_2, s32 param_3);
@@ -87,7 +111,7 @@ public:
void func_ov00_02082acc();
unk32 *func_ov00_02082adc();
void func_ov00_02082af4();
- void func_ov00_02082b3c(unk32 *param_2, Vec2b *param3);
+ bool func_ov00_02082b3c(FlagsUnk2 *param_2);
u8 func_ov00_02082d08();
u8 GetCurrentMapPosX();
u8 GetCurrentMapPosY();
@@ -140,7 +164,7 @@ public:
s32 GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4);
bool func_ov00_020836dc(u32 param_2, u32 actorId);
bool IsTriggerTypeOverlapped(u32 param_2, Vec3p *param_3);
- bool GetOverlappingTrigger(Vec3p *param_2);
+ unk8 GetOverlappingTrigger(Vec3p *param_2);
bool func_ov00_02083790(s32 param_2);
bool func_ov00_02083840(s32 param_2);
bool AddTrigger(s32 param_2);
@@ -160,7 +184,7 @@ public:
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(u8 *param_1, MapManager *param_2, s32 *param_3, s32 param_4, s32 *param_5);
+ static void func_ov00_02083a54(Vec2b *param_1, MapManager *param_2, Vec3p *param_3, s32 param_4, unk32 param_5);
s32 GetTileStartX(unk32 x);
s32 GetTileStartZ(unk32 z);
s32 GetTileEndX(unk32 x);
@@ -168,7 +192,7 @@ public:
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, u32 param_3, s32 param_4, u32 param_5);
+ void func_ov00_02083ce8(Vec3p *param_2, Vec2b 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);
@@ -180,11 +204,11 @@ public:
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);
- unk32 func_ov00_020840a0(unk8 param_2, unk8 param_3);
+ unk32 func_ov00_020840a0(u8 param_2, u8 param_3);
unk32 *MapData_vfunc_78(Vec2b *param_1);
unk32 func_ov00_020840dc(Vec2b *param_1);
static unk8 func_ov00_02084100(unk32 *param_1, MapManager *param_2);
- u32 GetMapData_Unk_48();
+ unk32 GetMapData_Unk_48();
unk32 GetMapData_Unk_4c();
unk32 func_ov00_0208412c();
void func_ov00_0208413c(unk32 param_2);
@@ -234,11 +258,11 @@ public:
s32 func_ov00_02084d4c(unk32 param_2, unk32 param_3, Vec3p *param_4);
unk32 func_ov00_02084ebc(Vec3p *param_2);
s32 func_ov00_02085108(Vec3p *param_2);
- static s32 func_ov00_0208527c(MapManager *param_1, unk32 param_2, unk32 *param_3);
+ static unk32 func_ov00_0208527c(MapManager *param_1, unk32 param_2, Vec3p *param_3);
static s32 func_ov00_020853fc(MapManager *param_1, Vec3p *param_2, s32 *param_3);
unk32 func_ov00_02085594(Vec3p *param_2);
- static void func_ov00_0208583c(MapManager *param_1, Vec3p *param_2, unk32 param_3);
- static unk32 func_ov00_020858b0(MapManager *param_1, Vec3p *param_2, s32 param_3);
+ static unk32 func_ov00_0208583c(MapManager *param_1, Vec3p *param_2, unk32 param_3);
+ static unk32 func_ov00_020858b0(MapManager *param_1, Vec3p *param_2, unk32 param_3);
s32 func_ov00_02085a34(Vec3p *param_2, unk32 param_3);
unk8 func_ov00_02085c60(Vec3p *param_2, unk32 *param_3, unk32 *param_4, u32 param_5);
unk8 func_ov00_02086044(Vec3p *param_2, Vec3p *param_3, unk32 param_4);
@@ -255,7 +279,7 @@ public:
static void LoadMapTexSprites(s32 param1);
void func_ov004_02102260();
void func_ov004_02102264(unk32 *param1, char *param2);
- void func_ov004_021024c4(unk32 *param1, unk32 param2, bool param3);
+ void func_ov004_021024c4(FlagsUnk2 *param1, bool param2, bool param3);
void func_ov004_021025d8();
};
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 04:09:31 +0000