From 58bd996bdf6001983fec63b0200bc3b25822efba Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Tue, 24 Jan 2023 23:00:15 -0500
Subject: [PATCH] gears: even smaller

---
 demos/lovebyte2023/TODO               |  11 +-
 graphics/hgr/shape_table/gears.s      | 133 +++++++++---------
 graphics/hgr/shape_table/gears_tiny.s | 189 ++++++++++++++++++++++++++
 utils/dos33fs-utils/dos33.c           |   2 +-
 4 files changed, 265 insertions(+), 70 deletions(-)
 create mode 100644 graphics/hgr/shape_table/gears_tiny.s

diff --git a/demos/lovebyte2023/TODO b/demos/lovebyte2023/TODO
index accef418..5f47be9a 100644
--- a/demos/lovebyte2023/TODO
+++ b/demos/lovebyte2023/TODO
@@ -32,16 +32,16 @@ Apple II:
 128:
 	hgr/transitions/rectangle	139-byte (??)
 	gr/parallax/large		111-byte  dir-switching parallax
-	gr/parallax/par			127-byte  parallax scrolling
+*	gr/parallax/par			127-byte  parallax scrolling
 	hgr/parallax/par		139-byte hires-parallax (boring)
 	hgr/parallax/wierd2		118-byte oddly compelling
 	hgr/parallax/sier		120-bytes sierpinski parallax
 	hgr/shape_table/pattern_logo.s	125-bytes (so-so)
-	hgr/shape_table/gear.s		138-byte gears (cool, good with music?)
+*	hgr/shape_table/gears.s		138-byte gears (cool, good with music?)
 	gr/sprite/stars_128.s		133-byte bouncing stars (cool) (heart?)
 
 256
-	aiibot/lemm.bas			251-byte (cool) lemming animation
+*	aiibot/lemm.bas			251-byte (cool) lemming animation
 
 
 
@@ -57,6 +57,10 @@ Apple II:
 256 -- procedural graphics
 	planet_lores?
 
+1k -- keep working on budge3d
+
+	moon over water effect
+
 
 TODO: image stuff but raw hex bytes instead of text
 
@@ -67,5 +71,6 @@ ARM/Linux:
 Atari 2600:
 	parallax scroll?
 	game?
+	apple II logo.  Maybe with apple ii forever music?
 
 
diff --git a/graphics/hgr/shape_table/gears.s b/graphics/hgr/shape_table/gears.s
index 741563b5..10bbf1d5 100644
--- a/graphics/hgr/shape_table/gears.s
+++ b/graphics/hgr/shape_table/gears.s
@@ -1,10 +1,12 @@
 ; Rotating Gears
 
+; by Vince `deater` Weaver
+
 ; 138 bytes -- original for Apple II bot
 ; 134 bytes -- only set SCALE once
 ; 131 bytes -- unecessary var set, change jmp to bra
+; 110 bytes -- move draw_scene to a function
 
-; by Vince `deater` Weaver
 
 ; zero page locations
 HGR_SHAPE	=	$1A
@@ -32,14 +34,10 @@ HGR_SCALE	=	$E7
 HGR_SHAPE_TABLE	=	$E8
 HGR_SHAPE_TABLE2=	$E9
 HGR_COLLISIONS	=	$EA
-HGR_ROTATION	=	$F9
+
 ROTATION	=	$FA
 SMALLER		=	$FB
-FRAME		=	$FC
-FRAMEH		=	$FD
-XPOS		=	$FE
-YPOS		=	$FF
-
+CURRENT_ROT	=	$FF
 
 ; Soft Switches
 PAGE1   = $C054 ; Page1
@@ -59,19 +57,62 @@ RESTORE		=	$FF3F
 
 gears:
 
+	;============================
+	; scene 1
+	;============================
 
 	jsr	HGR		; Hi-res, full screen		; 3
 				; Y=0, A=0 after this call
 
 	lda	#8
 	sta	HGR_SCALE
-	sty	SMALLER
+
+	lda	#1
+	sta	CURRENT_ROT
+
+	sty	SMALLER		; init to 0
+
+	jsr	draw_scene
+
+	;===================
+	; scene2
+	;===================
+
+	jsr	HGR2		; set to hires PAGE2, full screen
+				; Y=0, A=0 after
 
 
-	;============================
-	; scene 1
+	lda	#<gear2_table	; draw alternate gear
+	sta	which_smc+1
 
