1 files changed, 62 insertions, 17 deletions

diff --git a/arm9/modules/59/src/mod59_021D74E0_src.c b/arm9/modules/59/src/mod59_021D74E0_src.c
index 7d6be2ca..1a301bc1 100644
--- a/arm9/modules/59/src/mod59_021D74E0_src.c
+++ b/arm9/modules/59/src/mod59_021D74E0_src.c
@@ -8,6 +8,10 @@
 #include "unk_02024E64.h"
 #include "bg_window.h"
 #include "render_window.h"
+#include "msgdata.h"
+#include "msgdata/msg.naix"
+#include "text.h"
+#include "script_buffers.h"
 #include "module_52.h"
 
 extern void *FUN_02077A84(u32 heap_id, u32 param1, u32 param2, u32 param3, struct Options *options);
@@ -20,9 +24,7 @@ extern struct GraphicsModes MOD59_021D9DCC;
 extern struct BgTemplate MOD59_021D9EA0;
 extern struct BgTemplate MOD59_021D9EBC;
 
-extern void MOD59_021D79F8(MOD59_OverlayData *data);
 extern void MOD59_021D7A34(MOD59_OverlayData *data);
-extern void MOD59_021D796C(MOD59_OverlayData *data);
 extern void MOD59_021D7A4C(MOD59_OverlayData *data);
 extern void MOD59_021D7A5C(MOD59_OverlayData *data);
 extern void MOD59_021D8058(MOD59_OverlayData *data);
@@ -31,6 +33,8 @@ extern u32 MOD59_021D8920(MOD59_OverlayData *data);
 extern void FUN_0200E1D0(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 heap_id);
 extern u32 FUN_0200E308(void);
 
+extern u32 FUN_020142EC(u32 param0, u32 param1, u32 param2, u32 heap_id);
+
 extern void FUN_02077AC4(void *param0);
 
 FS_EXTERN_OVERLAY(MODULE_52);
@@ -45,15 +49,15 @@ THUMB_FUNC BOOL MOD59_Init(struct UnkStruct_02006234 *param0)
     s32 *field18 = OverlayManager_GetField18(param0);
     data->sav2 = (struct SaveBlock2 *)field18[2]; //?
     data->options = Sav2_PlayerData_GetOptionsAddr(data->sav2);
-    data->Unk10 = data->Unk0C = 0;
-    data->Unk14 = NULL;
+    data->unk10 = data->unk0C = 0;
+    data->unk14 = NULL;
     data->playerStruct = (struct MOD59_UnkPlayerStruct *)FUN_02077A84(0x52, 0, 0, 7, data->options);
     data->rivalStruct = (struct MOD59_UnkPlayerStruct *)FUN_02077A84(0x52, 3, 0, 7, data->options);
-    data->Unk88 = 0;
-    data->Unk89 = 0;
-    data->Unk8A = 0;
-    data->Unk8B = 0;
-    data->Unk90 = 0;
+    data->unk88 = 0;
+    data->unk89 = 0;
+    data->unk8A = 0;
+    data->unk8B = 0;
+    data->unk90 = 0;
     return TRUE;
 }
 
@@ -80,7 +84,7 @@ THUMB_FUNC BOOL MOD59_021D7564(struct UnkStruct_02006234 *param0, u32 *param1)
             SetKeyRepeatTimers(4, 8);
 
             MOD59_SetupBg(data);
-            MOD59_021D79F8(data);
+            MOD59_SetupMsg(data);
             MOD59_021D7A4C(data);
 
             Main_SetVBlankIntrCB((void (*)(void *))MOD59_021D7724, data);
@@ -98,7 +102,7 @@ THUMB_FUNC BOOL MOD59_021D7564(struct UnkStruct_02006234 *param0, u32 *param1)
                 *param1 = 2;
             }
 
-            if (data->Unk14 == NULL)
+            if (data->unk14 == NULL)
             {
                 break;
             }
@@ -115,7 +119,7 @@ THUMB_FUNC BOOL MOD59_021D7564(struct UnkStruct_02006234 *param0, u32 *param1)
             }
 
             MOD59_021D7A34(data);
