Skip to content

Commit

Permalink
Settings: Change Quick Menu to DS Classic Menu
Browse files Browse the repository at this point in the history
  • Loading branch information
RocketRobz committed Feb 14, 2020
1 parent 0b53cee commit 93fe1ac
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions settings/arm9/source/language.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ std::string STR_WIFILED = "STR_WIFILED";
std::string STR_REFERSD = "STR_REFERSD";
std::string STR_SDREMOVALDETECTION = "STR_SDREMOVALDETECTION";
std::string STR_S1SDACCESS = "STR_S1SDACCESS";
std::string STR_MAINMENU = "STR_MAINMENU";
std::string STR_DSCLASSICMENU = "STR_DSCLASSICMENU";
std::string STR_THEME = "STR_THEME";
std::string STR_DSIMUSIC = "STR_DSIMUSIC";
std::string STR_LASTPLAYEDROM = "STR_LASTPLAYEDROM";
Expand Down Expand Up @@ -68,7 +68,7 @@ std::string STR_DESCRIPTION_WIFILED = "STR_DESCRIPTION_WIFILED";
std::string STR_DESCRIPTION_SDREMOVALDETECTION = "STR_DESCRIPTION_SDREMOVALDETECTION";
std::string STR_DESCRIPTION_REFERSD = "STR_DESCRIPTION_REFERSD";
std::string STR_DESCRIPTION_S1SDACCESS_1 = "STR_DESCRIPTION_S1SDACCESS_1";
std::string STR_DESCRIPTION_MAINMENU = "STR_DESCRIPTION_MAINMENU";
std::string STR_DESCRIPTION_DSCLASSICMENU = "STR_DESCRIPTION_DSCLASSICMENU";
std::string STR_DESCRIPTION_THEME_1 = "STR_DESCRIPTION_THEME_1";
std::string STR_DESCRIPTION_DSIMUSIC = "STR_DESCRIPTION_DSIMUSIC";
std::string STR_DESCRIPTION_LASTPLAYEDROM_1 = "STR_DESCRIPTION_LASTPLAYEDROM_1";
Expand Down Expand Up @@ -274,7 +274,7 @@ void langInit(void)
STR_REFERSD = ConvertFromUTF8(languageini.GetString("LANGUAGE", "REFERSD", "Refer to the SD as"));
STR_SDREMOVALDETECTION = ConvertFromUTF8(languageini.GetString("LANGUAGE", "SDREMOVALDETECTION", "SD removal detection"));
STR_S1SDACCESS = ConvertFromUTF8(languageini.GetString("LANGUAGE", "S1SDACCESS", "Slot-1 microSD access"));
STR_MAINMENU = ConvertFromUTF8(languageini.GetString("LANGUAGE", "QUICKMENU", "Quick Menu"));
STR_DSCLASSICMENU = ConvertFromUTF8(languageini.GetString("LANGUAGE", "DSCLASSICMENU", "DS Classic Menu"));
STR_THEME = ConvertFromUTF8(languageini.GetString("LANGUAGE", "THEME", "Theme"));
STR_DSIMUSIC = ConvertFromUTF8(languageini.GetString("LANGUAGE", "DSIMUSIC", "DSi/3DS Theme Music"));
STR_LASTPLAYEDROM = ConvertFromUTF8(languageini.GetString("LANGUAGE", "LASTPLAYEDROM", "Last played ROM on startup."));
Expand Down Expand Up @@ -315,7 +315,7 @@ void langInit(void)

STR_DESCRIPTION_S1SDACCESS_1 = ConvertFromUTF8(languageini.GetString("LANGUAGE", "DESCRIPTION_S1SDACCESS_1", "Allows your flashcard to be used as a secondary device. Turn this off, if IR functionality doesn't work, or if the app crashes."));

STR_DESCRIPTION_MAINMENU = ConvertFromUTF8(languageini.GetString("LANGUAGE", "DESCRIPTION_QUICKMENU", "The menu that is shown before the ROM select menu. Has the look of the original DS UI."));
STR_DESCRIPTION_DSCLASSICMENU = ConvertFromUTF8(languageini.GetString("LANGUAGE", "DESCRIPTION_DSCLASSICMENU", "The menu that is shown by pressing SELECT in the DSi theme, can be shown before the ROM select menu."));

STR_DESCRIPTION_THEME_1 = ConvertFromUTF8(languageini.GetString("LANGUAGE", "DESCRIPTION_THEME_1", "The theme to use in TWiLight Menu++. Press Left/Right to select, A for sub-themes."));

Expand Down
4 changes: 2 additions & 2 deletions settings/arm9/source/language.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ extern std::string STR_WIFILED;
extern std::string STR_REFERSD;
extern std::string STR_SDREMOVALDETECTION;
extern std::string STR_S1SDACCESS;
extern std::string STR_MAINMENU;
extern std::string STR_DSCLASSICMENU;
extern std::string STR_THEME;
extern std::string STR_DSIMUSIC;
extern std::string STR_LASTPLAYEDROM;
Expand Down Expand Up @@ -61,7 +61,7 @@ extern std::string STR_DESCRIPTION_WIFILED;
extern std::string STR_DESCRIPTION_SDREMOVALDETECTION;
extern std::string STR_DESCRIPTION_REFERSD;
extern std::string STR_DESCRIPTION_S1SDACCESS_1;
extern std::string STR_DESCRIPTION_MAINMENU;
extern std::string STR_DESCRIPTION_DSCLASSICMENU;
extern std::string STR_DESCRIPTION_THEME_1;
extern std::string STR_DESCRIPTION_DSIMUSIC;
extern std::string STR_DESCRIPTION_LASTPLAYEDROM_1;
Expand Down
2 changes: 1 addition & 1 deletion settings/arm9/source/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ int main(int argc, char **argv)
using TLanguage = DSiMenuPlusPlusSettings::TLanguage;
using TAKScrollSpeed = DSiMenuPlusPlusSettings::TScrollSpeed;
guiPage
.option(STR_MAINMENU, STR_DESCRIPTION_MAINMENU, Option::Bool(&ms().showMainMenu), {STR_SHOW, STR_HIDE}, {true, false})
.option(STR_DSCLASSICMENU, STR_DESCRIPTION_DSCLASSICMENU, Option::Bool(&ms().showMainMenu), {STR_SHOW, STR_HIDE}, {true, false})

// Theme
.option(STR_THEME,
Expand Down

0 comments on commit 93fe1ac

Please sign in to comment.