Add three *Sonic Jam* BGM

ALSO: DS(i): Downconvert Hz for
Sonic Mania - Main Menu: "Comfort Zone"
This commit is contained in:
RocketRobz 2021-07-16 22:44:12 -06:00
parent 46cf74758a
commit 727ffea4d0
19 changed files with 51 additions and 1 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -173,6 +173,18 @@ void loadMusic(int num) {
startName = "romfs:/music/superMarioBros/overworld_start.wav";
loopName = "romfs:/music/superMarioBros/overworld_loop.wav";
break;
case 43: // Sonic Jam - Menu
startName = "romfs:/music/sonicJam/menu_start.wav";
loopName = "romfs:/music/sonicJam/menu_loop.wav";
break;
case 44: // Sonic Jam - Sonic World
startName = "romfs:/music/sonicJam/sworld_start.wav";
loopName = "romfs:/music/sonicJam/sworld_loop.wav";
break;
case 45: // Sonic Jam - Gallery
startName = "romfs:/music/sonicJam/gallery_start.wav";
loopName = "romfs:/music/sonicJam/gallery_loop.wav";
break;
}
if (access(startName, F_OK) == 0) {

View File

@ -55,6 +55,7 @@ The result, *Super Photo Studio*! Take pictures of your favorite all-star charac
* devkitPro: libnds, libctru, citro2d/3d, nds-hb-menu's file/folder browsing code
* Universal Team: Universal Core
* SuperSaiyajinStackZ: StackZ and Stackie avatars
* The Brickster: Some included remastered music
* Pk11: DSi version's font rendering code
* chyyran: DSi version's alpha blending and sound streaming code
* joel16: Screenshot code from [3DShell](https://github.com/joel16/3DShell)

View File

@ -0,0 +1,11 @@
const char* sonicJamBgmNames[] = {
"Menu",
"Sonic World",
"Gallery",
};
int sonicJamBgmNums[] = {
43,
44,
45,
};

View File

@ -38,7 +38,7 @@ void loadMusic(int num) {
case 5: // Sonic Mania - Main Menu: "Comfort Zone"
startName = "nitro:/music/sonicMania/mainMenu_start.raw";
loopName = "nitro:/music/sonicMania/mainMenu_loop.raw";
sampleRate = 44100;
sampleRate = 22050;
break;
case 6: // Sonic Mania - Angel Island Zone
loopName = "nitro:/music/sonicMania/angelIslandZone.raw";
@ -215,6 +215,21 @@ void loadMusic(int num) {
sampleRate = 32000;
stereo = false;
break;
case 43: // Sonic Jam - Menu
startName = "nitro:/music/sonicJam/menu_start.raw";
loopName = "nitro:/music/sonicJam/menu_loop.raw";
sampleRate = 32000;
break;
case 44: // Sonic Jam - Sonic World
startName = "nitro:/music/sonicJam/sworld_start.raw";
loopName = "nitro:/music/sonicJam/sworld_loop.raw";
sampleRate = 32000;
break;
case 45: // Sonic Jam - Gallery
startName = "nitro:/music/sonicJam/gallery_start.raw";
loopName = "nitro:/music/sonicJam/gallery_loop.raw";
sampleRate = 22050;
break;
}
snd().loadStream(startName, loopName, sampleRate, stereo, true);
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -36,6 +36,7 @@
#include "pkmnStadiumBgmNames.h"
#include "savvyMgrBgmNames.h"
#include "sonicManiaBgmNames.h"
#include "sonicJamBgmNames.h"
#include "superMarioBrosBgmNames.h"
#include "ss1BgmNames.h"
#include "ss2BgmNames.h"
@ -125,6 +126,7 @@ static u8 bgmPageOrder[] = {
1, // MegaMan: Battle and Chase
0, // Pokemon Stadium
7, // Savvy Manager
10, // Sonic Jam
4, // Sonic Mania
5, // Style Savvy
8, // Style Savvy: Trendsetters
@ -186,6 +188,9 @@ void PhotoStudio::getMaxChars() {
case 9:
import_totalCharacters = 0;
break;
case 10:
import_totalCharacters = 2;
break;
}
} else if (subScreenMode == 1) {
// Locations
@ -742,6 +747,8 @@ const char* PhotoStudio::bgmGameTitle(void) const {
return ss2Title();
case 9:
return "Super Mario Bros.";
case 10:
return "Sonic Jam";
}
return "???";
}
@ -832,6 +839,8 @@ const char* PhotoStudio::bgmName(int i) const {
return ss2BgmNames[i];
case 9:
return superMarioBrosBgmNames[i];
case 10:
return sonicJamBgmNames[i];
}
return "???";
}
@ -878,6 +887,8 @@ int PhotoStudio::getBgmNum(void) const {
return ss2BgmNums[bgmList_cursorPosition];
case 9:
return superMarioBrosBgmNums[bgmList_cursorPosition];
case 10:
return sonicJamBgmNums[bgmList_cursorPosition];
}
return 0;
}