Add option to turn off DS(i) splash screen easter eggs

Author: RocketRobz

settings/arm9/source/language.inl

@@ -296,6 +296,9 @@ STRING(AUTOSTARTSLOT1, "Auto-start Slot-1")
 STRING(GBSPLASH, "GB Splash Screen")
 STRING(DSSPLASH, "DS Splash Screen")
 STRING(DSISPLASH, "DSi Splash Screen")
+STRING(GB_SPLASH_EASTER_EGGS, "GB Splash Easter Eggs")
+STRING(DS_SPLASH_EASTER_EGGS, "DS Splash Easter Eggs")
+STRING(DSI_SPLASH_EASTER_EGGS, "DSi Splash Easter Eggs")
 STRING(DSSPLASHAUTOSKIP, "DS Splash Auto-skip")
 STRING(DSISPLASHAUTOSKIP, "DSi Splash Auto-skip")
 STRING(NINTENDOLOGOCOLOR, "Nintendo Logo Color")
@@ -355,6 +358,9 @@ STRING(DESCRIPTION_AUTOSTARTSLOT1, "Auto-starts the game or flashcard in Slot-1.
 STRING(DESCRIPTION_GBSPLASH, "Select whether to show the Game Boy splash screen on boot.")
 STRING(DESCRIPTION_DSSPLASH, "Select whether to show the Nintendo DS splash screen on boot. Set to \"With H&S\" for the Health & Safety message to show on the bottom screen.")
 STRING(DESCRIPTION_DSISPLASH, "Select whether to show the Nintendo DSi splash screen on boot. Set to \"With H&S\" for the Health & Safety message to show on the bottom screen.")
+STRING(DESCRIPTION_GB_SPLASH_EASTER_EGGS, "Different versions of the GameBoy splash screen will be displayed on specific days (ex. anniversaries).")
+STRING(DESCRIPTION_DS_SPLASH_EASTER_EGGS, "Different versions of the DS splash screen will be displayed on specific days (ex. anniversaries).")
+STRING(DESCRIPTION_DSI_SPLASH_EASTER_EGGS, "Different versions of the DSi splash screen will be displayed on specific days (ex. anniversaries).")
 STRING(DESCRIPTION_DSSPLASHAUTOSKIP, "When enabled the Nintendo DS splash screen will automatically continue instead of waiting for you to touch the touch screen.")
 STRING(DESCRIPTION_DSISPLASHAUTOSKIP, "When enabled the Nintendo DSi splash screen will automatically continue instead of waiting for you to touch the touch screen.")
 STRING(DESCRIPTION_NINTENDOLOGOCOLOR, "Changes the color of the Nintendo logo that shows in the Nintendo DSi splash screen if you have a game card in.")

settings/arm9/source/main.cpp

@@ -1191,11 +1191,13 @@ int settingsMode(void)
 		.option(STR_ROCKET_ROBZ_LOGO, ms().macroMode ? STR_DESCRIPTION_ROCKET_ROBZ_LOGO_MACRO : STR_DESCRIPTION_ROCKET_ROBZ_LOGO, Option::Bool(&ms().rocketRobzLogo), {STR_SHOW, STR_HIDE}, {true, false});
 	if (ms().macroMode) {
 		guiPage
-			.option(STR_GBSPLASH, STR_DESCRIPTION_GBSPLASH, Option::Int(&ms().dsiSplash), {STR_SHOW, STR_CUSTOM_SPLASH, STR_HIDE}, {(ms().dsiSplash==2 ? 2 : 1), 3, 0});
+			.option(STR_GBSPLASH, STR_DESCRIPTION_GBSPLASH, Option::Int(&ms().dsiSplash), {STR_SHOW, STR_CUSTOM_SPLASH, STR_HIDE}, {(ms().dsiSplash==2 ? 2 : 1), 3, 0})
+			.option(STR_GB_SPLASH_EASTER_EGGS, STR_DESCRIPTION_GB_SPLASH_EASTER_EGGS, Option::Bool(&ms().dsiSplashEasterEggs), {STR_OFF, STR_ON}, {false, true});
 	} else {
 		guiPage
 			.option(sys().isRegularDS() ? STR_DSSPLASH : STR_DSISPLASH, sys().isRegularDS() ? STR_DESCRIPTION_DSSPLASH : STR_DESCRIPTION_DSISPLASH, Option::Int(&ms().dsiSplash), {STR_WITHOUT_HS, STR_WITH_HS, STR_CUSTOM_SPLASH, STR_HIDE}, {1, 2, 3, 0})
-			.option(sys().isRegularDS() ? STR_DSSPLASHAUTOSKIP : STR_DSISPLASHAUTOSKIP, sys().isRegularDS() ? STR_DESCRIPTION_DSSPLASHAUTOSKIP : STR_DESCRIPTION_DSISPLASHAUTOSKIP, Option::Bool(&ms().dsiSplashAutoSkip), {STR_OFF, STR_ON}, {false, true});
+			.option(sys().isRegularDS() ? STR_DSSPLASHAUTOSKIP : STR_DSISPLASHAUTOSKIP, sys().isRegularDS() ? STR_DESCRIPTION_DSSPLASHAUTOSKIP : STR_DESCRIPTION_DSISPLASHAUTOSKIP, Option::Bool(&ms().dsiSplashAutoSkip), {STR_OFF, STR_ON}, {false, true})
+			.option(sys().isRegularDS() ? STR_DS_SPLASH_EASTER_EGGS : STR_DSI_SPLASH_EASTER_EGGS, sys().isRegularDS() ? STR_DESCRIPTION_DS_SPLASH_EASTER_EGGS : STR_DESCRIPTION_DSI_SPLASH_EASTER_EGGS, Option::Bool(&ms().dsiSplashEasterEggs), {STR_OFF, STR_ON}, {false, true});
 	}
 	guiPage
 		.option(STR_NINTENDOLOGOCOLOR, STR_DESCRIPTION_NINTENDOLOGOCOLOR, Option::Int(&ms().nintendoLogoColor), {STR_RED, STR_BLUE, STR_MAGENTA, STR_GRAY}, {1, 2, 3, 0})

settings/nitrofiles/languages/en/language.ini

@@ -282,6 +282,9 @@ AUTOSTARTSLOT1=Auto-start Slot-1
 GBSPLASH=GB Splash Screen
 DSSPLASH=DS Splash Screen
 DSISPLASH=DSi Splash Screen
+GB_SPLASH_EASTER_EGGS=GB Splash Easter Eggs
+DS_SPLASH_EASTER_EGGS=DS Splash Easter Eggs
+DSI_SPLASH_EASTER_EGGS=DSi Splash Easter Eggs
 DSSPLASHAUTOSKIP=DS Splash Auto-skip
 DSISPLASHAUTOSKIP=DSi Splash Auto-skip
 NINTENDOLOGOCOLOR=Nintendo Logo Color
@@ -338,6 +341,9 @@ DESCRIPTION_AUTOSTARTSLOT1=Auto-starts the game or flashcard in Slot-1. Useful i
 DESCRIPTION_GBSPLASH=Select whether to show the Game Boy splash screen on boot.
 DESCRIPTION_DSSPLASH=Select whether to show the Nintendo DS splash screen on boot. Set to "With H&S" for the Health & Safety message to show on the bottom screen.
 DESCRIPTION_DSISPLASH=Select whether to show the Nintendo DSi splash screen on boot. Set to "With H&S" for the Health & Safety message to show on the bottom screen.
+DESCRIPTION_GB_SPLASH_EASTER_EGGS=Different versions of the GameBoy splash screen will be displayed on specific days (ex. anniversaries).
+DESCRIPTION_DS_SPLASH_EASTER_EGGS=Different versions of the DS splash screen will be displayed on specific days (ex. anniversaries).
+DESCRIPTION_DSI_SPLASH_EASTER_EGGS=Different versions of the DSi splash screen will be displayed on specific days (ex. anniversaries).
 DESCRIPTION_DSSPLASHAUTOSKIP=When enabled the Nintendo DS splash screen will automatically continue instead of waiting for you to touch the touch screen.
 DESCRIPTION_DSISPLASHAUTOSKIP=When enabled the Nintendo DSi splash screen will automatically continue instead of waiting for you to touch the touch screen.
 DESCRIPTION_NINTENDOLOGOCOLOR=Changes the color of the Nintendo logo that shows in the Nintendo DSi splash screen if you have a game card in.

title/arm9/source/bootsplash.cpp

@@ -41,7 +41,7 @@ void bootSplashDSi(void) {
 	const struct tm *Time = localtime(&Raw);
 
 	strftime(currentDate, sizeof(currentDate), "%m/%d", Time);
-	const bool virtualPain = (strcmp(currentDate, "04/01") == 0 || (ms().getGameRegion() == 0 ? (strcmp(currentDate, "07/21") == 0) : (strcmp(currentDate, "08/14") == 0))); // If April Fools, or the release date of the Virtual Boy
+	const bool virtualPain = (ms().dsiSplashEasterEggs && (strcmp(currentDate, "04/01") == 0 || strcmp(currentDate, ms().getGameRegion() == 0 ? "07/21" : "08/14") == 0)); // If April Fools, or the release date of the Virtual Boy
 	const bool super = (*(u16*)(0x020000C0) == 0x334D || *(u16*)(0x020000C0) == 0x3647 || *(u16*)(0x020000C0) == 0x4353); // Slot-2 flashcard
 	const bool regularDS = (sys().isRegularDS() && !ms().oppositeSplash) || (!sys().isRegularDS() && ms().oppositeSplash);
 

universal/include/common/twlmenusettings.h

@@ -323,6 +323,7 @@ class TWLSettings
 
 	int dsiSplash;
 	bool oppositeSplash;
+	bool dsiSplashEasterEggs;
 	bool dsiSplashAutoSkip;
 	int nintendoLogoColor;
 	bool showlogo;

universal/source/common/twlmenusettings.cpp

@@ -86,6 +86,7 @@ TWLSettings::TWLSettings()
 
 	dsiSplash = isDSiMode();
 	oppositeSplash = false;
+	dsiSplashEasterEggs = true;
 	dsiSplashAutoSkip = false;
 	nintendoLogoColor = 1;
 	showlogo = true;
@@ -284,6 +285,7 @@ void TWLSettings::loadSettings()
 
 	dsiSplash = settingsini.GetInt("SRLOADER", "DSI_SPLASH", dsiSplash);
 	oppositeSplash = settingsini.GetInt("SRLOADER", "OPPOSITE_SPLASH", oppositeSplash);
+	dsiSplashEasterEggs = settingsini.GetInt("SRLOADER", "DSI_SPLASH_EASTER_EGGS", dsiSplashEasterEggs);
 	dsiSplashAutoSkip = settingsini.GetInt("SRLOADER", "DSI_SPLASH_AUTO_SKIP", dsiSplashAutoSkip);
 	nintendoLogoColor = settingsini.GetInt("SRLOADER", "NINTENDO_LOGO_COLOR", nintendoLogoColor);
 	showlogo = settingsini.GetInt("SRLOADER", "SHOWLOGO", showlogo);
@@ -469,6 +471,7 @@ void TWLSettings::saveSettings()
 	settingsini.SetInt("SRLOADER", "SLOT1_LAUNCHMETHOD", slot1LaunchMethod);
 
 	settingsini.SetInt("SRLOADER", "DSI_SPLASH", dsiSplash);
+	settingsini.SetInt("SRLOADER", "DSI_SPLASH_EASTER_EGGS", dsiSplashEasterEggs);
 	settingsini.SetInt("SRLOADER", "DSI_SPLASH_AUTO_SKIP", dsiSplashAutoSkip);
 	settingsini.SetInt("SRLOADER", "NINTENDO_LOGO_COLOR", nintendoLogoColor);
 	settingsini.SetInt("SRLOADER", "SHOWLOGO", showlogo);