summaryrefslogtreecommitdiff
path: root/macros/sound.asm
diff options
context:
space:
mode:
Diffstat (limited to 'macros/sound.asm')
-rw-r--r--macros/sound.asm25
1 files changed, 12 insertions, 13 deletions
diff --git a/macros/sound.asm b/macros/sound.asm
index 64fe309cb..ad6a50749 100644
--- a/macros/sound.asm
+++ b/macros/sound.asm
@@ -37,10 +37,10 @@ notetype: macro
endc
endm
- enum forceoctave_cmd
-forceoctave: macro
- db forceoctave_cmd
- db \1 ; octave
+ enum pitchoffset_cmd
+pitchoffset: macro
+ db pitchoffset_cmd
+ dn \1, \2 - 1 ; octave, key
endm
enum tempo_cmd
@@ -67,10 +67,10 @@ soundinput: macro
db \1 ; input
endm
- enum unknownmusic0xde_cmd
-unknownmusic0xde: macro
- db unknownmusic0xde_cmd
- db \1 ; unknown
+ enum sound_duty_cmd
+sound_duty: macro
+ db sound_duty_cmd
+ db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence
endm
enum togglesfx_cmd
@@ -78,11 +78,10 @@ togglesfx: macro
db togglesfx_cmd
endm
- enum unknownmusic0xe0_cmd
-unknownmusic0xe0: macro
- db unknownmusic0xe0_cmd
- db \1 ; unknown
- ; db \2 ; unknown
+ enum slidepitchto_cmd
+slidepitchto: macro
+ db slidepitchto_cmd
+ db \1 - 1 ; duration
dn \2, \3 ; octave, pitch
endm