-;	ldy	#0
+	jsr	draw_scene
+
+
+	;===================
+	; rotate forever
+	;===================
+	; just page flipping with a delay
+
+rotate_it:
+	bit	PAGE1
+	lda	#255
+	jsr	WAIT
+
+	bit	PAGE2
+	lda	#255
+	jsr	WAIT
+
+	beq	rotate_it		; bra
+
+
+	;=========================
+	; draw scene
+	;=========================
+	; Y must be 0 at entry
+
+draw_scene:
+
+				; Y is zero from HGR
 	ldx	#110
 	lda	#10
 	jsr	HPOSN		; set screen position to X= (y,x) Y=(a)
@@ -97,54 +138,7 @@ gears:
 
 	dec	SMALLER
 
-
-	;===================
-	; scene2
-
-	jsr	HGR2		; set to hires PAGE2, full screen
-				; Y=0, A=0 after
-
-	ldx	#110
-	lda	#10
-	jsr	HPOSN		; set screen position to X= (y,x) Y=(a)
-
-	lda	#<gear2_table
-	sta	which_smc+1
-
-	ldy	#32
-	jsr	draw_gear
-
-	ldy	#0
-	ldx	#235
-	lda	#100
-	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 ??
-
-
-	inc	SMALLER
-
-	ldy	#16
-	jsr	draw_gear
-
-
-	;===================
-	; rotate
-	;
-	; just page flipping with a delay
-
-rotate_it:
-	bit	PAGE1
-	lda	#255
-	jsr	WAIT
-
-	bit	PAGE2
-	lda	#255
-	jsr	WAIT
-
-	beq	rotate_it		; bra
-
+	rts
 
 	;===============================
 	;===============================
@@ -154,12 +148,18 @@ draw_gear:
 	sty	ROTATION
 gear1_loop:
 
-	inc	rot_smc+1
-	inc	rot_smc+1
+	inc	CURRENT_ROT
+	inc	CURRENT_ROT
+
+;	inc	rot_smc+1
+;	inc	rot_smc+1
 	lda	SMALLER
 	beq	not_smaller
-	inc	rot_smc+1
-	inc	rot_smc+1
+
+	inc	CURRENT_ROT
+	inc	CURRENT_ROT
+;	inc	rot_smc+1
+;	inc	rot_smc+1
 not_smaller:
 
 which_smc:
@@ -170,7 +170,8 @@ which_smc:
 
 	; this will be 0 2nd time through loop, arbitrary otherwise
 rot_smc:
-	lda	#1		; ROT=0
+;	lda	#1		; ROT=0
+	lda	CURRENT_ROT
 	jsr	XDRAW0		; XDRAW 1 AT X,Y
 				; Both A and X are 0 at exit
 				; Z flag set on exit
@@ -182,7 +183,7 @@ rot_smc:
 
 
 gear1_table:
-.byte	37,53,0
+.byte	$25,$35,$00		; 37,53,0
 gear2_table:
-.byte	$2c,$2e,$00
+.byte	$2c,$2e,$00		; 44,46,0
 
