4 files changed, 6 insertions, 6 deletions
diff --git a/src/debug/mori_debug_menu.c b/src/debug/mori_debug_menu.c
index 767f4cda0..4f798ecb3 100644
--- a/src/debug/mori_debug_menu.c
+++ b/src/debug/mori_debug_menu.c
@@ -2,7 +2,7 @@
 #include "mori_debug_menu.h"
 #include "data2.h"
 #include "daycare.h"
-#include "learn_move.h"
+#include "move_tutor_menu.h"
 #include "link.h"
 #include "main.h"
 #include "menu.h"
@@ -136,7 +136,7 @@ u8 MoriDebugMenu_10000Steps(void)
 
 u8 MoriDebugMenu_MoveTutor(void)
 {
-    TeachMoveTutorMove();
+    DisplayMoveTutorMenu();
     CloseMenu();
     return 1;
 }
diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c
index 935f5cd67..1fcf52f38 100644
--- a/src/debug/sound_check_menu.c
+++ b/src/debug/sound_check_menu.c
@@ -133,7 +133,7 @@ void CB2_StartSoundCheckMenu(void)
     ResetTasks();
     ResetSpriteData();
     Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C);
-    InitMenuWindow(&gWindowTemplate_81E6CE4);
+    InitMenuWindow(&gMenuTextWindowTemplate);
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
     REG_WIN0H = WIN_RANGE(0, 0);
     REG_WIN0V = WIN_RANGE(0, 0);
@@ -1218,7 +1218,7 @@ void Task_InitCryTest(u8 taskId)
     u8 zero;
 
     Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C);
-    InitMenuWindow(&gWindowTemplate_81E6CE4);
+    InitMenuWindow(&gMenuTextWindowTemplate);
     gSoundTestCryNum = 1;
     ResetSpriteData();
     FreeAllSpritePalettes();
diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c
index b16b15a0a..1f0cb5f60 100644
--- a/src/debug/start_menu_debug.c
+++ b/src/debug/start_menu_debug.c
@@ -685,7 +685,7 @@ void DebugMenu_8077048(void)
 
 u8 DebugMenu_807706C(void)
 {
-    InitMenuWindow(&gWindowTemplate_81E6CE4);
+    InitMenuWindow(&gMenuTextWindowTemplate);
     DebugMenu_8077004();
     DebugMenu_807719C();
     DebugMenu_80771EC();
diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c
index 86b8f6b0b..ed6a1d18d 100644
--- a/src/debug/watanabe_debug_menu.c
+++ b/src/debug/watanabe_debug_menu.c
@@ -210,7 +210,7 @@ void debug_80C35DC(void)
     LoadSpriteSheet(stru_83F8828);
     LoadSpritePalette(stru_83F8838);
     Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C);
-    InitMenuWindow(&gWindowTemplate_81E6CE4);
+    InitMenuWindow(&gMenuTextWindowTemplate);
 }
 
 void debug_80C36F4(void)