From c12c4148b4341743794a8873332eebe82b252138 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Wed, 25 Jan 2023 00:58:07 -0500
Subject: [PATCH] gears: update gears_tiny

---
 graphics/hgr/shape_table/Makefile     | 15 ++++++--
 graphics/hgr/shape_table/gears_tiny.s | 50 ++++++++++++---------------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/graphics/hgr/shape_table/Makefile b/graphics/hgr/shape_table/Makefile
index f118dfa8..68bb8198 100644
--- a/graphics/hgr/shape_table/Makefile
+++ b/graphics/hgr/shape_table/Makefile
@@ -9,12 +9,14 @@ all:	shape_table.dsk
 
 shape_table.dsk:	HELLO APPLE.BAS GEARS.BAS \
 	APPLE2 GEARS LINE32 PATTERN PATTERN_LOGO SQUARE_WAVE \
-	AGONY17 HERRING16 STRIPE17 COOL_WAVE TEETH32 TICK_TOCK
+	AGONY17 HERRING16 STRIPE17 COOL_WAVE TEETH32 TICK_TOCK \
+	GEARS_TINY
 	cp $(EMPTYDISK) shape_table.dsk
 	$(DOS33) -y shape_table.dsk SAVE A HELLO
 	$(DOS33) -y shape_table.dsk SAVE A GEARS.BAS
 	$(DOS33) -y shape_table.dsk SAVE A APPLE.BAS
 	$(DOS33) -y shape_table.dsk BSAVE -a 0x3f5 GEARS
+	$(DOS33) -y shape_table.dsk BSAVE -a 0x60 GEARS_TINY
 	$(DOS33) -y shape_table.dsk BSAVE -a 0xc00 APPLE2
 	$(DOS33) -y shape_table.dsk BSAVE -a 0xc00 LINE32
 	$(DOS33) -y shape_table.dsk BSAVE -a 0xe7 AGONY17
@@ -53,6 +55,15 @@ gears.o:	gears.s
 
 ###
 
+GEARS_TINY:	gears_tiny.o
+	ld65 -o GEARS_TINY gears_tiny.o -C $(LINKERSCRIPTS)/apple2_60_zp.inc
+
+gears_tiny.o:	gears_tiny.s
+	ca65 -o gears_tiny.o gears_tiny.s -l gears_tiny.lst
+
+
+###
+
 SQUARE_WAVE:	square_wave.o
 	ld65 -o SQUARE_WAVE square_wave.o -C $(LINKERSCRIPTS)/apple2_e7_zp.inc
 
@@ -152,4 +163,4 @@ pattern_logo.o:	pattern_logo.s
 clean:	
 	rm -f *~ *.o *.lst HELLO GEAR.BAS GEARS PATTERN APPLE.BAS \
 		PATTERN_LOGO COOL_WAVE SQUARE_WAVE TEETH32 TICK_TOCK \
-		HERRING16 STRIPE17 AGONY17 LINE32 APPLE2
+		HERRING16 STRIPE17 AGONY17 LINE32 APPLE2 GEARS_TINY
diff --git a/graphics/hgr/shape_table/gears_tiny.s b/graphics/hgr/shape_table/gears_tiny.s
index cde9febe..bffa12c2 100644
--- a/graphics/hgr/shape_table/gears_tiny.s
+++ b/graphics/hgr/shape_table/gears_tiny.s
@@ -6,6 +6,9 @@
 ; 106 bytes -- move to zero page
 ; 104 bytes -- use smaller_smc
 ; 103 bytes -- use which_smc
+; 102 bytes -- note register is zero
+;  99 bytes -- make rotate use adc instead of inc
+;  95 bytes -- fall through
 
 ; zero page locations
 HGR_SHAPE	=	$1A
@@ -70,8 +73,6 @@ gears_tiny:
 	lda	#8
 	sta	HGR_SCALE
 
-;	sty	SMALLER		; init to 0
-
 	jsr	draw_scene
 
 	;===================
@@ -112,17 +113,21 @@ rotate_it:
 
 draw_scene:
 
-				; Y is zero from HGR
+				; Y is zero from HGR/HGR2
 	ldx	#110
 	lda	#10
 	jsr	HPOSN		; set screen position to X= (y,x) Y=(a)
 				; saves X,Y,A to zero page
 				; after Y= orig X/7
 				; A and X are ??
-	ldy	#32
-	jsr	draw_gear
 
-	ldy	#0
+	ldy	#32		; Y = steps to draw
+	lda	#2		; A = rotation increment
+	jsr	draw_gear
+				; A and X zero on return
+
+
+	tay			; set Y to 0
 	ldx	#235
 	lda	#100
 	jsr	HPOSN		; set screen position to X= (y,x) Y=(a)
@@ -130,45 +135,34 @@ draw_scene:
 				; after Y= orig X/7
 				; A and X are ??
 
+	ldy	#16		; only 16 repeats
+	lda	#4		; A = rotation increment
 
-;	inc	SMALLER
-	inc	smaller_smc+1
-
-	ldy	#16
-	jsr	draw_gear
-
-;	dec	SMALLER
-	dec	smaller_smc+1
-
-	rts
+	; fall through
 
 	;===============================
 	;===============================
 	;===============================
 	;===============================
 draw_gear:
-	sty	ROTATION
+	sty	ROTATION	; set number of rotations
+	sta	smaller_smc+1	; set rotation increment
+
 gear1_loop:
 
-	inc	rot_smc+1
-	inc	rot_smc+1
-
+	clc
+	lda	rot_smc+1
 smaller_smc:
-	lda	#0
-	beq	not_smaller
-
-	inc	rot_smc+1
-	inc	rot_smc+1
+	adc	#2
+	sta	rot_smc+1
 
 not_smaller:
 
 which_smc:
 	ldx	#<gear1_table	; point to bottom byte of shape address
 	ldy	#>gear1_table	; point to top byte of shape address
+				; this is always 0 if in zero page
 
-	; ROT in A
-
-	; this will be 0 2nd time through loop, arbitrary otherwise
 rot_smc:
 	lda	#1		; ROT=1 at first