From e4b22152887b6bdf591bd9a44859a26617c73bae Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Tue, 6 Feb 2024 23:03:20 -0500
Subject: [PATCH] lovebyte: more work on submissions

---
 demos/lovebyte2024/dsr_wires_256/Makefile     |   9 ++++----
 demos/lovebyte2024/plasma/Makefile            |   3 ++-
 demos/lovebyte2024/plasma/graphics/Makefile   |  20 ++++++++++++++++++
 .../lovebyte2024/plasma/graphics/dsr_big.png  | Bin 0 -> 680 bytes
 demos/lovebyte2024/plasma/plasmag_tiny.s      |   6 ++++++
 demos/lovebyte2024/plasma/zp.inc              |   8 +++++++
 demos/lovebyte2024/spiral_32/hello.bas        |   7 ------
 demos/lovebyte2024/spiral_32/monitor.txt      |   4 ----
 .../Makefile                                  |   0
 .../file_id.diz                               |   0
 .../lovebyte2024/spiraling_shape_32/hello.bas |  10 +++++++++
 .../spiraling_shape_32/monitor.txt            |   4 ++++
 .../spiral_32.s                               |   0
 13 files changed, 54 insertions(+), 17 deletions(-)
 create mode 100644 demos/lovebyte2024/plasma/graphics/Makefile
 create mode 100644 demos/lovebyte2024/plasma/graphics/dsr_big.png
 delete mode 100644 demos/lovebyte2024/spiral_32/hello.bas
 delete mode 100644 demos/lovebyte2024/spiral_32/monitor.txt
 rename demos/lovebyte2024/{spiral_32 => spiraling_shape_32}/Makefile (100%)
 rename demos/lovebyte2024/{spiral_32 => spiraling_shape_32}/file_id.diz (100%)
 create mode 100644 demos/lovebyte2024/spiraling_shape_32/hello.bas
 create mode 100644 demos/lovebyte2024/spiraling_shape_32/monitor.txt
 rename demos/lovebyte2024/{spiral_32 => spiraling_shape_32}/spiral_32.s (100%)

diff --git a/demos/lovebyte2024/dsr_wires_256/Makefile b/demos/lovebyte2024/dsr_wires_256/Makefile
index abcb27af..9f4bab38 100644
--- a/demos/lovebyte2024/dsr_wires_256/Makefile
+++ b/demos/lovebyte2024/dsr_wires_256/Makefile
@@ -16,15 +16,14 @@ dsr_wires.dsk:	HELLO DSR_WIRES
 
 submit:	dsr_wires.zip
 
-dsr_wires.zip:	DSR_WIRES dsr_wires file_id.diz dsr_wires.dsk
+dsr_wires.zip:	DSR_WIRES dsr_wires.s file_id.diz dsr_wires.dsk
 	mkdir -p lovebyte2024_wires
 	cp DSR_WIRES ./lovebyte2024_wires
-	cp dsr_wires ./lovebyte2024_wires
+	cp dsr_wires.s ./lovebyte2024_wires
 	cp file_id.diz ./lovebyte2024_wires
 	cp dsr_wires.dsk ./lovebyte2024_wires
-	cp monitor.txt ./lovebyte2024_wires
-	cp wires_screen.png ./lovebyte2024_wires
-	cp wires_720p.mp4 ./lovebyte2024_wires
+	cp dsr_wires_screen.png ./lovebyte2024_wires
+	cp dsr_wires_720p.mp4 ./lovebyte2024_wires
 	zip -r dsr_wires.zip lovebyte2024_wires
 
 ####
diff --git a/demos/lovebyte2024/plasma/Makefile b/demos/lovebyte2024/plasma/Makefile
index 83c7d4bf..8ac2c18c 100644
--- a/demos/lovebyte2024/plasma/Makefile
+++ b/demos/lovebyte2024/plasma/Makefile
@@ -22,7 +22,8 @@ HELLO:	hello.bas
 PLASMAG_TINY:	plasmag_tiny.o
 	ld65 -o PLASMAG_TINY plasmag_tiny.o -C $(LINKERSCRIPTS)/apple2_4000.inc
 
