From 2385c53473b017dc6d0fb49c11ba99ec03d2b12f Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Wed, 23 May 2018 23:49:18 -0400
Subject: [PATCH] sa: add 4-channel KR4 file

---
 still_alive/README.still_alive  |   6 +--
 still_alive/SA.KR4              | Bin 0 -> 8833 bytes
 still_alive/interrupt_handler.s |  89 ++++++++++++++++++++------------
 still_alive/still_alive.s       |   2 +-
 4 files changed, 60 insertions(+), 37 deletions(-)
 create mode 100644 still_alive/SA.KR4

diff --git a/still_alive/README.still_alive b/still_alive/README.still_alive
index 004df14a..cb13fb3b 100644
--- a/still_alive/README.still_alive
+++ b/still_alive/README.still_alive
@@ -24,13 +24,13 @@ initial 40 col support:				18864
 have art loading properly 40col:		18910
 lz4 encode the ascii art:			15529
 revert because lz4 code not re-entrant:		18910
-
+add 4-channel music (KR4):			20128
 
 
 Memory Map
 
 
 Lowmem:		4k
-Code:		16k (8k=audio, 5k=lyrics, 3k=art)
+Code:		20k (8k=audio, 5k=lyrics, 3k=art)
 Sound buffers:	14k
-Sound buffer2:	14k?
+
diff --git a/still_alive/SA.KR4 b/still_alive/SA.KR4
new file mode 100644
index 0000000000000000000000000000000000000000..1e9a61fb3eecc0cbb5c6fc32efa8abbb41593278
GIT binary patch
literal 8833
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
LUJtv$ZAtWh$D^uN

literal 0
HcmV?d00001

diff --git a/still_alive/interrupt_handler.s b/still_alive/interrupt_handler.s
index 1b0d8b37..344fd17c 100644
--- a/still_alive/interrupt_handler.s
+++ b/still_alive/interrupt_handler.s
@@ -1,6 +1,6 @@
 	;================================
 	;================================
-	; mockingboard interrupt handler
+	; mockingboard KR4 interrupt handler
 	;================================
 	;================================
 	; On Apple II/6502 the interrupt handler jumps to address in 0xfffe
@@ -45,57 +45,57 @@ mb_write_frame:
 	; loop through the 14 registers
 	; reading the value, then write out
 	;==================================
-	; inlined "write_ay_both" to save up to 156 (12*13) cycles
-	; unrolled
+
+	; This is actually a KRW4 player
+	; plays 4 channels, right is 123, left is 143
+	; used for converted MOD files
+	; To save space also no envelope support
 
 mb_write_loop:
 	lda	REGISTER_DUMP,X	; load register value			; 4
 	cmp	REGISTER_OLD,X	; compare with old values		; 4
-	beq	mb_no_write						; 3/2nt
-								;=============
-								; typ 11
-
-	; special case R13.  If it is 0xff, then don't update
-	; otherwise might spuriously reset the envelope settings
-
-	cpx	#13							; 2
-	bne	mb_not_13						; 3/2nt
-	cmp	#$ff							; 2
-	beq	mb_skip_13						; 3/2nt
-								;============
-								; typ 5
-mb_not_13:
+	beq	mb_no_write_left						; 3/2nt
 
 	; address
 	stx	MOCK_6522_ORA1		; put address on PA1		; 4
-	stx	MOCK_6522_ORA2		; put address on PA2		; 4
 	lda	#MOCK_AY_LATCH_ADDR	; latch_address for PB1		; 2
 	sta	MOCK_6522_ORB1		; latch_address on PB1          ; 4
-	sta	MOCK_6522_ORB2		; latch_address on PB2		; 4
 	lda	#MOCK_AY_INACTIVE	; go inactive			; 2
 	sta	MOCK_6522_ORB1						; 4
-	sta	MOCK_6522_ORB2						; 4
 
         ; value
 	lda	REGISTER_DUMP,X		; load register value		; 4
 	sta	MOCK_6522_ORA1		; put value on PA1		; 4
