diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 39e15b88..f40e4eed 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -188,7 +188,7 @@ public: unk32 func_ov00_0208412c(); void func_ov00_0208413c(unk32 param_2); unk8 MapData_vfunc_58(Vec2b *param_1, int param_2); - unk8 func_ov00_02084164(Vec2b *param_2); + s32 func_ov00_02084164(Vec2b *param_2); u8 GetMapData_Unk_0a(); u8 GetMapData_Unk_0b(); unk8 MapData_vfunc_a4(unk8 *param_1); diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp index e7f0397a..64225e48 100644 --- a/src/00_Core/Map/MapManager.cpp +++ b/src/00_Core/Map/MapManager.cpp @@ -1460,9 +1460,7 @@ unk8 MapManager::func_ov00_0208433c(Vec3p *param_2, Vec3p *param_3) { Vec3p VStack_24; Vec3p local_18; - local_18.x = param_2->x; - local_18.y = param_2->y; - local_18.z = param_2->z; + local_18 = *param_2; this->GetMapMinBounds(&VStack_24); Vec3p_Sub(&local_18, &VStack_24, &local_18); this->mMap->func_ov00_0207f53c(&local_28, this->mMap, &local_18); @@ -1613,6 +1611,13 @@ ARM s32 MapManager::func_ov00_02084700(MapManager *pMapManager) { } unk8 MapManager::func_ov00_02084740() { + static const s32 data_ov000_020d88f0[] = { + 0x51, 0x6e, 0x65, 0x50, 0x30, 0x74, 0x49, 0x50, 0x51, 0x54, 0x52, 0x53, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5f, + 0x60, 0x61, 0x5c, 0x5b, 0x5e, 0x62, 0x63, 0x64, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x5d, 0x31, 0x39, + 0x3a, 0x3b, 0x3c, 0x32, 0x33, 0x34, 0x35, 0x38, 0x3d, 0xd9, 0xdc, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0x6f, 0x72, + 0x75, 0x78, 0x79, 0x7a, 0x7b, 0x7f, 0x83, 0x87, 0x7c, 0x80, 0x84, 0x0, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, + 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9d, 0x9e, 0x9f, 0xa0, 0x70, 0x71, + 0x73, 0x76, 0x77, 0x7d, 0x7e, 0x81, 0x82, 0x86, 0x9c, 0x36, 0x37, 0xd0, 0xd1, 0xcd, 0x19a}; bool bVar1; int iVar2; int iVar3;