-plasmag_tiny.o:	plasmag_tiny.s gr_gbascalc.s make_tables.s
+plasmag_tiny.o:	plasmag_tiny.s gr_gbascalc.s make_tables.s \
+	graphics/dsr_big.gr.zx02
 	ca65 -o plasmag_tiny.o plasmag_tiny.s -l plasmag_tiny.lst
 
 ###
diff --git a/demos/lovebyte2024/plasma/graphics/Makefile b/demos/lovebyte2024/plasma/graphics/Makefile
new file mode 100644
index 00000000..b109b306
--- /dev/null
+++ b/demos/lovebyte2024/plasma/graphics/Makefile
@@ -0,0 +1,20 @@
+include ../../../../Makefile.inc
+
+ZX02 = ~/research/6502_compression/zx02.git/build/zx02
+PNG2GR = ../../../../utils/gr-utils/png2gr
+
+all:	dsr_big.gr.zx02
+
+
+####
+
+dsr_big.gr:	dsr_big.png
+	$(PNG2GR) dsr_big.png dsr_big.gr
+
+dsr_big.gr.zx02:	dsr_big.gr
+	$(ZX02) dsr_big.gr dsr_big.gr.zx02
+
+####
+
+clean:
+	rm -f *~
diff --git a/demos/lovebyte2024/plasma/graphics/dsr_big.png b/demos/lovebyte2024/plasma/graphics/dsr_big.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f1c94c9cdf77626580a3dcab5924d221f3af261
GIT binary patch
literal 680
zcmV;Z0$2TsP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004lX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>9WW4hAgZkfC<6i;6hbDionYs1;guFdzMbCJjl7
zi=*ILaPVWX>fqw6tAnc`2!4RLx;QDiNQwVT3N2zhIPS;0dyl(!0N1K1n$?#CG~G6{
z>6DN!tO}u5gb~FEc*G^eGUh}v1K;s=j{sZm5-iLA+@E7mEm{f?5QvkCVcNtS#50?=
z!FZpTS1OW9d`>)J(glehnJ#<$#<=V<$1-^{mz^i(iG^|x%RQ`AOpSP&IHqbk<#TzD
zRmNM4wOT{z+>^a9Qq)(LnND*IX)Iz1A_T~2po$u7Bxu!1v5=+xl#hSZ^^4?^$yJ3y
zjs?`AL2~_IfAG6ot28y~B}Gy||BK^%j02%vpxtzw?_<Ylp8&yU;7afM>n&jRlk{d+
ziyZ+&+rY(jSCjXE%N-#4WJspuN<o@jsRX>A(Ki)<;aecQ=JnRu$LRx*qpmVHz`-F9
zFH`oq&$|bDd;9lHr@tS%uX4j@<$mD+001*kOjJbx00842U|>$Y|3v)&qhOqzoD|Rf
z(8K>=as&TrJe{4L|Dezm^*qqsjdK6c|Ns90005njhJXM7010qNS#tmY7)$^F7<2)j
zs6Ze9000McNliru=mG`;1|SF6Y|{V$02y>eSad^gZEa<4bO1wgWnpw>WFU8GbZ8()
zNlj2!fese{002};L_t(Y$7A59GGG`raMZwIZ6E`MVAMc}fhd8CrjS^5Bi%p@Nn#^n
z)IbzLTnfpK<xvCiMig0*G6D?57XidX-bgoav|gsnz|r>MsDYyf;sF4<yq{smr1Xpc
O0000<MNUMnLSTa8$R{`e

literal 0
HcmV?d00001

diff --git a/demos/lovebyte2024/plasma/plasmag_tiny.s b/demos/lovebyte2024/plasma/plasmag_tiny.s
index e138ef7b..3b575cce 100644
--- a/demos/lovebyte2024/plasma/plasmag_tiny.s
+++ b/demos/lovebyte2024/plasma/plasmag_tiny.s
@@ -206,5 +206,11 @@ lores_colors_lookup:
 .include "interrupt_handler.s"
 .include "mockingboard_constants.s"
 
+.include "zx02_optim.s"
+
+; graphics
+dsr_big:
+.incbin		"graphics/dsr_big.gr.zx02"
+
 ; music
 .include        "mA2E_2.s"
diff --git a/demos/lovebyte2024/plasma/zp.inc b/demos/lovebyte2024/plasma/zp.inc
index 938ac24c..90d6eaec 100644
--- a/demos/lovebyte2024/plasma/zp.inc
+++ b/demos/lovebyte2024/plasma/zp.inc
@@ -1,5 +1,13 @@
 ; zero page
 
+; zx02
+
+offset          = $00
+ZX0_src         = $02
+ZX0_dst         = $04
+bitr            = $06
+pntr            = $07
+
 ; pre-defined applesoft vars
 
 CH      = $24
diff --git a/demos/lovebyte2024/spiral_32/hello.bas b/demos/lovebyte2024/spiral_32/hello.bas
deleted file mode 100644
index f0e1d71c..00000000
--- a/demos/lovebyte2024/spiral_32/hello.bas
+++ /dev/null
@@ -1,7 +0,0 @@
-5 HOME
-10 PRINT "  SPIRAL_32"
-20 PRINT CHR$(4)"CATALOG"
-25 PRINT:PRINT "PRESS ANY KEY TO 'BRUN SPIRAL_32'"
-30 GET A$
-35 PRINT
-40 PRINT CHR$(4)"BRUN SPIRAL_32"
diff --git a/demos/lovebyte2024/spiral_32/monitor.txt b/demos/lovebyte2024/spiral_32/monitor.txt
deleted file mode 100644
index da191a34..00000000
--- a/demos/lovebyte2024/spiral_32/monitor.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-CALL -151
-E8: 20 D8 F3 2C 30 C0 A8 A2  8C A9 60 20 11 F4 A2 DF
-F8: A0 E2 E6 FE A9 01 29 7F  85 E7 20 5D F6 F0 E4
-E8G
diff --git a/demos/lovebyte2024/spiral_32/Makefile b/demos/lovebyte2024/spiraling_shape_32/Makefile
similarity index 100%
rename from demos/lovebyte2024/spiral_32/Makefile
rename to demos/lovebyte2024/spiraling_shape_32/Makefile
diff --git a/demos/lovebyte2024/spiral_32/file_id.diz b/demos/lovebyte2024/spiraling_shape_32/file_id.diz
similarity index 100%
rename from demos/lovebyte2024/spiral_32/file_id.diz
rename to demos/lovebyte2024/spiraling_shape_32/file_id.diz
diff --git a/demos/lovebyte2024/spiraling_shape_32/hello.bas b/demos/lovebyte2024/spiraling_shape_32/hello.bas
new file mode 100644
index 00000000..43143509
--- /dev/null
+++ b/demos/lovebyte2024/spiraling_shape_32/hello.bas
@@ -0,0 +1,10 @@
+5 HOME
+10 PRINT "    -= SPIRALING SHAPE - 32 BYTES =-"
+12 PRINT "      ----------------------------"
+13 PRINT "             BY: DEATER/DSR"
+14 PRINT "             LOVEBYTE  2024"
+20 PRINT CHR$(4)"CATALOG"
+25 PRINT:PRINT "PRESS ANY KEY TO 'BRUN SPIRAL_32'"
+30 GET A$
+35 PRINT
+40 PRINT CHR$(4)"BRUN SPIRAL_32"
diff --git a/demos/lovebyte2024/spiraling_shape_32/monitor.txt b/demos/lovebyte2024/spiraling_shape_32/monitor.txt
new file mode 100644
index 00000000..836ec010
--- /dev/null
+++ b/demos/lovebyte2024/spiraling_shape_32/monitor.txt
@@ -0,0 +1,4 @@
+CALL -151
+E9: 20 D8 F3 2C 30 C0 A8 A2  8C A9 60 20 11 F4 A2 DF
+F9: A0 E2 E6 FE A9 01 29 7F  85 E7 20 5D F6 F0 E4
+E9G
diff --git a/demos/lovebyte2024/spiral_32/spiral_32.s b/demos/lovebyte2024/spiraling_shape_32/spiral_32.s
similarity index 100%
rename from demos/lovebyte2024/spiral_32/spiral_32.s
rename to demos/lovebyte2024/spiraling_shape_32/spiral_32.s