From 7033bf3a17109acdda427279a1f1402557bca0f3 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Tue, 9 Nov 2021 01:51:33 -0500
Subject: [PATCH] d2: add text message

---
 demos/d2/Makefile            | 10 ++++----
 demos/d2/clear_bottom.s      |  2 +-
 demos/d2/d2.s                | 46 +++++++++++++++++++++++++++---------
 demos/d2/interrupt_handler.s |  2 +-
 4 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/demos/d2/Makefile b/demos/d2/Makefile
index 21664bca..4cd7ad45 100644
--- a/demos/d2/Makefile
+++ b/demos/d2/Makefile
@@ -6,12 +6,12 @@ HGR2PNG = ../../utils/hgr-utils/png2hgr
 LINKER_SCRIPTS = ../../linker_scripts
 TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
 
-all:	tiny_tracker.dsk text_to_tiny
+all:	hgr_d2.dsk text_to_tiny
 
-tiny_tracker.dsk:	HELLO D2
-	cp $(EMPTY_DISK)/empty.dsk ./tiny_tracker.dsk
-	$(DOS33) -y tiny_tracker.dsk SAVE A HELLO
-	$(DOS33) -y tiny_tracker.dsk -t BIN -a 0x6000 BSAVE D2
+hgr_d2.dsk:	HELLO D2
+	cp $(EMPTY_DISK)/empty.dsk ./hgr_d2.dsk
+	$(DOS33) -y hgr_d2.dsk SAVE A HELLO
+	$(DOS33) -y hgr_d2.dsk -t BIN -a 0x6000 BSAVE D2
 
 ####
 
diff --git a/demos/d2/clear_bottom.s b/demos/d2/clear_bottom.s
index e18f737d..80fe6a51 100644
--- a/demos/d2/clear_bottom.s
+++ b/demos/d2/clear_bottom.s
@@ -9,4 +9,4 @@ cbloop:
 	sta	$B00,X
 	dex
 	bne	cbloop
-
+	rts
diff --git a/demos/d2/d2.s b/demos/d2/d2.s
index c948d14f..073d5969 100644
--- a/demos/d2/d2.s
+++ b/demos/d2/d2.s
@@ -1,4 +1,4 @@
-; Demo2
+; HGR Demo2
 
 ; by deater (Vince Weaver) <vince@deater.net>
 
@@ -6,7 +6,6 @@
 	.include "zp.inc"
 	.include "hardware.inc"
 
-
 d2:
 
 	;===================
@@ -78,10 +77,14 @@ sin_done:
 	jsr	dsr_spin
 
 forever:
+	jsr	print_message
+
+	bit	TEXTGR
 
 	jsr	moving
 
 	jsr	fast_hclr
+
 	jsr	flip_page
 
 	jsr	wires
@@ -106,24 +109,45 @@ done_flip_page:
 
         rts
 
+	;===================
+	; print message
+	;===================
+print_message:
+	jsr	clear_both_bottoms
 
+	ldx	#35
+print_message_loop:
+	lda	message1,X
+	ora	#$80
+	sta	$650,X
+	sta	$A50,X
+	lda	message2,X
+	ora	#$80
+	sta	$6d0,X
+	sta	$AD0,X
+	dex
+	bpl	print_message_loop
+
+	rts
+
+
+;      01234567890123456789012345678901234567890"
+message1:
+.byte "THE APPLE II HAS NO PALETTE ROTATION"
+message2:
+.byte "WE ARE DOING THIS THE HARD WAY...   "
+
+.byte "CODE: DEATER",0
+.byte "MUSIC: MA2E",0
 
 .include	"dsr_shape.s"
 .include	"moving.s"
 .include	"wires.s"
 .include	"oval.s"
+.include	"clear_bottom.s"
 
 ; music
 .include	"peasant_music.s"
 .include        "interrupt_handler.s"
 ; must be last
 .include        "mockingboard_setup.s"
-
-; Moving
-;   moving, orange and green
-
-
-
-
-
-
diff --git a/demos/d2/interrupt_handler.s b/demos/d2/interrupt_handler.s
index b9fd7be4..c278471f 100644
--- a/demos/d2/interrupt_handler.s
+++ b/demos/d2/interrupt_handler.s
@@ -27,7 +27,7 @@ interrupt_handler:
 	tya
 	pha			; save Y
 
-	inc	$0404		; debug (flashes char onscreen)
+;	inc	$0404		; debug (flashes char onscreen)
 
 
 ay3_irq_handler: