Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified sound/samples/instruments/06_kick_drum_1.aiff
Binary file not shown.
Binary file modified sound/samples/instruments/08.aiff
Binary file not shown.
Binary file modified sound/samples/instruments/0E_hihat_closed.aiff
Binary file not shown.
Binary file modified sound/samples/instruments/0F_hihat_open.aiff
Binary file not shown.
Binary file modified sound/samples/instruments/10_cymbal_bell.aiff
Binary file not shown.
Binary file modified sound/samples/instruments/19_brass_Eb3.aiff
Binary file not shown.
Binary file modified sound/samples/instruments/1A_slap_bass_G#2.aiff
Binary file not shown.
Binary file modified sound/samples/instruments/1B_percussive_synth_Eb3.aiff
Binary file not shown.
Binary file modified sound/samples/instruments/1C_les_paul_guitar_E2.aiff
Binary file not shown.
Binary file modified sound/samples/instruments/32_metal_rimshot.aiff
Binary file not shown.
Binary file modified sound/samples/instruments/33_kick_drum_2.aiff
Binary file not shown.
Binary file modified sound/samples/instruments/42_bowser_hihat.aiff
Binary file not shown.
Binary file modified sound/samples/sfx_terrain/02_step_stone.aiff
Binary file not shown.
Binary file modified sound/sequences/jp/02_menu_title_screen.m64
Binary file not shown.
Binary file modified sound/sequences/jp/03_level_grass.m64
Binary file not shown.
56 changes: 31 additions & 25 deletions sound/sound_banks/11.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"hang"
],
"envelope1": [
[2, 32700],
[1, 32700],
[1, 32700],
[32700, 29430],
"hang"
Expand Down Expand Up @@ -83,7 +83,7 @@
},
"instruments": {
"inst0": {
"release_rate": 10,
"release_rate": 70,
"envelope": "envelope1",
"sound": "08"
},
Expand All @@ -108,7 +108,7 @@
"sound": "19_brass_Eb3"
},
"inst5": {
"release_rate": 208,
"release_rate": 88,
"envelope": "envelope5",
"sound": "1A_slap_bass_G#2"
},
Expand All @@ -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}},
Expand Down Expand Up @@ -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
Expand All @@ -251,6 +256,7 @@
"inst11",
"inst12",
"inst13",
"inst14"
"inst14",
"inst15"
]
}
4 changes: 2 additions & 2 deletions sound/sound_banks/12.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
52 changes: 26 additions & 26 deletions sound/sound_banks/22.json
Original file line number Diff line number Diff line change
Expand Up @@ -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}},
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/audio/external.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading