diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-10 14:33:24 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-10 14:33:24 -0400 |
| commit | f8c14d97e52c0f661dbda301d43927788078ff12 (patch) | |
| tree | 314cd94a1c162ed44d1f6bcb889c92ffb6a3bec7 /macros | |
| parent | 46ecd5b86977637c15fbb526812686fef5b7dcc1 (diff) | |
Pitch wheel
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/sound.asm | 7 | ||||
| -rwxr-xr-x | macros/wram.asm | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/macros/sound.asm b/macros/sound.asm index 64fe309cb..655bd0d26 100644 --- a/macros/sound.asm +++ b/macros/sound.asm @@ -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 diff --git a/macros/wram.asm b/macros/wram.asm index e5311eebc..f31d15056 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -146,10 +146,9 @@ channel_struct: MACRO \1VibratoDelay:: db ; number of frames a note plays until vibrato starts \1VibratoExtent:: db \1VibratoRate:: db ; hi:frames for each alt lo:frames to the next alt -\1Field0x21:: ds 1 ; c122 -\1Field0x22:: ds 1 ; c123 -\1Field0x23:: ds 1 ; c124 -\1Field0x24:: ds 1 ; c125 +\1PitchWheelTarget:: dw ; frequency endpoint for pitch wheel +\1PitchWheelAmount:: db ; c124 +\1PitchWheelAmountFraction:: db ; c125 \1Field0x25:: ds 1 ; c126 ds 1 ; c127 \1CryPitch:: dw |