Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-01-17 03:30:28 +00:00
Code Issues Projects Releases Wiki Activity

pt3: more multi-channel work

Browse Source
This commit is contained in:
Vince Weaver 2019-05-13 00:36:44 -04:00
parent a68547ae91
commit 4672350134
1 changed files with 112 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

218
pt3_player/pt3_lib.s
View File

@ -49,6 +49,8 @@ NOTE_TONE_DELTA_L=41
NOTE_TONE_DELTA_H=42 NOTE_TONE_DELTA_H=42
NOTE_TONE_SLIDE_TO_STEP=43 NOTE_TONE_SLIDE_TO_STEP=43
NOTE_STRUCT_SIZE=44
note_a: note_a:
.byte 'A' ; NOTE_WHICH .byte 'A' ; NOTE_WHICH
.byte $0 ; NOTE_VOLUME .byte $0 ; NOTE_VOLUME
@ -405,19 +407,20 @@ e_slide_amount: .byte $0
;===================================== ;=====================================
; Calculate Note ; Calculate Note
;===================================== ;=====================================
; ; note offset in X
calculate_note: calculate_note:
lda note_a+NOTE_ENABLED lda note_a+NOTE_ENABLED,X
bne note_enabled bne note_enabled
lda #0 lda #0
sta note_a+NOTE_AMPLITUDE sta note_a+NOTE_AMPLITUDE,X
jmp done_note jmp done_note
note_enabled: note_enabled:
lda note_a+NOTE_SAMPLE_POSITION lda note_a+NOTE_SAMPLE_POSITION,X
asl asl
asl asl
tay tay
@ -435,20 +438,20 @@ note_enabled:
; a->tone += (pt3->data[a->sample_pointer + a->sample_position * 4 + 3])<<8; ; a->tone += (pt3->data[a->sample_pointer + a->sample_position * 4 + 3])<<8;
iny iny
lda (SAMPLE_A_L),Y lda (SAMPLE_A_L),Y
sta note_a+NOTE_TONE_L sta note_a+NOTE_TONE_L,X
iny iny
lda (SAMPLE_A_L),Y lda (SAMPLE_A_L),Y
sta note_a+NOTE_TONE_H sta note_a+NOTE_TONE_H,X
; a->tone += a->tone_accumulator; ; a->tone += a->tone_accumulator;
clc clc
lda note_a+NOTE_TONE_ACCUMULATOR_L lda note_a+NOTE_TONE_ACCUMULATOR_L,X
adc note_a+NOTE_TONE_L adc note_a+NOTE_TONE_L,X
sta note_a+NOTE_TONE_L sta note_a+NOTE_TONE_L,X
lda note_a+NOTE_TONE_H lda note_a+NOTE_TONE_H,X
adc note_a+NOTE_TONE_ACCUMULATOR_H adc note_a+NOTE_TONE_ACCUMULATOR_H,X
sta note_a+NOTE_TONE_H sta note_a+NOTE_TONE_H,X
;======================== ;========================
; Accumulate tone if set ; Accumulate tone if set
@ -457,10 +460,10 @@ note_enabled:
bit sample_b1 bit sample_b1
beq no_accum beq no_accum
lda note_a+NOTE_TONE_L ; tone_accumulator=tone lda note_a+NOTE_TONE_L,X ; tone_accumulator=tone
sta note_a+NOTE_TONE_ACCUMULATOR_L sta note_a+NOTE_TONE_ACCUMULATOR_L,X
lda note_a+NOTE_TONE_H lda note_a+NOTE_TONE_H,X
sta note_a+NOTE_TONE_ACCUMULATOR_H sta note_a+NOTE_TONE_ACCUMULATOR_H,X
no_accum: no_accum:
@ -468,10 +471,10 @@ no_accum:
; Calculate tone ; Calculate tone
; j = a->note + (pt3->data[a->ornament_pointer + a->ornament_position] ; j = a->note + (pt3->data[a->ornament_pointer + a->ornament_position]
clc clc
lda note_a+NOTE_ORNAMENT_POSITION lda note_a+NOTE_ORNAMENT_POSITION,X
tay tay
lda (ORNAMENT_A_L),Y lda (ORNAMENT_A_L),Y
adc note_a+NOTE_NOTE adc note_a+NOTE_NOTE,X
; if (j < 0) j = 0; ; if (j < 0) j = 0;
bpl note_not_negative bpl note_not_negative
@ -494,90 +497,90 @@ note_not_too_high:
; a->tone = (a->tone + a->tone_sliding + w) & 0xfff; ; a->tone = (a->tone + a->tone_sliding + w) & 0xfff;
clc clc
lda note_a+NOTE_TONE_L lda note_a+NOTE_TONE_L,X
adc note_a+NOTE_TONE_SLIDING_L adc note_a+NOTE_TONE_SLIDING_L,X
sta note_a+NOTE_TONE_L sta note_a+NOTE_TONE_L,X
lda note_a+NOTE_TONE_H lda note_a+NOTE_TONE_H,X
adc note_a+NOTE_TONE_SLIDING_H adc note_a+NOTE_TONE_SLIDING_H,X
sta note_a+NOTE_TONE_H sta note_a+NOTE_TONE_H,X
clc clc
lda note_a+NOTE_TONE_L lda note_a+NOTE_TONE_L,X
adc freq_l adc freq_l
sta note_a+NOTE_TONE_L sta note_a+NOTE_TONE_L,X
lda note_a+NOTE_TONE_H lda note_a+NOTE_TONE_H,X
adc note_a+NOTE_TONE_SLIDING_H adc note_a+NOTE_TONE_SLIDING_H,X
and #$0f and #$0f
sta note_a+NOTE_TONE_H sta note_a+NOTE_TONE_H,X
;===================== ;=====================
; handle tone sliding ; handle tone sliding
lda note_a+NOTE_TONE_SLIDE_COUNT lda note_a+NOTE_TONE_SLIDE_COUNT,X
bmi no_tone_sliding ; if (a->tone_slide_count > 0) { bmi no_tone_sliding ; if (a->tone_slide_count > 0) {
dec note_a+NOTE_TONE_SLIDE_COUNT ; a->tone_slide_count--; dec note_a+NOTE_TONE_SLIDE_COUNT,X ; a->tone_slide_count--;
bne no_tone_sliding ; if (a->tone_slide_count==0) { bne no_tone_sliding ; if (a->tone_slide_count==0) {
; a->tone_sliding+=a->tone_slide_step ; a->tone_sliding+=a->tone_slide_step
clc clc
lda note_a+NOTE_TONE_SLIDING_L lda note_a+NOTE_TONE_SLIDING_L,X
adc note_a+NOTE_TONE_SLIDE_STEP_L adc note_a+NOTE_TONE_SLIDE_STEP_L,X
sta note_a+NOTE_TONE_SLIDING_L sta note_a+NOTE_TONE_SLIDING_L,X
lda note_a+NOTE_TONE_SLIDING_H lda note_a+NOTE_TONE_SLIDING_H,X
adc note_a+NOTE_TONE_SLIDE_STEP_H adc note_a+NOTE_TONE_SLIDE_STEP_H,X
sta note_a+NOTE_TONE_SLIDING_H sta note_a+NOTE_TONE_SLIDING_H,X
; a->tone_slide_count = a->tone_slide_delay; ; a->tone_slide_count = a->tone_slide_delay;
lda note_a+NOTE_TONE_SLIDE_DELAY lda note_a+NOTE_TONE_SLIDE_DELAY,X
sta note_a+NOTE_TONE_SLIDE_COUNT sta note_a+NOTE_TONE_SLIDE_COUNT,X
lda note_a+NOTE_SIMPLE_GLISS lda note_a+NOTE_SIMPLE_GLISS,X
bne no_tone_sliding ; if (!a->simplegliss) { bne no_tone_sliding ; if (!a->simplegliss) {
check1: check1:
lda note_a+NOTE_TONE_SLIDE_STEP_H 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 ; lda note_a+NOTE_TONE_SLIDING,X
; cmp note_a+NOTE_TONE_DELTA ; cmp note_a+NOTE_TONE_DELTA,X
; bcc slide_to_note ; (a->tone_sliding <= a->tone_delta)) || ; bcc slide_to_note ; (a->tone_sliding <= a->tone_delta)) ||
; beq slide_to_note ; beq slide_to_note
lda note_a+NOTE_TONE_SLIDING_H ; compare high bytes lda note_a+NOTE_TONE_SLIDING_H,X ; compare high bytes
cmp note_a+NOTE_TONE_DELTA_H cmp note_a+NOTE_TONE_DELTA_H,X
bcc slide_to_note ; if NUM1H < NUM2H then NUM1 < NUM2 bcc slide_to_note ; if NUM1H < NUM2H then NUM1 < NUM2
bne check2 ; if NUM1H <> NUM2H then NUM1 > NUM2 (so NUM1 >= NUM2) bne check2 ; if NUM1H <> NUM2H then NUM1 > NUM2 (so NUM1 >= NUM2)
lda note_a+NOTE_TONE_SLIDING_L ; compare low bytes lda note_a+NOTE_TONE_SLIDING_L,X ; compare low bytes
cmp note_a+NOTE_TONE_DELTA_L cmp note_a+NOTE_TONE_DELTA_L,X
bcc slide_to_note bcc slide_to_note
beq slide_to_note beq slide_to_note
check2: check2:
lda note_a+NOTE_TONE_SLIDE_STEP_H 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 ; lda note_a+NOTE_TONE_SLIDING,X
; cmp note_a+NOTE_TONE_DELTA ; cmp note_a+NOTE_TONE_DELTA,X
; bcc no_tone_sliding ; blt (a->tone_sliding >= a->tone_delta)) { ; bcc no_tone_sliding ; blt (a->tone_sliding >= a->tone_delta)) {
lda note_a+NOTE_TONE_SLIDING_H ; compare high bytes lda note_a+NOTE_TONE_SLIDING_H,X ; compare high bytes
cmp note_a+NOTE_TONE_DELTA_H 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
bne slide_to_note ; if NUM1H <> NUM2H then NUM1 > NUM2 (so NUM1 >= NUM2) bne slide_to_note ; if NUM1H <> NUM2H then NUM1 > NUM2 (so NUM1 >= NUM2)
lda note_a+NOTE_TONE_SLIDING_L ; compare low bytes lda note_a+NOTE_TONE_SLIDING_L,X ; compare low bytes
cmp note_a+NOTE_TONE_DELTA_L cmp note_a+NOTE_TONE_DELTA_L,X
bcc no_tone_sliding ; if NUM1L < NUM2L then NUM1 < NUM2 bcc no_tone_sliding ; if NUM1L < NUM2L then NUM1 < NUM2
slide_to_note: slide_to_note:
lda note_a+NOTE_SLIDE_TO_NOTE lda note_a+NOTE_SLIDE_TO_NOTE,X
sta note_a+NOTE_NOTE ; a->note = a->slide_to_note; sta note_a+NOTE_NOTE,X ; a->note = a->slide_to_note;
lda #0 lda #0
sta note_a+NOTE_TONE_SLIDE_COUNT sta note_a+NOTE_TONE_SLIDE_COUNT,X
sta note_a+NOTE_TONE_SLIDING_L sta note_a+NOTE_TONE_SLIDING_L,X
sta note_a+NOTE_TONE_SLIDING_H sta note_a+NOTE_TONE_SLIDING_H,X
no_tone_sliding: no_tone_sliding:
@ -586,7 +589,7 @@ no_tone_sliding:
lda sample_b1 ; a->amplitude= (b1 & 0xf); lda sample_b1 ; a->amplitude= (b1 & 0xf);
and #$f and #$f
sta note_a+NOTE_AMPLITUDE sta note_a+NOTE_AMPLITUDE,X
; adjust amplitude sliding ; adjust amplitude sliding
@ -598,29 +601,29 @@ no_tone_sliding:
and #$40 and #$40
beq amp_slide_down beq amp_slide_down
amp_slide_up: amp_slide_up:
lda note_a+NOTE_AMPLITUDE_SLIDING lda note_a+NOTE_AMPLITUDE_SLIDING,X
cmp #15 cmp #15
bcs done_amp_sliding ; bge bcs done_amp_sliding ; bge
; if (a->amplitude_sliding < 15) { ; if (a->amplitude_sliding < 15) {
inc note_a+NOTE_AMPLITUDE_SLIDING ; a->amplitude_sliding++; inc note_a+NOTE_AMPLITUDE_SLIDING,X ; a->amplitude_sliding++;
jmp done_amp_sliding jmp done_amp_sliding
amp_slide_down: amp_slide_down:
lda note_a+NOTE_AMPLITUDE_SLIDING lda note_a+NOTE_AMPLITUDE_SLIDING,X
cmp #$f2 ; -14 1111 0010 cmp #$f2 ; -14 1111 0010
bcc done_amp_sliding ; if (a->amplitude_sliding > -15) { bcc done_amp_sliding ; if (a->amplitude_sliding > -15) {
dec note_a+NOTE_AMPLITUDE_SLIDING ; ; a->amplitude_sliding--; dec note_a+NOTE_AMPLITUDE_SLIDING,X ; ; a->amplitude_sliding--;
done_amp_sliding: done_amp_sliding:
; a->amplitude+=a->amplitude_sliding; ; a->amplitude+=a->amplitude_sliding;
clc clc
lda note_a+NOTE_AMPLITUDE lda note_a+NOTE_AMPLITUDE,X
adc note_a+NOTE_AMPLITUDE_SLIDING adc note_a+NOTE_AMPLITUDE_SLIDING,X
sta note_a+NOTE_AMPLITUDE sta note_a+NOTE_AMPLITUDE,X
; clamp amplitude to 0 - 15 ; clamp amplitude to 0 - 15
lda note_a+NOTE_AMPLITUDE lda note_a+NOTE_AMPLITUDE,X
check_amp_lo: check_amp_lo:
bpl check_amp_hi bpl check_amp_hi
lda #0 lda #0
@ -631,7 +634,7 @@ check_amp_hi:
bcc done_clamp_amplitude ; blt bcc done_clamp_amplitude ; blt
lda #15 lda #15
write_clamp_amplitude: write_clamp_amplitude:
sta note_a+NOTE_AMPLITUDE sta note_a+NOTE_AMPLITUDE,X
done_clamp_amplitude: done_clamp_amplitude:
; if (PlParams.PT3.PT3_Version <= 4) ; if (PlParams.PT3.PT3_Version <= 4)
@ -639,27 +642,28 @@ done_clamp_amplitude:
; } ; }
; else { ; else {
lda note_a+NOTE_VOLUME lda note_a+NOTE_VOLUME,X
asl asl
asl asl
asl asl
asl asl
ora note_a+NOTE_AMPLITUDE ora note_a+NOTE_AMPLITUDE,X
tax
lda PT3VolumeTable_35,X tay
sta note_a+NOTE_AMPLITUDE ; a->amplitude = PT3VolumeTable_35[a->volume][a->amplitude]; lda PT3VolumeTable_35,Y
sta note_a+NOTE_AMPLITUDE,X ; a->amplitude = PT3VolumeTable_35[a->volume][a->amplitude];
; } ; }
lda sample_b0 ; if (((b0 & 0x1) == 0) && ( a->envelope_enabled)) { lda sample_b0 ; if (((b0 & 0x1) == 0) && ( a->envelope_enabled)) {
and #$1 and #$1
bne envelope_slide bne envelope_slide
lda note_a+NOTE_ENVELOPE_ENABLED lda note_a+NOTE_ENVELOPE_ENABLED,X
beq envelope_slide beq envelope_slide
lda note_a+NOTE_AMPLITUDE ; a->amplitude |= 16; lda note_a+NOTE_AMPLITUDE,X ; a->amplitude |= 16;
ora #$10 ora #$10
sta note_a+NOTE_AMPLITUDE sta note_a+NOTE_AMPLITUDE,X
envelope_slide: envelope_slide:
@ -680,7 +684,7 @@ envelope_slide_up:
lsr lsr
ora #$f0 ora #$f0
clc clc
adc note_a+NOTE_ENVELOPE_SLIDING adc note_a+NOTE_ENVELOPE_SLIDING,X
sta e_slide_amount ; j = ((b0>>1)|0xF0) + a->envelope_sliding sta e_slide_amount ; j = ((b0>>1)|0xF0) + a->envelope_sliding
jmp envelope_slide_done jmp envelope_slide_done
envelope_slide_down: envelope_slide_down:
@ -688,7 +692,7 @@ envelope_slide_down:
lsr lsr
and #$0f and #$0f
clc clc
adc note_a+NOTE_ENVELOPE_SLIDING adc note_a+NOTE_ENVELOPE_SLIDING,X
sta e_slide_amount ; j = ((b0>>1)&0xF) + a->envelope_sliding; sta e_slide_amount ; j = ((b0>>1)&0xF) + a->envelope_sliding;
envelope_slide_done: envelope_slide_done:
@ -697,7 +701,7 @@ envelope_slide_done:
bit sample_b1 bit sample_b1
beq last_envelope ; if (( b1 & 0x20) != 0) { beq last_envelope ; if (( b1 & 0x20) != 0) {
lda e_slide_amount lda e_slide_amount
sta note_a+NOTE_ENVELOPE_SLIDING ; a->envelope_sliding = j; sta note_a+NOTE_ENVELOPE_SLIDING,X ; a->envelope_sliding = j;
last_envelope: last_envelope:
@ -713,14 +717,14 @@ noise_slide:
lda sample_b0 lda sample_b0
lsr lsr
clc clc
adc note_a+NOTE_NOISE_SLIDING adc note_a+NOTE_NOISE_SLIDING,X
sta pt3_noise_add ; pt3->noise_add = (b0>>1) + a->noise_sliding; sta pt3_noise_add ; pt3->noise_add = (b0>>1) + a->noise_sliding;
lda #$20 lda #$20
bit sample_b1 bit sample_b1
beq noise_slide_done ; if ((b1 & 0x20) != 0) { beq noise_slide_done ; if ((b1 & 0x20) != 0) {
lda pt3_noise_add lda pt3_noise_add
sta note_a+NOTE_NOISE_SLIDING ; noise_sliding = pt3_noise_add sta note_a+NOTE_NOISE_SLIDING,X ; noise_sliding = pt3_noise_add
noise_slide_done: noise_slide_done:
;====================== ;======================
@ -736,28 +740,28 @@ noise_slide_done:
;======================== ;========================
; increment sample position ; increment sample position
inc note_a+NOTE_SAMPLE_POSITION ; a->sample_position++; inc note_a+NOTE_SAMPLE_POSITION,X ; a->sample_position++;
lda note_a+NOTE_SAMPLE_POSITION lda note_a+NOTE_SAMPLE_POSITION,X
cmp note_a+NOTE_SAMPLE_LENGTH cmp note_a+NOTE_SAMPLE_LENGTH,X
bcc sample_pos_ok ; blt bcc sample_pos_ok ; blt
lda note_a+NOTE_SAMPLE_LOOP lda note_a+NOTE_SAMPLE_LOOP,X
sta note_a+NOTE_SAMPLE_POSITION sta note_a+NOTE_SAMPLE_POSITION,X
sample_pos_ok: sample_pos_ok:
;======================== ;========================
; increment ornament position ; increment ornament position
inc note_a+NOTE_ORNAMENT_POSITION ; a->ornament_position++; inc note_a+NOTE_ORNAMENT_POSITION,X ; a->ornament_position++;
lda note_a+NOTE_ORNAMENT_POSITION lda note_a+NOTE_ORNAMENT_POSITION,X
cmp note_a+NOTE_ORNAMENT_LENGTH cmp note_a+NOTE_ORNAMENT_LENGTH,X
bcc ornament_pos_ok ; blt bcc ornament_pos_ok ; blt
lda note_a+NOTE_ORNAMENT_LOOP lda note_a+NOTE_ORNAMENT_LOOP,X
sta note_a+NOTE_SAMPLE_POSITION sta note_a+NOTE_SAMPLE_POSITION,X
ornament_pos_ok: ornament_pos_ok:
@ -770,24 +774,24 @@ done_note:
sta pt3_mixer_value sta pt3_mixer_value
handle_onoff: handle_onoff:
lda note_a+NOTE_ONOFF ;if (a->onoff>0) { lda note_a+NOTE_ONOFF,X ;if (a->onoff>0) {
beq done_onoff beq done_onoff
dec note_a+NOTE_ONOFF ; a->onoff--; dec note_a+NOTE_ONOFF,X ; a->onoff--;
bne done_onoff ; if (a->onoff==0) { bne done_onoff ; if (a->onoff==0) {
lda note_a+NOTE_ENABLED lda note_a+NOTE_ENABLED,X
eor #$1 ; toggle eor #$1 ; toggle
sta note_a+NOTE_ENABLED sta note_a+NOTE_ENABLED,X
bne do_offon bne do_offon
do_onoff: do_onoff:
lda note_a+NOTE_ONOFF_DELAY ; if (a->enabled) a->onoff=a->onoff_delay; lda note_a+NOTE_ONOFF_DELAY,X ; if (a->enabled) a->onoff=a->onoff_delay;
jmp put_offon jmp put_offon
do_offon: do_offon:
lda note_a+NOTE_OFFON_DELAY ; else a->onoff=a->offon_delay; lda note_a+NOTE_OFFON_DELAY,X ; else a->onoff=a->offon_delay;
put_offon: put_offon:
sta note_a+NOTE_ONOFF sta note_a+NOTE_ONOFF,X
done_onoff: done_onoff:
@ -1445,10 +1449,12 @@ pt3_decode_line:
jsr decode_note jsr decode_note
; decode_note(&pt3->b,&(pt3->b_addr),pt3); ; decode_note(&pt3->b,&(pt3->b_addr),pt3);
; jsr decode_note ldx #(NOTE_STRUCT_SIZE*1)
jsr decode_note
; decode_note(&pt3->c,&(pt3->c_addr),pt3); ; decode_note(&pt3->c,&(pt3->c_addr),pt3);
; jsr decode_note ldx #(NOTE_STRUCT_SIZE*2)
jsr decode_note
; if (pt3->a.all_done && pt3->b.all_done && pt3->c.all_done) { ; if (pt3->a.all_done && pt3->b.all_done && pt3->c.all_done) {
; return 1; ; return 1;
@ -1602,12 +1608,12 @@ do_frame:
sta pt3_mixer_value sta pt3_mixer_value
sta pt3_envelope_add sta pt3_envelope_add
lda #0 ; Note A ldx #0 ; Note A
jsr calculate_note
ldx #(NOTE_STRUCT_SIZE*1) ; Note B
jsr calculate_note
ldx #(NOTE_STRUCT_SIZE*2) ; Note C
jsr calculate_note jsr calculate_note
; lda #1 ; Note B
; jsr calculate_note
; lda #2 ; Note C
; jsr calculate_note
; Load up the Frequency Registers ; Load up the Frequency Registers