From 04037a309694dc56e3139f676b409ba7deab9298 Mon Sep 17 00:00:00 2001
From: Nebuleon Fumika
Date: Wed, 6 Feb 2013 06:27:11 -0500
Subject: When changing languages, quit doing the "Changing language, please
 wait..." as it only takes a few milliseconds.

---
 CATSFC/system/language.msg | 12 ------------
 source/nds/gui.c           | 14 --------------
 source/nds/message.h       |  3 ---
 3 files changed, 29 deletions(-)

diff --git a/CATSFC/system/language.msg b/CATSFC/system/language.msg
index 3261266..f43d77d 100644
--- a/CATSFC/system/language.msg
+++ b/CATSFC/system/language.msg
@@ -191,10 +191,6 @@ Saving a screenshot...
 OK!
 #MSG_PROGRESS_SCREENSHOT_CREATION_FAILED
 Failed!
-#MSG_CHANGE_LANGUAGE
-Changing language...
-#MSG_CHANGE_LANGUAGE_WAITING
-Please wait...
 #MSG_NO_SLIDE
 No screenshots found
 #MSG_PLAYING_SLIDE
@@ -403,10 +399,6 @@ Press the buttons you wish to use to perform this action.
 完成!
 #MSG_PROGRESS_SCREENSHOT_CREATION_FAILED
 失败!
-#MSG_CHANGE_LANGUAGE
-正在修改...
-#MSG_CHANGE_LANGUAGE_WAITING
-请稍候!
 #MSG_NO_SLIDE
 此目录没有屏幕快照，取消放映
 #MSG_PLAYING_SLIDE
@@ -615,10 +607,6 @@ Capture de l'écran...
 Terminé!
 #MSG_PROGRESS_SCREENSHOT_CREATION_FAILED
 Échec!
-#MSG_CHANGE_LANGUAGE
-Changement de la langue...
-#MSG_CHANGE_LANGUAGE_WAITING
-Veuillez patienter...
 #MSG_NO_SLIDE
 Aucune capture d'écran trouvée
 #MSG_PLAYING_SLIDE
diff --git a/source/nds/gui.c b/source/nds/gui.c
index 9ce602c..5e02a55 100644
--- a/source/nds/gui.c
+++ b/source/nds/gui.c
@@ -2709,21 +2709,8 @@ u32 menu(u16 *screen, bool8 FirstInvocation)
         if(gui_action == CURSOR_LEFT || gui_action == CURSOR_RIGHT)
         {
             HighFrequencyCPU(); // crank it up
-            if(bg_screenp != NULL)
-            {
-                bg_screenp_color = COLOR16(43, 11, 11);
-                memcpy(bg_screenp, down_screen_addr, 256*192*2);
-            }
-            else
-                bg_screenp_color = COLOR_BG;
-
-            draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, bg_screenp_color);
-            draw_string_vcenter(down_screen_addr, 36, 75, 190, COLOR_MSSG, msg[MSG_CHANGE_LANGUAGE]);
-            draw_string_vcenter(down_screen_addr, 36, 95, 190, COLOR_MSSG, msg[MSG_CHANGE_LANGUAGE_WAITING]);
-            ds2_flipScreen(DOWN_SCREEN, DOWN_SCREEN_UPDATE_METHOD);
 
             load_language_msg(LANGUAGE_PACK, emu_config.language);
-            // gui_change_icon(emu_config.language); // uncomment if images change per language [Neb]
 
             if(first_load)
             {
@@ -2733,7 +2720,6 @@ u32 menu(u16 *screen, bool8 FirstInvocation)
             }
 
             LowFrequencyCPU(); // and back down
-            wait_Allkey_release(0);
         }
     }
 
diff --git a/source/nds/message.h b/source/nds/message.h
index 64c3a6c..c7e79b8 100644
--- a/source/nds/message.h
+++ b/source/nds/message.h
@@ -121,9 +121,6 @@ enum MSG
 	MSG_PROGRESS_SCREENSHOT_CREATION_SUCCEEDED,
 	MSG_PROGRESS_SCREENSHOT_CREATION_FAILED,
 
-	MSG_CHANGE_LANGUAGE,
-	MSG_CHANGE_LANGUAGE_WAITING,
-
 	MSG_NO_SLIDE,
 	MSG_PLAYING_SLIDE,
 	MSG_PAUSE_SLIDE,
-- 
cgit v1.2.3