Add more music from *Style Savvy*

3ds/source/bgm.cpp

@@ -154,7 +154,20 @@ void loadMusic(int num) {
 			loopName = "romfs:/music/styleSavvy2/girlsMall.wav";
 			break;
 		case 37: // Style Savvy: Trendsetters - Main Shop Data
-			loopName = "nitro:/music/styleSavvy2/personalCheck.wav";
+			loopName = "romfs:/music/styleSavvy2/personalCheck.wav";
+			break;
+		case 38: // Style Savvy - Hair Salon
+			loopName = "romfs:/music/styleSavvy/hairSalon.wav";
+			break;
+		case 39: // Style Savvy - Makeup Salon
+			startName = "romfs:/music/styleSavvy/makeSalon_start.wav";
+			loopName = "romfs:/music/styleSavvy/makeSalon_loop.wav";
+			break;
+		case 40: // Style Savvy - Unused?
+			loopName = "romfs:/music/styleSavvy/exhibition.wav";
+			break;
+		case 41: // Style Savvy - Dominic's Mansion
+			loopName = "romfs:/music/styleSavvy/mansion.wav";
 			break;
 	}
 

include/ss1BgmNames.h

@@ -6,6 +6,10 @@ const char* ss1BgmNames[] = {
 	"Map (Winter)",
 	"Wireless Menu",
 	"Wireless Map",
+	"Dominic's Mansion",
+	"Hair Salon",
+	"Makeup Salon",
+	"Unused?",
 };
 
 int ss1BgmNums[] = {
@@ -16,4 +20,8 @@ int ss1BgmNums[] = {
 	15,
 	16,
 	17,
+	41,
+	38,
+	39,
+	40,
 };

nds/arm9/source/bgm.cpp

@@ -192,6 +192,23 @@ void loadMusic(int num) {
 			loopName = "nitro:/music/styleSavvy2/personalCheck.raw";
 			sampleRate = 32728;
 			break;
+		case 38: // Style Savvy - Hair Salon
+			loopName = "nitro:/music/styleSavvy/hairSalon.raw";
+			sampleRate = 32000;
+			break;
+		case 39: // Style Savvy - Makeup Salon
+			startName = "nitro:/music/styleSavvy/makeSalon_start.raw";
+			loopName = "nitro:/music/styleSavvy/makeSalon_loop.raw";
+			sampleRate = 32000;
+			break;
+		case 40: // Style Savvy - Unused?
+			loopName = "nitro:/music/styleSavvy/exhibition.raw";
+			sampleRate = 32000;
+			break;
+		case 41: // Style Savvy - Dominic's Mansion
+			loopName = "nitro:/music/styleSavvy/mansion.raw";
+			sampleRate = 32000;
+			break;
 	}
 	snd().loadStream(startName, loopName, sampleRate, stereo, true);
 }

source/screens/photoStudio.cpp

@@ -170,7 +170,7 @@ void PhotoStudio::getMaxChars() {
 				import_totalCharacters = 5;
 				break;
 			case 5:
-				import_totalCharacters = 6;
+				import_totalCharacters = 10;
 				break;
 			case 6:
 				import_totalCharacters = 0;