UnkStruct_02082348 -> FlagsUnk2

2 files changed, 27 insertions, 39 deletions

diff --git a/include/DTCM/UnkStruct_027e0d38.hpp b/include/DTCM/UnkStruct_027e0d38.hpp
index ab7b7794..f2f0ac51 100644
--- a/include/DTCM/UnkStruct_027e0d38.hpp
+++ b/include/DTCM/UnkStruct_027e0d38.hpp
@@ -1,36 +1,10 @@
 #pragma once
 
+#include "Save/AdventureFlags.hpp"
 #include "global.h"
 #include "nds/math.h"
 #include "types.h"
 
-struct UnkStruct_027e0d38_UnkC {
-    /* 00 */ unk32 mUnk_00;
-
-    s32 func_ov000_020a5e9c(void);
-};
-
-class UnkStruct_02082348_04 {
-public:
-    /* 00 */ Vec3p mPos;
-    /* 0c */ unk16 mAngle;
-    /* 0e */ u8 mId;
-    /* 0f */ u8 mUnk_0f;
-    /* 10 */ u8 mUnk_10;
-    /* 11 */ u8 mUnk_11;
-    /* 14 */
-};
-
-// This might be FlagsUnk2
-struct UnkStruct_02082348 {
-    /* 00 */ UnkStruct_027e0d38_UnkC mUnk_00;
-    /* 04 */ UnkStruct_02082348_04 mUnk_04;
-    /* 18 */
-
-    void func_ov000_02078bf0(UnkStruct_02082348 *param_2);
-    void func_ov004_02100ae0();
-};
-
 struct UnkStruct_027e0d38_Unk28 {
     /* 000 */ unk32 *mUnk_00;
     /* 004 */ unk32 mUnk_04;
@@ -64,7 +38,7 @@ struct UnkStruct_027e0d38_Unk28 {
     /* 057 */ unk8 mUnk_57;
     /* 058 */ unk32 mUnk_58;
     /* 05c */ UnkStruct_02082348_04 mUnk_5c;
-    /* 070 */ UnkStruct_02082348 mUnk_70;
+    /* 070 */ FlagsUnk2 mUnk_70;
     /* 088 */ unk8 pad1[0x9A - 0x88];
     /* 09a */ u8 mUnk_9a;
     /* 09b */ u8 mUnk_9b;
diff --git a/include/Save/AdventureFlags.hpp b/include/Save/AdventureFlags.hpp
index 39d2e409..0841cf32 100644
--- a/include/Save/AdventureFlags.hpp
+++ b/include/Save/AdventureFlags.hpp
@@ -57,21 +57,35 @@ enum AdventureFlag_ {
     /* 0x187 */ AdventureFlag_COUNT = 391,
 };
 
-struct FlagsUnk2 {
+struct UnkStruct_027e0d38_UnkC {
     /* 00 */ unk32 mUnk_00;
-    /* 04 */ unk32 mUnk_04;
-    /* 08 */ unk32 mUnk_08;
-    /* 0c */ unk32 mUnk_0c;
-    /* 10 */ unk16 mUnk_10;
-    /* 12 */ unk8 mUnk_12;
-    /* 13 */ unk8 mUnk_13;
-    /* 14 */ unk8 mUnk_14;
-    /* 15 */ unk8 mUnk_15;
-    /* 16 */ unk8 mUnk_16;
-    /* 17 */ unk8 mUnk_17;
+
+    s32 func_ov000_020a5e9c(void);
+};
+
+class UnkStruct_02082348_04 {
+public:
+    /* 00 */ unk32 mUnk_00;
+    /* 00 */ unk32 mUnk_04;
+    /* 00 */ unk32 mUnk_08;
+    /* 0c */ unk16 mUnk_0c;
+    /* 0e */ u8 mUnk_0e;
+    /* 0f */ u8 mUnk_0f;
+    /* 10 */ u8 mUnk_10;
+    /* 11 */ u8 mUnk_11;
+    /* 12 */ u8 mUnk_12;
+    /* 13 */ u8 mUnk_13;
+    /* 14 */
+};
+
+struct FlagsUnk2 {
+    /* 00 */ struct UnkStruct_027e0d38_UnkC mUnk_00;
+    /* 04 */ UnkStruct_02082348_04 mUnk_04;
     /* 18 */
 
     ~FlagsUnk2();
+    void func_ov000_02078bf0(FlagsUnk2 *param_2);
+    void func_ov004_02100ae0();
 };
 
 struct FlagsUnk {