diff --git a/include/sounds.h b/include/sounds.h
index e186684e97..dcb2106336 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_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 cad642171d..a6a2c26be5 100644
--- a/sound/sequences/00_sound_player.s
+++ b/sound/sequences/00_sound_player.s
@@ -6985,6 +6985,7 @@ sound_ref .chan_2D18
 sound_ref .sound_menu_power_meter
 sound_ref .sound_menu_camera_buzz
 sound_ref .sound_menu_camera_turn
+sound_ref .sound_menu_critical_error
 
 .sound_menu_change_select:
 chan_setbank 9
@@ -7838,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
@@ -8132,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
@@ -8147,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
diff --git a/src/game/crash_screen.c b/src/game/crash_screen.c
index 6b199da916..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_MARIO_WAAAOOOW, 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..fecbe31ab8 100644
--- a/src/game/game_init.c
+++ b/src/game/game_init.c
@@ -831,12 +831,6 @@ void thread5_game_loop(UNUSED void *arg) {
             // amount of free space remaining.
             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);
-        }
 #endif
     }
 }