vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Integrate 'press start to play' fix from https://github.com/sm64pc/sm64ex/pull/441

This commit is contained in:
Colton G. Rushton 2021-02-12 19:19:38 -04:00 committed by GitHub
parent 328454095e
commit b3c112ef21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/menu/level_select_menu.c
View File

@ -27,7 +27,7 @@ static char gLevelSelect_StageNamesText[64][16] = {
static u16 gDemoCountdown = 0;
#ifndef VERSION_JP
static s16 D_U_801A7C34 = 1;
static s16 playMarioGreeting = 1;
static s16 gameOverNotPlayed = 1;
#endif
@ -61,6 +61,7 @@ int run_press_start_demo_timer(s32 timer) {
timer = (s8)((struct DemoInput *) gDemo.targetAnim)->timer;
gCurrSaveFileNum = 1;
gCurrActNum = 1;
playMarioGreeting = 1;
}
} else { // activity was detected, so reset the demo countdown.
gDemoCountdown = 0;
@ -162,9 +163,13 @@ int intro_default(void) {
s32 sp1C = 0;
#ifndef VERSION_JP
if (D_U_801A7C34 == 1) {
play_sound(SOUND_MARIO_HELLO, gDefaultSoundArgs);
D_U_801A7C34 = 0;
if (playMarioGreeting == 1) {
if (gGlobalTimer < 0x81) {
play_sound(SOUND_MARIO_HELLO, gDefaultSoundArgs);
} else {
play_sound(SOUND_MARIO_PRESS_START_TO_PLAY, gDefaultSoundArgs);
}
playMarioGreeting = 0;
}
#endif
print_intro_text();
@ -173,7 +178,7 @@ int intro_default(void) {
play_sound(SOUND_MENU_STAR_SOUND, gDefaultSoundArgs);
sp1C = 100 + gDebugLevelSelect;
#ifndef VERSION_JP
D_U_801A7C34 = 1;
playMarioGreeting = 1;
#endif
}
return run_press_start_demo_timer(sp1C);