From dcdb5d769342b3bf5aaf1bc760e52327a8286bc2 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Mon, 8 Jan 2018 01:30:28 -0600 Subject: [PATCH] Create sound data files --- asm/macros/music_voice.inc | 125 +++++++++++++++++++++++++++++++ data/sound_data.s | 11 +-- sound/direct_sound_data.inc | 1 + sound/keysplit_tables.inc | 1 + sound/programmable_wave_data.inc | 1 + 5 files changed, 132 insertions(+), 7 deletions(-) create mode 100644 asm/macros/music_voice.inc create mode 100644 sound/direct_sound_data.inc create mode 100644 sound/keysplit_tables.inc create mode 100644 sound/programmable_wave_data.inc diff --git a/asm/macros/music_voice.inc b/asm/macros/music_voice.inc new file mode 100644 index 0000000000..b7a9e7f8d0 --- /dev/null +++ b/asm/macros/music_voice.inc @@ -0,0 +1,125 @@ + .macro voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release + .byte 0 + _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release + .endm + + .macro voice_directsound_no_resample base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release + .byte 8 + _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release + .endm + + .macro voice_directsound_alt base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release + .byte 16 + _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release + .endm + + .macro _voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release + .byte \base_midi_key + .byte 0 + .if \pan != 0 + .byte (0x80 | \pan) + .else + .byte 0 + .endif + .4byte \sample_data_pointer + .byte \attack + .byte \decay + .byte \sustain + .byte \release + .endm + + .macro voice_square_1 sweep, duty_cycle, attack, decay, sustain, release + _voice_square_1 1, \sweep, \duty_cycle, \attack, \decay, \sustain, \release + .endm + + .macro voice_square_1_alt sweep, duty_cycle, attack, decay, sustain, release + _voice_square_1 9, \sweep, \duty_cycle, \attack, \decay, \sustain, \release + .endm + + .macro _voice_square_1 type, sweep, duty_cycle, attack, decay, sustain, release + .byte \type, 60, 0 + .byte \sweep + .byte (\duty_cycle & 0x3) + .byte 0, 0, 0 + .byte (\attack & 0x7) + .byte (\decay & 0x7) + .byte (\sustain & 0xF) + .byte (\release & 0x7) + .endm + + .macro voice_square_2 duty_cycle, attack, decay, sustain, release + _voice_square_2 2, \duty_cycle, \attack, \decay, \sustain, \release + .endm + + .macro voice_square_2_alt duty_cycle, attack, decay, sustain, release + _voice_square_2 10, \duty_cycle, \attack, \decay, \sustain, \release + .endm + + .macro _voice_square_2 type, duty_cycle, attack, decay, sustain, release + .byte \type, 60, 0, 0 + .byte (\duty_cycle & 0x3) + .byte 0, 0, 0 + .byte (\attack & 0x7) + .byte (\decay & 0x7) + .byte (\sustain & 0xF) + .byte (\release & 0x7) + .endm + + .macro voice_programmable_wave wave_samples_pointer, attack, decay, sustain, release + _voice_programmable_wave 3, \wave_samples_pointer, \attack, \decay, \sustain, \release + .endm + + .macro voice_programmable_wave_alt wave_samples_pointer, attack, decay, sustain, release + _voice_programmable_wave 11, \wave_samples_pointer, \attack, \decay, \sustain, \release + .endm + + .macro _voice_programmable_wave type, wave_samples_pointer, attack, decay, sustain, release + .byte \type, 60, 0, 0 + .4byte \wave_samples_pointer + .byte (\attack & 0x7) + .byte (\decay & 0x7) + .byte (\sustain & 0xF) + .byte (\release & 0x7) + .endm + + .macro voice_noise period, attack, decay, sustain, release + _voice_noise 4, \period, \attack, \decay, \sustain, \release + .endm + + .macro voice_noise_alt period, attack, decay, sustain, release + _voice_noise 12, \period, \attack, \decay, \sustain, \release + .endm + + .macro _voice_noise type, period, attack, decay, sustain, release + .byte \type, 60, 0, 0 + .byte (\period & 0x1) + .byte 0, 0, 0 + .byte (\attack & 0x7) + .byte (\decay & 0x7) + .byte (\sustain & 0xF) + .byte (\release & 0x7) + .endm + + .macro voice_keysplit voice_group_pointer, keysplit_table_pointer + .byte 0x40, 0, 0, 0 + .4byte \voice_group_pointer + .4byte \keysplit_table_pointer + .endm + + .macro voice_keysplit_all voice_group_pointer + .byte 0x80, 0, 0, 0 + .4byte \voice_group_pointer + .4byte 0 + .endm + + .macro cry sample + .byte 0x20, 60, 0, 0 + .4byte \sample + .byte 0xff, 0, 0xff, 0 + .endm + + .macro cry2 sample + .byte 0x30, 60, 0, 0 + .4byte \sample + .byte 0xff, 0, 0xff, 0 + .endm diff --git a/data/sound_data.s b/data/sound_data.s index f5470dda50..bf5138f84a 100644 --- a/data/sound_data.s +++ b/data/sound_data.s @@ -1,14 +1,11 @@ .section .rodata .include "asm/macros/m4a.inc" + .include "asm/macros/music_voice.inc" .include "sound/voice_groups.inc" - - @ keysplit tables, programmable wave data - .incbin "baserom.gba", 0x6b4698, 0x328 - + .include "sound/keysplit_tables.inc" + .include "sound/programmable_wave_data.inc" .include "sound/music_player_table.inc" .include "sound/song_table.inc" - - @ direct sound data - .incbin "baserom.gba", 0x6b5d04, 0x246338 + .include "sound/direct_sound_data.inc" diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc new file mode 100644 index 0000000000..2cd409e615 --- /dev/null +++ b/sound/direct_sound_data.inc @@ -0,0 +1 @@ +.incbin "baserom.gba", 0x6b5d04, 0x246338 diff --git a/sound/keysplit_tables.inc b/sound/keysplit_tables.inc new file mode 100644 index 0000000000..4a9e8cfd7f --- /dev/null +++ b/sound/keysplit_tables.inc @@ -0,0 +1 @@ +.incbin "baserom.gba", 0x6b4698, 0x198 diff --git a/sound/programmable_wave_data.inc b/sound/programmable_wave_data.inc new file mode 100644 index 0000000000..f451a4b45a --- /dev/null +++ b/sound/programmable_wave_data.inc @@ -0,0 +1 @@ +.incbin "baserom.gba", 0x6b4830, 0x190