Clean up some macro definitions

2021-03-21 20:09:34 -04:00
parent 90ce126139
commit 5037adc55f
3 changed files with 16 additions and 14 deletions
--- a/macros/scripts/audio.asm
+++ b/macros/scripts/audio.asm
@@ -50,8 +50,8 @@ FIRST_MUSIC_CMD EQU const_value

 	const octave_cmd ; $d0
 octave: MACRO
-	assert 0 < (\1) && (\1) < 8, "octave must be 1-8"
-	db octave_cmd | 8 - (\1) ; octave
+	assert 1 <= (\1) && (\1) <= 8, "octave must be 1-8"
+	db octave_cmd + 8 - (\1) ; octave
 ENDM

 	const_skip 7 ; all octave values