Merge branch 'master' into contest_link_80C2020

1 files changed, 9 insertions, 10 deletions

diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
index 56801ff53..b39804b79 100644
--- a/src/mystery_event_menu.c
+++ b/src/mystery_event_menu.c
@@ -15,6 +15,7 @@
 #include "text.h"
 #include "title_screen.h"
 #include "ewram.h"
+#include "debug.h"
 
 static EWRAM_DATA u8 gUnknown_02039338 = 0;
 
@@ -46,8 +47,8 @@ void CB2_InitMysteryEventMenu(void)
     FreeAllSpritePalettes();
     ResetTasks();
     SetVBlankCallback(VBlankCB);
-    Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4);
-    InitMenuWindow(&gWindowTemplate_81E6CE4);
+    Text_LoadWindowTemplate(&gMenuTextWindowTemplate);
+    InitMenuWindow(&gMenuTextWindowTemplate);
     Menu_EraseScreen();
     REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON;
     REG_BLDCNT = 0;
@@ -88,7 +89,7 @@ static void CB2_MysteryEventMenu(void)
     {
     case 0:
         Menu_DrawStdWindowFrame(0, 14, 29, 19);
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
         gMain.state++;
         break;
     case 1:
@@ -313,7 +314,7 @@ static void CB2_MysteryEventMenu(void)
         }
         break;
     case 15:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
         gMain.state++;
         break;
     case 16:
@@ -347,8 +348,6 @@ static const u8 Str_843DA84[] = _("LR:　select　A:　send。");
 static const u8 Str_843DA98[] = _("sending。。。");
 static const u8 Str_843DAA3[] = _("completed。");
 
-extern const struct {const u8 *text; void (*func)();} gUnknown_Debug_842E2D0[];
-extern const u8 gUnknown_Debug_842E350;
 
 void debug_sub_815D1D8();
 
@@ -395,8 +394,8 @@ void debug_sub_815D15C(void)
     FreeAllSpritePalettes();
     ResetTasks();
     SetVBlankCallback(VBlankCB);
-    Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4);
-    InitMenuWindow(&gWindowTemplate_81E6CE4);
+    Text_LoadWindowTemplate(&gMenuTextWindowTemplate);
+    InitMenuWindow(&gMenuTextWindowTemplate);
     Menu_EraseScreen();
     REG_DISPCNT = DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_MODE_0;
     REG_BLDCNT = 0;
@@ -417,7 +416,7 @@ void debug_sub_815D1D8(void)
     {
     case 0:
         Menu_DrawStdWindowFrame(3, 14, 27, 19);
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
         gMain.state++;
         break;
     case 1:
@@ -476,7 +475,7 @@ void debug_sub_815D1D8(void)
     case 10:
         if (gMain.newKeys & A_BUTTON)
         {
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
             gMain.state++;
         }
         break;