Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-10-12 05:24:02 +00:00
Code Issues Projects Releases Wiki Activity

pt3: embarassing cut and paste bug

Browse Source 
was resetting sample when ornament overflowed
This commit is contained in:
Vince Weaver 2019-05-13 13:30:57 -04:00
parent 2e48253b04
commit 34dc987eaa
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pt3_player/pt3_lib.s
View File

@ -556,14 +556,11 @@ note_not_too_high:
lda note_a+NOTE_SIMPLE_GLISS,X lda note_a+NOTE_SIMPLE_GLISS,X
bne no_tone_sliding ; if (!a->simplegliss) { bne no_tone_sliding ; if (!a->simplegliss) {
; FIXME: do these need to be signed compares?
check1: check1:
lda note_a+NOTE_TONE_SLIDE_STEP_H,X lda note_a+NOTE_TONE_SLIDE_STEP_H,X
bpl check2 ; if ( ((a->tone_slide_step < 0) && bpl check2 ; if ( ((a->tone_slide_step < 0) &&
; lda note_a+NOTE_TONE_SLIDING,X
; cmp note_a+NOTE_TONE_DELTA,X
; bcc slide_to_note ; (a->tone_sliding <= a->tone_delta)) ||
; beq slide_to_note
lda note_a+NOTE_TONE_SLIDING_H,X ; compare high bytes lda note_a+NOTE_TONE_SLIDING_H,X ; compare high bytes
cmp note_a+NOTE_TONE_DELTA_H,X cmp note_a+NOTE_TONE_DELTA_H,X
@ -578,11 +575,6 @@ check2:
lda note_a+NOTE_TONE_SLIDE_STEP_H,X lda note_a+NOTE_TONE_SLIDE_STEP_H,X
bmi no_tone_sliding ; ((a->tone_slide_step >= 0) && bmi no_tone_sliding ; ((a->tone_slide_step >= 0) &&
; lda note_a+NOTE_TONE_SLIDING,X
; cmp note_a+NOTE_TONE_DELTA,X
; bcc no_tone_sliding ; blt (a->tone_sliding >= a->tone_delta)) {
lda note_a+NOTE_TONE_SLIDING_H,X ; compare high bytes lda note_a+NOTE_TONE_SLIDING_H,X ; compare high bytes
cmp note_a+NOTE_TONE_DELTA_H,X cmp note_a+NOTE_TONE_DELTA_H,X
bcc no_tone_sliding ; if NUM1H < NUM2H then NUM1 < NUM2 bcc no_tone_sliding ; if NUM1H < NUM2H then NUM1 < NUM2
@ -772,6 +764,7 @@ noise_slide_done:
; increment sample position ; increment sample position
inc note_a+NOTE_SAMPLE_POSITION,X ; a->sample_position++; inc note_a+NOTE_SAMPLE_POSITION,X ; a->sample_position++;
lda note_a+NOTE_SAMPLE_POSITION,X lda note_a+NOTE_SAMPLE_POSITION,X
cmp note_a+NOTE_SAMPLE_LENGTH,X cmp note_a+NOTE_SAMPLE_LENGTH,X
@ -792,7 +785,7 @@ sample_pos_ok:
bcc ornament_pos_ok ; blt bcc ornament_pos_ok ; blt
lda note_a+NOTE_ORNAMENT_LOOP,X lda note_a+NOTE_ORNAMENT_LOOP,X
sta note_a+NOTE_SAMPLE_POSITION,X sta note_a+NOTE_ORNAMENT_POSITION,X
ornament_pos_ok: ornament_pos_ok: