From 197f9b9e2b972d5a65840204b788ff8876e0b9c4 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Thu, 2 Nov 2023 15:32:58 -0400
Subject: [PATCH] second: use common zx02 library

was already in qload though I hadn't realized it, so use it

saves 150 bytes or so per effect
---
 demos/second/Makefile                       | 4 ++++
 demos/second/part01_intropan/intro.s        | 2 +-
 demos/second/part04_chess_shapes/chess.s    | 2 +-
 demos/second/part08_gorilla/gorilla.s       | 2 +-
 demos/second/part09_leaves/leaves.s         | 2 +-
 demos/second/part10_lens_rotozoom/lens.s    | 2 +-
 demos/second/part13_plasmacube/plasmacube.s | 2 +-
 demos/second/part14_dotbounce/dots.s        | 4 ----
 demos/second/part17_polar/polar.s           | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/demos/second/Makefile b/demos/second/Makefile
index 2c28f404..8d1bc337 100644
--- a/demos/second/Makefile
+++ b/demos/second/Makefile
@@ -190,6 +190,10 @@ qload.inc:	generate_common QLOAD
 	./generate_common -a 0x1200 -s clear_bottoms qload.lst >> qload.inc
 	./generate_common -a 0x1200 -s clear_screens qload.lst >> qload.inc
 	./generate_common -a 0x1200 -s clear_top qload.lst >> qload.inc
+	./generate_common -a 0x1200 -s zx02_full_decomp qload.lst >> qload.inc
+	./generate_common -a 0x1200 -s zx_src_h qload.lst >> qload.inc
+	./generate_common -a 0x1200 -s zx_src_l qload.lst >> qload.inc
+
 
 #	./generate_common -a 0x1200 -s mockingboard_patch qload.lst >> qload.inc
 #	./generate_common -a 0x1200 -s mockingboard_init qload.lst >> qload.inc
diff --git a/demos/second/part01_intropan/intro.s b/demos/second/part01_intropan/intro.s
index ce04e29e..9cf79833 100644
--- a/demos/second/part01_intropan/intro.s
+++ b/demos/second/part01_intropan/intro.s
@@ -175,7 +175,7 @@ done_intro:
 
 ;.align $100
 	.include	"../wait_keypress.s"
-	.include	"../zx02_optim.s"
+;	.include	"../zx02_optim.s"
 	.include	"../hgr_table.s"
 	.include	"../hgr_clear_screen.s"
 	.include	"horiz_scroll.s"
diff --git a/demos/second/part04_chess_shapes/chess.s b/demos/second/part04_chess_shapes/chess.s
index b2011cbf..ae080215 100644
--- a/demos/second/part04_chess_shapes/chess.s
+++ b/demos/second/part04_chess_shapes/chess.s
@@ -385,7 +385,7 @@ main_interference_done:
 
 ;.align $100
 	.include	"../wait_keypress.s"
-	.include	"../zx02_optim.s"
+;	.include	"../zx02_optim.s"
 ;	.include	"../hgr_table.s"
 	.include	"../hgr_clear_screen.s"
 	.include	"../hgr_copy_fast.s"
diff --git a/demos/second/part08_gorilla/gorilla.s b/demos/second/part08_gorilla/gorilla.s
index ed08fa62..da034eb1 100644
--- a/demos/second/part08_gorilla/gorilla.s
+++ b/demos/second/part08_gorilla/gorilla.s
@@ -81,7 +81,7 @@ gorilla_done:
 
 .align $100
 	.include	"../wait_keypress.s"
-	.include	"../zx02_optim.s"
+;	.include	"../zx02_optim.s"
 ;	.include	"../hgr_table.s"
 	.include	"../hgr_clear_screen.s"
 	.include	"../hgr_copy_fast.s"
diff --git a/demos/second/part09_leaves/leaves.s b/demos/second/part09_leaves/leaves.s
index 6362730a..6ef65a6f 100644
--- a/demos/second/part09_leaves/leaves.s
+++ b/demos/second/part09_leaves/leaves.s
@@ -77,7 +77,7 @@ leaves_done:
 
 .align $100
 	.include	"../wait_keypress.s"
-	.include	"../zx02_optim.s"
+;	.include	"../zx02_optim.s"
 ;	.include	"../hgr_table.s"
 	.include	"../hgr_clear_screen.s"
 	.include	"../hgr_copy_fast.s"
diff --git a/demos/second/part10_lens_rotozoom/lens.s b/demos/second/part10_lens_rotozoom/lens.s
index fe87b4e0..f065d0f7 100644
--- a/demos/second/part10_lens_rotozoom/lens.s
+++ b/demos/second/part10_lens_rotozoom/lens.s
@@ -230,7 +230,7 @@ lens_end:
 .include "../multiply_fast.s"
 
 	.include	"../wait_keypress.s"
-	.include	"../zx02_optim.s"
+;	.include	"../zx02_optim.s"
 	.include	"../irq_wait.s"
 	.include	"gr_putsprite_mask.s"
 	.include	"../audio.s"
diff --git a/demos/second/part13_plasmacube/plasmacube.s b/demos/second/part13_plasmacube/plasmacube.s
index a3114d91..a92c1a1f 100644
--- a/demos/second/part13_plasmacube/plasmacube.s
+++ b/demos/second/part13_plasmacube/plasmacube.s
@@ -513,7 +513,7 @@ mask_src_table:
 	.byte	$7C-8,$78-8,$74-8,$70-8,$6C-8,$68-8,$64-8,$60-8
 
 .include "../wait_keypress.s"
-.include "../zx02_optim.s"
+;.include "../zx02_optim.s"
 .include "../irq_wait.s"
 
 mask1_data:
diff --git a/demos/second/part14_dotbounce/dots.s b/demos/second/part14_dotbounce/dots.s
index 1bd86f89..641a32c0 100644
--- a/demos/second/part14_dotbounce/dots.s
+++ b/demos/second/part14_dotbounce/dots.s
@@ -130,10 +130,6 @@ dots_done:
 
 
 	.include	"../wait_keypress.s"
-;	.include	"../zx02_optim.s"
-;	.include	"../hgr_table.s"
-;	.include	"../hgr_clear_screen.s"
-;	.include	"../hgr_copy_fast.s"
 
 	.include	"../irq_wait.s"
 
diff --git a/demos/second/part17_polar/polar.s b/demos/second/part17_polar/polar.s
index a6069fc1..5c12f234 100644
--- a/demos/second/part17_polar/polar.s
+++ b/demos/second/part17_polar/polar.s
@@ -81,7 +81,7 @@ polar_done:
 
 
 	.include	"../wait_keypress.s"
-	.include	"../zx02_optim.s"
+;	.include	"../zx02_optim.s"
 	.include	"../hgr_clear_screen.s"
 	.include	"../hgr_copy_fast.s"
 	.include	"../irq_wait.s"