diff --git a/graphics/hgr/shape_table/gears_tiny.s b/graphics/hgr/shape_table/gears_tiny.s
new file mode 100644
index 00000000..cde9febe
--- /dev/null
+++ b/graphics/hgr/shape_table/gears_tiny.s
@@ -0,0 +1,189 @@
+; Rotating Gears (Tiny)
+
+; by Vince `deater` Weaver
+
+; 110 bytes -- original
+; 106 bytes -- move to zero page
+; 104 bytes -- use smaller_smc
+; 103 bytes -- use which_smc
+
+; zero page locations
+HGR_SHAPE	=	$1A
+HGR_SHAPE2	=	$1B
+HGR_BITS	=	$1C
+GBASL		=	$26
+GBASH		=	$27
+A5H		=	$45
+XREG		=	$46
+YREG		=	$47
+			; C0-CF should be clear
+			; D0-DF?? D0-D5 = HGR scratch?
+HGR_DX		=	$D0	; HGLIN
+HGR_DX2		=	$D1	; HGLIN
+HGR_DY		=	$D2	; HGLIN
+HGR_QUADRANT	=	$D3
+HGR_E		=	$D4
+HGR_E2		=	$D5
+HGR_X		=	$E0
+HGR_X2		=	$E1
+HGR_Y		=	$E2
+HGR_COLOR	=	$E4
+HGR_HORIZ	=	$E5
+HGR_SCALE	=	$E7
+HGR_SHAPE_TABLE	=	$E8
+HGR_SHAPE_TABLE2=	$E9
+HGR_COLLISIONS	=	$EA
+
+ROTATION	=	$FA
+;SMALLER		=	$FB
+CURRENT_ROT	=	$FF
+
+; Soft Switches
+PAGE1   = $C054 ; Page1
+PAGE2   = $C055 ; Page2
+
+
+; ROM calls
+HGR2		=	$F3D8
+HGR		=	$F3E2
+HPOSN		=	$F411
+DRAW0		=	$F601
+XDRAW0		=	$F65D
+XDRAW1		=	$F661
+WAIT		=	$FCA8                 ;; delay 1/2(26+27A+5A^2) us
+RESTORE		=	$FF3F
+
+.zeropage
+.globalzp rot_smc
+.globalzp smaller_smc
+.globalzp which_smc
+
+gears_tiny:
+
+	;============================
+	; scene 1
+	;============================
+
+	jsr	HGR		; Hi-res, full screen		; 3
+				; Y=0, A=0 after this call
+
+	lda	#8
+	sta	HGR_SCALE
+
+;	sty	SMALLER		; init to 0
+
+	jsr	draw_scene
+
+	;===================
+	; scene2
+	;===================
+
+	jsr	HGR2		; set to hires PAGE2, full screen
+				; Y=0, A=0 after
+
+
+	lda	#<gear2_table	; draw alternate gear
+	sta	which_smc+1
+
+	jsr	draw_scene
+
+
+	;===================
+	; rotate forever
+	;===================
+	; just page flipping with a delay
+
+rotate_it:
+	bit	PAGE1
+	lda	#255
+	jsr	WAIT
+
+	bit	PAGE2
+	lda	#255
+	jsr	WAIT
+
+	beq	rotate_it		; bra
+
+
+	;=========================
+	; draw scene
+	;=========================
+	; Y must be 0 at entry
+
+draw_scene:
+
+				; Y is zero from HGR
+	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
+	ldx	#235
+	lda	#100
+	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 ??
+
+
+;	inc	SMALLER
+	inc	smaller_smc+1
+
+	ldy	#16
+	jsr	draw_gear
+
+;	dec	SMALLER
+	dec	smaller_smc+1
+
+	rts
+
+	;===============================
+	;===============================
+	;===============================
+	;===============================
+draw_gear:
+	sty	ROTATION
+gear1_loop:
+
+	inc	rot_smc+1
+	inc	rot_smc+1
+
+smaller_smc:
+	lda	#0
+	beq	not_smaller
+
+	inc	rot_smc+1
+	inc	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
+
+	; ROT in A
+
+	; this will be 0 2nd time through loop, arbitrary otherwise
+rot_smc:
+	lda	#1		; ROT=1 at first
+
+	jsr	XDRAW0		; XDRAW 1 AT X,Y
+				; Both A and X are 0 at exit
+				; Z flag set on exit
+				; Y varies
+
+	dec	ROTATION
+	bne	gear1_loop
+	rts
+
+
+gear1_table:
+.byte	$25,$35,$00		; 37,53,0
+gear2_table:
+.byte	$2c,$2e,$00		; 44,46,0
+
diff --git a/utils/dos33fs-utils/dos33.c b/utils/dos33fs-utils/dos33.c
index 53b3da3f..79ff1434 100644
--- a/utils/dos33fs-utils/dos33.c
+++ b/utils/dos33fs-utils/dos33.c
@@ -1161,7 +1161,7 @@ int main(int argc, char **argv) {
 
 		truncate_filename(apple_filename,argv[optind]);
 
-		if (debug) printf("\tAhpple filename: %s\n",apple_filename);
+		if (debug) printf("\tApple filename: %s\n",apple_filename);
 
 		/* get output filename */
 		optind++;