From 8fda530565d1a8357b72e5567aa60d45e71e1d4c Mon Sep 17 00:00:00 2001 From: mr-video Date: Fri, 23 Oct 2020 18:50:02 +0300 Subject: [PATCH 1/2] intro: Play the "Press start to play" audio --- src/menu/level_select_menu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/menu/level_select_menu.c b/src/menu/level_select_menu.c index b9505df91..0a08666ba 100644 --- a/src/menu/level_select_menu.c +++ b/src/menu/level_select_menu.c @@ -61,6 +61,7 @@ int run_press_start_demo_timer(s32 timer) { timer = (s8)((struct DemoInput *) gDemo.targetAnim)->timer; gCurrSaveFileNum = 1; gCurrActNum = 1; + D_U_801A7C34 = 1; } } else { // activity was detected, so reset the demo countdown. gDemoCountdown = 0; @@ -163,7 +164,11 @@ int intro_default(void) { #ifndef VERSION_JP if (D_U_801A7C34 == 1) { - play_sound(SOUND_MARIO_HELLO, gDefaultSoundArgs); + if (gGlobalTimer < 0x81) { + play_sound(SOUND_MARIO_HELLO, gDefaultSoundArgs); + } else { + play_sound(SOUND_MARIO_PRESS_START_TO_PLAY, gDefaultSoundArgs); + } D_U_801A7C34 = 0; } #endif From 1ac3295f634ddd69a52c5386d94dab17d5655b16 Mon Sep 17 00:00:00 2001 From: mr-video Date: Fri, 23 Oct 2020 19:44:10 +0300 Subject: [PATCH 2/2] level_select_menu.c: Rename D_U_801A7C34 to playMarioGreeting --- src/menu/level_select_menu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/menu/level_select_menu.c b/src/menu/level_select_menu.c index 0a08666ba..483c86e84 100644 --- a/src/menu/level_select_menu.c +++ b/src/menu/level_select_menu.c @@ -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,7 +61,7 @@ int run_press_start_demo_timer(s32 timer) { timer = (s8)((struct DemoInput *) gDemo.targetAnim)->timer; gCurrSaveFileNum = 1; gCurrActNum = 1; - D_U_801A7C34 = 1; + playMarioGreeting = 1; } } else { // activity was detected, so reset the demo countdown. gDemoCountdown = 0; @@ -163,13 +163,13 @@ int intro_default(void) { s32 sp1C = 0; #ifndef VERSION_JP - if (D_U_801A7C34 == 1) { + if (playMarioGreeting == 1) { if (gGlobalTimer < 0x81) { play_sound(SOUND_MARIO_HELLO, gDefaultSoundArgs); } else { play_sound(SOUND_MARIO_PRESS_START_TO_PLAY, gDefaultSoundArgs); } - D_U_801A7C34 = 0; + playMarioGreeting = 0; } #endif print_intro_text(); @@ -178,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);