diff options
| author | yenatch <yenatch@gmail.com> | 2018-06-05 07:04:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-05 07:04:54 -0400 |
| commit | dbf05e48ebe2cd841a3d710f5bc9f24db2f068a0 (patch) | |
| tree | 2b05ffe9e84a2c6212da18169141cfaa1ed40dd4 /macros/wram.asm | |
| parent | c61d6a3a5a602d5594071e9446bb3d93b5d99a75 (diff) | |
| parent | 6f4e968b7038a2478c6bcf98b71aa81ed9d21f6a (diff) | |
Merge pull request #517 from mid-kid/master
Some fixes all around
Diffstat (limited to 'macros/wram.asm')
| -rw-r--r-- | macros/wram.asm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/macros/wram.asm b/macros/wram.asm index 469cc1022..6096d2bba 100644 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -131,7 +131,7 @@ channel_struct: MACRO ; Addreses are wChannel1 (c101). \1MusicID:: dw \1MusicBank:: db -\1Flags:: db ; 0:on/off 1:subroutine 3:sfx 4:noise 5:rest +\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 \1MusicAddress:: dw @@ -141,9 +141,7 @@ channel_struct: MACRO \1Condition:: db ; conditional jumps \1DutyCycle:: db ; bits 6-7 (0:12.5% 1:25% 2:50% 3:75%) \1Intensity:: db ; hi:pressure lo:velocity -\1Frequency:: ; 11 bits -\1FrequencyLo:: db -\1FrequencyHi:: db +\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) |