From 668bfcca8b7a66ecbf65d01e7a8558744453b1cd Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sun, 4 Feb 2024 23:33:29 -0500
Subject: [PATCH] lovebyte: rs update final version

---
 .../lovebyte2024/rainbow_squares_128/Makefile | 17 ++++----
 .../rainbow_squares_128/file_id.diz           | 18 ++++++++
 .../rainbow_squares_128/hello.bas             |  5 ++-
 .../rainbow_squares_128/rainbow_squares.s     | 41 ++++++++++---------
 4 files changed, 51 insertions(+), 30 deletions(-)
 create mode 100644 demos/lovebyte2024/rainbow_squares_128/file_id.diz

diff --git a/demos/lovebyte2024/rainbow_squares_128/Makefile b/demos/lovebyte2024/rainbow_squares_128/Makefile
index bff702ac..02c32076 100644
--- a/demos/lovebyte2024/rainbow_squares_128/Makefile
+++ b/demos/lovebyte2024/rainbow_squares_128/Makefile
@@ -17,15 +17,14 @@ rainbow_squares.dsk:	HELLO RAINBOW_SQUARES
 submit:	rainbow_squares.zip
 
 rainbow_squares.zip:	RAINBOW_SQUARES rainbow_squares.s file_id.diz rainbow_squares.dsk
-	mkdir -p lovebyte2023_rainbow_squares
-	cp RAINBOW_SQUARES ./lovebyte2023_rainbow_squares
-	cp rainbow_squares.s ./lovebyte2023_rainbow_squares
-	cp file_id.diz ./lovebyte2023_rainbow_squares
-	cp rainbow_squares.dsk ./lovebyte2023_rainbow_squares
-	cp monitor.txt ./lovebyte2023_rainbow_squares
-	cp rainbow_squares_screen.png ./lovebyte2023_rainbow_squares
-	cp rainbow_squares_720p.mp4 ./lovebyte2023_rainbow_squares
-	zip -r rainbow_squares.zip lovebyte2023_rainbow_squares
+	mkdir -p lovebyte2024_rainbow_squares
+	cp RAINBOW_SQUARES ./lovebyte2024_rainbow_squares
+	cp rainbow_squares.s ./lovebyte2024_rainbow_squares
+	cp file_id.diz ./lovebyte2024_rainbow_squares
+	cp rainbow_squares.dsk ./lovebyte2024_rainbow_squares
+	cp rainbow_squares_screen.png ./lovebyte2024_rainbow_squares
+	cp rainbow_squares_720p.mp4 ./lovebyte2024_rainbow_squares
+	zip -r rainbow_squares.zip lovebyte2024_rainbow_squares
 
 ####
 
diff --git a/demos/lovebyte2024/rainbow_squares_128/file_id.diz b/demos/lovebyte2024/rainbow_squares_128/file_id.diz
new file mode 100644
index 00000000..482ea60f
--- /dev/null
+++ b/demos/lovebyte2024/rainbow_squares_128/file_id.diz
@@ -0,0 +1,18 @@
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+ RAINBOW_SQUARES 128
+-------------------------------------
+
+by Deater / dSr
+
+123-byte Intro for Apple II
+(Apple II has a 4-byte header)
+Lovebyte 2024
+
+Some rainbow-backed squares with
+ also some "sound".
+
+This is a frozen scene from a
+Sierpinski rotozoom (loosely
+based on the one in Hellmood's
+Memories)
+
diff --git a/demos/lovebyte2024/rainbow_squares_128/hello.bas b/demos/lovebyte2024/rainbow_squares_128/hello.bas
index 0d155477..082f889c 100644
--- a/demos/lovebyte2024/rainbow_squares_128/hello.bas
+++ b/demos/lovebyte2024/rainbow_squares_128/hello.bas
@@ -1,5 +1,8 @@
 5 HOME
-10 PRINT "  RAINBOW_SQUARES"
+10 PRINT "          -= RAINBOW_SQUARES =-"
+12 PRINT "           ------------------- "
+15 PRINT "            FOR LOVEBYTE 2024"
+17 PRINT "             BY DEATER / DSR"
 20 PRINT CHR$(4)"CATALOG"
 25 PRINT:PRINT "PRESS ANY KEY TO 'BRUN RAINBOW_SQUARES'"
 30 GET A$
diff --git a/demos/lovebyte2024/rainbow_squares_128/rainbow_squares.s b/demos/lovebyte2024/rainbow_squares_128/rainbow_squares.s
index 900738e9..e09d2b05 100644
--- a/demos/lovebyte2024/rainbow_squares_128/rainbow_squares.s
+++ b/demos/lovebyte2024/rainbow_squares_128/rainbow_squares.s
@@ -16,6 +16,7 @@ COLOR		= $30
 HGR_X		= $E0
 HGR_Y		= $E2
 HGR_COLOR	= $E4
+HGR_PAGE	= $E6
 
 ;XX	=	$F7
 XX_TH	=	$F8
@@ -23,7 +24,7 @@ XX_TL	=	$F9
 ;YY	=	$FA
 YY_TH	=	$FB
 YY_TL	=	$FC
-FRAME	=	$FD
+WAIT_TIME=	$FD
 SAVED	=	$FF
 
 ; Soft switches
@@ -46,7 +47,6 @@ WAIT    = $FCA8                 ; delay 1/2(26+27A+5A^2) us
 	;================================
 rainbow_squares:
 	jsr	HGR		; set FULLGR, sets A=0,Y=0
-	sta	FRAME		; init frame
 
 rainbow_outer:
 	; Y=0 from both paths
@@ -109,7 +109,7 @@ rainbow_xloop:
 
 	beq	white
 black:
-	bit	$C030
+	bit	$C030			; make some noise
 	lda	#00	; black
 	.byte	$2C	; bit trick
 white:
@@ -132,7 +132,8 @@ white:
 	ldx	HGR_X
 
 	inx		; XX
-	cpx	#255
+;	cpx	#255
+;	bne	rainbow_xloop
 	bne	rainbow_xloop
 
 	iny		; YY
@@ -142,39 +143,39 @@ white:
 	; inc T
 	inc	T_L
 
-;	clc
-;	lda	T_L
-;blah_smc:
-;	adc	#1
-;	sta	T_L
-;	bcc	no_carry
-;	inc	T_H
-;no_carry:
-
 	; done frame
 
+	; only draw two frames
 
 
-	inc	FRAME
-	lda	FRAME
-	cmp	#2
-	beq	really_done
+
+	lda	HGR_PAGE	; see if on page2 yet
+	cmp	#$40
+	beq	really_done	; if so, skip to end
 
 	jsr	HGR2
+
 	; A/Y=0
 
-	beq	rainbow_outer	; what can we branch on?
+	beq	rainbow_outer	;
+
+reset_wait:
+	lda	#$D0
+	sta	WAIT_TIME
 
 really_done:
 
 	bit	PAGE1
 
-	lda	#200
+	lda	WAIT_TIME
 	jsr	WAIT
 
+	inc	WAIT_TIME
+	beq	reset_wait
+
 	bit	PAGE2
 
-	lda	#200
+	lda	WAIT_TIME
 	jsr	WAIT
 
 	beq	really_done	; bra