-	sta	MOCK_6522_ORA2		; put value on PA2		; 4
 	lda	#MOCK_AY_WRITE		;				; 2
 	sta	MOCK_6522_ORB1		; write on PB1			; 4
-	sta	MOCK_6522_ORB2		; write on PB2			; 4
 	lda	#MOCK_AY_INACTIVE	; go inactive			; 2
 	sta	MOCK_6522_ORB1						; 4
+
+mb_no_write_left:
+
+	lda	REGISTER_DUMP2,X; load register value			; 4
+	cmp	REGISTER_OLD2,X	; compare with old values		; 4
+	beq	mb_no_write_right					; 3/2nt
+
+	; address
+	stx	MOCK_6522_ORA2		; put address on PA2		; 4
+	lda	#MOCK_AY_LATCH_ADDR	; latch_address for PB1		; 2
+	sta	MOCK_6522_ORB2		; latch_address on PB2		; 4
+	lda	#MOCK_AY_INACTIVE	; go inactive			; 2
 	sta	MOCK_6522_ORB2						; 4
 
-								;===========
-								; 	62
-mb_no_write:
+        ; value
+	lda	REGISTER_DUMP2,X	; load register value		; 4
+	sta	MOCK_6522_ORA2		; put value on PA2		; 4
+	lda	#MOCK_AY_WRITE		;				; 2
+	sta	MOCK_6522_ORB2		; write on PB2			; 4
+	lda	#MOCK_AY_INACTIVE	; go inactive			; 2
+	sta	MOCK_6522_ORB2						; 4
+
+mb_no_write_right:
 	inx				; point to next register	; 2
-	cpx	#14			; if 14 we're done		; 2
+	cpx	#12			; if 14 we're done		; 2
 	bmi	mb_write_loop		; otherwise, loop		; 3/2nt
-								;============
-								; 	7
-mb_skip_13:
 
 
 	;=====================================
@@ -105,10 +105,10 @@ mb_skip_13:
 mb_reg_copy:
 	lda	REGISTER_DUMP,X	; load register value			; 4
 	sta	REGISTER_OLD,X	; compare with old values		; 4
+	lda	REGISTER_DUMP2,X; load register value			; 4
+	sta	REGISTER_OLD2,X	; compare with old values		; 4
 	dex								; 2
 	bpl	mb_reg_copy						; 2nt/3
-								;=============
-								; 	171
 
 	;===================================
 	; Load all 14 registers in advance
@@ -125,9 +125,29 @@ mb_load_values:
 
 mb_load_loop:
 	lda	(INL),y		; load register value			; 5
+
+	cpx	#11
+	bne	mb_load12
+mb_load11:
+	sta	REGISTER_DUMP2+2
+	jmp	mb_done_load
+mb_load12:
+	cpx	#12
+	bne	mb_load13
+	sta	REGISTER_DUMP2+3
+	jmp	mb_done_load
+mb_load13:
+	cpx	#12
+	bne	mb_regular_load
+	sta	REGISTER_DUMP2+9
+	jmp	mb_done_load
+mb_regular_load:
 	sta	REGISTER_DUMP,X						; 4
-								;============
-								;	9
+	sta	REGISTER_DUMP2,X
+
+mb_done_load:
+
+
 	;====================
 	; point to next page
 	;====================
@@ -340,3 +360,6 @@ exit_interrupt:
 
 REGISTER_OLD:
 	.byte	0,0,0,0,0,0,0,0,0,0,0,0,0,0
+
+REGISTER_OLD2:
+	.byte	0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/still_alive/still_alive.s b/still_alive/still_alive.s
index 9f19c97b..2de2efdf 100644
--- a/still_alive/still_alive.s
+++ b/still_alive/still_alive.s
@@ -354,5 +354,5 @@ lyrics:
 .include	"ascii_art.inc"
 
 LZ4_BUFFER:
-.incbin		"SA.KRW"
+.incbin		"SA.KR4"