diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index e8b53bf3..9c7f5c87 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -612,29 +612,29 @@ _ZN10MapManager18func_ov00_02083c50Ei kind:function(arm,size=0x2c) addr:0x2083c5 _ZN10MapManager18func_ov00_02083c7cEP5Vec3pj kind:function(arm,size=0x6c) addr:0x2083c7c _ZN10MapManager18func_ov00_02083ce8EPS_Pijij kind:function(arm,size=0x14c) addr:0x2083ce8 _ZN10MapManager18func_ov00_02083e34Ecci kind:function(arm,size=0x24) addr:0x2083e34 -_ZN10MapManager16MapData_vfunc_60Ev kind:function(arm,size=0x18) addr:0x2083e58 +_ZN10MapManager16MapData_vfunc_60EPc kind:function(arm,size=0x18) addr:0x2083e58 _ZN10MapManager18func_ov00_02083e70Ev kind:function(arm,size=0x70) addr:0x2083e70 -_ZN10MapManager16MapData_vfunc_68Ev kind:function(arm,size=0x18) addr:0x2083ee0 +_ZN10MapManager16MapData_vfunc_68EP5Vec3pPb kind:function(arm,size=0x18) addr:0x2083ee0 _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ kind:function(arm,size=0x4c) addr:0x2083ef8 _ZN10MapManager18func_ov00_02083f44EP5Vec3p kind:function(arm,size=0x3c) addr:0x2083f44 _ZN10MapManager16MapData_vfunc_6cEiii kind:function(arm,size=0x18) addr:0x2083f80 _ZN10MapManager16MapData_vfunc_70EP5Vec3p kind:function(arm,size=0x18) addr:0x2083f98 _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p kind:function(arm,size=0x74) addr:0x2083fb0 _ZN10MapManager18func_ov00_02084024EP5Vec2bP4AABB kind:function(arm,size=0x64) addr:0x2084024 -_ZN10MapManager16MapData_vfunc_54Ev kind:function(arm,size=0x18) addr:0x2084088 +_ZN10MapManager16MapData_vfunc_54EPc kind:function(arm,size=0x18) addr:0x2084088 _ZN10MapManager18func_ov00_020840a0Ecci kind:function(arm,size=0x24) addr:0x20840a0 -_ZN10MapManager16MapData_vfunc_78Ev kind:function(arm,size=0x18) addr:0x20840c4 +_ZN10MapManager16MapData_vfunc_78EPb kind:function(arm,size=0x18) addr:0x20840c4 _ZN10MapManager18func_ov00_020840dcEv kind:function(arm,size=0x24) addr:0x20840dc _ZN10MapManager18func_ov00_02084100EPiPS_ kind:function(arm,size=0x14) addr:0x2084100 _ZN10MapManager17GetMapData_Unk_48Ev kind:function(arm,size=0xc) addr:0x2084114 _ZN10MapManager17GetMapData_Unk_4cEv kind:function(arm,size=0xc) addr:0x2084120 _ZN10MapManager18func_ov00_0208412cEv kind:function(arm,size=0x10) addr:0x208412c _ZN10MapManager18func_ov00_0208413cEi kind:function(arm,size=0x10) addr:0x208413c -_ZN10MapManager16MapData_vfunc_58Ev kind:function(arm,size=0x18) addr:0x208414c -_ZN10MapManager18func_ov00_02084164Ev kind:function(arm,size=0x1a8) addr:0x2084164 +_ZN10MapManager16MapData_vfunc_58EP5Vec2bi kind:function(arm,size=0x18) addr:0x208414c +_ZN10MapManager18func_ov00_02084164EP5Vec2b kind:function(arm,size=0x1a8) addr:0x2084164 _ZN10MapManager17GetMapData_Unk_0aEv kind:function(arm,size=0xc) addr:0x208430c _ZN10MapManager17GetMapData_Unk_0bEv kind:function(arm,size=0xc) addr:0x2084318 -_ZN10MapManager16MapData_vfunc_a4Ev kind:function(arm,size=0x18) addr:0x2084324 +_ZN10MapManager16MapData_vfunc_a4EPc kind:function(arm,size=0x18) addr:0x2084324 _ZN10MapManager18func_ov00_0208433cEP5Vec3pS1_ kind:function(arm,size=0x60) addr:0x208433c _ZN10MapManager18func_ov00_0208439cEP5Vec2sP5Vec3p kind:function(arm,size=0x50) addr:0x208439c _ZN10MapManager18func_ov00_020843ecEPi kind:function(arm,size=0x2ac) addr:0x20843ec @@ -662,7 +662,7 @@ _ZN10MapManager10GetNumKeysEv kind:function(arm,size=0xc) addr:0x2084b14 _ZN10MapManager15SetBlueWarpOpenEb kind:function(arm,size=0xc) addr:0x2084b20 _ZN10MapManager15GetBlueWarpOpenEv kind:function(arm,size=0xc) addr:0x2084b2c _ZN10MapManager18func_ov00_02084b38Eiii kind:function(arm,size=0xa8) addr:0x2084b38 -_ZN10MapManager18func_ov00_02084be0Eii kind:function(arm,size=0x7c) addr:0x2084be0 +_ZN10MapManager18func_ov00_02084be0Eji kind:function(arm,size=0x7c) addr:0x2084be0 _ZN10MapManager15SetMapDataFlag1Eib kind:function(arm,size=0x10) addr:0x2084c5c _ZN10MapManager15GetMapDataFlag1Ei kind:function(arm,size=0x10) addr:0x2084c6c _ZN10MapManager18func_ov00_02084c7cEi kind:function(arm,size=0x18) addr:0x2084c7c diff --git a/config/eur/arm9/overlays/ov015/symbols.txt b/config/eur/arm9/overlays/ov015/symbols.txt index dc62d8fb..6d74b107 100644 --- a/config/eur/arm9/overlays/ov015/symbols.txt +++ b/config/eur/arm9/overlays/ov015/symbols.txt @@ -290,7 +290,7 @@ func_ov015_02129c04 kind:function(arm,size=0x10) addr:0x2129c04 _Z19func_ov015_02129c14P7MapBase kind:function(arm,size=0x10) addr:0x2129c14 _Z19func_ov015_02129c24P7MapBaseP5Vec3pS2_ kind:function(arm,size=0x10) addr:0x2129c24 _Z19func_ov015_02129c34P7MapBasei kind:function(arm,size=0x10) addr:0x2129c34 -func_ov015_02129c44 kind:function(arm,size=0x10) addr:0x2129c44 +_Z19func_ov015_02129c44i kind:function(arm,size=0x10) addr:0x2129c44 func_ov015_02129c54 kind:function(arm,size=0x50) addr:0x2129c54 func_ov015_02129ca4 kind:function(arm,size=0x44) addr:0x2129ca4 func_ov015_02129ce8 kind:function(arm,size=0xac) addr:0x2129ce8 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 2e88e8ca..6416c7c0 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -612,29 +612,29 @@ _ZN10MapManager18func_ov00_02083c50Ei kind:function(arm,size=0x2c) addr:0x2083bf _ZN10MapManager18func_ov00_02083c7cEP5Vec3pj kind:function(arm,size=0x6c) addr:0x2083c1c _ZN10MapManager18func_ov00_02083ce8EPS_Pijij kind:function(arm,size=0x14c) addr:0x2083c88 _ZN10MapManager18func_ov00_02083e34Ecci kind:function(arm,size=0x24) addr:0x2083dd4 -_ZN10MapManager16MapData_vfunc_60Ev kind:function(arm,size=0x18) addr:0x2083df8 +_ZN10MapManager16MapData_vfunc_60EPc kind:function(arm,size=0x18) addr:0x2083df8 _ZN10MapManager18func_ov00_02083e70Ev kind:function(arm,size=0x70) addr:0x2083e10 -_ZN10MapManager16MapData_vfunc_68Ev kind:function(arm,size=0x18) addr:0x2083e80 +_ZN10MapManager16MapData_vfunc_68EP5Vec3pPb kind:function(arm,size=0x18) addr:0x2083e80 _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ kind:function(arm,size=0x4c) addr:0x2083e98 _ZN10MapManager18func_ov00_02083f44EP5Vec3p kind:function(arm,size=0x3c) addr:0x2083ee4 _ZN10MapManager16MapData_vfunc_6cEiii kind:function(arm,size=0x18) addr:0x2083f20 _ZN10MapManager16MapData_vfunc_70EP5Vec3p kind:function(arm,size=0x18) addr:0x2083f38 _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p kind:function(arm,size=0x74) addr:0x2083f50 _ZN10MapManager18func_ov00_02084024EP5Vec2bP4AABB kind:function(arm,size=0x64) addr:0x2083fc4 -_ZN10MapManager16MapData_vfunc_54Ev kind:function(arm,size=0x18) addr:0x2084028 +_ZN10MapManager16MapData_vfunc_54EPc kind:function(arm,size=0x18) addr:0x2084028 _ZN10MapManager18func_ov00_020840a0Ecci kind:function(arm,size=0x24) addr:0x2084040 -_ZN10MapManager16MapData_vfunc_78Ev kind:function(arm,size=0x18) addr:0x2084064 +_ZN10MapManager16MapData_vfunc_78EPb kind:function(arm,size=0x18) addr:0x2084064 _ZN10MapManager18func_ov00_020840dcEv kind:function(arm,size=0x24) addr:0x208407c _ZN10MapManager18func_ov00_02084100EPiPS_ kind:function(arm,size=0x14) addr:0x20840a0 _ZN10MapManager17GetMapData_Unk_48Ev kind:function(arm,size=0xc) addr:0x20840b4 _ZN10MapManager17GetMapData_Unk_4cEv kind:function(arm,size=0xc) addr:0x20840c0 _ZN10MapManager18func_ov00_0208412cEv kind:function(arm,size=0x10) addr:0x20840cc _ZN10MapManager18func_ov00_0208413cEi kind:function(arm,size=0x10) addr:0x20840dc -_ZN10MapManager16MapData_vfunc_58Ev kind:function(arm,size=0x18) addr:0x20840ec -_ZN10MapManager18func_ov00_02084164Ev kind:function(arm,size=0x1a8) addr:0x2084104 +_ZN10MapManager16MapData_vfunc_58EP5Vec2bi kind:function(arm,size=0x18) addr:0x20840ec +_ZN10MapManager18func_ov00_02084164EP5Vec2b kind:function(arm,size=0x1a8) addr:0x2084104 _ZN10MapManager17GetMapData_Unk_0aEv kind:function(arm,size=0xc) addr:0x20842ac _ZN10MapManager17GetMapData_Unk_0bEv kind:function(arm,size=0xc) addr:0x20842b8 -_ZN10MapManager16MapData_vfunc_a4Ev kind:function(arm,size=0x18) addr:0x20842c4 +_ZN10MapManager16MapData_vfunc_a4EPc kind:function(arm,size=0x18) addr:0x20842c4 _ZN10MapManager18func_ov00_0208433cEP5Vec3pS1_ kind:function(arm,size=0x60) addr:0x20842dc _ZN10MapManager18func_ov00_0208439cEP5Vec2sP5Vec3p kind:function(arm,size=0x50) addr:0x208433c _ZN10MapManager18func_ov00_020843ecEPi kind:function(arm,size=0x2ac) addr:0x208438c @@ -662,7 +662,7 @@ _ZN10MapManager10GetNumKeysEv kind:function(arm,size=0xc) addr:0x2084ab4 _ZN10MapManager15SetBlueWarpOpenEb kind:function(arm,size=0xc) addr:0x2084ac0 _ZN10MapManager15GetBlueWarpOpenEv kind:function(arm,size=0xc) addr:0x2084acc _ZN10MapManager18func_ov00_02084b38Eiii kind:function(arm,size=0xa8) addr:0x2084ad8 -_ZN10MapManager18func_ov00_02084be0Eii kind:function(arm,size=0x7c) addr:0x2084b80 +_ZN10MapManager18func_ov00_02084be0Eji kind:function(arm,size=0x7c) addr:0x2084b80 _ZN10MapManager15SetMapDataFlag1Eib kind:function(arm,size=0x10) addr:0x2084bfc _ZN10MapManager15GetMapDataFlag1Ei kind:function(arm,size=0x10) addr:0x2084c0c _ZN10MapManager18func_ov00_02084c7cEi kind:function(arm,size=0x18) addr:0x2084c1c diff --git a/config/usa/arm9/overlays/ov015/symbols.txt b/config/usa/arm9/overlays/ov015/symbols.txt index aa63867c..695075e4 100644 --- a/config/usa/arm9/overlays/ov015/symbols.txt +++ b/config/usa/arm9/overlays/ov015/symbols.txt @@ -290,7 +290,7 @@ func_ov015_02129c04 kind:function(arm,size=0x10) addr:0x2129b84 _Z19func_ov015_02129c14P7MapBase kind:function(arm,size=0x10) addr:0x2129b94 _Z19func_ov015_02129c24P7MapBaseP5Vec3pS2_ kind:function(arm,size=0x10) addr:0x2129ba4 _Z19func_ov015_02129c34P7MapBasei kind:function(arm,size=0x10) addr:0x2129bb4 -func_ov015_02129c44 kind:function(arm,size=0x10) addr:0x2129bc4 +_Z19func_ov015_02129c44i kind:function(arm,size=0x10) addr:0x2129bc4 func_ov015_02129c54 kind:function(arm,size=0x50) addr:0x2129bd4 func_ov015_02129ca4 kind:function(arm,size=0x44) addr:0x2129c24 func_ov015_02129ce8 kind:function(arm,size=0xac) addr:0x2129c68 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); diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index 2d9ca7d9..6e9de875 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -18,12 +18,12 @@ s32 MapBase::func_ov00_0207e28c(s32 param_2) {} void MapBase::vfunc_b4() {} void MapBase::vfunc_48() {} unk32 MapBase::vfunc_50() {} -unk32 MapBase::vfunc_54() {} -unk32 MapBase::vfunc_58() {} +unk32 MapBase::vfunc_54(unk8 *param_1) {} +unk32 MapBase::vfunc_58(Vec2b *param_1, int param_2) {} unk32 MapBase::vfunc_5c() {} -unk32 MapBase::vfunc_60() {} +unk32 MapBase::vfunc_60(unk8 *param_1) {} unk32 MapBase::vfunc_64() {} -unk8 MapBase::vfunc_68() {} +unk8 MapBase::vfunc_68(Vec3p *param_1, bool *param_2) {} unk8 MapBase::func_ov00_0207e940(unk8 *param_1) {} unk8 MapBase::func_ov00_0207e968() {} unk8 MapBase::func_ov00_0207e96c() {} @@ -37,10 +37,10 @@ unk32 MapBase::vfunc_88() {} unk32 MapBase::vfunc_8c() {} void MapBase::vfunc_9c() {} void MapBase::vfunc_a0() {} -unk32 MapBase::vfunc_a4() {} +unk32 MapBase::vfunc_a4(unk8 *param_1) {} void MapBase::vfunc_a8() {} void MapBase::vfunc_ac() {} -unk32 MapBase::vfunc_78() {} +unk32 MapBase::vfunc_78(bool *param_1) {} void MapBase::vfunc_7c() {} unk32 MapBase::vfunc_80() {} void MapBase::vfunc_84(unk32 param_2) {} diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp index 3d5faa7e..6dff6ace 100644 --- a/src/00_Core/Map/MapManager.cpp +++ b/src/00_Core/Map/MapManager.cpp @@ -1161,10 +1161,10 @@ ARM s32 MapManager::func_ov00_02083c50(unk32 z) { } ARM void MapManager::func_ov00_02083c7c(Vec3p *param_2, u32 param_3) { - Vec3p local_28; // Unused. So why, ghidra? Why? Tell me why. + Vec3p local_28; param_2->x = this->func_ov00_02083c24(param_3 & 0xff); param_2->z = this->func_ov00_02083c50(param_3 >> 8 & 0xff); - param_2->y = this->MapData_vfunc_68(); + param_2->y = this->MapData_vfunc_68(&local_28, 0); // please tell me this is correct } ARM void MapManager::func_ov00_02083ce8(MapManager *param_1, s32 *param_2, u32 param_3, s32 param_4, u32 param_5) { @@ -1203,29 +1203,29 @@ ARM void MapManager::func_ov00_02083ce8(MapManager *param_1, s32 *param_2, u32 p param_2[2] = iVar2 + 0x800; } } - iVar2 = param_1->MapData_vfunc_68(); + iVar2 = param_1->MapData_vfunc_68(&local_2c, 0); // I really do hope this is right param_2[1] = iVar2; } ARM void MapManager::func_ov00_02083e34(unk8 param_2, unk8 param_3, unk32 param_4) { - unk8 local_8; + unk8 local_8; // Should this be a bool or a Vec2p or a Vec3p? unk8 local_7; // Unused. unk16 uStack_6; uStack_6 = (unk16) ((u32) param_4 >> 0x10); // _local_8 = CONCAT11(param_3, param_2); What is this? - this->mMap->vfunc_60(/*&local_8*/); // Doesn't take any params, so why? + this->mMap->vfunc_60(&local_8); } -ARM unk32 MapManager::MapData_vfunc_60() { - return this->mMap->vfunc_60(); +ARM unk32 MapManager::MapData_vfunc_60(unk8 *param_1) { // should the param be bool*? + return this->mMap->vfunc_60(param_1); } ARM bool MapManager::func_ov00_02083e70() { int iVar1; int iVar2; - iVar1 = this->MapData_vfunc_54(); + iVar1 = this->MapData_vfunc_54(0); if (iVar1 < 0x2c) { if ((0x2a < iVar1) || (iVar1 == 0x1b)) { return true; @@ -1233,13 +1233,13 @@ ARM bool MapManager::func_ov00_02083e70() { } else if (((iVar1 < 0x50) && (0x4d < iVar1)) && (iVar1 == 0x4e || iVar1 == 0x4f)) { return true; } - iVar1 = this->MapData_vfunc_60(); + iVar1 = this->MapData_vfunc_60(0); iVar2 = this->GetMapData_Unk_48(); return iVar2 <= iVar1; } -ARM unk8 MapManager::MapData_vfunc_68() { - return this->mMap->vfunc_68(); +ARM unk32 MapManager::MapData_vfunc_68(Vec3p *param_1, bool *param_2) { // not sure about the bool* here. + return this->mMap->vfunc_68(param_1, param_2); } ARM s32 MapManager::func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3) { @@ -1252,7 +1252,7 @@ ARM s32 MapManager::func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3) { if (param_2->y < param_3->y) { local_18.y = param_3->y; } - iVar1 = this->mMap->vfunc_68(/*&local_18*/); // takes no args. + iVar1 = this->mMap->vfunc_68(&local_18, 0); // takes no args. return iVar1; } @@ -1305,8 +1305,8 @@ void MapManager::func_ov00_02084024(Vec2b *param_2, AABB *param_3) { Vec3p_Add(¶m_3->max, &local_20, ¶m_3->max); } -unk8 MapManager::MapData_vfunc_54() { - this->mMap->vfunc_54(); +unk32 MapManager::MapData_vfunc_54(unk8 *param_1) { // what type is this param? + return this->mMap->vfunc_54(param_1); } unk8 MapManager::func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4) { @@ -1316,18 +1316,18 @@ unk8 MapManager::func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4) { uStack_6 = (unk16) ((u32) param_4 >> 0x10); // _local_8 = CONCAT11(param_3, param_2); - this->MapData_vfunc_54(/*&local_8*/); // Doesn't take any params. + this->MapData_vfunc_54(&local_8); // Doesn't take any params. // No calls to functions according to objdiff, why??? } -unk8 MapManager::MapData_vfunc_78() { - this->mMap->vfunc_78(); +unk32 MapManager::MapData_vfunc_78(bool *param_1) { // bool* param placeholder for now, no way of knowing what the type is. + return this->mMap->vfunc_78(param_1); } unk8 MapManager::func_ov00_020840dc() { int *piVar1; - piVar1 = (int *) this->MapData_vfunc_78(); + piVar1 = (int *) this->MapData_vfunc_78(0); if (piVar1 != (int *) 0x0) { // (**(code **) (*piVar1 + 0x1c))(); // MapBase::func_ov00_0207f934() ?? } @@ -1355,17 +1355,17 @@ void MapManager::func_ov00_0208413c(unk32 param_2) { this->mMap->func_ov00_0207f948(param_2); } -unk8 MapManager::MapData_vfunc_58() { - this->mMap->vfunc_58(); +unk8 MapManager::MapData_vfunc_58(Vec2b *param_1, int param_2) { + this->mMap->vfunc_58(param_1, param_2); } -unk8 MapManager::func_ov00_02084164() { +unk8 MapManager::func_ov00_02084164(Vec2b *param_2) { int iVar1; unk32 uVar2; - iVar1 = this->mMap->vfunc_58(/*param_2, 7, pcVar3, param_4*/); // Params? + iVar1 = this->mMap->vfunc_58(param_2, 7 /*, pcVar3, param_4*/); // Params? if (iVar1 == 0) { - uVar2 = this->MapData_vfunc_54(); + uVar2 = this->MapData_vfunc_54(0); switch (uVar2) { case 0: break; case 1: return 0; @@ -1467,8 +1467,8 @@ u8 MapManager::GetMapData_Unk_0b() { return this->mMap->mUnk_00b; } -unk8 MapManager::MapData_vfunc_a4() { - this->mMap->vfunc_a4(); +unk8 MapManager::MapData_vfunc_a4(unk8 *param_1) { + this->mMap->vfunc_a4(param_1); } unk8 MapManager::func_ov00_0208433c(Vec3p *param_2, Vec3p *param_3) { @@ -1493,7 +1493,7 @@ unk8 MapManager::func_ov00_0208439c(Vec2s *param_2, Vec3p *param_3) { this->mMap->func_ov00_0207f630(param_2, param_3); this->GetMapMinBounds(&VStack_18); Vec3p_Add(param_3, &VStack_18, param_3); - iVar1 = this->MapData_vfunc_68(); + iVar1 = this->MapData_vfunc_68(param_3, 0); // is this correct? param_3->y = iVar1; } @@ -1617,7 +1617,7 @@ unk8 MapManager::func_ov00_020846a4() { return iVar1; } -unk8 MapManager::func_ov00_02084700(s32 *param_1) { +unk8 MapManager::func_ov00_02084700(s32 *param_1) { // param_1 perhaps Vec2b ? int iVar1; iVar1 = *(int *) (param_1[1] + 0x34); @@ -1827,10 +1827,10 @@ bool MapManager::func_ov00_02084ac4(u32 actorId) { bool bVar1; iVar1 = gActorManager->FindActorById(actorId); - if (iVar1 == (Actor *) 0x0) { + if (iVar1 == NULL) { return false; } - bVar1 = (char *) iVar1->mType == "CIVE"; // s_CIVE_overlay_d_0__02084b04 + bVar1 = iVar1->mType == ActorTypeId_EVIC; if (bVar1) { iVar1->mAlive = false; } @@ -1878,7 +1878,7 @@ LAB_overlay_d_0__02084b60: return; } -bool MapManager::func_ov00_02084be0(unk32 param_2, unk32 param_3) { +bool MapManager::func_ov00_02084be0(u32 param_2, unk32 param_3) { bool bVar1; if (param_2 == 0) { @@ -2035,7 +2035,7 @@ unk32 MapManager::func_ov00_02084ebc(Vec3p *param_2) { u32 uStack_14; this->func_ov00_02083a1c(auStack_18, this, param_2); - piVar1 = (int *) this->MapData_vfunc_78(); + piVar1 = (int *) this->MapData_vfunc_78(0); if (piVar1 != (int *) 0x0) { // iVar2 = (**(code **) (*piVar1 + 0x1c))(); if (iVar2 < 0x39) { @@ -2059,7 +2059,7 @@ unk32 MapManager::func_ov00_02084ebc(Vec3p *param_2) { if (iVar2 != 0) { return 0; } - iVar2 = this->MapData_vfunc_54(); + iVar2 = this->MapData_vfunc_54(0); if (iVar2 < 0x47) { if (0x45 < iVar2) { return 0; @@ -2122,7 +2122,7 @@ unk32 MapManager::func_ov00_02084ebc(Vec3p *param_2) { } else if (iVar2 == 0x50) { return 0; } - iVar2 = this->mMap->vfunc_58(/*auStack_18, 5*/); + iVar2 = this->mMap->vfunc_58(auStack_18, 5); if (iVar2 != 0) { return 0; } @@ -2167,7 +2167,7 @@ s32 MapManager::func_ov00_02085108(s32 *param_2) { uVar5 = (u32) local_39; if ((u32) local_3a <= (u32) local_39) { do { - piVar3 = (int *) puVar1->MapData_vfunc_78(); + piVar3 = (int *) puVar1->MapData_vfunc_78(0); if ((piVar3 != (int *) 0x0) && ((piVar3[1] & 4U) != 0)) { iVar7 = piVar3[7]; iVar6 = piVar3[6]; @@ -2244,7 +2244,7 @@ s32 MapManager::func_ov00_0208527c(MapManager *param_1, unk32 param_2, unk32 *pa return 0; } for (; (int) uVar1 <= (int) uVar6; uVar1 = uVar1 + 1) { - iVar4 = puVar2->MapData_vfunc_78(); + iVar4 = puVar2->MapData_vfunc_78(0); if (((iVar4 != 0) && ((*(u32 *) (iVar4 + 4) & 4) != 0)) && (iVar5 = func_ov000_0208b73c(iVar4, param_2), iVar5 != 0)) { @@ -2305,7 +2305,7 @@ s32 MapManager::func_ov00_020853fc(MapManager *param_1, Vec3p *param_2, s32 *par local_30 = 0; for (; uVar1 = local_50, (int) local_48 <= (int) (u32) local_3b; local_48 = local_48 + 1) { for (; (int) uVar1 <= (int) uVar6; uVar1 = uVar1 + 1) { - iVar3 = gMapManager->MapData_vfunc_78(); + iVar3 = gMapManager->MapData_vfunc_78(0); if ((((iVar3 != 0) && ((*(u32 *) (iVar3 + 4) & 4) != 0)) && (iVar4 = Vec3p_Distance((Vec3p *) (iVar3 + 0x18), param_2), iVar4 < *param_3)) && (iVar5 = func_ov000_0208b7d0(iVar3, param_2), iVar5 != 0)) @@ -2330,7 +2330,7 @@ unk32 MapManager::func_ov00_02085594(MapManager *param_1, Vec3p *param_2, unk32 Vec3p VStack_20; param_1->func_ov00_02083a1c(&local_28, param_1, param_2); - piVar1 = (int *) param_1->MapData_vfunc_78(); + piVar1 = (int *) param_1->MapData_vfunc_78(0); bVar5 = true; if (piVar1 != (int *) 0x0) { param_2->x = piVar1[6]; @@ -2425,7 +2425,7 @@ unk32 MapManager::func_ov00_02085594(MapManager *param_1, Vec3p *param_2, unk32 } else if (iVar2 == 0x50) { return 0; } - iVar2 = param_1->mMap->vfunc_58(/*&local_28, 5*/); // no params + iVar2 = param_1->mMap->vfunc_58(&local_28, 5); // no params if (iVar2 != 0) { return 0; } @@ -2452,7 +2452,7 @@ void MapManager::func_ov00_0208583c(MapManager *param_1, Vec3p *param_2, unk32 p unk8 auStack_10[4]; // param_1->func_ov00_02083a1c(auStack_10, param_1, param_2); // Should auStack_10 be pointer type or not ? - piVar1 = (s32 *) param_1->MapData_vfunc_78(); + piVar1 = (s32 *) param_1->MapData_vfunc_78(0); if (piVar1 == (s32 *) 0x0) { return; } @@ -2490,12 +2490,12 @@ unk8 MapManager::func_ov00_020858b0(MapManager *param_1, Vec3p *param_2, s32 par if ((-1 < iVar7) && (iVar1 = local_28.y - 1, iVar7 < iVar2)) { for (; iVar1 <= (int) (local_28.y + 1); iVar1 = iVar1 + 1) { if ((-1 < iVar1) && (iVar1 < iVar3)) { - iVar4 = param_1->MapData_vfunc_60(); + iVar4 = param_1->MapData_vfunc_60(0); iVar4 = iVar4 - iVar6; if (iVar4 < 0) { iVar4 = -iVar4; } - if ((iVar4 < 0xce) && (piVar5 = (int *) param_1->MapData_vfunc_78(), piVar5 != (int *) 0x0)) { + if ((iVar4 < 0xce) && (piVar5 = (int *) param_1->MapData_vfunc_78(0), piVar5 != (int *) 0x0)) { // local_38 = (**(code **) (*piVar5 + 0x38))(piVar5, param_3); } } @@ -2527,7 +2527,7 @@ s32 MapManager::func_ov00_02085a34(Vec3p *param_2, s32 param_3) { return -1; } this->func_ov00_02083a1c(auStack_2a, this, param_2); - piVar1 = (int *) this->MapData_vfunc_78(); + piVar1 = (int *) this->MapData_vfunc_78(0); if (piVar1 == (int *) 0x0) { return -1; } @@ -2545,7 +2545,7 @@ s32 MapManager::func_ov00_02085a34(Vec3p *param_2, s32 param_3) { if (iVar2 == 0) { return -1; } - piVar1 = (int *) this->MapData_vfunc_78(); + piVar1 = (int *) this->MapData_vfunc_78(0); if (piVar1 != (int *) 0x0) { // iVar2 = (**(code **) (*piVar1 + 0x1c))(); if (0x38 < iVar2) { @@ -2587,7 +2587,7 @@ s32 MapManager::func_ov00_02085a34(Vec3p *param_2, s32 param_3) { if (iVar2 == 0) { return -1; } - iVar2 = MapData_vfunc_78(); // Same here. + iVar2 = MapData_vfunc_78(0); // Same here. if ((iVar2 != 0) && (0 < *(s16 *) (iVar2 + 0xe))) { return 1; } @@ -2817,7 +2817,7 @@ unk8 MapManager::func_ov00_02086044(Vec3p *param_2, Vec3p *param_3, unk32 param_ return 1; } } - piVar9 = (int *) this->MapData_vfunc_78(); + piVar9 = (int *) this->MapData_vfunc_78(0); if ((piVar9 != (int *) 0x0) /*&& (iVar8 = (**(code **) (*piVar9 + 0x58))(), iVar8 != 0)*/) { iStack_c0.x = param_3->x; iStack_c0.y = param_3->y;