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 /wram.asm | |
| parent | dd6812c06a3a5123fa277c9c07089cb35647b4d2 (diff) | |
| parent | e7be25948dfeef257697a7aa30706339f6ba014b (diff) | |
Merge branch 'master' into audio-macros
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 15 |
1 files changed, 7 insertions, 8 deletions
@@ -37,7 +37,7 @@ wChannel8:: channel_struct wChannel8 ; c25f ds 1 ; c291 wCurTrackDuty:: db -wCurTrackIntensity:: db +wCurTrackVolumeEnvelope:: db wCurTrackFrequency:: dw wUnusedBCDNumber:: db ; BCD value, dummied out wCurNoteDuration:: db ; used in MusicE0 and LoadNote @@ -57,13 +57,12 @@ wSoundOutput:: ; c29b ; bit 4-7: ch1-4 so2 on/off ; bit 0-3: ch1-4 so1 on/off db -wSoundInput:: ; c29c -; corresponds to rNR52 -; bit 7: global on/off -; bit 0: ch1 on/off -; bit 1: ch2 on/off -; bit 2: ch3 on/off -; bit 3: ch4 on/off +wPitchSweep:: ; c29c +; corresponds to rNR10 +; bit 7: unused +; bit 4-6: sweep time +; bit 3: sweep direction +; but 0-2: sweep shift db wMusicID:: dw ; c29d |