diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2016-08-25 20:22:36 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2016-08-25 20:22:36 -0700 |
| commit | a4c54db04a8956f72e66cc69afc4dc14bb752aaa (patch) | |
| tree | 8c3877833698507da29d747c5bf6ba994ddfc48e | |
| parent | 7e2fd52543ed0e0d6fec0aa88137ceec7a2f9a1b (diff) | |
Add extra directsound macro.
| -rw-r--r-- | asm/macros/music_voice.s | 5 | ||||
| -rw-r--r-- | data/sound_data.s | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/asm/macros/music_voice.s b/asm/macros/music_voice.s index 0d3ac58e0..9a95d69f4 100644 --- a/asm/macros/music_voice.s +++ b/asm/macros/music_voice.s @@ -8,6 +8,11 @@ _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 diff --git a/data/sound_data.s b/data/sound_data.s index 4c1887359..dd31703e1 100644 --- a/data/sound_data.s +++ b/data/sound_data.s @@ -69276,9 +69276,7 @@ VoiceGroupTable_8451F90: @ 8451F90 .byte 255, 249, 0, 165 @ Direct Sound 8451F9C - .byte 0x10, 0x3c, 0x0, 0x0 - .4byte DirectSoundWaveData_8488F44 - .byte 255, 0, 255, 165 + voice_directsound_alt 60, 0, DirectSoundWaveData_8488F44, 255, 0, 255, 165 @ Direct Sound 8451FA8 .byte 0x0, 0x3c, 0x0, 0x0 @@ -70385,9 +70383,7 @@ VoiceGroupTable_8454C54: @ 8454C54 .byte 0, 0, 15, 0 @ Direct Sound 8454D50 - .byte 0x0, 0x3c, 0x0, 0x0 - .4byte DirectSoundWaveData_8654C20 - .byte 255, 249, 25, 248 + voice_directsound 60, 0, DirectSoundWaveData_8654C20, 255, 249, 25, 248 @ SquareWave1 8454D5C .byte 0x1, 0x3c, 0x0, 0x0 |