lovebyte: are we done?

demos/lovebyte2024/dtv_1k/Makefile

@@ -46,7 +46,7 @@ DONT_COMPRESS.zx02:	DONT_COMPRESS
 DONT_COMPRESS:	dont_compress.o
 	ld65 -o DONT_COMPRESS dont_compress.o -C $(LINKERSCRIPTS)/apple2_2000.inc
 
-dont_compress.o:	dont_compress.s graphics/scene.hgr
+dont_compress.o:	dont_compress.s graphics/scene.hgr still.s
 	ca65 -o dont_compress.o dont_compress.s -l dont_compress.lst
 
 ###

demos/lovebyte2024/dtv_1k/dont_new.s

@@ -4,9 +4,11 @@
 
 dont_new:
 
-	jsr	HGR
+;	jsr	HGR
 
-	jsr	opener
+;	jsr	opener
+
+	.include	"opener.s"
 
 	; inlined
 
@@ -176,4 +178,4 @@ exit:
 compressed_data:
 .incbin	"DONT_COMPRESS.zx02"
 
-.include "opener.s"
+

demos/lovebyte2024/dtv_1k/opener.s

@@ -1,36 +1,21 @@
 ; draws a circle pattern
 
-; by Vince `deater` Weaver / DsR
-
-.if 0
-; zero page locations
-GBASL		=	$26
-GBASH		=	$27
-HGR_SCALE	=	$E7
-HGR_ROTATION	=	$F9
-
-; ROM locations
-HGR2		=	$F3D8
-HPOSN		=	$F411
-XDRAW0		=	$F65D
-XDRAW1		=	$F661
-HPLOT0		=	$F457
-.endif
-
 opener:
-	sta	HGR_ROTATION
+	; A=0 from HGR
+
+
 	lda	#$20
 	sta	HGR_SCALE
 
-
-;	jsr	HGR2		; Hi-res, full screen		; 3
-				; Y=0, A=0 after this call
+	jsr	HGR
+	sta	HGR_ROTATION
 
 	; A and Y are 0 here.
 	; X is left behind by the boot process?
 
 tiny_loop:
-	ldy	#0
+	tay
+;	ldy	#0
 	ldx	#140
 	lda	#96
 	jsr	HPOSN		; set screen position to X= (y,x) Y=(a)
@@ -57,7 +42,7 @@ done_circle:
 	lda	#250
 	jsr	WAIT
 
-	rts
+;	rts
 
 our_shape = $E2E2
 

demos/lovebyte2024/dtv_1k/still.s

@@ -2,11 +2,10 @@
 ; still...
 
 still:
+
 	jsr	HOME
 	bit	SET_TEXT
 
-;	HLINE   = $F819                 ; HLINE Y,$2C at A
-;	VLINE   = $F828                 ; VLINE A,$2D at Y
 
 	lda	#'*'|$80
 	sta	COLOR
@@ -40,7 +39,7 @@ still:
 	lda	#1
 	ldy	#39
 	jsr	VLINE
-
+.if 0
 	;==============
 	; set screen for wrap
 
@@ -66,7 +65,7 @@ opening_loop:
 	jsr	COUT1
 	iny
 	bne	opening_loop	; bra
-
+.endif
 	;===========================
 	; play music and draw loop
 
@@ -98,10 +97,14 @@ play_music:
 	lda	#>music_data
 	sta     MADDRH
 
-	jsr	play_ed
+;	jsr	play_ed
 
-done_music:
-	jmp	done_music
+.include "duet.s"
+
+	; we crash!
+
+;done_music:
+;	jmp	done_music
 
 
 display_lyrics_ed:
@@ -116,6 +119,7 @@ display_lyrics_ed:
 	rts
 
 
+.if 0
 opening:
 .byte	13
 .byte "       ,:/;=",13
@@ -128,10 +132,11 @@ opening:
 .byte " .    .     -H @@M ",13
 .byte "  =MMM@MH +M@+ MX",13
 .byte "    ,++ .MMMM= ",0
+.endif
 
 
-.include "duet.s"
+;.include "duet.s"
 
 music_data:
-.incbin "SA.ED"
+.incbin "SA.ED",$0,$100