diff --git a/3ds/romfs/music/styleSavvy3/apartment.wav b/3ds/romfs/music/styleSavvy3/apartment.wav new file mode 100644 index 0000000..9d8d8a0 Binary files /dev/null and b/3ds/romfs/music/styleSavvy3/apartment.wav differ diff --git a/3ds/romfs/music/styleSavvy3/beaumonde12AM.wav b/3ds/romfs/music/styleSavvy3/beaumonde12AM.wav new file mode 100644 index 0000000..9e155cc Binary files /dev/null and b/3ds/romfs/music/styleSavvy3/beaumonde12AM.wav differ diff --git a/3ds/romfs/music/styleSavvy3/beaumonde1PM.wav b/3ds/romfs/music/styleSavvy3/beaumonde1PM.wav new file mode 100644 index 0000000..9e4427a Binary files /dev/null and b/3ds/romfs/music/styleSavvy3/beaumonde1PM.wav differ diff --git a/3ds/romfs/music/styleSavvy3/beaumonde6AM.wav b/3ds/romfs/music/styleSavvy3/beaumonde6AM.wav new file mode 100644 index 0000000..a7b82f6 Binary files /dev/null and b/3ds/romfs/music/styleSavvy3/beaumonde6AM.wav differ diff --git a/3ds/romfs/music/styleSavvy3/beaumonde7PM.wav b/3ds/romfs/music/styleSavvy3/beaumonde7PM.wav new file mode 100644 index 0000000..b474d40 Binary files /dev/null and b/3ds/romfs/music/styleSavvy3/beaumonde7PM.wav differ diff --git a/3ds/romfs/music/styleSavvy3/beaumonde9PM.wav b/3ds/romfs/music/styleSavvy3/beaumonde9PM.wav new file mode 100644 index 0000000..9b16270 Binary files /dev/null and b/3ds/romfs/music/styleSavvy3/beaumonde9PM.wav differ diff --git a/3ds/romfs/music/styleSavvy3/introEnglish_loop.wav b/3ds/romfs/music/styleSavvy3/introEnglish_loop.wav new file mode 100644 index 0000000..0665dfe Binary files /dev/null and b/3ds/romfs/music/styleSavvy3/introEnglish_loop.wav differ diff --git a/3ds/romfs/music/styleSavvy3/introEnglish_start.wav b/3ds/romfs/music/styleSavvy3/introEnglish_start.wav new file mode 100644 index 0000000..5c79aff Binary files /dev/null and b/3ds/romfs/music/styleSavvy3/introEnglish_start.wav differ diff --git a/3ds/romfs/music/styleSavvy3/introJapanese_loop.wav b/3ds/romfs/music/styleSavvy3/introJapanese_loop.wav new file mode 100644 index 0000000..51d2ded Binary files /dev/null and b/3ds/romfs/music/styleSavvy3/introJapanese_loop.wav differ diff --git a/3ds/romfs/music/styleSavvy3/introJapanese_start.wav b/3ds/romfs/music/styleSavvy3/introJapanese_start.wav new file mode 100644 index 0000000..d876748 Binary files /dev/null and b/3ds/romfs/music/styleSavvy3/introJapanese_start.wav differ diff --git a/3ds/romfs/music/styleSavvy3/phone_loop.wav b/3ds/romfs/music/styleSavvy3/phone_loop.wav new file mode 100644 index 0000000..e108d78 Binary files /dev/null and b/3ds/romfs/music/styleSavvy3/phone_loop.wav differ diff --git a/3ds/romfs/music/styleSavvy3/phone_start.wav b/3ds/romfs/music/styleSavvy3/phone_start.wav new file mode 100644 index 0000000..c079d65 Binary files /dev/null and b/3ds/romfs/music/styleSavvy3/phone_start.wav differ diff --git a/3ds/romfs/music/styleSavvy3/title.wav b/3ds/romfs/music/styleSavvy3/title.wav new file mode 100644 index 0000000..d7027a7 Binary files /dev/null and b/3ds/romfs/music/styleSavvy3/title.wav differ diff --git a/3ds/romfs/music/styleSavvy3/wardrobe.wav b/3ds/romfs/music/styleSavvy3/wardrobe.wav new file mode 100644 index 0000000..4ed803e Binary files /dev/null and b/3ds/romfs/music/styleSavvy3/wardrobe.wav differ diff --git a/3ds/source/bgm.cpp b/3ds/source/bgm.cpp index 8eb939c..91f877e 100644 --- a/3ds/source/bgm.cpp +++ b/3ds/source/bgm.cpp @@ -185,6 +185,42 @@ void loadMusic(int num) { startName = "romfs:/music/sonicJam/gallery_start.wav"; loopName = "romfs:/music/sonicJam/gallery_loop.wav"; break; + case 46: // Style Savvy: Fashion Forward - Intro Song (Japanese) + startName = "nitro:/music/styleSavvy3/introJapanese_start.wav"; + loopName = "nitro:/music/styleSavvy3/introJapanese_loop.wav"; + break; + case 47: // Style Savvy: Fashion Forward - Intro Song (English) + startName = "nitro:/music/styleSavvy3/introEnglish_start.wav"; + loopName = "nitro:/music/styleSavvy3/introEnglish_loop.wav"; + break; + case 48: // Style Savvy: Fashion Forward - Title Screen + loopName = "romfs:/music/styleSavvy3/title.wav"; + break; + case 49: // Style Savvy: Fashion Forward - My Apartment + loopName = "romfs:/music/styleSavvy3/apartment.wav"; + break; + case 50: // Style Savvy: Fashion Forward - Beaumonde City (Morning) + loopName = "romfs:/music/styleSavvy3/beaumonde6AM.wav"; + break; + case 51: // Style Savvy: Fashion Forward - Beaumonde City (Noon) + loopName = "romfs:/music/styleSavvy3/beaumonde1PM.wav"; + break; + case 52: // Style Savvy: Fashion Forward - Beaumonde City (Sunset) + loopName = "romfs:/music/styleSavvy3/beaumonde7PM.wav"; + break; + case 53: // Style Savvy: Fashion Forward - Beaumonde City (Night) + loopName = "romfs:/music/styleSavvy3/beaumonde9PM.wav"; + break; + case 54: // Style Savvy: Fashion Forward - Beaumonde City (Midnight) + loopName = "romfs:/music/styleSavvy3/beaumonde12AM.wav"; + break; + case 55: // Style Savvy: Fashion Forward - Phone + startName = "romfs:/music/styleSavvy3/phone_start.wav"; + loopName = "romfs:/music/styleSavvy3/phone_loop.wav"; + break; + case 56: // Style Savvy: Fashion Forward - Wardrobe + loopName = "romfs:/music/styleSavvy3/wardrobe.wav"; + break; } if (access(startName, F_OK) == 0) { diff --git a/include/ss3BgmNames.h b/include/ss3BgmNames.h new file mode 100644 index 0000000..f2d6c9d --- /dev/null +++ b/include/ss3BgmNames.h @@ -0,0 +1,27 @@ +const char* ss3BgmNames[] = { + "Intro Song (Japanese)", + "Intro Song (English)", + "Title Screen", + "Beaumonde City (Morning)", + "Beaumonde City (Noon)", + "Beaumonde City (Sunset)", + "Beaumonde City (Night)", + "Beaumonde City (Midnight)", + "My Apartment", + "Phone", + "Wardrobe", +}; + +int ss3BgmNums[] = { + 46, + 47, + 48, + 50, + 51, + 52, + 53, + 54, + 49, + 55, + 56, +}; diff --git a/nds/arm9/source/bgm.cpp b/nds/arm9/source/bgm.cpp index d2d0dae..4e6f3db 100644 --- a/nds/arm9/source/bgm.cpp +++ b/nds/arm9/source/bgm.cpp @@ -230,6 +230,53 @@ void loadMusic(int num) { loopName = "nitro:/music/sonicJam/gallery_loop.raw"; sampleRate = 22050; break; + case 46: // Style Savvy: Fashion Forward - Intro Song (Japanese) + startName = "nitro:/music/styleSavvy3/introJapanese_start.raw"; + loopName = "nitro:/music/styleSavvy3/introJapanese_loop.raw"; + sampleRate = 32728; + break; + case 47: // Style Savvy: Fashion Forward - Intro Song (English) + startName = "nitro:/music/styleSavvy3/introEnglish_start.raw"; + loopName = "nitro:/music/styleSavvy3/introEnglish_loop.raw"; + sampleRate = 32728; + break; + case 48: // Style Savvy: Fashion Forward - Title Screen + loopName = "nitro:/music/styleSavvy3/title.raw"; + sampleRate = 32000; + break; + case 49: // Style Savvy: Fashion Forward - My Apartment + loopName = "nitro:/music/styleSavvy3/apartment.raw"; + sampleRate = 32000; + break; + case 50: // Style Savvy: Fashion Forward - Beaumonde City (Morning) + loopName = "nitro:/music/styleSavvy3/beaumonde6AM.raw"; + sampleRate = 32000; + break; + case 51: // Style Savvy: Fashion Forward - Beaumonde City (Noon) + loopName = "nitro:/music/styleSavvy3/beaumonde1PM.raw"; + sampleRate = 32000; + break; + case 52: // Style Savvy: Fashion Forward - Beaumonde City (Sunset) + loopName = "nitro:/music/styleSavvy3/beaumonde7PM.raw"; + sampleRate = 22050; + break; + case 53: // Style Savvy: Fashion Forward - Beaumonde City (Night) + loopName = "nitro:/music/styleSavvy3/beaumonde9PM.raw"; + sampleRate = 32000; + break; + case 54: // Style Savvy: Fashion Forward - Beaumonde City (Midnight) + loopName = "nitro:/music/styleSavvy3/beaumonde12AM.raw"; + sampleRate = 32000; + break; + case 55: // Style Savvy: Fashion Forward - Phone + startName = "nitro:/music/styleSavvy3/phone_start.raw"; + loopName = "nitro:/music/styleSavvy3/phone_loop.raw"; + sampleRate = 22050; + break; + case 56: // Style Savvy: Fashion Forward - Wardrobe + loopName = "nitro:/music/styleSavvy3/wardrobe.raw"; + sampleRate = 32000; + break; } snd().loadStream(startName, loopName, sampleRate, stereo, true); } diff --git a/nds/nitrofiles/music/styleSavvy3/apartment.raw b/nds/nitrofiles/music/styleSavvy3/apartment.raw new file mode 100644 index 0000000..37ac725 Binary files /dev/null and b/nds/nitrofiles/music/styleSavvy3/apartment.raw differ diff --git a/nds/nitrofiles/music/styleSavvy3/beaumonde12AM.raw b/nds/nitrofiles/music/styleSavvy3/beaumonde12AM.raw new file mode 100644 index 0000000..5ee0a0e Binary files /dev/null and b/nds/nitrofiles/music/styleSavvy3/beaumonde12AM.raw differ diff --git a/nds/nitrofiles/music/styleSavvy3/beaumonde1PM.raw b/nds/nitrofiles/music/styleSavvy3/beaumonde1PM.raw new file mode 100644 index 0000000..6f56962 Binary files /dev/null and b/nds/nitrofiles/music/styleSavvy3/beaumonde1PM.raw differ diff --git a/nds/nitrofiles/music/styleSavvy3/beaumonde6AM.raw b/nds/nitrofiles/music/styleSavvy3/beaumonde6AM.raw new file mode 100644 index 0000000..72c9e81 Binary files /dev/null and b/nds/nitrofiles/music/styleSavvy3/beaumonde6AM.raw differ diff --git a/nds/nitrofiles/music/styleSavvy3/beaumonde7PM.raw b/nds/nitrofiles/music/styleSavvy3/beaumonde7PM.raw new file mode 100644 index 0000000..8a28f08 Binary files /dev/null and b/nds/nitrofiles/music/styleSavvy3/beaumonde7PM.raw differ diff --git a/nds/nitrofiles/music/styleSavvy3/beaumonde9PM.raw b/nds/nitrofiles/music/styleSavvy3/beaumonde9PM.raw new file mode 100644 index 0000000..fdc258a Binary files /dev/null and b/nds/nitrofiles/music/styleSavvy3/beaumonde9PM.raw differ diff --git a/nds/nitrofiles/music/styleSavvy3/introEnglish_loop.raw b/nds/nitrofiles/music/styleSavvy3/introEnglish_loop.raw new file mode 100644 index 0000000..713aa52 Binary files /dev/null and b/nds/nitrofiles/music/styleSavvy3/introEnglish_loop.raw differ diff --git a/nds/nitrofiles/music/styleSavvy3/introEnglish_start.raw b/nds/nitrofiles/music/styleSavvy3/introEnglish_start.raw new file mode 100644 index 0000000..d52da07 Binary files /dev/null and b/nds/nitrofiles/music/styleSavvy3/introEnglish_start.raw differ diff --git a/nds/nitrofiles/music/styleSavvy3/introJapanese_loop.raw b/nds/nitrofiles/music/styleSavvy3/introJapanese_loop.raw new file mode 100644 index 0000000..dcf76c1 Binary files /dev/null and b/nds/nitrofiles/music/styleSavvy3/introJapanese_loop.raw differ diff --git a/nds/nitrofiles/music/styleSavvy3/introJapanese_start.raw b/nds/nitrofiles/music/styleSavvy3/introJapanese_start.raw new file mode 100644 index 0000000..c661db1 Binary files /dev/null and b/nds/nitrofiles/music/styleSavvy3/introJapanese_start.raw differ diff --git a/nds/nitrofiles/music/styleSavvy3/phone_loop.raw b/nds/nitrofiles/music/styleSavvy3/phone_loop.raw new file mode 100644 index 0000000..5620079 Binary files /dev/null and b/nds/nitrofiles/music/styleSavvy3/phone_loop.raw differ diff --git a/nds/nitrofiles/music/styleSavvy3/phone_start.raw b/nds/nitrofiles/music/styleSavvy3/phone_start.raw new file mode 100644 index 0000000..e9e9c17 Binary files /dev/null and b/nds/nitrofiles/music/styleSavvy3/phone_start.raw differ diff --git a/nds/nitrofiles/music/styleSavvy3/title.raw b/nds/nitrofiles/music/styleSavvy3/title.raw new file mode 100644 index 0000000..20c7c50 Binary files /dev/null and b/nds/nitrofiles/music/styleSavvy3/title.raw differ diff --git a/nds/nitrofiles/music/styleSavvy3/wardrobe.raw b/nds/nitrofiles/music/styleSavvy3/wardrobe.raw new file mode 100644 index 0000000..2e3848e Binary files /dev/null and b/nds/nitrofiles/music/styleSavvy3/wardrobe.raw differ diff --git a/source/screens/photoStudio.cpp b/source/screens/photoStudio.cpp index 5658e6c..a2e767d 100644 --- a/source/screens/photoStudio.cpp +++ b/source/screens/photoStudio.cpp @@ -40,6 +40,7 @@ #include "superMarioBrosBgmNames.h" #include "ss1BgmNames.h" #include "ss2BgmNames.h" +#include "ss3BgmNames.h" #include "tetrisPartyBgmNames.h" #include @@ -130,6 +131,7 @@ static u8 bgmPageOrder[] = { 4, // Sonic Mania 5, // Style Savvy 8, // Style Savvy: Trendsetters + 11, // Style Savvy: Fashion Forward 9, // Super Mario Bros. 3, // Tetris Party }; @@ -191,6 +193,9 @@ void PhotoStudio::getMaxChars() { case 10: import_totalCharacters = 2; break; + case 11: + import_totalCharacters = 10; + break; } } else if (subScreenMode == 1) { // Locations @@ -758,6 +763,8 @@ const char* PhotoStudio::bgmGameTitle(void) const { return "Super Mario Bros."; case 10: return "Sonic Jam"; + case 11: + return ss3Title(); } return "???"; } @@ -850,6 +857,8 @@ const char* PhotoStudio::bgmName(int i) const { return superMarioBrosBgmNames[i]; case 10: return sonicJamBgmNames[i]; + case 11: + return ss3BgmNames[i]; } return "???"; } @@ -898,6 +907,8 @@ int PhotoStudio::getBgmNum(void) const { return superMarioBrosBgmNums[bgmList_cursorPosition]; case 10: return sonicJamBgmNums[bgmList_cursorPosition]; + case 11: + return ss3BgmNums[bgmList_cursorPosition]; } return 0; }