diff --git a/sound/samples/instruments/06_kick_drum_1.aiff b/sound/samples/instruments/06_kick_drum_1.aiff index 8dc02fc2..c16c2496 100644 Binary files a/sound/samples/instruments/06_kick_drum_1.aiff and b/sound/samples/instruments/06_kick_drum_1.aiff differ diff --git a/sound/samples/instruments/08.aiff b/sound/samples/instruments/08.aiff index 4b94cdd1..f6687d44 100644 Binary files a/sound/samples/instruments/08.aiff and b/sound/samples/instruments/08.aiff differ diff --git a/sound/samples/instruments/0E_hihat_closed.aiff b/sound/samples/instruments/0E_hihat_closed.aiff index cff5b840..9c0dce48 100644 Binary files a/sound/samples/instruments/0E_hihat_closed.aiff and b/sound/samples/instruments/0E_hihat_closed.aiff differ diff --git a/sound/samples/instruments/0F_hihat_open.aiff b/sound/samples/instruments/0F_hihat_open.aiff index 3e22e1f2..17f41db8 100644 Binary files a/sound/samples/instruments/0F_hihat_open.aiff and b/sound/samples/instruments/0F_hihat_open.aiff differ diff --git a/sound/samples/instruments/10_cymbal_bell.aiff b/sound/samples/instruments/10_cymbal_bell.aiff index 6aa8a84e..5fa21e9e 100644 Binary files a/sound/samples/instruments/10_cymbal_bell.aiff and b/sound/samples/instruments/10_cymbal_bell.aiff differ diff --git a/sound/samples/instruments/19_brass_Eb3.aiff b/sound/samples/instruments/19_brass_Eb3.aiff index 09b7d68a..0fd6031a 100644 Binary files a/sound/samples/instruments/19_brass_Eb3.aiff and b/sound/samples/instruments/19_brass_Eb3.aiff differ diff --git a/sound/samples/instruments/1A_slap_bass_G#2.aiff b/sound/samples/instruments/1A_slap_bass_G#2.aiff index a7304b77..fb0d447e 100644 Binary files a/sound/samples/instruments/1A_slap_bass_G#2.aiff and b/sound/samples/instruments/1A_slap_bass_G#2.aiff differ diff --git a/sound/samples/instruments/1B_percussive_synth_Eb3.aiff b/sound/samples/instruments/1B_percussive_synth_Eb3.aiff index 81871f9e..5d772119 100644 Binary files a/sound/samples/instruments/1B_percussive_synth_Eb3.aiff and b/sound/samples/instruments/1B_percussive_synth_Eb3.aiff differ diff --git a/sound/samples/instruments/1C_les_paul_guitar_E2.aiff b/sound/samples/instruments/1C_les_paul_guitar_E2.aiff index 9ec41ce9..86b55c75 100644 Binary files a/sound/samples/instruments/1C_les_paul_guitar_E2.aiff and b/sound/samples/instruments/1C_les_paul_guitar_E2.aiff differ diff --git a/sound/samples/instruments/32_metal_rimshot.aiff b/sound/samples/instruments/32_metal_rimshot.aiff index 78baa24a..e1641090 100644 Binary files a/sound/samples/instruments/32_metal_rimshot.aiff and b/sound/samples/instruments/32_metal_rimshot.aiff differ diff --git a/sound/samples/instruments/33_kick_drum_2.aiff b/sound/samples/instruments/33_kick_drum_2.aiff index 48f213d9..159d9bd4 100644 Binary files a/sound/samples/instruments/33_kick_drum_2.aiff and b/sound/samples/instruments/33_kick_drum_2.aiff differ diff --git a/sound/samples/instruments/42_bowser_hihat.aiff b/sound/samples/instruments/42_bowser_hihat.aiff index 8846cd89..a21b77d1 100644 Binary files a/sound/samples/instruments/42_bowser_hihat.aiff and b/sound/samples/instruments/42_bowser_hihat.aiff differ diff --git a/sound/samples/sfx_terrain/02_step_stone.aiff b/sound/samples/sfx_terrain/02_step_stone.aiff index c3722624..d9988d0f 100644 Binary files a/sound/samples/sfx_terrain/02_step_stone.aiff and b/sound/samples/sfx_terrain/02_step_stone.aiff differ diff --git a/sound/sequences/jp/02_menu_title_screen.m64 b/sound/sequences/jp/02_menu_title_screen.m64 index bfabccd6..55c2bff1 100644 Binary files a/sound/sequences/jp/02_menu_title_screen.m64 and b/sound/sequences/jp/02_menu_title_screen.m64 differ diff --git a/sound/sequences/jp/03_level_grass.m64 b/sound/sequences/jp/03_level_grass.m64 index bc65fce5..2dab4ce6 100644 Binary files a/sound/sequences/jp/03_level_grass.m64 and b/sound/sequences/jp/03_level_grass.m64 differ diff --git a/sound/sound_banks/11.json b/sound/sound_banks/11.json index fd4c0452..80885bc4 100644 --- a/sound/sound_banks/11.json +++ b/sound/sound_banks/11.json @@ -9,7 +9,7 @@ "hang" ], "envelope1": [ - [2, 32700], + [1, 32700], [1, 32700], [32700, 29430], "hang" @@ -83,7 +83,7 @@ }, "instruments": { "inst0": { - "release_rate": 10, + "release_rate": 70, "envelope": "envelope1", "sound": "08" }, @@ -108,7 +108,7 @@ "sound": "19_brass_Eb3" }, "inst5": { - "release_rate": 208, + "release_rate": 88, "envelope": "envelope5", "sound": "1A_slap_bass_G#2" }, @@ -123,26 +123,26 @@ "sound": "1C_les_paul_guitar_E2" }, "percussion": [ - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 0.735784}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 0.77953575}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 0.82589}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 0.875}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 0.926031}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 0.98215425}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.040557}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.10243175}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.168985}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.23743725}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.3110195}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.38997675}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.47156975}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.55807325}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.65178125}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.75}}, - {"release_rate": 10, "pan": 57, "envelope": "envelope8", "sound": "07_rimshot"}, - {"release_rate": 10, "pan": 65, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 1.3205508}}, - {"release_rate": 10, "pan": 66, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 1.0219052}}, - {"release_rate": 10, "pan": 66, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 0.9718465}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 0.735784}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 0.77953575}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 0.82589}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 0.875}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 0.926031}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 0.98215425}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.040557}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.10243175}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.168985}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.23743725}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.3110195}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.38997675}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.47156975}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.55807325}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.65178125}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 1.75}}, + {"release_rate": 60, "pan": 57, "envelope": "envelope8", "sound": "07_rimshot"}, + {"release_rate": 70, "pan": 65, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 1.3205508}}, + {"release_rate": 70, "pan": 66, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 1.0219052}}, + {"release_rate": 70, "pan": 66, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 0.9718465}}, {"release_rate": 10, "pan": 6, "envelope": "envelope8", "sound": {"sample": "09", "tuning": 0.471937}}, {"release_rate": 10, "pan": 6, "envelope": "envelope8", "sound": {"sample": "09", "tuning": 0.5}}, {"release_rate": 10, "pan": 27, "envelope": "envelope8", "sound": {"sample": "09", "tuning": 0.66742}}, @@ -227,9 +227,14 @@ "sound": "4B" }, "inst14": { - "release_rate": 1, + "release_rate": 208, "envelope": "envelope0", "sound": "4C" + }, + "inst15": { + "release_rate": 0, + "envelope": "envelope0", + "sound": "42_bowser_hihat" } }, "instrument_list": [/* the 'null' instruments in this soundbank were @@ -251,6 +256,7 @@ "inst11", "inst12", "inst13", - "inst14" + "inst14", + "inst15" ] } diff --git a/sound/sound_banks/12.json b/sound/sound_banks/12.json index d218754b..d9b66167 100644 --- a/sound/sound_banks/12.json +++ b/sound/sound_banks/12.json @@ -78,9 +78,9 @@ "normal_range_lo": 14, "normal_range_hi": 15, "envelope": "envelope3", - "sound_lo": {"sample": "32_metal_rimshot", "tuning": 2.244924}, + "sound_lo": { "sample": "32_metal_rimshot", "tuning": 2.6939088 }, "sound": "33_kick_drum_2", - "sound_hi": {"sample": "32_metal_rimshot", "tuning": 3} + "sound_hi": { "sample": "32_metal_rimshot", "tuning": 3.6 } }, "inst4": { "release_rate": 10, diff --git a/sound/sound_banks/22.json b/sound/sound_banks/22.json index f99c76be..587998b2 100644 --- a/sound/sound_banks/22.json +++ b/sound/sound_banks/22.json @@ -47,46 +47,46 @@ }, "instruments": { "inst0": { - "release_rate": 255, + "release_rate": 208, "envelope": "envelope0", "sound": "19_brass_Eb3" }, "inst1": { - "release_rate": 255, + "release_rate": 208, "envelope": "envelope1", "sound": "1A_slap_bass_G#2" }, "inst2": { - "release_rate": 255, + "release_rate": 128, "envelope": "envelope2", "sound": "1B_percussive_synth_Eb3" }, "inst3": { - "release_rate": 255, + "release_rate": 208, "envelope": "envelope3", "sound": "1C_les_paul_guitar_E2" }, "percussion": [ - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 0.735784}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 0.77953575}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 0.82588975}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 0.875}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 0.926031}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 0.98215425}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.040557}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.10243175}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.167985}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.23743725}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.3110195}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.38897675}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.47156975}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.55907325}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.65178125}}, - {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.75}}, - {"release_rate": 10, "pan": 57, "envelope": "envelope4", "sound": "07_rimshot"}, - {"release_rate": 10, "pan": 65, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 4.621928}}, - {"release_rate": 10, "pan": 66, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 3.40146275}}, - {"release_rate": 10, "pan": 66, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 3.5766682}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 0.735784}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 0.77953575}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 0.82588975}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 0.875}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 0.926031}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 0.98215425}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.040557}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.10243175}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.167985}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.23743725}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.3110195}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.38897675}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.47156975}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.55907325}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.65178125}}, + {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.75}}, + {"release_rate": 60, "pan": 57, "envelope": "envelope4", "sound": "07_rimshot"}, + {"release_rate": 70, "pan": 65, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 2.310964}}, + {"release_rate": 70, "pan": 66, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 1.700731375}}, + {"release_rate": 70, "pan": 66, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 1.7883341}}, {"release_rate": 10, "pan": 6, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.471937}}, {"release_rate": 10, "pan": 6, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.5}}, {"release_rate": 10, "pan": 27, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.66742}}, @@ -133,14 +133,14 @@ {"release_rate": 10, "pan": 128, "envelope": "envelope4", "sound": "0D_clave"} ], "inst4": { - "release_rate":150, + "release_rate": 208, "normal_range_lo": 24, "envelope": "envelope5", "sound_lo": "0E_hihat_closed", "sound": "0F_hihat_open" }, "inst5": { - "release_rate": 3, + "release_rate": 10, "normal_range_lo": 28, "normal_range_hi": 28, "envelope": "envelope6", diff --git a/src/audio/external.c b/src/audio/external.c index ab7d7e51..3cd0783f 100644 --- a/src/audio/external.c +++ b/src/audio/external.c @@ -235,7 +235,7 @@ u8 sBackgroundMusicDefaultVolume[] = { 127, // SEQ_SOUND_PLAYER 80, // SEQ_EVENT_CUTSCENE_COLLECT_STAR 80, // SEQ_MENU_TITLE_SCREEN - 75, // SEQ_LEVEL_GRASS + 80, // SEQ_LEVEL_GRASS 70, // SEQ_LEVEL_INSIDE_CASTLE 75, // SEQ_LEVEL_WATER 75, // SEQ_LEVEL_HOT