diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/sound.asm | 10 | ||||
| -rwxr-xr-x | macros/wram.asm | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/macros/sound.asm b/macros/sound.asm index a0eacc1e0..ad6a50749 100644 --- a/macros/sound.asm +++ b/macros/sound.asm @@ -37,10 +37,10 @@ notetype: macro endc endm - enum forceoctave_cmd -forceoctave: macro - db forceoctave_cmd - db \1 ; octave + enum pitchoffset_cmd +pitchoffset: macro + db pitchoffset_cmd + dn \1, \2 - 1 ; octave, key endm enum tempo_cmd @@ -81,7 +81,7 @@ togglesfx: macro enum slidepitchto_cmd slidepitchto: macro db slidepitchto_cmd - db \1 ; unknown + db \1 - 1 ; duration dn \2, \3 ; octave, pitch endm diff --git a/macros/wram.asm b/macros/wram.asm index 1a44f0f17..ce53dc5c7 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -134,7 +134,7 @@ channel_struct: MACRO \1FrequencyHi:: db \1Pitch:: db ; 0:rest 1-c:note \1Octave:: db ; 7-0 (0 is highest) -\1StartingOctave:: db ; raises existing octaves (to repeat phrases) +\1PitchOffset:: db ; raises existing octaves (to repeat phrases) \1NoteDuration:: db ; frames remaining for the current note \1Field0x16:: ds 1 ; c117 ds 1 ; c118 |