-            MOD59_021D796C(data);
+            MOD59_DestroyBg(data);
             MOD59_021D7A5C(data);
 
             Main_SetVBlankIntrCB(NULL, NULL);
@@ -130,7 +134,7 @@ THUMB_FUNC BOOL MOD59_021D7564(struct UnkStruct_02006234 *param0, u32 *param1)
             }
 
             MOD59_021D7A34(data);
-            MOD59_021D796C(data);
+            MOD59_DestroyBg(data);
             MOD59_021D7A5C(data);
 
             Main_SetVBlankIntrCB(NULL, NULL);
@@ -140,13 +144,13 @@ THUMB_FUNC BOOL MOD59_021D7564(struct UnkStruct_02006234 *param0, u32 *param1)
             break;
 
         case 4:
-            if (OverlayManager_Run(data->Unk14) != TRUE)
+            if (OverlayManager_Run(data->unk14) != TRUE)
             {
                 break;
             }
 
-            OverlayManager_delete(data->Unk14);
-            data->Unk14 = NULL;
+            OverlayManager_delete(data->unk14);
+            data->unk14 = NULL;
 
             *param1 = 5;
 
@@ -275,5 +279,46 @@ THUMB_FUNC void MOD59_SetupBg(MOD59_OverlayData *data)
     ToggleBgLayer(GF_BG_LYR_SUB_3, GX_LAYER_TOGGLE_OFF);
 
     MOD59_021D8058(data);
-    data->Unk78 = 0;
+    data->unk78 = 0;
+}
+
+THUMB_FUNC void MOD59_DestroyBg(MOD59_OverlayData *data)
+{
+    ToggleBgLayer(GF_BG_LYR_MAIN_0, GX_LAYER_TOGGLE_OFF);
+    ToggleBgLayer(GF_BG_LYR_MAIN_1, GX_LAYER_TOGGLE_OFF);
+    ToggleBgLayer(GF_BG_LYR_MAIN_2, GX_LAYER_TOGGLE_OFF);
+    ToggleBgLayer(GF_BG_LYR_MAIN_3, GX_LAYER_TOGGLE_OFF);
+
+    ToggleBgLayer(GF_BG_LYR_SUB_0, GX_LAYER_TOGGLE_OFF);
+    ToggleBgLayer(GF_BG_LYR_SUB_1, GX_LAYER_TOGGLE_OFF);
+    ToggleBgLayer(GF_BG_LYR_SUB_2, GX_LAYER_TOGGLE_OFF);
+    ToggleBgLayer(GF_BG_LYR_SUB_3, GX_LAYER_TOGGLE_OFF);
+
+    FreeBgTilemapBuffer(data->bgConfig, GF_BG_LYR_MAIN_0);
+    FreeBgTilemapBuffer(data->bgConfig, GF_BG_LYR_MAIN_1);
+    FreeBgTilemapBuffer(data->bgConfig, GF_BG_LYR_MAIN_2);
+    FreeBgTilemapBuffer(data->bgConfig, GF_BG_LYR_MAIN_3);
+
+    FreeBgTilemapBuffer(data->bgConfig, GF_BG_LYR_SUB_0);
+    FreeBgTilemapBuffer(data->bgConfig, GF_BG_LYR_SUB_1);
+    FreeBgTilemapBuffer(data->bgConfig, GF_BG_LYR_SUB_2);
+    FreeBgTilemapBuffer(data->bgConfig, GF_BG_LYR_SUB_3);
+
+    FreeToHeap(data->bgConfig);
+}
+
+THUMB_FUNC void MOD59_SetupMsg(MOD59_OverlayData *data)
+{
+    data->msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, NARC_msg_narc_0341_bin, data->heap_id);
+
+    FUN_0201BD5C();
+
+    data->unk60 = FUN_020142EC(0, 0, 6, data->heap_id);
+
+    data->strBufs = ScrStrBufs_new(data->heap_id);
+
+    data->unk50 = 0;
+    data->unk54 = 0;
+    data->unk2C = 0;
 }
+