summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-10 16:38:40 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-10 16:38:40 -0400
commitebf6ed8a149da3a3c1cb4c120867330a7fa6f369 (patch)
treefe683f0effe40c49a187db6bc14e689268c928b1 /macros
parentf8c14d97e52c0f661dbda301d43927788078ff12 (diff)
No more unknownmusic
Diffstat (limited to 'macros')
-rw-r--r--macros/sound.asm6
-rwxr-xr-xmacros/wram.asm2
2 files changed, 4 insertions, 4 deletions
diff --git a/macros/sound.asm b/macros/sound.asm
index 655bd0d26..49eb30d6b 100644
--- a/macros/sound.asm
+++ b/macros/sound.asm
@@ -67,9 +67,9 @@ soundinput: macro
db \1 ; input
endm
- enum unknownmusic0xde_cmd
-unknownmusic0xde: macro
- db unknownmusic0xde_cmd
+ enum sound_duty_cmd
+sound_duty: macro
+ db sound_duty_cmd
db \1 ; unknown
endm
diff --git a/macros/wram.asm b/macros/wram.asm
index f31d15056..1a44f0f17 100755
--- a/macros/wram.asm
+++ b/macros/wram.asm
@@ -141,7 +141,7 @@ channel_struct: MACRO
\1LoopCount:: db
\1Tempo:: dw
\1Tracks:: db ; hi:left lo:right
-\1Field0x1c:: ds 1 ; c11d
+\1SFXDutyLoop:: ds 1 ; c11d
\1VibratoDelayCount:: db ; initialized by \1VibratoDelay
\1VibratoDelay:: db ; number of frames a note plays until vibrato starts
\1VibratoExtent:: db