more progress

6 files changed, 207 insertions, 82 deletions

diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt
index 478f8f21..d3b09a05 100644
--- a/config/eur/arm9/symbols.txt
+++ b/config/eur/arm9/symbols.txt
@@ -1789,14 +1789,14 @@ func_020361d0 kind:function(arm,size=0x70) addr:0x20361d0
 func_02036240 kind:function(arm,size=0x170) addr:0x2036240
 func_020363b0 kind:function(arm,size=0x18) addr:0x20363b0
 func_020363c8 kind:function(arm,size=0x74) addr:0x20363c8
-func_0203643c kind:function(arm,size=0x54) addr:0x203643c
-func_02036490 kind:function(thumb,size=0x1cc) addr:0x2036490
-func_0203665c kind:function(thumb,size=0x4c) addr:0x203665c
+_Z13func_0203643cPiP18UnkStruct_027E0C68j kind:function(arm,size=0x54) addr:0x203643c
+_ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x2036490
+_ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x203665c
 _ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x1c) addr:0x20366a8
 _ZN18UnkStruct_027E0C6813func_020366c4Ev kind:function(arm,size=0x3c) addr:0x20366c4
 _ZN18UnkStruct_027E0C6813func_02036700Ev kind:function(arm,size=0x3c) addr:0x2036700
 _ZN18UnkStruct_027E0C6813func_0203673cEv kind:function(arm,size=0x34) addr:0x203673c
-func_02036770 kind:function(arm,size=0x28) addr:0x2036770
+_ZN18UnkStruct_027E0C6813func_02036770Ej kind:function(arm,size=0x28) addr:0x2036770
 _ZN18UnkStruct_027E0C6813func_02036798Ev kind:function(arm,size=0x44) addr:0x2036798
 _ZN18UnkStruct_027E0C6813func_020367dcEi kind:function(arm,size=0x10) addr:0x20367dc
 _ZN18UnkStruct_027E0C6813func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367ec
@@ -1825,7 +1825,7 @@ _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x20371b4
 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x20371c8
 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037258
 _Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x203728c
-_Z13func_020372f0P9BMGGroups12BMGFileIndexsi kind:function(thumb,size=0xc4) addr:0x20372f0
+_Z13func_020372f0P9BMGGroups12BMGFileIndexs kind:function(thumb,size=0xc4) addr:0x20372f0
 _Z13func_020373b4P9BMGGroupss kind:function(thumb,size=0x38) addr:0x20373b4
 _Z13func_020373ecP9BMGGroupsi kind:function(arm,size=0x60) addr:0x20373ec
 func_0203744c kind:function(thumb,size=0xc) addr:0x203744c
diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt
index 35ce8b88..96d68755 100644
--- a/config/usa/arm9/symbols.txt
+++ b/config/usa/arm9/symbols.txt
@@ -1789,14 +1789,14 @@ func_020361d0 kind:function(arm,size=0x70) addr:0x203618c
 func_02036240 kind:function(arm,size=0x170) addr:0x20361fc
 func_020363b0 kind:function(arm,size=0x18) addr:0x203636c
 func_020363c8 kind:function(arm,size=0x74) addr:0x2036384
-func_0203643c kind:function(arm,size=0x54) addr:0x20363f8
-func_02036490 kind:function(thumb,size=0x1cc) addr:0x203644c
-func_0203665c kind:function(thumb,size=0x4c) addr:0x2036618
+_Z13func_0203643cPiP18UnkStruct_027E0C68j kind:function(arm,size=0x54) addr:0x20363f8
+_ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x203644c
+_ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x2036618
 _ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x1c) addr:0x2036664
 _ZN18UnkStruct_027E0C6813func_020366c4Ev kind:function(arm,size=0x3c) addr:0x2036680
 _ZN18UnkStruct_027E0C6813func_02036700Ev kind:function(arm,size=0x3c) addr:0x20366bc
 _ZN18UnkStruct_027E0C6813func_0203673cEv kind:function(arm,size=0x34) addr:0x20366f8
-func_02036770 kind:function(arm,size=0x28) addr:0x203672c
+_ZN18UnkStruct_027E0C6813func_02036770Ej kind:function(arm,size=0x28) addr:0x203672c
 _ZN18UnkStruct_027E0C6813func_02036798Ev kind:function(arm,size=0x44) addr:0x2036754
 _ZN18UnkStruct_027E0C6813func_020367dcEi kind:function(arm,size=0x10) addr:0x2036798
 _ZN18UnkStruct_027E0C6813func_020367ecEv kind:function(arm,size=0x1c) addr:0x20367a8
