From 617fc6694c1f0b702d8e67629038490cf45caa8b Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Mon, 18 Dec 2017 01:05:05 -0500
Subject: [PATCH] mode7_demo: update with working scroller

---
 mode7/scroller.c                              |  78 ++++++++++++++----
 mode7_demo/Makefile                           |   3 +-
 mode7_demo/a2.scrolltext                      |  10 +++
 .../{scrolltext.inc => deater.scrolltext}     |   0
 mode7_demo/mode7_demo.dsk                     | Bin 143360 -> 143360 bytes
 mode7_demo/mode7_demo.s                       |  18 ++--
 6 files changed, 86 insertions(+), 23 deletions(-)
 create mode 100644 mode7_demo/a2.scrolltext
 rename mode7_demo/{scrolltext.inc => deater.scrolltext} (100%)

diff --git a/mode7/scroller.c b/mode7/scroller.c
index 26225b44..d161266e 100644
--- a/mode7/scroller.c
+++ b/mode7/scroller.c
@@ -35,7 +35,7 @@ static unsigned char font[256][9]={
 	{0,0,0,0,0,0,0,0,0},
 	{0,0,0,0,0,0,0,0,0},
 	{0,0,0,0,0,0,0,0,0},
-	{5,0,0,0,0,0,0,0,0},	// 32 ' '
+	{4,0,0,0,0,0,0,0,0},	// 32 ' '
 	{4,
 		0x00,
 		0xe0,		// ******
@@ -147,17 +147,19 @@ static unsigned char font[256][9]={
 		0x80,	// **
 		0xf0,	// ********
 	},
-	{0,0,0,0,0,0,0,0,0},
+	{5,
+		0x00,
+		0xf0,	// ********
+		0x80,	// **
+		0x80,	// **
+		0xe0,	// ******
+		0x80,	// **
+		0x80,	// **
+		0x80,	// **
+	},
+
 	{0,0,0,0,0,0,0,0,0},
 /*
-********  
-**        
-**        
-******    
-**        
-**        
-**         
-
   ****    
 **        
 **        
@@ -201,7 +203,7 @@ static unsigned char font[256][9]={
     ****    **    **  
 */
 
-	{5,
+	{4,
 		0x00,
 		0x80,	// **
 		0x80,	// **
@@ -209,7 +211,7 @@ static unsigned char font[256][9]={
 		0x80,	// **
 		0x80,	// **
 		0x80,	// **
-		0xf0,	// ********
+		0xe0,	// ******
 	},
 
 
@@ -360,6 +362,30 @@ static unsigned char font[256][9]={
   **
   **********
 */
+	{3,
+		0x00,
+		0xc0,	// ****
+		0x80,	// **
+		0x80,	// **
+		0x80,	// **
+		0x80,	// **
+		0x80,	// **
+		0xc0,	// ****
+	},
+
+	{0,0,0,0,0,0,0,0,0},
+
+	{3,
+		0x00,
+		0xc0,	// ****
+		0x40,	//   **
+		0x40,	//   **
+		0x40,	//   **
+		0x40,	//   **
+		0x40,	//   **
+		0xc0,	// ****
+	},
+
 
 };
 
@@ -427,13 +453,20 @@ static int vmw_logo[4][18]={
 	{0x00,0x00,0x11,0x44,0x44,0x44, 0x44,0x44,0x22,0x44,0x44,0x44, 0x44,0x44,0x22,0x00,0x00,0x00},
 };
 
+static int rainbow_logo[4][6]={
+	{0x00,0x00,0x00,0xc0,0x0c,0x00 },
+	{0xd0,0xdc,0xdc,0xdc,0x0c,0x00 },
+	{0x19,0x19,0x19,0x19,0x10,0x00 },
+	{0x02,0x62,0x62,0x62,0x02,0x00 },
+};
+
 
 int main(int argc, char **argv) {
 
 	//char string[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-//	char string[]="        \001DEATER \002WAS \003HERE!!!        ";
-	char string[]="        \001BY DEATER... \002A \010 PRODUCTION        ";
-//	char string[]="\003* APPLE ][ FOREVER *        ";
+//	char string[]="         \001DEATER \002WAS \003HERE!!!         ";
+//	char string[]="         \001BY DEATER... \002A \010 PRODUCTION         ";
+	char string[]="           \003\011APPLE ][ FOREVER\011           ";
 	int length=0,width=0,x,y,i,j;
 	int color,color1,color2;
 	int which_color=0;
@@ -462,6 +495,19 @@ int main(int argc, char **argv) {
 			continue;
 		}
 
+		/* rainbow apple logo */
+		if (string[i]==9) {
+			width=6;
+			for(x=0;x<width;x++) {
+				for(j=0;j<4;j++) {
+					row[j][length]=rainbow_logo[j][x];
+				}
+				length++;
+			}
+
+			continue;
+		}
+
 		width=font[(int)string[i]][0];
 		for(x=0;x<width;x++) {
 			for(j=0;j<4;j++) {
@@ -497,7 +543,7 @@ int main(int argc, char **argv) {
 		printf("\n");
 	}
 #endif
-	printf("deater_scroll:\n");
+	printf("a2_scroll:\n");
 	printf("; scroll_length:\n.byte %d\n",length);
 	for(y=0;y<4;y++) {
 		//printf("scroll_row%d:\n",y+1);
diff --git a/mode7_demo/Makefile b/mode7_demo/Makefile
index b5a61a01..8682938d 100644
--- a/mode7_demo/Makefile
+++ b/mode7_demo/Makefile
@@ -19,7 +19,8 @@ mode7_demo.dsk:	$(DOS33) MODE7_DEMO
 MODE7_DEMO:	mode7_demo.o
 	ld65 -o MODE7_DEMO mode7_demo.o -C ./apple2_1000.inc
 
-mode7_demo.o:	mode7_demo.s mode7_demo_backgrounds.inc scrolltext.inc \
+mode7_demo.o:	mode7_demo.s mode7_demo_backgrounds.inc \
+		a2.scrolltext deater.scrolltext \
 		../asm_routines/gr_unrle.s \
 		../asm_routines/hlin_clearscreen.s \
 		../asm_routines/gr_setpage.s \
diff --git a/mode7_demo/a2.scrolltext b/mode7_demo/a2.scrolltext
new file mode 100644
index 00000000..3c84e48d
--- /dev/null
+++ b/mode7_demo/a2.scrolltext
@@ -0,0 +1,10 @@
+; Original size = 692 bytes
+a2_scroll:
+; scroll_length:
+.byte 173
+	.byte $A0,$2F,$00,$C0,$0C,$00,$00,$10,$10,$00,$00,$A3,$10,$00,$00,$A3,$10,$00,$00,$10,$A3,$00,$A4,$10,$A5,$00,$10,$10,$00,$10,$10,$A5,$00,$A4,$10,$00,$00,$10,$10,$00,$00,$A3,$10,$00,$00,$A4,$10,$00,$10,$00,$00,$10,$00,$A4,$10,$00,$A3,$10,$A5,$00,$C0,$0C,$A0,$80,$00
+	.byte $A0,$2C,$00,$D0,$A3,$DC,$0C,$00,$B3,$00,$00,$B3,$00,$B3,$00,$00,$B3,$00,$B3,$00,$00,$B3,$00,$B3,$A3,$00,$B3,$A9,$00,$B3,$00,$B3,$A6,$00,$B3,$A4,$00,$B3,$00,$00,$B3,$00,$B3,$00,$00,$B3,$00,$B3,$A4,$00,$B3,$00,$00,$B3,$00,$B3,$A4,$00,$B3,$00,$00,$B3,$00,$D0,$A3,$DC,$0C,$A0,$80,$00
+	.byte $A0,$2C,$00,$A4,$19,$10,$00,$BF,$0F,$0F,$BF,$00,$BF,$0F,$0F,$00,$00,$BF,$0F,$0F,$00,$00,$BF,$A3,$00,$BF,$0F,$0F,$A7,$00,$BF,$00,$BF,$A6,$00,$BF,$0F,$0F,$00,$00,$BF,$00,$00,$BF,$00,$BF,$0F,$0F,$B0,$00,$BF,$0F,$0F,$00,$00,$0F,$B0,$00,$BF,$00,$BF,$0F,$0F,$00,$00,$BF,$0F,$0F,$B0,$00,$A4,$19,$10,$A0,$80,$00
+	.byte $A0,$2C,$00,$02,$A3,$62,$02,$00,$13,$00,$00,$13,$00,$13,$A4,$00,$13,$A4,$00,$13,$10,$10,$00,$13,$A3,$10,$A5,$00,$10,$13,$00,$13,$10,$A5,$00,$13,$A4,$00,$03,$10,$10,$03,$00,$13,$00,$00,$13,$00,$13,$A3,$10,$00,$00,$03,$10,$03,$00,$13,$A3,$10,$00,$13,$00,$00,$13,$00,$02,$A3,$62,$02,$A0,$80,$00
+	.byte $A1
+; Compressed size = 285 bytes
diff --git a/mode7_demo/scrolltext.inc b/mode7_demo/deater.scrolltext
similarity index 100%
rename from mode7_demo/scrolltext.inc
rename to mode7_demo/deater.scrolltext
diff --git a/mode7_demo/mode7_demo.dsk b/mode7_demo/mode7_demo.dsk
index a3c739e6f9346556fd96c66007b1ad285ec3b812..96744bd4fdd276966eefc686508cfa383174ca3c 100644
GIT binary patch
delta 1489
zcmZuvQHUE=6upyVH7=37$z*X?ls==KO`vLZQBXuuNY_wPT3hqus!RhdS)`w`U+b*c
zfuN37MhNSNo$O2|c}umG6ibk8*N?(3^&?*vX*Br?^(PJbA?~im`(`FkjWhS%d(OG@
z?z`{3S?PvX(5?s{6Jf7>hzN6Kg$SXB`uI!2w=v<^gTmz1<NJiIgA-HtPlcz9$KLK5
zWHO`@7N%Fk11C1=Ey6-tpG|2pi)*tCv?PmYDLPMRGDaVeF!2}rUE5<xZ9hFEv4@a;
zr0pT3x5XSK4C>krrkX^10^N3Hu#im+w#~sraZPANim7NTi26E?&yu}lE6_`2dpqS%
zUlZmJ<6?b!RHSD_-hzh|Ut~awBiY5ux!rnmS)4w-tI1mkPWQE0g$_u$a#Dx~2E;h~
z*2^;?u{gaL*iN>7Q<$k8#HOD#AxlG|Q91lV**q%5jq@))tg>y~ZA_b`@5bo&BHN<%
zJ@(VM^y|3v=a{6hagF`Y%zNsqqcz9dP}X2$S=7Ib=^L?)_i(p;{Tc_0Vf{kPgl_n9
z$Xq%fFpo8d!|b`;)Zhp{^>5_VK-<By<|sO`WACmGhb40R&Ydo4T~a_y%w_UtmP)JZ
z-~I4&f2aaL0xh2}<>xY`%o1{Z@~$t9fXh7RHTA5dKPUN3J<kC)H7EV2DR<#N+=XxQ
zyDZRa(i+(NkKmQ*y3|xf-FQZ7zAx&lQu6~*zaVW*ySJ%-!jrh)&v_Q(7d(&Al<a~r
zzpyWZr?!kYHC-(%CU2Y?O!Nx5tfZJggK_N?F7-G2P#Yq_fAFdCe=rzd$DDC#A$9eY
z*M(n%;w>`?76qU{9iY?#n-d%;BDCn&kWSa2O43z|=75#PT-rhvaA3s172iA^HS+{u
z=^mir>llx`IrHj8XalqzsEV0t0?l#xzg(o{(<-zr52A0Qc?IuAqg{Zzwes0_gh$nj
z(1}JnHLyf0V<q^gaRs<*K?mc#t_mH?<F4N6cqL^@?*ou)AiEJaE+h49L}V0X2XX+p
zI*8Rw0<8{e&UPh;q|*_|;qXv|9}<3>&ZYenQe3R^mH9Mm;#Y*=k@<t*nUgA)2nHL~
zQ5G?0T(dB>88KJDJOC}L9f1a*sjl~&1r3H$!-0nFWj%dF{KzMJW$YOO*Q3$v+=1^b
z9&3P_<13iq=(0z7^b=e=jy1eu0jm%I3D6|lHQa;5n<l7WKs886(Eo&QJ;)gXcM_kD
Og(`+HdD3}9`0*dk9`}?0

delta 353
zcmZp8z|jCiTNrx;nEp3RW>mJ?enNn;osW@ydw@LS34_UuTrar=6j>Ey1Qc!vtaP5v
z<I5<?_gF~bkI+h%)^`dZ)^x=jMw#jUzKlE?D_VcGsw$iiXjK6cCl`K*_R#!ra={1I
zj75wWcrrBkFE9heS1FvBUJ}R{G<{<bqlm;JhPGc_Tq|}83%CAj{j*a<IQ3oYe;_se
zj4z`)kEx(e;sF8Hl?!~P3r=Qq(Gr|4sPaj`^x3DSpEQ|2F#AjuoXlsf%syRkr6Wj%
zfq^WSu&_kx=hlBfBPPdN8!>$moP5wlQV1lf(y9S5Uo%00MQHLqYZVy@h&LpJGFsmy
zwEXVU{0DZ4+6kb0rfc~#>Vq}@ZUqYfU8bI(&^9@+T$HhGdZRz1J>#tD2mKkvKokd)
Z)pp5H#(RvwAiKROgNJ=PPaNZyivSB!fNB5$

diff --git a/mode7_demo/mode7_demo.s b/mode7_demo/mode7_demo.s
index f1a18552..34125426 100644
--- a/mode7_demo/mode7_demo.s
+++ b/mode7_demo/mode7_demo.s
@@ -42,19 +42,24 @@ demo_loop:
 	; Scroll the message
 	;===================
 
-;	lda	#255
-;	jsr	WAIT
-
+	; Scroll "BY DEATER... A VMW PRODUCTION"
 
 	lda	#>deater_scroll
 	sta	INH
 	lda	#<deater_scroll
 	sta	INL
 
-;	lda	#10
-	lda	#40
+	lda	#40		; scroll at bottom of screen
 	sta	CV
 
+	jsr	gr_scroll
+
+	; Scroll "* APPLE ][ FOREVER *"
+
+	lda	#>a2_scroll
+	sta	INH
+	lda	#<a2_scroll
+	sta	INL
 
 	jsr	gr_scroll
 
@@ -86,6 +91,7 @@ demo_loop:
 ; Variables
 ;===============================================
 
-.include "scrolltext.inc"
+.include "deater.scrolltext"
+.include "a2.scrolltext"