R4 theme: Add mac-like theme for R4 from v6.3.0

Also: fix overlooked bug

Author: RocketRobz

romsel_r4theme/arm9/source/graphics/graphics.cpp

@@ -50,6 +50,7 @@
 #include "theme12_bckgrd1.h"
 #include "theme12_logo.h"
 #include "bluemoon_bckgrd1.h"
+#include "maclike_bckgrd1.h"
 #include "iconbox.h"
 #include "wirelessicons.h"
 
@@ -467,6 +468,10 @@ void topLogoLoad() {
 			swiDecompressLZSSVram ((void*)bluemoon_bckgrd1Tiles, (void*)CHAR_BASE_BLOCK_SUB(4), 0, &decompressBiosCallback);
 			vramcpy_ui (&BG_PALETTE_SUB[0], bluemoon_bckgrd1Pal, bluemoon_bckgrd1PalLen);
 			break;
+		case 13:
+			swiDecompressLZSSVram ((void*)maclike_bckgrd1Tiles, (void*)CHAR_BASE_BLOCK_SUB(4), 0, &decompressBiosCallback);
+			vramcpy_ui (&BG_PALETTE_SUB[0], maclike_bckgrd1Pal, maclike_bckgrd1PalLen);
+			break;
 	}
 }
 
@@ -525,6 +530,10 @@ void topBgLoad() {
 			swiDecompressLZSSVram ((void*)bluemoon_bckgrd1Tiles, (void*)CHAR_BASE_BLOCK_SUB(4), 0, &decompressBiosCallback);
 			vramcpy_ui (&BG_PALETTE_SUB[0], bluemoon_bckgrd1Pal, bluemoon_bckgrd1PalLen);
 			break;
+		case 13:
+			swiDecompressLZSSVram ((void*)maclike_bckgrd1Tiles, (void*)CHAR_BASE_BLOCK_SUB(4), 0, &decompressBiosCallback);
+			vramcpy_ui (&BG_PALETTE_SUB[0], maclike_bckgrd1Pal, maclike_bckgrd1PalLen);
+			break;
 	}
 }
 

romsel_r4theme/nitrofiles/themes/theme14/bckgrd_2.bmp

@@ -12,7 +12,7 @@ DSiMenuPlusPlusSettings::DSiMenuPlusPlusSettings()
     cursorPosition = 0;
     startMenu_cursorPosition = 0;
     consoleModel = 0;
-    appName = ENameDSiMenuPP;
+    appName = ENameTWiLightMenu;
 
     gotosettings = false;
     guiLanguage = ELangDefault;

romsel_r4theme/nitrofiles/themes/theme14/icons.bmp

@@ -141,6 +141,7 @@ std::string STR_R4_THEME10 = "STR_R4_THEME10";
 std::string STR_R4_THEME11 = "STR_R4_THEME11";
 std::string STR_R4_THEME12 = "STR_R4_THEME12";
 std::string STR_R4_THEME13 = "STR_R4_THEME13";
+std::string STR_R4_THEME14 = "STR_R4_THEME14";
 
 std::string STR_DEFAULT_LAUNCHER = "STR_DEFAULT_LAUNCHER";
 std::string STR_DESCRIPTION_DEFAULT_LAUNCHER_1 = "STR_DESCRIPTION_DEFAULT_LAUNCHER_1";
@@ -383,6 +384,7 @@ void langInit(void)
 	STR_R4_THEME11 = languageini.GetString("LANGUAGE", "R4_THEME11", "Christmas tree");
 	STR_R4_THEME12 = languageini.GetString("LANGUAGE", "R4_THEME12", "Drawn symbol");
 	STR_R4_THEME13 = languageini.GetString("LANGUAGE", "R4_THEME13", "Blue moon");
+	STR_R4_THEME14 = languageini.GetString("LANGUAGE", "R4_THEME14", "Mac-like");
 
 	STR_DEFAULT_LAUNCHER = languageini.GetString("LANGUAGE", "DEFAULT_LAUNCHER", "Default launcher");
 

titleandsettings/arm9/source/common/dsimenusettings.cpp

@@ -135,6 +135,7 @@ extern std::string STR_R4_THEME10;
 extern std::string STR_R4_THEME11;
 extern std::string STR_R4_THEME12;
 extern std::string STR_R4_THEME13;
+extern std::string STR_R4_THEME14;
 
 extern std::string STR_DEFAULT_LAUNCHER;
 extern std::string STR_DESCRIPTION_DEFAULT_LAUNCHER_1;

titleandsettings/arm9/source/language.cpp

@@ -360,8 +360,9 @@ std::optional<Option> opt_subtheme_select(Option::Int &optVal)
 						  STR_R4_THEME11,
 						  STR_R4_THEME12,
 						  STR_R4_THEME13,
+						  STR_R4_THEME14,
 					  },
-					  {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12});
+					  {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13});
 	case 3:
 		return Option(STR_SUBTHEMESEL_AK, STR_AB_SETRETURN, Option::Str(&ms().ak_theme), akThemeList);
 	case 1:

titleandsettings/arm9/source/language.h

@@ -150,3 +150,4 @@ R4_THEME10 = Fall trees
 R4_THEME11 = Christmas tree
 R4_THEME12 = Drawn symbol
 R4_THEME13 = Blue moon
+R4_THEME14 = Mac-like

titleandsettings/arm9/source/main.cpp

@@ -148,3 +148,4 @@ R4_THEME10 = Arbres d'automne
 R4_THEME11 = Sapin de Noel
 R4_THEME12 = Symbole dessine
 R4_THEME13 = Blue moon
+R4_THEME14 = Mac-like

titleandsettings/nitrofiles/languages/english.ini

@@ -148,3 +148,4 @@ R4_THEME10 = Herbstbäume
 R4_THEME11 = Weihnachtsbäume
 R4_THEME12 = Gemaltes Symbol
 R4_THEME13 = Blauer Mond
+R4_THEME14 = Mac-like