@@ -1825,7 +1825,7 @@ _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170
 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x2037184
 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037214
 _Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x2037248
-_Z13func_020372f0P9BMGGroups12BMGFileIndexsi kind:function(thumb,size=0xc4) addr:0x20372ac
+_Z13func_020372f0P9BMGGroups12BMGFileIndexs kind:function(thumb,size=0xc4) addr:0x20372ac
 _Z13func_020373b4P9BMGGroupss kind:function(thumb,size=0x38) addr:0x2037370
 _Z13func_020373ecP9BMGGroupsi kind:function(arm,size=0x60) addr:0x20373a8
 func_0203744c kind:function(thumb,size=0xc) addr:0x2037408
diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp
index 7915ced7..844da446 100644
--- a/include/Message/BMG.hpp
+++ b/include/Message/BMG.hpp
@@ -5,6 +5,9 @@
 
 #define BMG_MAGIC "MESGbmg1"
 #define BMG_TAG(a, b, c, d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a))
+#define BMG_GET_INF1(pGroups, flags) (func_02037258(&(pGroups)->entries[(flags) >> 0x10], (flags) & 0xFFFF))
+#define BMG_GET_MSG_OFFSET(pGroups, flags) (BMG_GET_INF1((pGroups), (flags))->offset)
+#define BMG_GET_MSG_ADDR(pGroups, flags) ((u32)(pGroups)->entries[(flags) >> 0x10].pDAT1 + (BMG_GET_MSG_OFFSET((pGroups), (flags)) & ~1))
 
 typedef enum BMGTag {
     /* "INF1" */ BMG_TAG_INF1 = BMG_TAG('I', 'N', 'F', '1'),
@@ -174,4 +177,6 @@ typedef struct BMGGroups {
 } BMGGroups; // size = 0x8
 
 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 bfb4853f..aa0ac753 100644
--- a/include/Message/MessageManager.hpp
+++ b/include/Message/MessageManager.hpp
@@ -9,7 +9,7 @@
 // temp
 #define UNK_TYPE void
 
-class UnkStruct_027E0C68_UnkSubClass1 {
+class UnkStruct_027E0C68_UnkSubClass1 : public SysObject {
 public:
     /* 0x00 (vtable) */
     /* 0x04 */ unk32* unk_04;
@@ -24,7 +24,7 @@ public:
     /* 0x20 */ unk32 unk_20;
     /* 0x24 */ unk32 unk_24;
     /* 0x28 */ unk32 unk_28;
-    /* 0x2C */ unk32 unk_2C;
+    /* 0x2C */ u32* unk_2C;
     /* 0x30 */ unk32 unk_30;
     /* 0x34 */ unk32 unk_34;
     /* 0x38 */ unk32 unk_38;
@@ -40,38 +40,38 @@ public:
     /* 0x60 */ unk32 unk_60[0x3D];
     /* 0x5C */ s16 unk_15C;
 
-    /* 0x00 */ virtual UNK_TYPE vfunc_00(void);
-    /* 0x04 */ virtual UNK_TYPE vfunc_04(void);
-    /* 0x08 */ virtual UNK_TYPE vfunc_08(void);
-    /* 0x0C */ virtual UNK_TYPE vfunc_0C(void);
-    /* 0x10 */ virtual UNK_TYPE vfunc_10(void);
-    /* 0x14 */ virtual UNK_TYPE vfunc_14(void);
-    /* 0x18 */ virtual UNK_TYPE vfunc_18(void);
-    /* 0x1C */ virtual UNK_TYPE vfunc_1C(void);
-    /* 0x20 */ virtual UNK_TYPE vfunc_20(void);
-    /* 0x24 */ virtual UNK_TYPE vfunc_24(void);
-    /* 0x28 */ virtual void vfunc_28(void);
-    /* 0x2C */ virtual UNK_TYPE vfunc_2C(void);
-    /* 0x30 */ virtual UNK_TYPE vfunc_30(void);
-    /* 0x34 */ virtual UNK_TYPE vfunc_34(void);
-    /* 0x38 */ virtual UNK_TYPE vfunc_38(void);
-    /* 0x3C */ virtual void vfunc_3C(unk32 param_2);
-    /* 0x40 */ virtual UNK_TYPE vfunc_40(void);
-    /* 0x44 */ virtual UNK_TYPE vfunc_44(void);
-    /* 0x48 */ virtual UNK_TYPE vfunc_48(void);
-    /* 0x4C */ virtual UNK_TYPE vfunc_4C(void);
-    /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, int param_3, u8* param_4);
-    /* 0x54 */ virtual UNK_TYPE vfunc_54(void);
-    /* 0x58 */ virtual void vfunc_58(void);
-    /* 0x5C */ virtual UNK_TYPE vfunc_5C(void);
-    /* 0x60 */ virtual UNK_TYPE vfunc_60(void);
-    /* 0x64 */ virtual UNK_TYPE vfunc_64(void);
-    /* 0x68 */ virtual UNK_TYPE vfunc_68(void);
-    /* 0x6C */ virtual UNK_TYPE vfunc_6C(void);
-    /* 0x70 */ virtual UNK_TYPE vfunc_70(void);
+    UnkStruct_027E0C68_UnkSubClass1();
+    /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass1() override;
+    /* 0x08 */ virtual UNK_TYPE vfunc_08(void) override;
+    /* 0x0C */ virtual UNK_TYPE vfunc_0C(void) override;
+    /* 0x10 */ virtual UNK_TYPE vfunc_10(void) override;
+    /* 0x14 */ virtual UNK_TYPE vfunc_14(void) override;
+    /* 0x18 */ virtual UNK_TYPE vfunc_18(void) override;
+    /* 0x1C */ virtual UNK_TYPE vfunc_1C(void) override;
+    /* 0x20 */ virtual UNK_TYPE vfunc_20(void) override;
+    /* 0x24 */ virtual UNK_TYPE vfunc_24(void) override;
+    /* 0x28 */ virtual void vfunc_28(void) override;
+    /* 0x2C */ virtual UNK_TYPE vfunc_2C(void) override;
+    /* 0x30 */ virtual UNK_TYPE vfunc_30(void) override;
+    /* 0x34 */ virtual UNK_TYPE vfunc_34(void) override;
+    /* 0x38 */ virtual UNK_TYPE vfunc_38(void) override;
+    /* 0x3C */ virtual void vfunc_3C(unk32 param_2) override;
+    /* 0x40 */ virtual UNK_TYPE vfunc_40(void) override;
+    /* 0x44 */ virtual UNK_TYPE vfunc_44(void) override;
+    /* 0x48 */ virtual UNK_TYPE vfunc_48(void) override;
+    /* 0x4C */ virtual void vfunc_4C(void) override;
+    /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, int param_3, u8* param_4) override;
+    /* 0x54 */ virtual UNK_TYPE vfunc_54(void) override;
+    /* 0x58 */ virtual void vfunc_58(void) override;
+    /* 0x5C */ virtual UNK_TYPE vfunc_5C(void) override;
+    /* 0x60 */ virtual UNK_TYPE vfunc_60(void) override;
+    /* 0x64 */ virtual UNK_TYPE vfunc_64(void) override;
+    /* 0x68 */ virtual UNK_TYPE vfunc_68(void) override;
+    /* 0x6C */ virtual UNK_TYPE vfunc_6C(void) override;
+    /* 0x70 */ virtual UNK_TYPE vfunc_70(void) override;
 };
 
