Add setting to hide Rocket Robz logo

settings/arm9/source/language.inl

@@ -283,6 +283,7 @@ STRING(DSISPLASHAUTOSKIP, "DSi Splash Auto-skip")
 STRING(NINTENDOLOGOCOLOR, "Nintendo Logo Color")
 STRING(DSIMENUPPLOGO, "TWLMenu++ Splash Screen")
 STRING(SPLASH_JINGLE_LENGTH, "Splash Jingle Length")
+STRING(ROCKET_ROBZ_LOGO, "Rocket Robz Logo")
 STRING(DSIWARE_EXPLOIT, "DSiWare Exploit")
 STRING(SYSREGION, "SysNAND Region")
 STRING(LAUNCHERAPP, "SysNAND Launcher")
@@ -341,6 +342,8 @@ STRING(DESCRIPTION_DSISPLASHAUTOSKIP, "When enabled the Nintendo DSi splash scre
 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.")
 STRING(DESCRIPTION_DSIMENUPPLOGO_1, "The logo will be shown when you start TWiLight Menu++.")
 STRING(DESCRIPTION_SPLASH_JINGLE_LENGTH, "Changes the length of the jingle played in the TWiLight Menu++ splash screen. Does not affect variants which use a different jingle.")
+STRING(DESCRIPTION_ROCKET_ROBZ_LOGO, "The Rocket Robz logo will be shown on the bottom screen during the TWiLight Menu++ splash screen.")
+STRING(DESCRIPTION_ROCKET_ROBZ_LOGO_MACRO, "The Rocket Robz logo will be shown before the TWiLight Menu++ splash screen.")
 STRING(DESCRIPTION_DSIWARE_EXPLOIT, "The exploited DSiWare app/game you're using for TWiLight Menu++ and nds-bootstrap. Set to \"None\" if not using one.")
 STRING(DESCRIPTION_SYSREGION_1, "The region of SysNAND. \"Auto\" option will only work if SDNAND is set up.")
 STRING(DESCRIPTION_LAUNCHERAPP, "To get the .app name, press POWER, hold \\A + \\B, then highlight LAUNCHER.")

settings/arm9/source/main.cpp

@@ -1036,7 +1036,8 @@ int settingsMode(void)
 				{false, true})
 		.option(STR_SORT_METHOD, STR_DESCRIPTION_SORT_METHOD, Option::Int((int *)&ms().sortMethod), {STR_ALPHABETICAL, STR_RECENT, STR_MOST_PLAYED, STR_FILE_TYPE, STR_CUSTOM}, {TSortMethod::ESortAlphabetical, TSortMethod::ESortRecent, TSortMethod::ESortMostPlayed, TSortMethod::ESortFileType, TSortMethod::ESortCustom})
 		.option(STR_DSIMENUPPLOGO, STR_DESCRIPTION_DSIMENUPPLOGO_1, Option::Bool(&ms().showlogo), {STR_SHOW, STR_HIDE}, {true, false})
-		.option(STR_SPLASH_JINGLE_LENGTH, STR_DESCRIPTION_SPLASH_JINGLE_LENGTH, Option::Bool(&ms().longSplashJingle), {STR_LONG, STR_SHORT}, {true, false});
+		.option(STR_SPLASH_JINGLE_LENGTH, STR_DESCRIPTION_SPLASH_JINGLE_LENGTH, Option::Bool(&ms().longSplashJingle), {STR_LONG, STR_SHORT}, {true, false})
+		.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});

settings/nitrofiles/languages/en/language.ini

@@ -274,6 +274,7 @@ DSISPLASHAUTOSKIP=DSi Splash Auto-skip
 NINTENDOLOGOCOLOR=Nintendo Logo Color
 DSIMENUPPLOGO=TWLMenu++ Splash Screen
 SPLASH_JINGLE_LENGTH=Splash Jingle Length
+ROCKET_ROBZ_LOGO=Rocket Robz Logo
 DSIWARE_EXPLOIT=DSiWare Exploit
 SYSREGION=SysNAND Region
 LAUNCHERAPP=SysNAND Launcher
@@ -329,6 +330,8 @@ DESCRIPTION_DSISPLASHAUTOSKIP=When enabled the Nintendo DSi splash screen will a
 DESCRIPTION_NINTENDOLOGOCOLOR=Changes the color of the Nintendo logo that shows in the Nintendo DSi splash screen if you have a game card in.
 DESCRIPTION_DSIMENUPPLOGO_1=The logo will be shown when you start TWiLight Menu++.
 DESCRIPTION_SPLASH_JINGLE_LENGTH=Changes the length of the jingle played in the TWiLight Menu++ splash screen. Does not affect variants which use a different jingle.
