convert BMGGroups to a class

2 files changed, 13 insertions, 6 deletions

diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp
index 844da446..997e41f3 100644
--- a/include/Message/BMG.hpp
+++ b/include/Message/BMG.hpp
@@ -2,6 +2,7 @@
 
 #include "global.h"
 #include "types.h"
+#include "System/SysNew.hpp"
 
 #define BMG_MAGIC "MESGbmg1"
 #define BMG_TAG(a, b, c, d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a))
@@ -170,13 +171,18 @@ typedef struct BMGFileInfo {
     /* 0x1A */ s16 groupId; // stores the group id
 } BMGFileInfo; // size = 0x1C
 
-// 0x027E0C68 + 0x14
-typedef struct BMGGroups {
+
+class BMGGroups : public SysObject {
+public:
     /* 0x00 */ BMGFileInfo* entries; // accessed with `groupId`
     /* 0x04 */ s32 numEntries;
-} BMGGroups; // size = 0x8
+    /* 0x08 */
+
+    BMGGroups();
+    ~BMGGroups();
+    void func_020372f0(BMGFileIndex eIndex, s16 unk_18);
+    void func_020373b4(s16 unk_18);
+    u32 func_020373ec(unk32 param_2);
+};
 
 extern EntryINF1* func_02037258(BMGFileInfo* pFileInfo, unk32 param_2);
-extern void func_020372f0(BMGGroups* pGroups, BMGFileIndex eIndex, s16 unk_18);
-extern void func_020373b4(BMGGroups* pGroups, s16 unk_18);
-extern u32 func_020373ec(BMGGroups* pGroups, unk32 param_2);
diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp
index 06caff2b..d6547c2f 100644
--- a/include/Message/MessageManager.hpp
+++ b/include/Message/MessageManager.hpp
@@ -159,6 +159,7 @@ public:
     /* 0x20 */ UnkStruct_027E0C68_UnkSubClass3* unk_20[2]; // is it actually UnkStruct_027E0C68_UnkSubClass2?
     /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1* unk_28[6];
     /* 0x40 */ UnkStruct_027E0C68_UnkSubClass1* unk_40[2]; // is array size 6?
+    /* 0x48 */
 
     static void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3);
     void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4);