Add music from *Style Savvy: Trendsetters*

3ds/source/bgm.cpp

@@ -93,6 +93,69 @@ void loadMusic(int num) {
 			startName = "romfs:/music/savvyManager/menu_start.wav";
 			loopName = "romfs:/music/savvyManager/menu_loop.wav";
 			break;
+		case 20: // Style Savvy: Trendsetters - Title Screen
+			startName = "romfs:/music/styleSavvy2/title_start.wav";
+			loopName = "romfs:/music/styleSavvy2/title_loop.wav";
+			break;
+		case 21: // Style Savvy: Trendsetters - Map (Max)
+			startName = "romfs:/music/styleSavvy2/map_start.wav";
+			loopName = "romfs:/music/styleSavvy2/map_loop.wav";
+			break;
+		case 22: // Style Savvy: Trendsetters - Emmylou's Theme
+			loopName = "romfs:/music/styleSavvy2/tetsuko.wav";
+			break;
+		case 23: // Style Savvy: Trendsetters - Brad's Theme
+			loopName = "romfs:/music/styleSavvy2/musashi.wav";
+			break;
+		case 24: // Style Savvy: Trendsetters - Buyer's Center
+			startName = "romfs:/music/styleSavvy2/exhibition_start.wav";
+			loopName = "romfs:/music/styleSavvy2/exhibition_loop.wav";
+			break;
+		case 25: // Style Savvy: Trendsetters - Hair Salon
+			startName = "romfs:/music/styleSavvy2/hairSalon_start.wav";
+			loopName = "romfs:/music/styleSavvy2/hairSalon_loop.wav";
+			break;
+		case 26: // Style Savvy: Trendsetters - Makeup Salon
+			startName = "romfs:/music/styleSavvy2/makeSalon_start.wav";
+			loopName = "romfs:/music/styleSavvy2/makeSalon_loop.wav";
+			break;
+		case 27: // Style Savvy: Trendsetters - Photo Studio
+			loopName = "romfs:/music/styleSavvy2/photoStudio.wav";
+			break;
+		case 28: // Style Savvy: Trendsetters - Fashion Contest Menu
+			loopName = "romfs:/music/styleSavvy2/contest.wav";
+			break;
+		case 29: // Style Savvy: Trendsetters - MC Mode's Theme
+			loopName = "romfs:/music/styleSavvy2/contestDJ.wav";
+			break;
+		case 30: // Style Savvy: Trendsetters - Cute Runway Theme
+			startName = "romfs:/music/styleSavvy2/runway00_start.wav";
+			loopName = "romfs:/music/styleSavvy2/runway00_loop.wav";
+			break;
+		case 31: // Style Savvy: Trendsetters - Pop Runway Theme
+			loopName = "romfs:/music/styleSavvy2/runway01.wav";
+			break;
+		case 32: // Style Savvy: Trendsetters - Runway Theme 02
+			startName = "romfs:/music/styleSavvy2/runway02_start.wav";
+			loopName = "romfs:/music/styleSavvy2/runway02_loop.wav";
+			break;
+		case 33: // Style Savvy: Trendsetters - Romantic Runway Theme
+			startName = "romfs:/music/styleSavvy2/runway03_start.wav";
+			loopName = "romfs:/music/styleSavvy2/runway03_loop.wav";
+			break;
+		case 34: // Style Savvy: Trendsetters - Boho-Chic Runway Theme
+			loopName = "romfs:/music/styleSavvy2/runway04.wav";
+			break;
+		case 35: // Style Savvy: Trendsetters - Rock Runway Theme
+			startName = "romfs:/music/styleSavvy2/runway05_start.wav";
+			loopName = "romfs:/music/styleSavvy2/runway05_loop.wav";
+			break;
+		case 36: // Style Savvy: Trendsetters - Wireless Shop
+			loopName = "romfs:/music/styleSavvy2/girlsMall.wav";
+			break;
+		case 37: // Style Savvy: Trendsetters - Main Shop Data
+			loopName = "nitro:/music/styleSavvy2/personalCheck.wav";
+			break;
 	}
 
 	if (access(startName, F_OK) == 0) {

include/ss2BgmNames.h

@@ -0,0 +1,41 @@
+const char* ss2BgmNames[] = {
+	"Title Screen",
+	"Map",
+	"Emmylou's Theme",
+	"Brad's Theme",
+	"Buyer's Center",
+	"Hair Salon",
+	"Makeup Salon",
+	"Photo Studio",
+	"Contest Menu",
+	"MC Mode's Theme",
+	"Cute Runway",
+	"Pop Runway",
+	"Unknown Runway",
+	"Romantic Runway",
+	"Boho-Chic Runway",
+	"Rock Runway",
+	"Wireless Shop",
+	"Main Shop Check",
+};
+
+int ss2BgmNums[] = {
+	20,
+	21,
+	22,
+	23,
+	24,
+	25,
+	26,
+	27,
+	28,
+	29,
+	30,
+	31,
+	32,
+	33,
+	34,
+	35,
+	36,
+	37,
+};

nds/arm9/source/bgm.cpp

@@ -111,6 +111,87 @@ void loadMusic(int num) {
 			sampleRate = 48000;
 			stereo = false;
 			break;
+		case 20: // Style Savvy: Trendsetters - Title Screen
+			startName = "nitro:/music/styleSavvy2/title_start.raw";
+			loopName = "nitro:/music/styleSavvy2/title_loop.raw";
+			sampleRate = 32728;
+			break;
+		case 21: // Style Savvy: Trendsetters - Map (Max)
+			startName = "nitro:/music/styleSavvy2/map_start.raw";
+			loopName = "nitro:/music/styleSavvy2/map_loop.raw";
+			sampleRate = 32728;
+			break;
+		case 22: // Style Savvy: Trendsetters - Emmylou's Theme
+			loopName = "nitro:/music/styleSavvy2/tetsuko.raw";
+			sampleRate = 32728;
+			break;
+		case 23: // Style Savvy: Trendsetters - Brad's Theme
+			loopName = "nitro:/music/styleSavvy2/musashi.raw";
+			sampleRate = 32728;
+			break;
+		case 24: // Style Savvy: Trendsetters - Buyer's Center
+			startName = "nitro:/music/styleSavvy2/exhibition_start.raw";
+			loopName = "nitro:/music/styleSavvy2/exhibition_loop.raw";
+			sampleRate = 32728;
+			break;
+		case 25: // Style Savvy: Trendsetters - Hair Salon
+			startName = "nitro:/music/styleSavvy2/hairSalon_start.raw";
+			loopName = "nitro:/music/styleSavvy2/hairSalon_loop.raw";
+			sampleRate = 32728;
+			break;
+		case 26: // Style Savvy: Trendsetters - Makeup Salon
+			startName = "nitro:/music/styleSavvy2/makeSalon_start.raw";
+			loopName = "nitro:/music/styleSavvy2/makeSalon_loop.raw";
+			sampleRate = 44100;
+			break;
+		case 27: // Style Savvy: Trendsetters - Photo Studio
+			loopName = "nitro:/music/styleSavvy2/photoStudio.raw";
+			sampleRate = 32728;
+			break;
+		case 28: // Style Savvy: Trendsetters - Fashion Contest Menu
+			loopName = "nitro:/music/styleSavvy2/contest.raw";
+			sampleRate = 32728;
+			break;
+		case 29: // Style Savvy: Trendsetters - MC Mode's Theme
+			loopName = "nitro:/music/styleSavvy2/contestDJ.raw";
+			sampleRate = 32728;
+			break;
+		case 30: // Style Savvy: Trendsetters - Cute Runway Theme
+			startName = "nitro:/music/styleSavvy2/runway00_start.raw";
+			loopName = "nitro:/music/styleSavvy2/runway00_loop.raw";
+			sampleRate = 32728;
+			break;
+		case 31: // Style Savvy: Trendsetters - Pop Runway Theme
+			loopName = "nitro:/music/styleSavvy2/runway01.raw";
+			sampleRate = 32728;
+			break;
+		case 32: // Style Savvy: Trendsetters - Runway Theme 02
+			startName = "nitro:/music/styleSavvy2/runway02_start.raw";
+			loopName = "nitro:/music/styleSavvy2/runway02_loop.raw";
+			sampleRate = 32728;
+			break;
+		case 33: // Style Savvy: Trendsetters - Romantic Runway Theme
+			startName = "nitro:/music/styleSavvy2/runway03_start.raw";
+			loopName = "nitro:/music/styleSavvy2/runway03_loop.raw";
+			sampleRate = 32728;
+			break;
+		case 34: // Style Savvy: Trendsetters - Boho-Chic Runway Theme
+			loopName = "nitro:/music/styleSavvy2/runway04.raw";
+			sampleRate = 32728;
+			break;
+		case 35: // Style Savvy: Trendsetters - Rock Runway Theme
+			startName = "nitro:/music/styleSavvy2/runway05_start.raw";
+			loopName = "nitro:/music/styleSavvy2/runway05_loop.raw";
+			sampleRate = 32728;
+			break;
+		case 36: // Style Savvy: Trendsetters - Wireless Shop
+			loopName = "nitro:/music/styleSavvy2/girlsMall.raw";
+			sampleRate = 32728;
+			break;
+		case 37: // Style Savvy: Trendsetters - Main Shop Data
+			loopName = "nitro:/music/styleSavvy2/personalCheck.raw";
+			sampleRate = 32728;
+			break;
 	}
 	snd().loadStream(startName, loopName, sampleRate, stereo, true);
 }

