From 3b97264ffafad6c432ea8136cd3e424d5c97764d Mon Sep 17 00:00:00 2001 From: username Date: Wed, 23 Oct 2024 17:38:05 -0400 Subject: [PATCH 1/9] a --- include/sounds.h | 1 + sound/sequences.json | 2 +- sound/sequences/00_sound_player.s | 30 ++++++++++++++++++++++++++++++ src/game/crash_screen.c | 2 +- 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/include/sounds.h b/include/sounds.h index e186684e97..737f0fe16d 100644 --- a/include/sounds.h +++ b/include/sounds.h @@ -555,6 +555,7 @@ enum SoundBank { #define SOUND_MENU_HIGH_SCORE /* 0x70222081 */ SOUND_ARG_LOAD(SOUND_BANK_MENU, 0x22, 0x20, SOUND_DISCRETE) // unverified #define SOUND_MENU_STAR_SOUND_OKEY_DOKEY /* 0x7023FF81 */ SOUND_ARG_LOAD(SOUND_BANK_MENU, 0x23, 0xFF, SOUND_DISCRETE) #define SOUND_MENU_STAR_SOUND_LETS_A_GO /* 0x7024FF81 */ SOUND_ARG_LOAD(SOUND_BANK_MENU, 0x24, 0xFF, SOUND_DISCRETE) +#define SOUND_MENU_CRTICIAL_ERROR SOUND_ARG_LOAD(SOUND_BANK_MENU, 0x40, 0xFF, SOUND_DISCRETE) // US/EU only; an index between 0-7 or 0-4 is added to the sound ID before // playing, producing the same sound with different pitch. diff --git a/sound/sequences.json b/sound/sequences.json index 1470c97db4..2ac5850da1 100644 --- a/sound/sequences.json +++ b/sound/sequences.json @@ -1,6 +1,6 @@ { "comment": "This file lists all sequences together with the sound banks they use. If a sequence uses multiple banks, the first bank will be used by default, and it can switch between them using the chan_setbank command; e.g. chan_setbank 0 will switch to the first bank in the given list.", - "00_sound_player": ["00", "01_terrain", "02_water", "03", "04", "05", "06", "07", "08_mario", "09", "0A_mario_peach"], + "00_sound_player": ["00", "01_terrain", "02_water", "03", "04", "05", "06", "07", "08_mario", "09", "0A_mario_peach", "13"], "01_cutscene_collect_star": ["22"], "02_menu_title_screen": ["11"], "03_level_grass": ["22"], diff --git a/sound/sequences/00_sound_player.s b/sound/sequences/00_sound_player.s index cad642171d..3b520299a2 100644 --- a/sound/sequences/00_sound_player.s +++ b/sound/sequences/00_sound_player.s @@ -6986,6 +6986,36 @@ sound_ref .sound_menu_power_meter sound_ref .sound_menu_camera_buzz sound_ref .sound_menu_camera_turn +// Crash screen error sfx + +sound_ref .sound_menu_critical_error + +.layer_critical_error_0: +layer_note1 3, 0x7f, 115 +layer_end + +.layer_critical_error_1: +layer_note1 15, 0x7f, 115 +layer_end + +.layer_critical_error_2: +layer_note1 27, 0x7f, 115 +layer_end + +.layer_critical_error_3: +layer_note1 39, 0x7f, 115 +layer_end + +.sound_menu_critical_error: +chan_setbank 11 +chan_setinstr 14 +chan_setenvelope .envelope_340C +chan_setlayer 0, .layer_critical_error_0 +chan_setlayer 1, .layer_critical_error_1 +chan_setlayer 2, .layer_critical_error_2 +chan_setlayer 3, .layer_critical_error_3 +chan_end + .sound_menu_change_select: chan_setbank 9 chan_setinstr 1 diff --git a/src/game/crash_screen.c b/src/game/crash_screen.c index 6b199da916..0653b05549 100644 --- a/src/game/crash_screen.c +++ b/src/game/crash_screen.c @@ -419,7 +419,7 @@ void thread2_crash_screen(UNUSED void *arg) { stop_background_music(sBackgroundMusicQueue[0].seqId); audio_signal_game_loop_tick(); crash_screen_sleep(200); - play_sound(SOUND_MARIO_WAAAOOOW, gGlobalSoundSource); + play_sound(SOUND_MENU_CRTICIAL_ERROR, gGlobalSoundSource); audio_signal_game_loop_tick(); crash_screen_sleep(200); continue; From 184c165710fb658f13bb3f2ac3b8fd10d4a51e71 Mon Sep 17 00:00:00 2001 From: username Date: Wed, 23 Oct 2024 23:09:08 -0400 Subject: [PATCH 2/9] feedback --- sound/sequences.json | 2 +- sound/sequences/00_sound_player.s | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/sequences.json b/sound/sequences.json index 2ac5850da1..1470c97db4 100644 --- a/sound/sequences.json +++ b/sound/sequences.json @@ -1,6 +1,6 @@ { "comment": "This file lists all sequences together with the sound banks they use. If a sequence uses multiple banks, the first bank will be used by default, and it can switch between them using the chan_setbank command; e.g. chan_setbank 0 will switch to the first bank in the given list.", - "00_sound_player": ["00", "01_terrain", "02_water", "03", "04", "05", "06", "07", "08_mario", "09", "0A_mario_peach", "13"], + "00_sound_player": ["00", "01_terrain", "02_water", "03", "04", "05", "06", "07", "08_mario", "09", "0A_mario_peach"], "01_cutscene_collect_star": ["22"], "02_menu_title_screen": ["11"], "03_level_grass": ["22"], diff --git a/sound/sequences/00_sound_player.s b/sound/sequences/00_sound_player.s index 3b520299a2..b50a6988b7 100644 --- a/sound/sequences/00_sound_player.s +++ b/sound/sequences/00_sound_player.s @@ -7007,8 +7007,8 @@ layer_note1 39, 0x7f, 115 layer_end .sound_menu_critical_error: -chan_setbank 11 -chan_setinstr 14 +chan_setbank 9 +chan_setinstr 1 chan_setenvelope .envelope_340C chan_setlayer 0, .layer_critical_error_0 chan_setlayer 1, .layer_critical_error_1 From 18b867a90bfdcc77e69b6657fabbc1ce4c74a8e2 Mon Sep 17 00:00:00 2001 From: username Date: Wed, 23 Oct 2024 23:25:36 -0400 Subject: [PATCH 3/9] note changes --- sound/sequences/00_sound_player.s | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/sequences/00_sound_player.s b/sound/sequences/00_sound_player.s index b50a6988b7..a42ce0d5b3 100644 --- a/sound/sequences/00_sound_player.s +++ b/sound/sequences/00_sound_player.s @@ -6991,24 +6991,24 @@ sound_ref .sound_menu_camera_turn sound_ref .sound_menu_critical_error .layer_critical_error_0: -layer_note1 3, 0x7f, 115 +layer_note1 3, 0x3f, 115 layer_end .layer_critical_error_1: -layer_note1 15, 0x7f, 115 +layer_note1 15, 0x3f, 115 layer_end .layer_critical_error_2: -layer_note1 27, 0x7f, 115 +layer_note1 34, 0x3f, 115 layer_end .layer_critical_error_3: -layer_note1 39, 0x7f, 115 +layer_note1 39, 0x3f, 115 layer_end .sound_menu_critical_error: chan_setbank 9 -chan_setinstr 1 +chan_setinstr 0 chan_setenvelope .envelope_340C chan_setlayer 0, .layer_critical_error_0 chan_setlayer 1, .layer_critical_error_1 From b9e5784d3b536fc501e3e9ec618de03dd7188b9c Mon Sep 17 00:00:00 2001 From: username Date: Fri, 25 Oct 2024 01:01:22 -0400 Subject: [PATCH 4/9] Ready --- include/sounds.h | 2 +- src/game/crash_screen.c | 2 +- src/game/game_init.c | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/sounds.h b/include/sounds.h index 737f0fe16d..5e891db762 100644 --- a/include/sounds.h +++ b/include/sounds.h @@ -555,7 +555,7 @@ enum SoundBank { #define SOUND_MENU_HIGH_SCORE /* 0x70222081 */ SOUND_ARG_LOAD(SOUND_BANK_MENU, 0x22, 0x20, SOUND_DISCRETE) // unverified #define SOUND_MENU_STAR_SOUND_OKEY_DOKEY /* 0x7023FF81 */ SOUND_ARG_LOAD(SOUND_BANK_MENU, 0x23, 0xFF, SOUND_DISCRETE) #define SOUND_MENU_STAR_SOUND_LETS_A_GO /* 0x7024FF81 */ SOUND_ARG_LOAD(SOUND_BANK_MENU, 0x24, 0xFF, SOUND_DISCRETE) -#define SOUND_MENU_CRTICIAL_ERROR SOUND_ARG_LOAD(SOUND_BANK_MENU, 0x40, 0xFF, SOUND_DISCRETE) +#define SOUND_MENU_CRITICAL_ERROR SOUND_ARG_LOAD(SOUND_BANK_MENU, 0x40, 0xFF, SOUND_DISCRETE) // US/EU only; an index between 0-7 or 0-4 is added to the sound ID before // playing, producing the same sound with different pitch. diff --git a/src/game/crash_screen.c b/src/game/crash_screen.c index 0653b05549..deef81945f 100644 --- a/src/game/crash_screen.c +++ b/src/game/crash_screen.c @@ -419,7 +419,7 @@ void thread2_crash_screen(UNUSED void *arg) { stop_background_music(sBackgroundMusicQueue[0].seqId); audio_signal_game_loop_tick(); crash_screen_sleep(200); - play_sound(SOUND_MENU_CRTICIAL_ERROR, gGlobalSoundSource); + play_sound(SOUND_MENU_CRITICAL_ERROR , gGlobalSoundSource); audio_signal_game_loop_tick(); crash_screen_sleep(200); continue; diff --git a/src/game/game_init.c b/src/game/game_init.c index bec0cfd3ec..9dbb8ab7cb 100644 --- a/src/game/game_init.c +++ b/src/game/game_init.c @@ -832,11 +832,9 @@ void thread5_game_loop(UNUSED void *arg) { print_text_fmt_int(180, 20, "BUF %d", gGfxPoolEnd - (u8 *) gDisplayListHead); } #endif -#if 0 if (gPlayer1Controller->buttonPressed & L_TRIG) { - osStartThread(&hvqmThread); - osRecvMesg(&gDmaMesgQueue, NULL, OS_MESG_BLOCK); + FORCE_CRASH; } -#endif + } } From 3f48ad6961bdc4ab1f13f80975a9df51fabbb4de Mon Sep 17 00:00:00 2001 From: username Date: Fri, 25 Oct 2024 01:02:39 -0400 Subject: [PATCH 5/9] . --- src/game/crash_screen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/crash_screen.c b/src/game/crash_screen.c index deef81945f..2f180cb67f 100644 --- a/src/game/crash_screen.c +++ b/src/game/crash_screen.c @@ -419,7 +419,7 @@ void thread2_crash_screen(UNUSED void *arg) { stop_background_music(sBackgroundMusicQueue[0].seqId); audio_signal_game_loop_tick(); crash_screen_sleep(200); - play_sound(SOUND_MENU_CRITICAL_ERROR , gGlobalSoundSource); + play_sound(SOUND_MENU_CRITICAL_ERROR, gGlobalSoundSource); audio_signal_game_loop_tick(); crash_screen_sleep(200); continue; From 92814526a7e6c7fd898d61d0c9df4ea6ea164975 Mon Sep 17 00:00:00 2001 From: username Date: Fri, 25 Oct 2024 01:05:41 -0400 Subject: [PATCH 6/9] . --- sound/sequences/00_sound_player.s | 8 +++++++- src/game/game_init.c | 4 ---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sound/sequences/00_sound_player.s b/sound/sequences/00_sound_player.s index a42ce0d5b3..a496db34e3 100644 --- a/sound/sequences/00_sound_player.s +++ b/sound/sequences/00_sound_player.s @@ -6990,6 +6990,12 @@ sound_ref .sound_menu_camera_turn sound_ref .sound_menu_critical_error +.envelope_critical_error: +envelope_line 1 32760 +envelope_line 128 0 +envelope_line 500 500 +envelope_goto 4 + .layer_critical_error_0: layer_note1 3, 0x3f, 115 layer_end @@ -7009,7 +7015,7 @@ layer_end .sound_menu_critical_error: chan_setbank 9 chan_setinstr 0 -chan_setenvelope .envelope_340C +chan_setenvelope .envelope_critical_error chan_setlayer 0, .layer_critical_error_0 chan_setlayer 1, .layer_critical_error_1 chan_setlayer 2, .layer_critical_error_2 diff --git a/src/game/game_init.c b/src/game/game_init.c index 9dbb8ab7cb..fecbe31ab8 100644 --- a/src/game/game_init.c +++ b/src/game/game_init.c @@ -832,9 +832,5 @@ void thread5_game_loop(UNUSED void *arg) { print_text_fmt_int(180, 20, "BUF %d", gGfxPoolEnd - (u8 *) gDisplayListHead); } #endif - if (gPlayer1Controller->buttonPressed & L_TRIG) { - FORCE_CRASH; - } - } } From ef387c2b03aeb69bacf35953c4f4cffc9ce85b2c Mon Sep 17 00:00:00 2001 From: username Date: Wed, 12 Feb 2025 23:01:13 -0500 Subject: [PATCH 7/9] fix --- include/sounds.h | 2 +- sound/sequences/00_sound_player.s | 61 +++++++++++++------------------ 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/include/sounds.h b/include/sounds.h index 5e891db762..dcb2106336 100644 --- a/include/sounds.h +++ b/include/sounds.h @@ -555,7 +555,7 @@ enum SoundBank { #define SOUND_MENU_HIGH_SCORE /* 0x70222081 */ SOUND_ARG_LOAD(SOUND_BANK_MENU, 0x22, 0x20, SOUND_DISCRETE) // unverified #define SOUND_MENU_STAR_SOUND_OKEY_DOKEY /* 0x7023FF81 */ SOUND_ARG_LOAD(SOUND_BANK_MENU, 0x23, 0xFF, SOUND_DISCRETE) #define SOUND_MENU_STAR_SOUND_LETS_A_GO /* 0x7024FF81 */ SOUND_ARG_LOAD(SOUND_BANK_MENU, 0x24, 0xFF, SOUND_DISCRETE) -#define SOUND_MENU_CRITICAL_ERROR SOUND_ARG_LOAD(SOUND_BANK_MENU, 0x40, 0xFF, SOUND_DISCRETE) +#define SOUND_MENU_CRITICAL_ERROR /* 0x7040FF81 */ SOUND_ARG_LOAD(SOUND_BANK_MENU, 0x40, 0xFF, SOUND_DISCRETE) // US/EU only; an index between 0-7 or 0-4 is added to the sound ID before // playing, producing the same sound with different pitch. diff --git a/sound/sequences/00_sound_player.s b/sound/sequences/00_sound_player.s index a496db34e3..e3c51be497 100644 --- a/sound/sequences/00_sound_player.s +++ b/sound/sequences/00_sound_player.s @@ -6985,43 +6985,8 @@ sound_ref .chan_2D18 sound_ref .sound_menu_power_meter sound_ref .sound_menu_camera_buzz sound_ref .sound_menu_camera_turn - -// Crash screen error sfx - sound_ref .sound_menu_critical_error -.envelope_critical_error: -envelope_line 1 32760 -envelope_line 128 0 -envelope_line 500 500 -envelope_goto 4 - -.layer_critical_error_0: -layer_note1 3, 0x3f, 115 -layer_end - -.layer_critical_error_1: -layer_note1 15, 0x3f, 115 -layer_end - -.layer_critical_error_2: -layer_note1 34, 0x3f, 115 -layer_end - -.layer_critical_error_3: -layer_note1 39, 0x3f, 115 -layer_end - -.sound_menu_critical_error: -chan_setbank 9 -chan_setinstr 0 -chan_setenvelope .envelope_critical_error -chan_setlayer 0, .layer_critical_error_0 -chan_setlayer 1, .layer_critical_error_1 -chan_setlayer 2, .layer_critical_error_2 -chan_setlayer 3, .layer_critical_error_3 -chan_end - .sound_menu_change_select: chan_setbank 9 chan_setinstr 1 @@ -7874,6 +7839,32 @@ layer_transpose 0 layer_note1 32, 0x7f, 115 layer_end +.sound_menu_critical_error: +chan_setbank 9 +chan_setinstr 0 +chan_setenvelope .envelope_340C +chan_setlayer 0, .layer_critical_error_0 +chan_setlayer 1, .layer_critical_error_1 +chan_setlayer 2, .layer_critical_error_2 +chan_setlayer 3, .layer_critical_error_3 +chan_end + +.layer_critical_error_0: +layer_note1 3, 0x3f, 103 +layer_end + +.layer_critical_error_1: +layer_note1 15, 0x3f, 103 +layer_end + +.layer_critical_error_2: +layer_note1 34, 0x3f, 103 +layer_end + +.layer_critical_error_3: +layer_note1 39, 0x3f, 103 +layer_end + .sound_general_bird_chirp2: chan_setbank 5 chan_setinstr 9 From da9d0b3cebff3000cfa85dc44cdeda775a13de06 Mon Sep 17 00:00:00 2001 From: username Date: Wed, 12 Feb 2025 23:19:08 -0500 Subject: [PATCH 8/9] a --- sound/sequences/00_sound_player.s | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sound/sequences/00_sound_player.s b/sound/sequences/00_sound_player.s index e3c51be497..321213d0d4 100644 --- a/sound/sequences/00_sound_player.s +++ b/sound/sequences/00_sound_player.s @@ -8159,11 +8159,7 @@ envelope_goto 2 .envelope_341C: envelope_line 25 32760 envelope_line 60 10000 -#ifdef VERSION_SH - envelope_hang -#else - envelope_goto 2 -#endif +envelope_hang .envelope_3428: envelope_line 1 10000 From 7158f4dd82daed3d082faddc46fc872b0c962e05 Mon Sep 17 00:00:00 2001 From: username Date: Wed, 12 Feb 2025 23:19:52 -0500 Subject: [PATCH 9/9] a --- sound/sequences/00_sound_player.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/sequences/00_sound_player.s b/sound/sequences/00_sound_player.s index 321213d0d4..a6a2c26be5 100644 --- a/sound/sequences/00_sound_player.s +++ b/sound/sequences/00_sound_player.s @@ -8170,7 +8170,7 @@ envelope_goto 2 .envelope_3438: envelope_line 23 32760 envelope_line 80 15000 -envelope_goto 2 +envelope_hang .envelope_3444: envelope_line 22 32760