-class UnkStruct_027E0C68_UnkSubClass2 {
+class UnkStruct_027E0C68_UnkSubClass2 : public SysObject {
 public:
     /* 0x00 (vtable) */
     /* 0x04 */ unk32 unk_04;
@@ -88,50 +88,51 @@ public:
     /* 0x30 */ unk32 unk_30;
     /* 0x34 */ unk16 unk_34;
     /* 0x36 */ unk16 unk_36;
-    /* 0x38 */ unk32 unk_38;
-    /* 0x3C */ unk32 unk_3C;
-    /* 0x40 */ unk32 unk_40;
-    /* 0x44 */ unk32 unk_44;
-    /* 0x48 */ unk32 unk_48;
+    /* 0x38 */ u8 unk_38;
+    /* 0x39 */ u8 unk_39;
+    /* 0x3A */ unk16 unk_3A;
 
-    /* 0x00 */ virtual UNK_TYPE vfunc_00(void);
-    /* 0x04 */ virtual UNK_TYPE vfunc_04(void);
-    /* 0x08 */ virtual void vfunc_08(void);
-    /* 0x0C */ virtual void vfunc_0C(UnkStruct_027E0C68_UnkSubClass1* param_2);
-    /* 0x10 */ virtual void vfunc_10(void);
-    /* 0x14 */ virtual UNK_TYPE vfunc_14(void);
-    /* 0x1C */ virtual UNK_TYPE vfunc_1C(void);
-    /* 0x20 */ virtual UNK_TYPE vfunc_20(void);
-    /* 0x24 */ virtual UNK_TYPE vfunc_24(void);
-    /* 0x28 */ virtual UNK_TYPE vfunc_28(void);
-    /* 0x2C */ virtual UNK_TYPE vfunc_2C(void);
-    /* 0x30 */ virtual UNK_TYPE vfunc_30(void);
-    /* 0x34 */ virtual UNK_TYPE vfunc_34(void);
+    UnkStruct_027E0C68_UnkSubClass2();
+    /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass2() override;
+    /* 0x08 */ virtual void vfunc_08(void) override;
+    /* 0x0C */ virtual void vfunc_0C(UnkStruct_027E0C68_UnkSubClass1* param_2) override;
+    /* 0x10 */ virtual void vfunc_10(void) override;
+    /* 0x14 */ virtual UNK_TYPE vfunc_14(void) override;
+    /* 0x1C */ virtual UNK_TYPE vfunc_1C(void) override;
+    /* 0x20 */ virtual UNK_TYPE vfunc_20(void) override;
+    /* 0x24 */ virtual UNK_TYPE vfunc_24(void) override;
+    /* 0x28 */ virtual UNK_TYPE vfunc_28(void) override;
+    /* 0x2C */ virtual UNK_TYPE vfunc_2C(void) override;
+    /* 0x30 */ virtual UNK_TYPE vfunc_30(void) override;
+    /* 0x34 */ virtual UNK_TYPE vfunc_34(void) override;
 };
 
 class UnkStruct_027E0C68 : public SysObject {
-private:
+public:
     /* 0x00 */ unk16 unk_00;
-    /* 0x02 */ unk16 unk_02;
+    /* 0x02 */ u8 unk_02;
+    /* 0x03 */ u8 unk_03;
     /* 0x04 */ u8 unk_04;
     /* 0x05 */ u8 unk_05;
     /* 0x06 */ unk16 unk_06;
     /* 0x08 */ UnkStruct_027E0C68_UnkSubClass1* unk_08;
-    /* 0x0C */ unk32 unk_0C;
+    /* 0x0C */ u8 unk_0C;
+    /* 0x0C */ u8 unk_0D;
+    /* 0x0C */ unk16 unk_0E;
     /* 0x10 */ unk32 unk_10;
     /* 0x14 */ BMGGroups* pGroups;
-    /* 0x18 */ UnkStruct_027E0C68_UnkSubClass2* unk_18;
-    /* 0x1C */ UnkStruct_027E0C68_UnkSubClass2* unk_1C;
+    /* 0x18 */ UnkStruct_027E0C68_UnkSubClass2* unk_18[2];
     /* 0x20 */ u32* unk_20;
     /* 0x24 */ unk32 unk_24;
     /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1* unk_28[6];
 
-public:
-    UnkStruct_027E0C68();
+    void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4);
+    void func_0203665c(void);
     ~UnkStruct_027E0C68();
     UnkStruct_027E0C68_UnkSubClass1* func_020366c4(void);
     UnkStruct_027E0C68_UnkSubClass1* func_02036700(void);
     UnkStruct_027E0C68_UnkSubClass2* func_0203673c(void);
+    bool func_02036770(u32 param_2);
     unk32 func_02036798(void);
     bool func_020367dc(int param_2);
     bool UnkStruct_027E0C68::func_020367ec(void);
diff --git a/src/Main/Message/BMG.cpp b/src/Main/Message/BMG.cpp
index 830fccba..db3623b8 100644
--- a/src/Main/Message/BMG.cpp
+++ b/src/Main/Message/BMG.cpp
@@ -135,7 +135,7 @@ ARM u16 func_0203728c(BMGFileInfo* pFileInfo, unk32 param_2) {
     return -1;
 }
 
-THUMB void func_020372f0(BMGGroups* pGroups, BMGFileIndex eIndex, s16 unk_18, int param_4) {
+THUMB void func_020372f0(BMGGroups* pGroups, BMGFileIndex eIndex, s16 unk_18) {
     char bmgPath[64];
     BMGFileInfo bmgFile;
     u32* pFile;
diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp
index 92a2f965..5a107d8d 100644
--- a/src/Main/Message/MessageManager.cpp
+++ b/src/Main/Message/MessageManager.cpp
@@ -6,6 +6,7 @@ extern unk32 func_02037628(u8*);
 extern THUMB unk32 func_0202ab48(void);
 extern ARM void func_02038b40(UnkStruct_027E0C68_UnkSubClass1*);
 extern ARM unk32 func_0203de14(UnkStruct_027E0C68_UnkSubClass1*, unk32);
+extern ARM void func_0203dc74(UnkStruct_027E0C68_UnkSubClass1*, unk32, unk32);
 
 // see Actor.cpp
 struct UnkStruct2 {
@@ -16,6 +17,126 @@ struct UnkStruct2 {
 extern UnkStruct2 data_027e077c;
 extern u32 data_ov000_020eec9c[];
 extern u8 data_02056be4[];
+extern u32 data_027e0618;
+extern u32** data_027e0ce0[];
+extern u32 data_02056924[];
+extern u32* data_02068e6c;
+extern u32* data_02068e8c;
+
+ARM void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3) {
+    BMGGroups *pBVar2 = param_2->pGroups;
+    *param_1 = BMG_GET_MSG_ADDR(pBVar2, param_3);
+}
+
+THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 param_4) {
+    s32 i;
+
+    this->unk_03 = 0;
+    this->unk_0C = 0;
+
+    func_020372f0(this->pGroups, BMG_FILE_INDEX_SYSTEM, 2);
+
+    switch (data_027e0618) {
+        case 3:
+            func_020372f0(this->pGroups, BMG_FILE_INDEX_MAINSELECT, 2);
+            func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLE, 2);
+            break;
+        case 5:
+            func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLE, 2);
+            func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLECOMMON, 2);
+            break;
+        case 6:
+            func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLE, 2);
+            func_020372f0(this->pGroups, BMG_FILE_INDEX_BATTLECOMMON, 2);
+            break;
+        case 7:
+            func_020372f0(this->pGroups, BMG_FILE_INDEX_MAINSELECT, 2);
+            break;
+        default:
+            break;
+    }
+
+    for (i = 0; i < ARRAY_LEN(this->unk_18); i++) {
+        if (this->unk_18[i] != NULL) {
+            this->unk_18[i] = NULL;
+        }
+    }
+
+    for (i = 0; i < ARRAY_LEN(this->unk_28); i++) {
+        if (this->unk_28[i] != NULL) {
+            this->unk_28[i] = NULL;
+        }
+    }
+
+    for (i = 0; i < ARRAY_LEN(this->unk_18); i++) {
+        this->unk_18[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass2();
+    }
+
+    this->unk_18[0]->unk_39 = 0;
+    this->unk_18[1]->unk_39 = 1;
+
+    // switch?
+    if (data_027e0618 == 2 || data_027e0618 == 3 || data_027e0618 == 6) {
+        for (i = 0; i < ARRAY_LEN(this->unk_28); i++) {
+            switch (data_02056924[i + 1]) {
+                case 0:
+                    if (data_027e0618 != 2) {
+                        this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1();
+                        func_0203dc74(this->unk_28[i], 0xE0, 0x40);
+                        this->unk_28[i]->unk_2C = data_02068e6c;
+                        this->unk_28[i]->unk_50 = i != 0;
+                    }
+                    break;
+                case 1:
+                    this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1();
+                    func_0203dc74(this->unk_28[i], 0x50, 0x60);
+                    this->unk_28[i]->unk_2C = data_02068e6c;
+                    break;
+                case 2:
+                    this->unk_28[i] = NULL;
+                    break;
+                case 3:
+                    if (func_0202ab48() == 0) {
+                        this->unk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_027E0C68_UnkSubClass1();
+                        func_0203dc74(this->unk_28[i], 0xC0, 0x20);
+                        this->unk_28[i]->unk_2C = data_02068e8c;
+                    } else {
+                        this->unk_28[i] = NULL;
+                    }
+                    break;
+                default:
+                    break;
+            }
+
+            if (this->unk_28[i] != NULL) {
+                this->unk_28[i]->vfunc_4C();
+            }
+        }
+    }
+}
+
+// non-matching
+THUMB void UnkStruct_027E0C68::func_0203665c(void) {
+    s32 i;
+
+    for (i = 0; i < ARRAY_LEN(this->unk_28); i++) {
+        if (this->unk_28[i] != NULL) {
+            delete this->unk_28[i];
+
+            this->unk_28[i] = NULL;
+        }
+    }
+
+    for (i = 0; i < ARRAY_LEN(this->unk_18); i++) {
+        if (this->unk_18[i] != NULL) {
+            delete this->unk_18[i];
+
+            this->unk_18[i] = NULL;
+        }
+    }
+
+    func_020373b4(this->pGroups, 2);
+}
 
 // non-matching
 ARM UnkStruct_027E0C68::~UnkStruct_027E0C68() {}