source/screens/photoStudio.cpp

@@ -37,6 +37,7 @@
 #include "savvyMgrBgmNames.h"
 #include "sonicManiaBgmNames.h"
 #include "ss1BgmNames.h"
+#include "ss2BgmNames.h"
 #include "tetrisPartyBgmNames.h"
 
 #include <unistd.h>
@@ -125,6 +126,7 @@ static u8 bgmPageOrder[] = {
 	7,	// Savvy Manager
 	4,	// Sonic Mania
 	5,	// Style Savvy
+	8,	// Style Savvy: Trendsetters
 	3,	// Tetris Party
 };
 
@@ -176,6 +178,9 @@ void PhotoStudio::getMaxChars() {
 			case 7:
 				import_totalCharacters = 0;
 				break;
+			case 8:
+				import_totalCharacters = 17;
+				break;
 		}
 	} else if (subScreenMode == 1) {
 		// Locations
@@ -727,6 +732,8 @@ const char* PhotoStudio::bgmGameTitle(void) const {
 			return "Jim Power";
 		case 7:
 			return "Savvy Manager";
+		case 8:
+			return ss2Title();
 	}
 	return "???";
 }
@@ -855,6 +862,8 @@ int PhotoStudio::getBgmNum(void) const {
 			return jimPowerBgmNums[bgmList_cursorPosition];
 		case 7:
 			return savvyMgrBgmNums[bgmList_cursorPosition];
+		case 8:
+			return ss2BgmNums[bgmList_cursorPosition];
 	}
 	return 0;
 }
@@ -924,7 +933,7 @@ void PhotoStudio::loadChrImage(void) {
 
 void PhotoStudio::Draw(void) const {
 	if (!musicLoaded) {
-		loadMusic(0);
+		loadMusic(27);
 		musicLoaded = true;
 	}