diff options
| author | mid-kid <esteve.varela@gmail.com> | 2020-02-04 16:01:30 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2020-02-04 16:03:01 +0100 |
| commit | 44b361c1bb099656641dc04448ce4a1e8a4ac010 (patch) | |
| tree | 99515207506b937d7190e7392c57cd10c0e6bdf3 /macros/wram.asm | |
| parent | dd6812c06a3a5123fa277c9c07089cb35647b4d2 (diff) | |
| parent | e7be25948dfeef257697a7aa30706339f6ba014b (diff) | |
Merge branch 'master' into audio-macros
Diffstat (limited to 'macros/wram.asm')
| -rw-r--r-- | macros/wram.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/macros/wram.asm b/macros/wram.asm index eec839b7d..af306d1f8 100644 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -129,37 +129,37 @@ channel_struct: MACRO ; Addreses are wChannel1 (c101). \1MusicID:: dw \1MusicBank:: db -\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 +\1Flags1:: db ; 0:on/off 1:subroutine 2:looping 3:sfx 4:noise 5:rest +\1Flags2:: db ; 0:vibrato on/off 1:pitch slide 2:duty cycle pattern 4:pitch offset +\1Flags3:: db ; 0:vibrato up/down 1:pitch slide direction \1MusicAddress:: dw \1LastMusicAddress:: dw dw \1NoteFlags:: db ; 5:rest \1Condition:: db ; conditional jumps \1DutyCycle:: db ; bits 6-7 (0:12.5% 1:25% 2:50% 3:75%) -\1Intensity:: db ; hi:pressure lo:velocity +\1VolumeEnvelope:: db ; hi:volume lo:fade \1Frequency:: dw ; 11 bits \1Pitch:: db ; 0:rest 1-c:note \1Octave:: db ; 7-0 (0 is highest) -\1PitchOffset:: db ; raises existing octaves (to repeat phrases) +\1Transposition:: db ; raises existing octaves (to repeat phrases) \1NoteDuration:: db ; frames remaining for the current note \1Field16:: ds 1 ds 1 \1LoopCount:: db \1Tempo:: dw \1Tracks:: db ; hi:left lo:right -\1SFXDutyLoop:: db +\1DutyCyclePattern:: db \1VibratoDelayCount:: db ; initialized by \1VibratoDelay \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 -\1PitchWheelTarget:: dw ; frequency endpoint for pitch wheel -\1PitchWheelAmount:: db -\1PitchWheelAmountFraction:: db +\1PitchSlideTarget:: dw ; frequency endpoint for pitch slide +\1PitchSlideAmount:: db +\1PitchSlideAmountFraction:: db \1Field25:: db ds 1 -\1CryPitch:: dw +\1PitchOffset:: dw \1Field29:: ds 1 \1Field2a:: ds 2 \1Field2c:: ds 1 |