diff options
Diffstat (limited to 'src/00_Core')
| -rw-r--r-- | src/00_Core/Map/MapManager.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp index 7de4d030..dcc1124e 100644 --- a/src/00_Core/Map/MapManager.cpp +++ b/src/00_Core/Map/MapManager.cpp @@ -207,8 +207,8 @@ ARM void MapManager::func_ov00_0208210c(unk32 param_2, unk32 *param_3) { } else { this->func_ov00_02082348((unk32 *) &local_40[1]); *param_3 = ((UnkStruct_027e0d38_UnkC *) &local_40[1])->func_ov000_020a5e9c(); - *(unk8 *) (param_3 + 1) = local_40[1].mUnk_12; - *(u8 *) ((int) param_3 + 5) = local_40[1].mUnk_13; + *(unk8 *) (param_3 + 1) = local_40[1].mUnk_04.mUnk_0e; + *(u8 *) ((int) param_3 + 5) = local_40[1].mUnk_04.mUnk_0f; } param_3[2] = ((UnkStruct_027e0d38_UnkC *) ((unk32) (data_027e0d38->mUnk_28) + 0x1c))->func_ov000_020a5e9c(); *(u8 *) (param_3 + 4) = *(u8 *) ((int) data_027e0d38->mUnk_28 + 0x2e); @@ -225,19 +225,19 @@ ARM void MapManager::func_ov00_0208210c(unk32 param_2, unk32 *param_3) { param_3[0xb] = *(unk32 *) ((int) pvVar3 + 0x64); *(unk16 *) ((int) param_3 + 0x16) = *(unk16 *) ((int) data_027e0d38->mUnk_28 + 0x68); pvVar3 = data_027e0d38->mUnk_28; - local_40[0].mUnk_00 = *(unk32 *) ((int) pvVar3 + 0x70); - local_40[0].mUnk_04 = *(unk32 *) ((int) pvVar3 + 0x74); - local_40[0].mUnk_08 = *(unk32 *) ((int) pvVar3 + 0x78); - local_40[0].mUnk_0c = *(unk32 *) ((int) pvVar3 + 0x7c); - local_40[0].mUnk_10 = *(unk16 *) ((int) pvVar3 + 0x80); - local_40[0].mUnk_12 = *(u8 *) ((int) pvVar3 + 0x82); - local_40[0].mUnk_13 = *(u8 *) ((int) pvVar3 + 0x83); - local_40[0].mUnk_14 = *(u8 *) ((int) pvVar3 + 0x84); - local_40[0].mUnk_15 = *(u8 *) ((int) pvVar3 + 0x85); + local_40[0].mUnk_00.mUnk_00 = *(unk32 *) ((int) pvVar3 + 0x70); + local_40[0].mUnk_04.mUnk_00 = *(unk32 *) ((int) pvVar3 + 0x74); + local_40[0].mUnk_04.mUnk_04 = *(unk32 *) ((int) pvVar3 + 0x78); + local_40[0].mUnk_04.mUnk_08 = *(unk32 *) ((int) pvVar3 + 0x7c); + local_40[0].mUnk_04.mUnk_0c = *(unk16 *) ((int) pvVar3 + 0x80); + local_40[0].mUnk_04.mUnk_0e = *(u8 *) ((int) pvVar3 + 0x82); + local_40[0].mUnk_04.mUnk_0f = *(u8 *) ((int) pvVar3 + 0x83); + local_40[0].mUnk_04.mUnk_10 = *(u8 *) ((int) pvVar3 + 0x84); + local_40[0].mUnk_04.mUnk_11 = *(u8 *) ((int) pvVar3 + 0x85); uVar2 = ((UnkStruct_027e0d38_UnkC *) &local_40[0])->func_ov000_020a5e9c(); param_3[0x70] = uVar2; - *(u8 *) ((int) param_3 + 0x1be) = local_40[0].mUnk_12; - *(u8 *) ((int) param_3 + 0x1bf) = local_40[0].mUnk_13; + *(u8 *) ((int) param_3 + 0x1be) = local_40[0].mUnk_04.mUnk_0e; + *(u8 *) ((int) param_3 + 0x1bf) = local_40[0].mUnk_04.mUnk_0f; func_ov000_02096324(data_027e0f70, param_3); func_ov000_0209d6e8(data_027e0f7c, param_3); if (this->mCourse->mType != CourseType_TempleOfTheOceanKing) { @@ -752,9 +752,9 @@ ARM void MapManager::func_ov00_0208315c(s32 *param_2, s32 *param_3) { if (*piVar4 == -2 || piVar4 == piVar2) { pvVar3 = data_027e0d38->mUnk_28; - local_2c.x = pvVar3->mUnk_5c[0]; - local_2c.y = pvVar3->mUnk_5c[1]; - local_2c.z = pvVar3->mUnk_5c[2]; + local_2c.x = pvVar3->mUnk_5c.mUnk_00; + local_2c.y = pvVar3->mUnk_5c.mUnk_04; + local_2c.z = pvVar3->mUnk_5c.mUnk_08; this->func_ov00_02083298((u32) * (u8 *) (*(s32 *) data_027e0d38->mUnk_28 + 0x56), &local_2c, param_2, param_3); return; } |