Add title and menu music from *Tetris Party*

ALSO: Slightly lower volume of *The Straight Out* BGM, once again
This commit is contained in:
RocketRobz 2021-06-29 00:55:56 -06:00
parent 8c1d0c274a
commit 76a6641b99
15 changed files with 38 additions and 2 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -6,7 +6,6 @@
extern sound *music;
extern sound *music_loop;
extern bool dspfirmfound;
extern bool musicLoopPlaying;
void loadMusic(int num) {
if (!dspfirmfound) return;
@ -25,5 +24,12 @@ void loadMusic(int num) {
music = new sound("romfs:/music/marioGolfAdvanceTour/marionClub_start.wav", 0, false);
music_loop = new sound("romfs:/music/marioGolfAdvanceTour/marionClub_loop.wav", 1, true);
break;
case 3: // Tetris Party - Title Screen
music = new sound("romfs:/music/tetrisParty/titleScreen_start.wav", 0, false);
music_loop = new sound("romfs:/music/tetrisParty/titleScreen_loop.wav", 1, true);
break;
case 4: // Tetris Party - Main Menu
music_loop = new sound("romfs:/music/tetrisParty/mainMenu.wav", 1, true);
break;
}
}

View File

@ -45,7 +45,7 @@ bool dspfirmfound = false;
bool exiting = false;
bool musicPlayStarted = false;
static bool musicPlaying = false;
bool musicLoopPlaying = false;
static bool musicLoopPlaying = false;
static int musicLoopDelay = 0;
bool clearTop = true; // Disable in order to render a second character
bool renderTop = true; // Disable to prevent second character from flickering

View File

@ -0,0 +1,10 @@
const char* tetrisPartyBgmNames[] = {
"Title Screen",
"Main Menu",
"",
};
int tetrisPartyBgmNums[] = {
3,
4,
};

View File

@ -25,6 +25,15 @@ void loadMusic(int num) {
loopName = "nitro:/music/marioGolfAdvanceTour/marionClub_loop.raw";
sampleRate = 48000;
break;
case 3: // Tetris Party - Title Screen
startName = "nitro:/music/tetrisParty/titleScreen_start.raw";
loopName = "nitro:/music/tetrisParty/titleScreen_loop.raw";
sampleRate = 48000;
break;
case 4: // Tetris Party - Main Menu
loopName = "nitro:/music/tetrisParty/mainMenu.raw";
sampleRate = 48000;
break;
}
snd().loadStream(startName, loopName, sampleRate, true);
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -33,6 +33,7 @@
#include "marioGolfAdvanceTourBgmNames.h"
#include "mmBattleAndChaseBgmNames.h"
#include "pkmnStadiumBgmNames.h"
#include "tetrisPartyBgmNames.h"
#include <unistd.h>
@ -116,6 +117,7 @@ static u8 bgmPageOrder[] = {
2, // Mario Golf: Advance Tour
1, // MegaMan: Battle and Chase
0, // Pokemon Stadium
3, // Tetris Party
};
static int metalXpos = 0;
@ -147,6 +149,9 @@ void PhotoStudio::getMaxChars() {
case 2:
import_totalCharacters = 0;
break;
case 3:
import_totalCharacters = 1;
break;
}
} else if (subScreenMode == 1) {
// Locations
@ -688,6 +693,8 @@ const char* PhotoStudio::bgmGameTitle(void) const {
return mmBattleAndChaseTitle();
case 2:
return "Mario Golf: Advance Tour";
case 3:
return "Tetris Party";
}
return "???";
}
@ -764,6 +771,8 @@ const char* PhotoStudio::bgmName(int i) const {
return mmBattleAndChaseBgmNames[i];
case 2:
return marioGolfAdvanceTourBgmNames[i];
case 3:
return tetrisPartyBgmNames[i];
}
return "???";
}
@ -796,6 +805,8 @@ int PhotoStudio::getBgmNum(void) const {
return mmBattleAndChaseBgmNums[bgmList_cursorPosition];
case 2:
return marioGolfAdvanceTourBgmNums[bgmList_cursorPosition];
case 3:
return tetrisPartyBgmNums[bgmList_cursorPosition];
}
return 0;
}