diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
| commit | 803c6081d7b458f1965c4b9e62be2714b73fcdf4 (patch) | |
| tree | 94632a90406f3b185d82cabee2beb834bd711215 /macros/sound.asm | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | a32b6ccbb5b9ad15befa3b9893659f2ceabd1ba0 (diff) | |
Merge github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'macros/sound.asm')
| -rw-r--r-- | macros/sound.asm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/macros/sound.asm b/macros/sound.asm index 64fe309cb..a0eacc1e0 100644 --- a/macros/sound.asm +++ b/macros/sound.asm @@ -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 + enum slidepitchto_cmd +slidepitchto: macro + db slidepitchto_cmd db \1 ; unknown - ; db \2 ; unknown dn \2, \3 ; octave, pitch endm |