From 07dc31e38600ec5d0b76543a5313f111c1fd8c13 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sat, 13 Feb 2021 22:20:30 -0500
Subject: [PATCH] wires: update

---
 basic/appleiibot/wires.bas     |  2 +-
 graphics/gr/plasma/wires_bot.s | 37 ++++++++++++++++++++--------------
 graphics/gr/plasma/zp.inc      |  3 +++
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/basic/appleiibot/wires.bas b/basic/appleiibot/wires.bas
index 13af730f..0a6f52f1 100644
--- a/basic/appleiibot/wires.bas
+++ b/basic/appleiibot/wires.bas
@@ -1,2 +1,2 @@
 1FORI=0TO140:POKE875+I,4*PEEK(2125+I)-192+(PEEK(2266+I/3)-35)/4^(I-INT(I/3)*3):NEXT
-2&",cl9E`V3Q/6m^U3QWl?WL60202ZQV0>b4kj_0@`(i1^U:2W0@jd^Xa,k0j_E_B1D^0M9R802,1QePBU3T0XlO;8=mY8J0N9X5U:21oY_03_2V/Z.Y_a/Q463nR4aHZV1`1UI>lMA.84G0S+4C^)'K-)+$#S3*#Z6#'`QK=K/%+6*06*)W;<BC#DUObE_
+2&",clZ48jl;=^X-QWh?WD>2(02TQV,?V*>b2j_0@`(i1^U:2W0>bd^Xa,k0j_E_B1D^0M9R802,1QePBU3T0XlO;8=mY8J0N9X5U:21oY_03_2V/Z.Y_a/Q463nR4aHZV1`4VI>lMA.84G0S$/E>3CM;3C+#S3*+Z6#'`QK=K/%+6*06*)W;<BC#DUCbE_
diff --git a/graphics/gr/plasma/wires_bot.s b/graphics/gr/plasma/wires_bot.s
index af10c4b2..e23879e5 100644
--- a/graphics/gr/plasma/wires_bot.s
+++ b/graphics/gr/plasma/wires_bot.s
@@ -7,6 +7,10 @@
 ; 148 -- use $10 instead of $ff for black color
 ; 147 -- optimize color code
 ; 143 -- use 15x15 grid instead of 7x7
+; 138 -- re-wrote clear screen code
+; 144 -- back to original layout
+; 142 -- jump to earlier BGND entry point
+; 141 -- start at $FF even though it misses upper left
 
 ; goal=141
 
@@ -25,22 +29,26 @@ plasma:
 ;	bit	SET_GR
 ;	bit	FULLGR		; make it 40x48
 
-	jsr	$F3D8		; HGR2
-	bit	LORES
+	jsr	$F3D8		; HGR2 (and full screen), set HGRPAGE to $40
+				; after, A is #$60
+	lda	#$10		; want to write $10 to memory
+;	sta	HGRBITS
+
+	jsr	$F3F4		; does the store, is this allowed?
+
+;	jsr	$F3F6		; BKGND
+
+	bit	LORES		; switch to lo-res
 
-;	lda	#$20
-;	sta	HGRPAGE
-	lda	#$10
-;	lsr
-	sta	HGRBITS
-	jsr	$F3F6		; BKGND
 
 	; we only create a 16x16 texture, which we pattern across 40x48 screen
 
 
 ; need to beat 30 bytes
 
-	ldx	#15	; store at 15,x and x,15
+
+	ldx	#15	; store at 15,x 8,x
+			;	and x,15 x,8
 			; 240+x, (x*16),15
 
 write_loop:
@@ -54,11 +62,10 @@ write_loop:
 	asl
 	asl
 
-;	clc
-
 	tay
 	txa
 	sta	lookup,Y
+	sta	lookup+8,Y
 
 	dex
 	bpl	write_loop
@@ -73,7 +80,7 @@ write_loop:
 ;	; vertical
 ;	txa
 ;;	and	#$7
-;	bne	horiz
+;	bne	horizh
 ;
 ;xnot:
 ;	tya
@@ -101,7 +108,7 @@ write_loop:
 ;	dey
 ;	bpl	create_yloop
 
-	; X and Y both $FF
+	; X is $FF
 
 create_lookup_done:
 
@@ -115,7 +122,7 @@ cycle_colors:
 
 	; X is $FF when arriving here
 ;	ldx	#0
-	inx	; make X 0
+;	inx	; make X 0
 cycle_loop:
 	ldy	lookup,X
 	cpy	#$10
@@ -125,7 +132,7 @@ cycle_loop:
 	and	#$f
 	sta	lookup,X
 skip_zero:
-	inx
+	dex
 	bne	cycle_loop
 
 
diff --git a/graphics/gr/plasma/zp.inc b/graphics/gr/plasma/zp.inc
index 32082246..1bb73c88 100644
--- a/graphics/gr/plasma/zp.inc
+++ b/graphics/gr/plasma/zp.inc
@@ -3,6 +3,7 @@
 ;; LZSA addresses
 NIBCOUNT	= $00
 
+HGRBITS = $1C
 WNDLFT	= $20
 WNDWDTH	= $21
 WNDTOP	= $22
@@ -19,6 +20,8 @@ MASK	= $2E
 COLOR	= $30
 INVFLG	= $32
 
+HGRPAGE	=	$E6
+
 ; More zero-page addresses
 ; we try not to conflict with anything DOS, MONITOR or BASIC related