Add screen swap hotkey customization

Author: RocketRobz

settings/arm9/source/language.inl

@@ -193,6 +193,7 @@ STRING(B4DSMODE, "B4DS Mode")
 STRING(S1SD_B4DSMODE, "S1SD: B4DS Mode")
 STRING(ESRBRATINGSCREEN, "ESRB Rating Screen")
 STRING(HOTKEY, "Menu hotkey")
+STRING(SCREEN_SWAP_HOTKEY, "Screen Swap hotkey")
 STRING(SAVE_LOCATION, "Save Location")
 STRING(FORCESLEEPPATCH, "Force sleep mode patch")
 STRING(SYSSD_FORCESLEEPPATCH, "Sys SD: Force sleep mode patch")
@@ -256,6 +257,7 @@ STRING(DESCRIPTION_GAMELOADER, "Select whether to use nds-bootstrap or the flash
 STRING(DESCRIPTION_B4DSMODE, "Only use for testing. Activates the mode used when running nds-bootstrap on DS/DS Lite, with some additional DSi features.")
 STRING(DESCRIPTION_ESRBRATINGSCREEN, "Displays a screen with USA DS title's ESRB rating and content descriptor(s), when launched via nds-bootstrap. Does not work with all DS titles.")
 STRING(DESCRIPTION_HOTKEY, "Set the hotkey to open the nds-bootstrap in-game menu.")
+STRING(DESCRIPTION_SCREEN_SWAP_HOTKEY, "Set the hotkey to swap the top and bottom screens.")
 STRING(DESCRIPTION_SAVE_LOCATION, "Pick the location of where game saves are placed. Selecting ROM folder will disable save slots.")
 STRING(DESCRIPTION_FORCESLEEPMODE, "If a certain Slot-1 card is preventing sleep mode from working, please turn this on. Remember to turn this off if you have a retail game card inserted.")
 STRING(DESCRIPTION_SLOT1SDACCESS, "Have access to the console's SD card while running a Slot-1 flashcard.")
@@ -412,6 +414,7 @@ STRING(AB_SETFONT, "\\A / \\B: Set font")
 
 STRING(HOLD_1S_SET, "Hold keys to set hotkey")
 STRING(HOLD_1S_DETAILS, "Hold at least two keys for 1 second.\nThe default is \\L \\DD SELECT.\nHold \\B to cancel.")
+STRING(HOLD_1S_SCREEN_SWAP_DETAILS, "Hold at least two keys for 1 second.\nThe default is \\L \\R \\DU \\X.\nHold \\B to cancel.")
 STRING(TOUCH, "Touch")
 STRING(HOTKEY_SET, "Hotkey set!")
 STRING(HOTKEY_SETTING_CANCELLED, "Hotkey setting cancelled!")

settings/arm9/source/main.cpp

@@ -451,7 +451,7 @@ std::string keyString(u16 pressed) {
 	return keys.substr(0, keys.size() - 1); // Remove trailing space
 }
 
-void opt_set_hotkey(void) {
+void opt_set_hotkey_main(const bool screenSwap) {
 	clearScroller();
 	bool refreshText = true;
 	u16 held = 0, set = 0, timer = 0;
@@ -467,7 +467,11 @@ void opt_set_hotkey(void) {
 
 			keys = keyString(set);
 			printSmall(false, 0, 48, keys, Alignment::center);
-			printSmall(false, 0, 170 - calcSmallFontHeight(STR_HOLD_1S_DETAILS), STR_HOLD_1S_DETAILS, Alignment::center);
+			if (screenSwap) {
+				printSmall(false, 0, 170 - calcSmallFontHeight(STR_HOLD_1S_SCREEN_SWAP_DETAILS), STR_HOLD_1S_SCREEN_SWAP_DETAILS, Alignment::center);
+			} else {
+				printSmall(false, 0, 170 - calcSmallFontHeight(STR_HOLD_1S_DETAILS), STR_HOLD_1S_DETAILS, Alignment::center);
+			}
 			updateText(false);
 			refreshText = false;
 		}
@@ -497,9 +501,13 @@ void opt_set_hotkey(void) {
 
 	// Holding *only* B cancels
 	if(set == KEY_B) {
-		keys = keyString(bs().bootstrapHotkey);
+		keys = keyString(screenSwap ? bs().screenSwapHotkey : bs().bootstrapHotkey);
 	} else {
-		bs().bootstrapHotkey = set;
+		if (screenSwap) {
+			bs().screenSwapHotkey = set;
+		} else {
+			bs().bootstrapHotkey = set;
+		}
 	}
 
 	mmEffectEx(currentTheme == 4 ? &snd().snd_saturn_select : &snd().snd_select);
@@ -520,6 +528,14 @@ void opt_set_hotkey(void) {
 	clearText();
 }
 
+void opt_set_hotkey(void) {
+	opt_set_hotkey_main(false);
+}
+
+void opt_set_screenswap_hotkey(void) {
+	opt_set_hotkey_main(true);
+}
+
 void begin_update(int opt)
 {
 	ms().saveSettings();
@@ -1339,7 +1355,8 @@ int settingsMode(void)
 
 	bootstrapPage
 		.option(STR_ESRBRATINGSCREEN, STR_DESCRIPTION_ESRBRATINGSCREEN, Option::Bool(&ms().esrbRatingScreen), {STR_ON, STR_OFF}, {true, false})
-		.option(STR_HOTKEY, STR_DESCRIPTION_HOTKEY, Option::Nul(opt_set_hotkey), {STR_PRESS_A}, {0});
+		.option(STR_HOTKEY, STR_DESCRIPTION_HOTKEY, Option::Nul(opt_set_hotkey), {STR_PRESS_A}, {0})
+		.option(STR_SCREEN_SWAP_HOTKEY, STR_DESCRIPTION_SCREEN_SWAP_HOTKEY, Option::Nul(opt_set_screenswap_hotkey), {STR_PRESS_A}, {0});
 
 	if (!sys().isRegularDS()) {
 		bootstrapPage.option(STR_SNDFREQ, STR_DESCRIPTION_SNDFREQ_1, Option::Bool((bool *)&ms().soundFreq), {"47.61 kHz", "32.73 kHz"}, {true, false});

settings/nitrofiles/languages/en/language.ini

@@ -185,6 +185,7 @@ B4DSMODE=B4DS Mode
 S1SD_B4DSMODE=S1SD: B4DS Mode
 ESRBRATINGSCREEN=ESRB Rating Screen
 HOTKEY=Menu hotkey
+SCREEN_SWAP_HOTKEY=Screen Swap hotkey
 SAVE_LOCATION=Save Location
 FORCESLEEPPATCH=Force sleep mode patch
 SYSSD_FORCESLEEPPATCH=Sys SD: Force sleep mode patch
@@ -244,6 +245,7 @@ DESCRIPTION_GAMELOADER=Select whether to use nds-bootstrap or the flashcard kern
 DESCRIPTION_B4DSMODE=Only use for testing. Activates the mode used when running nds-bootstrap on DS/DS Lite, with some additional DSi features.
 DESCRIPTION_ESRBRATINGSCREEN=Displays a screen with USA DS title's ESRB rating and content descriptor(s), when launched via nds-bootstrap. Does not work with all DS titles.
 DESCRIPTION_HOTKEY=Set the hotkey to open the nds-bootstrap in-game menu.
+DESCRIPTION_SCREEN_SWAP_HOTKEY=Set the hotkey to swap the top and bottom screens.
 DESCRIPTION_SAVE_LOCATION=Pick the location of where game saves are placed. Selecting ROM folder will disable save slots.
 DESCRIPTION_FORCESLEEPMODE=If a certain Slot-1 card is preventing sleep mode from working, please turn this on. Remember to turn this off if you have a retail game card inserted.
 DESCRIPTION_SLOT1SDACCESS=Have access to the console's SD card while running a Slot-1 flashcard.
@@ -390,6 +392,7 @@ AB_SETFONT=\A / \B: Set font
 
 HOLD_1S_SET=Hold keys to set hotkey
 HOLD_1S_DETAILS=Hold at least two keys for 1 second.\nThe default is \L \DD SELECT.\nHold \B to cancel.
+HOLD_1S_SCREEN_SWAP_DETAILS=Hold at least two keys for 1 second.\nThe default is \L \R \DU \X.\nHold \B to cancel.
 TOUCH=Touch
 HOTKEY_SET=Hotkey set!
 HOTKEY_SETTING_CANCELLED=Hotkey setting cancelled!

universal/include/common/bootstrapsettings.h

@@ -45,6 +45,7 @@ class BootstrapSettings
 	bool sdNand;
 	TWLSettings::TConsoleModel consoleModel;
 	int bootstrapHotkey;
+	int screenSwapHotkey;
 	TWLSettings::TSaveRelocation saveRelocation;
 
 };

universal/source/common/bootstrapsettings.cpp

@@ -42,6 +42,7 @@ void BootstrapSettings::loadSettings()
 	sdNand = bootstrapini.GetInt( "NDS-BOOTSTRAP", "SDNAND", sdNand);
 	consoleModel = (TWLSettings::TConsoleModel)bootstrapini.GetInt("NDS-BOOTSTRAP", "CONSOLE_MODEL", consoleModel);
 	bootstrapHotkey = strtol(bootstrapini.GetString("NDS-BOOTSTRAP", "HOTKEY", "284").c_str(), NULL, 16);
+	screenSwapHotkey = strtol(bootstrapini.GetString("NDS-BOOTSTRAP", "SCREEN_SWAP_HOTKEY", "740").c_str(), NULL, 16);
 	saveRelocation = (TWLSettings::TSaveRelocation)bootstrapini.GetInt( "NDS-BOOTSTRAP", "SAVE_RELOCATION", saveRelocation);
 }
 
@@ -68,6 +69,8 @@ void BootstrapSettings::saveSettings()
 	char hotkey[8] = {0};
 	itoa(bootstrapHotkey, hotkey, 16);
 	bootstrapini.SetString("NDS-BOOTSTRAP", "HOTKEY", hotkey);
+	itoa(screenSwapHotkey, hotkey, 16);
+	bootstrapini.SetString("NDS-BOOTSTRAP", "SCREEN_SWAP_HOTKEY", hotkey);
 	bootstrapini.SetInt("NDS-BOOTSTRAP", "SAVE_RELOCATION", saveRelocation);
 
 	bootstrapini.SaveIniFile(bootstrapinipath);