summaryrefslogtreecommitdiff
path: root/src/00_Core/Map/MapManager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/00_Core/Map/MapManager.cpp')
-rw-r--r--src/00_Core/Map/MapManager.cpp124
1 files changed, 82 insertions, 42 deletions
diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp
index dcc1124e..e6799530 100644
--- a/src/00_Core/Map/MapManager.cpp
+++ b/src/00_Core/Map/MapManager.cpp
@@ -334,14 +334,18 @@ ARM bool MapManager::func_ov00_020824cc(s32 param_2) {
ARM s32 MapManager::func_ov00_02082504() {
s32 var = this->mMap->vfunc_4c();
- if (var == 2) return this->mMap->mUnk_1ac;
+ if (var == 2) {
+ return this->mMap->mUnk_1ac;
+ }
return 0;
}
ARM Vec3p *MapManager::func_ov00_02082538() {
s32 var1 = this->mMap->vfunc_4c();
Vec3p var0;
- if (var1 == 2) return &this->mMap->mUnk_1a0;
+ if (var1 == 2) {
+ return &this->mMap->mUnk_1a0;
+ }
var0 = gPlayerPos;
return &var0;
}
@@ -396,12 +400,20 @@ ARM void MapManager::CreateMap(unk32 mapType, unk32 param_3, unk32 param_4) {
MapBase *mapBase;
if (this->mMap == NULL) {
switch (mapType) {
- case 4: this->mMap = new(data_027e0ce0[1], 4) Case_0(param_3, param_4); break;
- case 2: this->mMap = new(data_027e0ce0[1], 4) MapBase(param_3, param_4); break;
- case 0: this->mMap = new(data_027e0ce0[1], 4) Case_4(param_3, param_4); break;
+ case 4:
+ this->mMap = new(data_027e0ce0[1], 4) Case_0(param_3, param_4);
+ break;
+ case 2:
+ this->mMap = new(data_027e0ce0[1], 4) MapBase(param_3, param_4);
+ break;
+ case 0:
+ this->mMap = new(data_027e0ce0[1], 4) Case_4(param_3, param_4);
+ break;
case 1:
case 3:
- default: this->mMap = new(data_027e0ce0[1], 4) Case_Default(param_3, param_4); break;
+ default:
+ this->mMap = new(data_027e0ce0[1], 4) Case_Default(param_3, param_4);
+ break;
}
}
}
@@ -488,8 +500,10 @@ ARM s32 MapManager::func_ov00_02082914(unk32 param_2) {
case 0xfb:
case 0xfc:
case 0xfd:
- case 0xfe: break;
- default: return (int) this;
+ case 0xfe:
+ break;
+ default:
+ return (int) this;
}
local_44.mId = -1;
local_44.mUnk_10 = 0;
@@ -563,8 +577,7 @@ void MapManager::func_ov00_02082b3c(unk32 *param_2, Vec2b *param_3) {
uVar4 = this->GetCurrentMapPosX();
if (((((param_3->x) == uVar4) && (uVar4 = this->GetCurrentMapPosY(), (param_3->y) == uVar4)) &&
((*(s32 *) (param_2 + 8) != 1 || (*(s32 *) (*(s32 *) data_027e0d38 + 0x14) != 1)))) &&
- (*(char *) (param_2 + 0x15) == '\0'))
- {
+ (*(char *) (param_2 + 0x15) == '\0')) {
gAdventureFlags->func_ov00_020976c8();
this->mUnk_0c = *(unk32 *) (param_2 + 0x13);
gPlayer->TeleportToEntrance(*(unk32 *) (param_2 + 0x13), false);
@@ -607,7 +620,8 @@ ARM u8 MapManager::func_ov00_02082d40() {
switch (this->mCourse->mType) {
case CourseType_Sea:
return this->mCourse->mMapGrid[(u8) this->mCourse->mCurrMapPos.x][(u8) this->mCourse->mCurrMapPos.y];
- default: return this->mCourse->mUnk_0b1;
+ default:
+ return this->mCourse->mUnk_0b1;
}
}
@@ -1257,7 +1271,8 @@ ARM bool MapManager::func_ov00_02083e70(Vec2b *param_2) {
case 0x1b:
case 0x2b:
case 0x4e:
- case 0x4f: return true;
+ case 0x4f:
+ return true;
}
iVar1 = this->MapData_vfunc_60(param_2);
@@ -1437,7 +1452,8 @@ ARM s32 MapManager::func_ov00_02084164(Vec2b *param_2) {
case 0x51:
case 0x52:
case 0x53:
- case 0x54: return 1;
+ case 0x54:
+ return 1;
}
return 0;
}
@@ -1587,10 +1603,13 @@ ARM s32 MapManager::func_ov00_020846a4() {
switch (this->mCourse->mType) {
case CourseType_Dungeon:
case CourseType_TempleOfTheOceanKing:
- case CourseType_Battle: return 1;
- case CourseType_Sea: return 2;
+ case CourseType_Battle:
+ return 1;
+ case CourseType_Sea:
+ return 2;
case CourseType_Normal:
- default: return 0;
+ default:
+ return 0;
}
}
return iVar1;
@@ -1692,8 +1711,10 @@ bool MapManager::func_ov00_02084838() {
case 0x13:
case 0x14:
case 0x15:
- case 0x16: return true;
- default: return false;
+ case 0x16:
+ return true;
+ default:
+ return false;
}
}
@@ -1704,7 +1725,8 @@ bool MapManager::func_ov00_020848b8() {
case 0xc:
case 0xd:
case 0xf:
- case 0x11: return true;
+ case 0x11:
+ return true;
}
return false;
}
@@ -1751,7 +1773,8 @@ bool MapManager::func_ov00_020849dc() {
ARM bool MapManager::func_ov00_020849f8() {
switch (data_027e0d38->mUnk_0c.func_ov000_020a5e9c()) {
- case 5: return true;
+ case 5:
+ return true;
default:
if (this->GetMapData_Unk_06() != 0 && !this->func_ov00_020849c0()) {
return true;
@@ -1784,7 +1807,9 @@ ARM bool MapManager::func_ov00_02084ac4(u32 actorId) {
return false;
}
- if (iVar1->mType != ActorTypeId_EVIC) return false;
+ if (iVar1->mType != ActorTypeId_EVIC) {
+ return false;
+ }
iVar1->mAlive = false;
return true;
}
@@ -1819,10 +1844,17 @@ ARM void MapManager::func_ov00_02084b38(u32 param_2, unk32 param_3, bool param_4
}
pMVar1->mUnk_180[param_2 >> 5].mUnk_0 &= ~(1 << (param_2 & 0x1f));
break;
- case 1: this->mCourse->SetMapDataFlag0(param_2, param_4); break;
- case 2: this->mCourse->SetFlag0(param_2, param_4); break;
- case 3: this->mCourse->SetFlag1(param_2, param_4); break;
- default: break;
+ case 1:
+ this->mCourse->SetMapDataFlag0(param_2, param_4);
+ break;
+ case 2:
+ this->mCourse->SetFlag0(param_2, param_4);
+ break;
+ case 3:
+ this->mCourse->SetFlag1(param_2, param_4);
+ break;
+ default:
+ break;
}
}
@@ -1833,11 +1865,19 @@ bool MapManager::func_ov00_02084be0(u32 param_2, unk32 param_3) {
return false;
}
switch (param_3) {
- case 0: return (this->mMap->mUnk_180[param_2 >> 5].mUnk_0 & 1 << (param_2 & 0x1f)) != 0;
- case 1: bVar1 = this->mCourse->GetMapDataFlag0(param_2); return bVar1;
- case 2: bVar1 = this->mCourse->GetFlag0(param_2); return bVar1;
- case 3: bVar1 = this->mCourse->SetFlag1(param_2); return bVar1;
- default: return false;
+ case 0:
+ return (this->mMap->mUnk_180[param_2 >> 5].mUnk_0 & 1 << (param_2 & 0x1f)) != 0;
+ case 1:
+ bVar1 = this->mCourse->GetMapDataFlag0(param_2);
+ return bVar1;
+ case 2:
+ bVar1 = this->mCourse->GetFlag0(param_2);
+ return bVar1;
+ case 3:
+ bVar1 = this->mCourse->SetFlag1(param_2);
+ return bVar1;
+ default:
+ return false;
}
}
@@ -2025,8 +2065,10 @@ unk32 MapManager::func_ov00_02084ebc(Vec3p *param_2) {
case 0x1f:
case 0x27:
case 0x28:
- case 0x29: return 0;
- default: break;
+ case 0x29:
+ return 0;
+ default:
+ break;
}
} else if (iVar2 == 0x37) {
return 0;
@@ -2165,8 +2207,7 @@ s32 MapManager::func_ov00_0208527c(MapManager *param_1, unk32 param_2, unk32 *pa
for (; (int) uVar1 <= (int) uVar6; uVar1 = uVar1 + 1) {
// iVar4 = puVar2->MapData_vfunc_78(0);
if (((iVar4 != 0) && ((*(u32 *) (iVar4 + 4) & 4) != 0)) &&
- (iVar5 = func_ov000_0208b73c(iVar4, param_2), iVar5 != 0))
- {
+ (iVar5 = func_ov000_0208b73c(iVar4, param_2), iVar5 != 0)) {
*param_3 = *(unk32 *) (iVar4 + 0x18);
param_3[1] = *(unk32 *) (iVar4 + 0x1c);
param_3[2] = *(unk32 *) (iVar4 + 0x20);
@@ -2227,8 +2268,7 @@ s32 MapManager::func_ov00_020853fc(MapManager *param_1, Vec3p *param_2, s32 *par
// 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))
- {
+ (iVar5 = func_ov000_0208b7d0(iVar3, param_2), iVar5 != 0)) {
*param_3 = iVar4;
iVar7 = iVar3;
}
@@ -2302,7 +2342,8 @@ unk32 MapManager::func_ov00_02085594(Vec3p *param_2) {
case 0x1f:
case 0x27:
case 0x28:
- case 0x29: return 0;
+ case 0x29:
+ return 0;
}
} else if (iVar2 == 0x37) {
return 0;
@@ -2448,8 +2489,9 @@ s32 MapManager::func_ov00_02085a34(Vec3p *param_2, s32 param_3) {
// iVar2 = (**(code **) (*piVar1 + 0x3c))(piVar1, 1); // What is this?
return iVar2;
}
- } else if (iVar2 == 0x61)
+ } else if (iVar2 == 0x61) {
goto LAB_overlay_d_0__02085afc;
+ }
return -1;
}
if ((iVar2 < 0x38) && (iVar2 != 1)) {
@@ -2795,8 +2837,7 @@ bool MapManager::func_ov00_02086284(s32 *param_2, Vec3p *param_3, Vec3p *param_4
local_70.z = local_5c;
if ((((*(char *) ((int) param_2 + 5) != '\0') && ((param_6 & 0x80) != 0)) &&
(iVar2 = Vec3p_Distance(&local_70, param_3), iVar2 <= local_58)) &&
- ((local_60 + local_54 <= param_4->y && (iVar2 = param_5 + local_60 + local_54, param_3->y <= iVar2))))
- {
+ ((local_60 + local_54 <= param_4->y && (iVar2 = param_5 + local_60 + local_54, param_3->y <= iVar2)))) {
param_7->y = iVar2;
param_8->x = 0;
param_8->y = 0x1000;
@@ -2844,8 +2885,7 @@ bool MapManager::func_ov00_02086284(s32 *param_2, Vec3p *param_3, Vec3p *param_4
}
if (((*(char *) ((int) param_2 + 5) != '\0') && ((param_6 & 0x80) != 0)) &&
(((param_3->x < local_94 && (((local_a0.x <= param_3->x && (param_3->z < local_8c)) && (local_98 <= param_3->z)))) ||
- (local_90 + param_5 <= param_4->y))))
- {
+ (local_90 + param_5 <= param_4->y)))) {
param_7->y = local_90 + param_5;
param_8->x = 0;
param_8->y = 0x1000;
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 00:32:10 +0000