thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix pitch_slide on channel 2 and 3

Browse source 
thanks to TempoQuill
This commit is contained in:
dannye 2023-01-01 19:54:26 -06:00
parent fc059d36af
commit 610521f77a
2 changed files with 20 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crysaudio/engine.asm
View file

@ -363,6 +363,8 @@ UpdateChannels:
jr nz, .ch2_rest jr nz, .ch2_rest
bit NOTE_NOISE_SAMPLING, [hl] bit NOTE_NOISE_SAMPLING, [hl]
jr nz, .ch2_noise_sampling jr nz, .ch2_noise_sampling
bit NOTE_FREQ_OVERRIDE, [hl]
jr nz, .ch2_frequency_override
bit NOTE_VIBRATO_OVERRIDE, [hl] bit NOTE_VIBRATO_OVERRIDE, [hl]
jr nz, .ch2_vibrato_override jr nz, .ch2_vibrato_override
bit NOTE_DUTY_OVERRIDE, [hl] bit NOTE_DUTY_OVERRIDE, [hl]
@ -375,7 +377,7 @@ UpdateChannels:
ldh [rNR21], a ldh [rNR21], a
ret ret
.ch2_frequency_override ; unreferenced .ch2_frequency_override
ld a, [wCurTrackFrequency] ld a, [wCurTrackFrequency]
ldh [rNR23], a ldh [rNR23], a
ld a, [wCurTrackFrequency + 1] ld a, [wCurTrackFrequency + 1]
@ -423,11 +425,13 @@ UpdateChannels:
jr nz, .ch3_rest jr nz, .ch3_rest
bit NOTE_NOISE_SAMPLING, [hl] bit NOTE_NOISE_SAMPLING, [hl]
jr nz, .ch3_noise_sampling jr nz, .ch3_noise_sampling
bit NOTE_FREQ_OVERRIDE, [hl]
jr nz, .ch3_frequency_override
bit NOTE_VIBRATO_OVERRIDE, [hl] bit NOTE_VIBRATO_OVERRIDE, [hl]
jr nz, .ch3_vibrato_override jr nz, .ch3_vibrato_override
ret ret
.ch3_frequency_override ; unreferenced .ch3_frequency_override
ld a, [wCurTrackFrequency] ld a, [wCurTrackFrequency]
ldh [rNR33], a ldh [rNR33], a
ld a, [wCurTrackFrequency + 1] ld a, [wCurTrackFrequency + 1]

105
crysaudio/music/RBY/titlescreen.asm
View file

@ -390,61 +390,16 @@ Music_RBYTitleScreen_branch_7e664::
note A_, 3 note A_, 3
sound_call Music_RBYTitleScreen_branch_7e6e5 sound_call Music_RBYTitleScreen_branch_7e6e5
octave 5 octave 5
;pitch_slide 1, 4, D_ pitch_slide 1, 4, D_
;note D_, 4 note D_, 4
;rest 4 rest 4
note_type 3, 1, 0 ; XXX
note D_, 1 ; XXX
note C#, 1 ; XXX
note C_, 1 ; XXX
octave 4 ; XXX
note B_, 1 ; XXX
note A#, 1 ; XXX
note A_, 1 ; XXX
note G#, 1 ; XXX
note G_, 1 ; XXX
note F#, 1 ; XXX
note F_, 1 ; XXX
note E_, 1 ; XXX
note D#, 1 ; XXX
note D_, 4 ; XXX
rest 16 ; XXX
octave 6 octave 6
;pitch_slide 1, 5, D_ pitch_slide 1, 5, D_
;note D_, 4 note D_, 4
note D_, 1 ; XXX
note C#, 1 ; XXX
note C_, 1 ; XXX
octave 5 ; XXX
note B_, 1 ; XXX
note A#, 1 ; XXX
note A_, 1 ; XXX
note G#, 1 ; XXX
note G_, 1 ; XXX
note F#, 1 ; XXX
note F_, 1 ; XXX
note E_, 1 ; XXX
note D#, 1 ; XXX
note D_, 4 ; XXX
octave 5 octave 5
;pitch_slide 1, 4, D_ pitch_slide 1, 4, D_
;note D_, 4 note D_, 4
;rest 2 rest 2
note D_, 1 ; XXX
note C#, 1 ; XXX
note C_, 1 ; XXX
octave 4 ; XXX
note B_, 1 ; XXX
note A#, 1 ; XXX
note A_, 1 ; XXX
note G#, 1 ; XXX
note G_, 1 ; XXX
note F#, 1 ; XXX
note F_, 1 ; XXX
note E_, 1 ; XXX
note D#, 1 ; XXX
note D_, 4 ; XXX
rest 8 ; XXX
note_type 8, 1, 0 note_type 8, 1, 0
octave 4 octave 4
note C_, 4 note C_, 4
@ -452,45 +407,13 @@ Music_RBYTitleScreen_branch_7e664::
note C#, 4 note C#, 4
sound_call Music_RBYTitleScreen_branch_7e6e5 sound_call Music_RBYTitleScreen_branch_7e6e5
octave 6 octave 6
;pitch_slide 1, 5, D_ pitch_slide 1, 5, D_
;note D_, 4 note D_, 4
;rest 4 rest 4
note_type 3, 1, 0 ; XXX
note D_, 1 ; XXX
note C#, 1 ; XXX
note C_, 1 ; XXX
octave 5 ; XXX
note B_, 1 ; XXX
note A#, 1 ; XXX
note A_, 1 ; XXX
note G#, 1 ; XXX
note G_, 1 ; XXX
note F#, 1 ; XXX
note F_, 1 ; XXX
note E_, 1 ; XXX
note D#, 1 ; XXX
note D_, 4 ; XXX
rest 16 ; XXX
octave 5 octave 5
;pitch_slide 1, 4, D_ pitch_slide 1, 4, D_
;note D_, 4 note D_, 4
;rest 6 rest 6
note D_, 1 ; XXX
note C#, 1 ; XXX
note C_, 1 ; XXX
octave 4 ; XXX
note B_, 1 ; XXX
note A#, 1 ; XXX
note A_, 1 ; XXX
note G#, 1 ; XXX
note G_, 1 ; XXX
note F#, 1 ; XXX
note F_, 1 ; XXX
note E_, 1 ; XXX
note D#, 1 ; XXX
note D_, 4 ; XXX
rest 12 ; XXX
rest 12 ; XXX
note_type 8, 1, 0 note_type 8, 1, 0
octave 4 octave 4
note C_, 4 note C_, 4