Skip to content

Crash sound effect #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mountainflaw wants to merge 9 commits into
base: develop/3.0.0
Choose a base branch
from
Open

Crash sound effect #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3b97264
a
Oct 23, 2024
184c165
feedback
Oct 24, 2024
18b867a
note changes
Oct 24, 2024
b9e5784
Ready
Oct 25, 2024
3f48ad6
.
Oct 25, 2024
9281452
.
Oct 25, 2024
ef387c2
fix
Feb 13, 2025
da9d0b3
a
Feb 13, 2025
7158f4d
a
Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/sounds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
35 changes: 29 additions & 6 deletions sound/sequences/00_sound_player.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/game/crash_screen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions src/game/game_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}