summaryrefslogtreecommitdiff
path: root/macros/scripts/audio.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2018-12-16 14:19:06 -0500
committerGitHub <noreply@github.com>2018-12-16 14:19:06 -0500
commit83ff516c8280e4c196053e347a5802375a7066f9 (patch)
tree856e63dd64373abc8f240f1b3dcb34b3c945ec7b /macros/scripts/audio.asm
parente025ab9db0b85cadb42e9b72ac408a58f8133672 (diff)
parente51339f01a52603820749249b625d2093b611a8e (diff)
Merge pull request #579 from Rangi42/master
Miscellaneous
Diffstat (limited to 'macros/scripts/audio.asm')
-rw-r--r--macros/scripts/audio.asm13
1 files changed, 8 insertions, 5 deletions
diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm
index d4a3f7bb5..fc9e3397a 100644
--- a/macros/scripts/audio.asm
+++ b/macros/scripts/audio.asm
@@ -20,20 +20,23 @@ noise: MACRO
ENDM
; MusicCommands indexes (see audio/engine.asm)
- enum_start $d8
-first_music_cmd EQU __enum__ + -8
+ enum_start $d0, +8
+FIRST_MUSIC_CMD EQU __enum__
+ enum octave_cmd ; $d0
octave: MACRO
- db first_music_cmd + 8 - (\1)
+ db octave_cmd | 8 - (\1)
ENDM
+__enumdir__ = +1
+
enum notetype_cmd ; $d8
notetype: MACRO
db notetype_cmd
db \1 ; note_length
- if _NARG >= 2
+if _NARG >= 2
db \2 ; intensity
- endc
+endc
ENDM
enum pitchoffset_cmd ; $d9