@@ -43,23 +164,27 @@ ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_0203673c(void) {
     bool iVar2 = this->func_02036850();
 
     if (iVar1) {
-        return this->unk_18;
+        return this->unk_18[0];
     } 
 
     if (iVar2) {
-        return this->unk_1C;
+        return this->unk_18[1];
     }
 
     return NULL;
 }
 
+ARM bool UnkStruct_027E0C68::func_02036770(u32 param_2) {
+    return (this->unk_18[param_2]->unk_18 & ~0xFFFF) == (0x100 << 0x10);
+}
+
 ARM unk32 UnkStruct_027E0C68::func_02036798(void) {
     unk32 uVar2 = 1;
 
     if (this->unk_04 == 0) {
         bool bVar1 = false;
 
-        if (this->unk_1C != NULL && (this->unk_1C->unk_18 & 0xFFFF0000) != 0x1000000) {
+        if (this->unk_18[1] != NULL && (this->unk_18[1]->unk_18 & 0xFFFF0000) != 0x1000000) {
             bVar1 = true;
         }
 
@@ -241,9 +366,7 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036da8(u32 param
         iStack_34 = param_3[1];
         iStack_30 = param_3[2];
         pBVar5 = this->pGroups;
-        pEVar2 = func_02037258(&pBVar5->entries[param_2 >> 0x10], param_2 & 0xFFFF);
-
-        pSVar4->vfunc_50(pEVar1, (int)&((pBVar5->entries[param_2 >> 0x10].pDAT1)->base).tag + (pEVar2->offset & 0xfffffffe), &iStack_38);
+        pSVar4->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), &iStack_38);
 
         func_ov000_020d77e4(data_ov000_020eec9c, 0x1C);
         return pSVar4;
@@ -283,7 +406,6 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036f68(u32 param
     EntryINF1 *pEVar3;
     int iVar4;
     UnkStruct_027E0C68_UnkSubClass1 *pSVar5;
-    BMGGroups *pBVar6;
     
     pEVar1 = func_02037258(&this->pGroups->entries[param_2 >> 0x10], param_2 & 0xffff);
 
@@ -299,12 +421,9 @@ ARM UnkStruct_027E0C68_UnkSubClass1* UnkStruct_027E0C68::func_02036f68(u32 param
         pSVar2 = this->unk_28[1];
     }
 
-    pSVar5[0x16].unk_04 = (unk32*)pSVar2;
+    // pSVar5[0x16].unk_04 = (unk32*)pSVar2;
     pSVar5[0x41].unk_08 = (unk32*)this->unk_28[5];
-    pBVar6 = this->pGroups;
-    pEVar3 = func_02037258(&pBVar6->entries[param_2 >> 0x10], param_2 & 0xffff);
-
-    pSVar5->vfunc_50(pEVar1, (int)&((pBVar6->entries[param_2 >> 0x10].pDAT1)->base).tag + (pEVar3->offset & 0xfffffffe), param_3);
+    pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), param_3);
 
     if (func_ov000_020d7f18(data_ov000_020eec9c, 0x19) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x18) == 0 &&
         func_ov000_020d7f18(data_ov000_020eec9c, 0x34) == 0 && func_ov000_020d7f18(data_ov000_020eec9c, 0x35) == 0 &&
@@ -324,10 +443,10 @@ ARM UnkStruct_027E0C68_UnkSubClass2* UnkStruct_027E0C68::func_020370e8(unk32 par
     UnkStruct_027E0C68_UnkSubClass2* puVar2;
 
     if (this->func_02036824() != 0) {
-        puVar2 = this->unk_18;
+        puVar2 = this->unk_18[0];
     } else {
         if (this->func_02036850() != 0) {
-            puVar2 = this->unk_1C;
+            puVar2 = this->unk_18[1];
         } else {
             return NULL;
         }