Decomp progress 28%

3 files changed, 15 insertions, 14 deletions

diff --git a/include/Actor/ActorType.hpp b/include/Actor/ActorType.hpp
index 4adc3a7a..e20eaa32 100644
--- a/include/Actor/ActorType.hpp
+++ b/include/Actor/ActorType.hpp
@@ -111,6 +111,7 @@ enum ActorTypeId_ {
     ActorTypeId_BMTY = __ACTOR_TYPE_ID(B, M, T, Y),
     ActorTypeId_BTRF = __ACTOR_TYPE_ID(B, T, R, F),
     ActorTypeId_CBLS = __ACTOR_TYPE_ID(C, B, L, S),
+    ActorTypeId_EVIC = __ACTOR_TYPE_ID(E, V, I, C),
     ActorTypeId_FLAL = __ACTOR_TYPE_ID(F, L, A, L),
     ActorTypeId_FLBM = __ACTOR_TYPE_ID(F, L, B, M),
     ActorTypeId_FLBT = __ACTOR_TYPE_ID(F, L, B, T),
diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp
index b71f2b06..254212bd 100644
--- a/include/Map/MapBase.hpp
+++ b/include/Map/MapBase.hpp
@@ -135,16 +135,16 @@ public:
     /* 48 */ virtual void vfunc_48();
     /* 4c */ virtual s32 vfunc_4c() = 0;
     /* 50 */ virtual unk32 vfunc_50();
-    /* 54 */ virtual unk32 vfunc_54();
-    /* 58 */ virtual unk32 vfunc_58();
+    /* 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();
+    /* 60 */ virtual unk32 vfunc_60(unk8 *param_1);
     /* 64 */ virtual unk32 vfunc_64();
-    /* 68 */ virtual unk8 vfunc_68();
+    /* 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();
+    /* 78 */ virtual unk32 vfunc_78(bool *param_1);
     /* 7c */ virtual void vfunc_7c();
     /* 80 */ virtual unk32 vfunc_80();
     /* 84 */ virtual void vfunc_84(unk32 param_2);
@@ -155,7 +155,7 @@ public:
     /* 98 */ virtual void vfunc_98(unk32 param_2, unk32 param_3, unk32 param_4);
     /* 9c */ virtual void vfunc_9c();
     /* a0 */ virtual void vfunc_a0();
-    /* a4 */ virtual unk32 vfunc_a4();
+    /* a4 */ virtual unk32 vfunc_a4(unk8 *param_1);
     /* a8 */ virtual void vfunc_a8();
     /* ac */ virtual void vfunc_ac();
     /* b0 */ virtual void vfunc_b0(unk32 param_2, unk32 param_3);
diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp
index bd580686..513c4cc4 100644
--- a/include/Map/MapManager.hpp
+++ b/include/Map/MapManager.hpp
@@ -164,29 +164,29 @@ public:
     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();
+    unk32 MapData_vfunc_60(unk8 *param_1);
     bool func_ov00_02083e70();
-    unk8 MapData_vfunc_68();
+    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);
     static unk8 func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3);
     void func_ov00_02084024(Vec2b *param_2, AABB *param_3);
-    unk8 MapData_vfunc_54();
+    unk32 MapData_vfunc_54(unk8 *param_1);
     unk8 func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4);
-    unk8 MapData_vfunc_78();
+    unk32 MapData_vfunc_78(bool *param_1);
     unk8 func_ov00_020840dc();
     static unk8 func_ov00_02084100(unk32 *param_1, MapManager *param_2);
     u32 GetMapData_Unk_48();
     unk32 GetMapData_Unk_4c();
     unk32 func_ov00_0208412c();
     void func_ov00_0208413c(unk32 param_2);
-    unk8 MapData_vfunc_58();
-    unk8 func_ov00_02084164();
+    unk8 MapData_vfunc_58(Vec2b *param_1, int param_2);
+    unk8 func_ov00_02084164(Vec2b *param_2);
     u8 GetMapData_Unk_0a();
     u8 GetMapData_Unk_0b();
-    unk8 MapData_vfunc_a4();
+    unk8 MapData_vfunc_a4(unk8 *param_1);
     unk8 func_ov00_0208433c(Vec3p *param_2, Vec3p *param_3);
     unk8 func_ov00_0208439c(Vec2s *param_2, Vec3p *param_3);
     void func_ov00_020843ec(s32 *param_2);
@@ -214,7 +214,7 @@ public:
     void SetBlueWarpOpen(bool state);
     bool GetBlueWarpOpen();
     unk8 func_ov00_02084b38(unk32 param_2, unk32 param_3, unk32 param_4);
-    bool func_ov00_02084be0(unk32 param_2, unk32 param_3);
+    bool func_ov00_02084be0(u32 param_2, unk32 param_3);
     void SetMapDataFlag1(unk32 param_2, bool param_3);
     bool GetMapDataFlag1(unk32 param_2);
     void func_ov00_02084c7c(unk32 param_2);