+DESCRIPTION_ROCKET_ROBZ_LOGO=The Rocket Robz logo will be shown on the bottom screen during the TWiLight Menu++ splash screen.
+DESCRIPTION_ROCKET_ROBZ_LOGO_MACRO=The Rocket Robz logo will be shown before the TWiLight Menu++ splash screen.
 DESCRIPTION_DSIWARE_EXPLOIT=The exploited DSiWare app/game you're using for TWiLight Menu++ and nds-bootstrap. Set to "None" if not using one.
 DESCRIPTION_SYSREGION_1=The region of SysNAND. "Auto" option will only work if SDNAND is set up.
 DESCRIPTION_LAUNCHERAPP=To get the .app name, press POWER, hold \A + \B, then highlight LAUNCHER.

title/arm9/source/graphics/graphics.cpp

@@ -106,7 +106,7 @@ void LoadBMP(void) {
 	std::vector<unsigned char> image;
 	unsigned width, height;
 
-	lodepng::decode(image, width, height, (sys().isDSPhat() || ms().colorMode == 2) ? "nitro:/graphics/logoPhat_rocketrobz.png" : "nitro:/graphics/logo_rocketrobz.png");
+	lodepng::decode(image, width, height, ms().rocketRobzLogo ? ((sys().isDSPhat() || ms().colorMode == 2) ? "nitro:/graphics/logoPhat_rocketrobz.png" : "nitro:/graphics/logo_rocketrobz.png") : "nitro:/graphics/logo_rocketrobzHide.png");
 	bool alternatePixel = false;
 	for (unsigned i=0;i<image.size()/4;i++) {
 		image[(i*4)+3] = 0;

universal/include/common/twlmenusettings.h

@@ -278,6 +278,7 @@ class TWLSettings
 	bool gbar2DldiAccess;
 	bool showMainMenu;
 	bool showSelectMenu;
+	bool rocketRobzLogo;
 	TTheme theme;
 	TSettingsMusic settingsMusic;
 	TDSiMusic dsiMusic;

universal/source/common/twlmenusettings.cpp

@@ -45,6 +45,7 @@ TWLSettings::TWLSettings()
 	gbar2DldiAccess = false;
 	showMainMenu = false;
 	showSelectMenu = false;
+	rocketRobzLogo = true;
 	theme = EThemeDSi;
 	settingsMusic = ESMusicTheme;
 	dsiMusic = EMusicTheme;
@@ -200,6 +201,7 @@ void TWLSettings::loadSettings()
 	gbar2DldiAccess = settingsini.GetInt("SRLOADER", "GBAR2_DLDI_ACCESS", gbar2DldiAccess);
 	showMainMenu = settingsini.GetInt("SRLOADER", "SHOW_MAIN_MENU", showMainMenu);
 	showSelectMenu = settingsini.GetInt("SRLOADER", "SHOW_SELECT_MENU", showSelectMenu);
+	rocketRobzLogo = settingsini.GetInt("SRLOADER", "ROCKET_ROBZ_LOGO", rocketRobzLogo);
 	theme = (TTheme)settingsini.GetInt("SRLOADER", "THEME", theme);
 	settingsMusic = (TSettingsMusic)settingsini.GetInt("SRLOADER", "SETTINGS_MUSIC", settingsMusic);
 	dsiMusic = (TDSiMusic)settingsini.GetInt("SRLOADER", "DSI_MUSIC", dsiMusic);
@@ -388,6 +390,7 @@ void TWLSettings::saveSettings()
 	settingsini.SetInt("SRLOADER", "SHOW_HIDDEN", showHidden);
 	settingsini.SetInt("SRLOADER", "SHOW_PHOTO", showPhoto);
 	settingsini.SetInt("SRLOADER", "SHOW_BOX_ART", showBoxArt);
+	settingsini.SetInt("SRLOADER", "ROCKET_ROBZ_LOGO", rocketRobzLogo);
 	settingsini.SetInt("SRLOADER", "ANIMATE_DSI_ICONS", animateDsiIcons);
 	settingsini.SetInt("SRLOADER", "SHOW_CUSTOM_ICONS", showCustomIcons);
 	settingsini.SetInt("SRLOADER", "PREVENT_ROM_DELETION", preventDeletion);