summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorpfero <ohpee@loves.dicksinhisan.us>2018-06-04 03:35:28 +0200
committerpfero <ohpee@loves.dicksinhisan.us>2018-06-04 03:35:28 +0200
commit1bd0b22baf383dc171e5ce3c708746ba9aff86d6 (patch)
tree0ff0a58c153df11108d2055b00e81256cb20a7dc /macros
parent9bfd7f3cbe0aae80bab93ed715c8c88cfa7241c1 (diff)
Small dent into the audio engine
Diffstat (limited to 'macros')
-rw-r--r--macros/wram.asm6
1 files changed, 2 insertions, 4 deletions
diff --git a/macros/wram.asm b/macros/wram.asm
index dd9b76b..c598245 100644
--- a/macros/wram.asm
+++ b/macros/wram.asm
@@ -119,7 +119,7 @@ channel_struct: MACRO
; Addreses are Channel1 (c101).
\1MusicID:: dw
\1MusicBank:: db
-\1Flags:: db ; 0:on/off 1:subroutine 3:sfx 4:noise 5:rest
+\1Flags1:: db ; 0:on/off 1:subroutine 3:sfx 4:noise 5:rest
\1Flags2:: db ; 0:vibrato on/off 2:duty 4:cry pitch
\1Flags3:: db ; 0:vibrato up/down
\1MusicAddress:: dw
@@ -129,9 +129,7 @@ channel_struct: MACRO
\1Condition:: db ; conditional jumps
\1DutyCycle:: db ; bits 6-7 (0:12.5% 1:25% 2:50% 3:75%)
\1Intensity:: db ; hi:pressure lo:velocity
-\1Frequency:: ; 11 bits
-\1FrequencyLo:: db
-\1FrequencyHi:: db
+\1Frequency:: dw ; 11 bits
\1Pitch:: db ; 0:rest 1-c:note
\1Octave:: db ; 7-0 (0 is highest)
\1StartingOctave:: db ; raises existing octaves (to repeat phrases)