ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make all arguments for audio macros required

Browse Source
This commit is contained in:
Kurausukun 2020-09-17 19:56:55 -04:00
parent b9644e9583
commit f4a49dcd1d
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
asm/macros/music_voice.inc
View File

@ -1,19 +1,19 @@
.macro voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release .macro voice_directsound base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte 0 .byte 0
_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
.endm .endm
.macro voice_directsound_no_resample base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release .macro voice_directsound_no_resample base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte 8 .byte 8
_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
.endm .endm
.macro voice_directsound_alt base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release .macro voice_directsound_alt base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte 16 .byte 16
_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
.endm .endm
.macro _voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release .macro _voice_directsound base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte \base_midi_key .byte \base_midi_key
.byte 0 .byte 0
.if \pan != 0 .if \pan != 0
@ -28,15 +28,15 @@
.byte \release .byte \release
.endm .endm
.macro voice_square_1 base_midi_key, pan, sweep, duty_cycle, attack, decay, sustain, release .macro voice_square_1 base_midi_key:req, pan:req, sweep:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req
_voice_square_1 1, \base_midi_key, \pan, \sweep, \duty_cycle, \attack, \decay, \sustain, \release _voice_square_1 1, \base_midi_key, \pan, \sweep, \duty_cycle, \attack, \decay, \sustain, \release
.endm .endm
.macro voice_square_1_alt base_midi_key, pan, sweep, duty_cycle, attack, decay, sustain, release .macro voice_square_1_alt base_midi_key:req, pan:req, sweep:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req
_voice_square_1 9, \base_midi_key, \pan, \sweep, \duty_cycle, \attack, \decay, \sustain, \release _voice_square_1 9, \base_midi_key, \pan, \sweep, \duty_cycle, \attack, \decay, \sustain, \release
.endm .endm
.macro _voice_square_1 type, base_midi_key, pan, sweep, duty_cycle, attack, decay, sustain, release .macro _voice_square_1 type:req, base_midi_key:req, pan:req, sweep:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req
.byte \type .byte \type
.byte \base_midi_key .byte \base_midi_key
.if \pan != 0 .if \pan != 0
@ -53,15 +53,15 @@
.byte (\release & 0x7) .byte (\release & 0x7)
.endm .endm
.macro voice_square_2 base_midi_key, pan, duty_cycle, attack, decay, sustain, release .macro voice_square_2 base_midi_key:req, pan:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req
_voice_square_2 2, \base_midi_key, \pan, \duty_cycle, \attack, \decay, \sustain, \release _voice_square_2 2, \base_midi_key, \pan, \duty_cycle, \attack, \decay, \sustain, \release
.endm .endm
.macro voice_square_2_alt base_midi_key, pan, duty_cycle, attack, decay, sustain, release .macro voice_square_2_alt base_midi_key:req, pan:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req
_voice_square_2 10, \base_midi_key, \pan, \duty_cycle, \attack, \decay, \sustain, \release _voice_square_2 10, \base_midi_key, \pan, \duty_cycle, \attack, \decay, \sustain, \release
.endm .endm
.macro _voice_square_2 type, base_midi_key, pan, duty_cycle, attack, decay, sustain, release .macro _voice_square_2 type:req, base_midi_key:req, pan:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req
.byte \type .byte \type
.byte \base_midi_key .byte \base_midi_key
.if \pan != 0 .if \pan != 0
@ -78,15 +78,15 @@
.byte (\release & 0x7) .byte (\release & 0x7)
.endm .endm
.macro voice_programmable_wave base_midi_key, pan, wave_samples_pointer, attack, decay, sustain, release .macro voice_programmable_wave base_midi_key:req, pan:req, wave_samples_pointer:req, attack:req, decay:req, sustain:req, release:req
_voice_programmable_wave 3, \base_midi_key, \pan, \wave_samples_pointer, \attack, \decay, \sustain, \release _voice_programmable_wave 3, \base_midi_key, \pan, \wave_samples_pointer, \attack, \decay, \sustain, \release
.endm .endm
.macro voice_programmable_wave_alt base_midi_key, pan, wave_samples_pointer, attack, decay, sustain, release .macro voice_programmable_wave_alt base_midi_key:req, pan:req, wave_samples_pointer:req, attack:req, decay:req, sustain:req, release:req
_voice_programmable_wave 11, \base_midi_key, \pan, \wave_samples_pointer, \attack, \decay, \sustain, \release _voice_programmable_wave 11, \base_midi_key, \pan, \wave_samples_pointer, \attack, \decay, \sustain, \release
.endm .endm
.macro _voice_programmable_wave type, base_midi_key, pan, wave_samples_pointer, attack, decay, sustain, release .macro _voice_programmable_wave type:req, base_midi_key:req, pan:req, wave_samples_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte \type .byte \type
.byte \base_midi_key .byte \base_midi_key
.if \pan != 0 .if \pan != 0
@ -102,15 +102,15 @@
.byte (\release & 0x7) .byte (\release & 0x7)
.endm .endm
.macro voice_noise base_midi_key, pan, period, attack, decay, sustain, release .macro voice_noise base_midi_key:req, pan:req, period:req, attack:req, decay:req, sustain:req, release:req
_voice_noise 4, \base_midi_key, \pan, \period, \attack, \decay, \sustain, \release _voice_noise 4, \base_midi_key, \pan, \period, \attack, \decay, \sustain, \release
.endm .endm
.macro voice_noise_alt base_midi_key, pan, period, attack, decay, sustain, release .macro voice_noise_alt base_midi_key:req, pan:req, period:req, attack:req, decay:req, sustain:req, release:req
_voice_noise 12, \base_midi_key, \pan, \period, \attack, \decay, \sustain, \release _voice_noise 12, \base_midi_key, \pan, \period, \attack, \decay, \sustain, \release
.endm .endm
.macro _voice_noise type, base_midi_key, pan, period, attack, decay, sustain, release .macro _voice_noise type:req, base_midi_key:req, pan:req, period:req, attack:req, decay:req, sustain:req, release:req
.byte \type .byte \type
.byte \base_midi_key .byte \base_midi_key
.if \pan != 0 .if \pan != 0
@ -127,25 +127,25 @@
.byte (\release & 0x7) .byte (\release & 0x7)
.endm .endm
.macro voice_keysplit voice_group_pointer, keysplit_table_pointer .macro voice_keysplit voice_group_pointer:req, keysplit_table_pointer:req
.byte 0x40, 0, 0, 0 .byte 0x40, 0, 0, 0
.4byte \voice_group_pointer .4byte \voice_group_pointer
.4byte \keysplit_table_pointer .4byte \keysplit_table_pointer
.endm .endm
.macro voice_keysplit_all voice_group_pointer .macro voice_keysplit_all voice_group_pointer:req
.byte 0x80, 0, 0, 0 .byte 0x80, 0, 0, 0
.4byte \voice_group_pointer .4byte \voice_group_pointer
.4byte 0 .4byte 0
.endm .endm
.macro cry sample .macro cry sample:req
.byte 0x20, 60, 0, 0 .byte 0x20, 60, 0, 0
.4byte \sample .4byte \sample
.byte 0xff, 0, 0xff, 0 .byte 0xff, 0, 0xff, 0
.endm .endm
.macro cry2 sample .macro cry2 sample:req
.byte 0x30, 60, 0, 0 .byte 0x30, 60, 0, 0
.4byte \sample .4byte \sample
.byte 0xff, 0, 0xff, 0 .byte 0xff, 0, 0xff, 0