UnkStruct_02082348 -> FlagsUnk2

2 files changed, 32 insertions, 46 deletions

diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp
index 0351a7a6..7de4d030 100644
--- a/src/00_Core/Map/MapManager.cpp
+++ b/src/00_Core/Map/MapManager.cpp
@@ -84,20 +84,6 @@ struct astruct_16 {
     /* 2c */
 }; // What is this struct?
 
-// This might be FlagsUnk2
-struct UnkStruct_02082348 {
-    /* 00 */ unk32 mUnk_00;
-    /* 04 */ unk32 mUnk_04;
-    /* 08 */ unk32 mUnk_08;
-    /* 0c */ unk32 mUnk_0c;
-    /* 10 */ unk16 mUnk_10;
-    /* 12 */ u8 mUnk_12;
-    /* 13 */ u8 mUnk_13;
-    /* 14 */ u8 mUnk_14;
-    /* 15 */ u8 mUnk_15;
-    /* 16 */
-};
-
 struct UnkStruct_027e077c {
     /* 00 */ unk32 mUnk_00;
     /* 04 */ unk32 mUnk_04;
@@ -203,17 +189,17 @@ ARM void MapManager::func_ov00_020820fc(s32 param_2, unk32 param_3, unk32 param_
 ARM void MapManager::func_ov00_0208210c(unk32 param_2, unk32 *param_3) {
     void *pvVar3;
     unk32 uVar2;
-    UnkStruct_02082348 local_40[2];
-
-    local_40[1].mUnk_00 = 0x47;
-    local_40[1].mUnk_04 = 0;
-    local_40[1].mUnk_08 = 0;
-    local_40[1].mUnk_0c = -2;
-    local_40[1].mUnk_10 = 0;
-    local_40[1].mUnk_12 = -1;
-    local_40[1].mUnk_13 = 0;
-    local_40[1].mUnk_14 = 0;
-    local_40[1].mUnk_15 = 0;
+    FlagsUnk2 local_40[2];
+
+    local_40[1].mUnk_00.mUnk_00 = 0x47;
+    local_40[1].mUnk_04.mUnk_00 = 0;
+    local_40[1].mUnk_04.mUnk_04 = 0;
+    local_40[1].mUnk_04.mUnk_08 = -2;
+    local_40[1].mUnk_04.mUnk_0c = 0;
+    local_40[1].mUnk_04.mUnk_0e = -1;
+    local_40[1].mUnk_04.mUnk_0f = 0;
+    local_40[1].mUnk_04.mUnk_10 = 0;
+    local_40[1].mUnk_04.mUnk_11 = 0;
     if (param_2 != 0) {
         *param_3                    = 0xb;
         *(unk8 *) (param_3 + 1)     = 2;
@@ -268,16 +254,16 @@ ARM void MapManager::func_ov00_0208230c(s32 *param_2) {
 }
 
 ARM void MapManager::func_ov00_02082348(unk32 *param_2) {
-    UnkStruct_02082348 unkStruct;
-    unkStruct.mUnk_00 = 0x47;
-    unkStruct.mUnk_04 = 0;
-    unkStruct.mUnk_08 = 0;
-    unkStruct.mUnk_0c = -2;
-    unkStruct.mUnk_10 = 0;
-    unkStruct.mUnk_12 = -1;
-    unkStruct.mUnk_13 = 0;
-    unkStruct.mUnk_14 = 0;
-    unkStruct.mUnk_15 = 0;
+    FlagsUnk2 unkStruct;
+    unkStruct.mUnk_00.mUnk_00 = 0x47;
+    unkStruct.mUnk_04.mUnk_00 = 0;
+    unkStruct.mUnk_04.mUnk_04 = 0;
+    unkStruct.mUnk_04.mUnk_08 = -2;
+    unkStruct.mUnk_04.mUnk_0c = 0;
+    unkStruct.mUnk_04.mUnk_0e = -1;
+    unkStruct.mUnk_04.mUnk_0f = 0;
+    unkStruct.mUnk_04.mUnk_10 = 0;
+    unkStruct.mUnk_04.mUnk_11 = 0;
     this->func_ov00_0208230c((s32 *) &unkStruct);
     func_ov000_02078bf0((s32 *) &unkStruct, param_2);
 }
diff --git a/src/09_Adventure/Game/GameModeAdventure.cpp b/src/09_Adventure/Game/GameModeAdventure.cpp
index 630c4c07..dbfa9690 100644
--- a/src/09_Adventure/Game/GameModeAdventure.cpp
+++ b/src/09_Adventure/Game/GameModeAdventure.cpp
@@ -37,7 +37,7 @@ THUMB GameModeAdventure *GameModeAdventure::Create(unk32 param1) {
 // non-matching
 THUMB GameModeAdventure::GameModeAdventure(unk32 param1) :
     GameModePlay(param1) {
-    UnkStruct_02082348 local_28;
+    FlagsUnk2 local_28;
 
     this->mUnk_008 = new(data_027e0ce0[1], 4) UnkStruct_0211a9ac();
     this->mUnk_00c = new(data_027e0ce0[1], 4) UnkStruct_020fadf4(this->mUnk_008);
@@ -47,30 +47,30 @@ THUMB GameModeAdventure::GameModeAdventure(unk32 param1) :
     func_ov003_020f4510();
 
     local_28.mUnk_00.mUnk_00 = 0x47;
-    local_28.mUnk_04.mPos.x  = 0;
-    local_28.mUnk_04.mPos.y  = 0;
-    local_28.mUnk_04.mPos.z  = -2;
-    local_28.mUnk_04.mAngle  = 0;
-    local_28.mUnk_04.mId     = -1;
+    local_28.mUnk_04.mUnk_00 = 0;
+    local_28.mUnk_04.mUnk_04 = 0;
+    local_28.mUnk_04.mUnk_08 = -2;
+    local_28.mUnk_04.mUnk_0c = 0;
+    local_28.mUnk_04.mUnk_0e = -1;
     local_28.mUnk_04.mUnk_0f = 0;
     local_28.mUnk_04.mUnk_10 = 0;
     local_28.mUnk_04.mUnk_11 = 0;
 
     if (gGame.mUnk_102 != 0) {
-        AdventureFlags::Get_FlagsUnk_00(0x17, (FlagsUnk2 *) &local_28);
+        AdventureFlags::Get_FlagsUnk_00(0x17, &local_28);
     } else {
         if (gGame.mPrevModeId == 1) {
-            AdventureFlags::Get_FlagsUnk_00(0x17, (FlagsUnk2 *) &local_28);
+            AdventureFlags::Get_FlagsUnk_00(0x17, &local_28);
         } else if (data_ov000_020eab04 == 0x47) {
-            AdventureFlags::Get_FlagsUnk_00(0x01, (FlagsUnk2 *) &local_28);
+            AdventureFlags::Get_FlagsUnk_00(0x01, &local_28);
         } else {
             unk32 index = AdventureFlags::func_ov00_02097ecc();
 
             if (index != 0x21) {
-                AdventureFlags::Get_FlagsUnk_00(index, (FlagsUnk2 *) &local_28);
+                AdventureFlags::Get_FlagsUnk_00(index, &local_28);
             } else {
                 local_28.mUnk_00.mUnk_00 = data_ov000_020eab04;
-                local_28.mUnk_04.mId     = data_ov000_020eab08;
+                local_28.mUnk_04.mUnk_0e = data_ov000_020eab08;
                 local_28.mUnk_04.mUnk_0f = data_ov000_020eab09;
             }
         }