3 files changed, 18 insertions, 15 deletions
diff --git a/src/Main/Game/Game.cpp b/src/Main/Game/Game.cpp
index 65410b8d..b02fa9f9 100644
--- a/src/Main/Game/Game.cpp
+++ b/src/Main/Game/Game.cpp
@@ -377,7 +377,7 @@ ARM void Game::Run() {
             func_020363c8(local_28, &data_027e0c54);
             this->mUnk_0f0 = local_28[0];
             this->mMode->vfunc_10(&this->mUnk_0f0);
-            gMessageManager.func_02036ca4((unk32) & this->mUnk_0f0);
+            gMessageManager.func_02036ca4(&this->mUnk_0f0);
             if (this->mModeId == 2) {
                 data_027e103c->func_ov005_02103e58(&this->mUnk_0f0);
             }
diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp
index d1eabdd0..0c889f61 100644
--- a/src/Main/Message/MessageManager.cpp
+++ b/src/Main/Message/MessageManager.cpp
@@ -359,7 +359,7 @@ ARM void MessageManager::func_02036c50(u16 *param_2) {
     }
 }
 
-ARM void MessageManager::func_02036ca4(unk32 param_2) {
+ARM void MessageManager::func_02036ca4(u16 *param_2) {
     s32 i;
 
     for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
@@ -467,19 +467,19 @@ ARM UnkStruct_02038aa0 *MessageManager::func_02036da8(u32 param_2, s16 *param_3)
 // non-matching
 ARM void MessageManager::func_02036edc(u32 param_2, u8 param_3) {
     UnkStruct_020397f8 *pSVar1;
-    u8 auStack_28[24];
+    UnkStruct_02037628 auStack_28;
     u8 local_13;
 
-    func_02037628(auStack_28);
+    auStack_28.func_02037628();
     local_13 = 0;
 
     if ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (data_02056be4[data_027e077c.mUnk_0] & 2) == 0) {
         local_13 = 1;
     }
 
-    auStack_28[21] = local_13;
-    auStack_28[20] = param_3;
-    pSVar1         = this->func_02036f68(param_2, auStack_28);
+    auStack_28.mUnk_15 = local_13;
+    auStack_28.mUnk_14 = param_3;
+    pSVar1             = this->func_02036f68(param_2, &auStack_28, NULL);
 
     if (pSVar1 != NULL) {
         if (this->mUnk_04 == 0) {
@@ -489,7 +489,8 @@ ARM void MessageManager::func_02036edc(u32 param_2, u8 param_3) {
 }
 
 // non-matching
-ARM UnkStruct_020397f8 *MessageManager::func_02036f68(u32 param_2, u8 *param_3) {
+ARM UnkStruct_020397f8 *MessageManager::func_02036f68(u32 param_2, UnkStruct_02037628 *param_3,
+                                                      UnkStruct_ov000_020d18f4 *param_4) {
     EntryINF1 *pEVar1;
     UnkStruct_02038aa0 *pSVar2;
     EntryINF1 *pEVar3;
@@ -502,7 +503,7 @@ ARM UnkStruct_020397f8 *MessageManager::func_02036f68(u32 param_2, u8 *param_3)
         return NULL;
     }
 
-    if (param_3[21] != 0) {
+    if (param_3->mUnk_15 != 0) {
         pSVar5 = (UnkStruct_020397f8 *) this->mUnk_28[2];
         pSVar2 = this->mUnk_28[3];
     } else {
@@ -519,7 +520,7 @@ ARM UnkStruct_020397f8 *MessageManager::func_02036f68(u32 param_2, u8 *param_3)
     if (data_ov000_020eec9c.func_ov000_020d7f18(0x19) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x18) == 0 &&
         data_ov000_020eec9c.func_ov000_020d7f18(0x34) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x35) == 0 &&
         data_ov000_020eec9c.func_ov000_020d7f18(0x1A) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x1B) == 0 &&
-        (param_3[12]) != 7) {
+        (param_3->mUnk_0c) != 7) {
         data_ov000_020eec9c.func_ov000_020d77e4(0x1C);
     }
 
diff --git a/src/Main/Unknown/UnkStruct_020397f8.cpp b/src/Main/Unknown/UnkStruct_020397f8.cpp
index 793ee441..3f538f09 100644
--- a/src/Main/Unknown/UnkStruct_020397f8.cpp
+++ b/src/Main/Unknown/UnkStruct_020397f8.cpp
@@ -748,12 +748,13 @@ ARM unk32 UnkStruct_020397f8::vfunc_1c(u16 *param1, UnkStruct_0203b264 *param2,
     switch (this->mUnk_57a) {
         case 0:
             return this->func_0203905c(param1, param2, param3, param4);
-        case 1:
+        case 1: {
             UnknownMsgChoiceStruct *pChoiceData;
             s32 i       = this->func_0203a30c();
             pChoiceData = &this->mUnk_428[this->mUnk_528[i]];
             return this->mUnk_164->func_0203cb5c(
                 *param1, (((pChoiceData->mUnk_00->mUnk_0[3] << 0x10) | ((u16 *) pChoiceData->mUnk_00->mUnk_0)[2]) + ~0xFFFE));
+        }
         default:
             break;
     }
@@ -767,7 +768,8 @@ ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1 *param1, unk32 param2
     unk16 uVar2;
     unk32 iVar3;
     unk32 iVar4;
-    unk32 uVar5;
+    unk32 *uVar5;
+    unk32 uVar5_1;
     u32 uVar6;
 
     uVar6 = 0;
@@ -820,12 +822,12 @@ ARM void UnkStruct_020397f8::vfunc_60(func_0203b410_param1 *param1, unk32 param2
         iVar3 = func_02016fcc(uVar5);
     } else {
         if (this->func_02032fa4() != 0) {
-            uVar5 = 0x33;
+            uVar5_1 = 0x33;
         } else {
-            uVar5 = 0x32;
+            uVar5_1 = 0x32;
         }
 
-        data_027e0cbc.func_0203d77c(uVar5, 1, 1);
+        data_027e0cbc.func_0203d77c(uVar5_1, 1, 1);
         iVar3 = data_027e0cbc.func_0203d77c(data_02056a00[uVar6 * 0x18] - 2, 1, 1);
     }