From 3dbad79aa66b9729aebd65a513f7fc7f43a49d48 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Wed, 17 Oct 2018 12:04:14 -0400
Subject: [PATCH] megademo: update text in bird_mountain

---
 megademo/Makefile        |  2 +-
 megademo/SIZE            |  1 +
 megademo/TODO            |  5 +++--
 megademo/bird_mountain.s | 22 +---------------------
 megademo/letters.s       | 29 +++++++++++++++++++++++++++++
 megademo/megademo.s      | 22 +++++++++++++++++++---
 6 files changed, 54 insertions(+), 27 deletions(-)
 create mode 100644 megademo/letters.s

diff --git a/megademo/Makefile b/megademo/Makefile
index a3fc4a89..0189e652 100644
--- a/megademo/Makefile
+++ b/megademo/Makefile
@@ -34,7 +34,7 @@ megademo.o:	megademo.s \
 	check_email.s email_40_96.inc \
 	leaving.s leaving.inc tfv_sprites.inc \
 	arrival.s arrival.inc \
-	bird_mountain.s \
+	bird_mountain.s letters.s \
 	waterfall.s gr_unrolled_copy.s waterfall_page1.inc waterfall_page2.inc \
 	takeoff.s takeoff.inc takeoff.img.lz4 \
 	mode7.s \
diff --git a/megademo/SIZE b/megademo/SIZE
index f916bb2e..a62d0de6 100644
--- a/megademo/SIZE
+++ b/megademo/SIZE
@@ -11,3 +11,4 @@
 	29476	-- get leaving all working
 	30599	-- have most of heart scene going
 	30501	-- move mountain image to HGR image block
+	30420	-- update words in bird_mountain
diff --git a/megademo/TODO b/megademo/TODO
index aac8c31d..acb30ee6 100644
--- a/megademo/TODO
+++ b/megademo/TODO
@@ -47,9 +47,10 @@ Timing:
 	
 
 5: running bird:
-	run to middle of screen, then have everything start moving?
-	update text
 	auto timeout to next screen
+	run to middle of screen, then have everything start moving?
+	have sprites partially on all screen rather than jumping at edge?
+	stop scrolling and run off at end?
 
 6: waterfall:
 	finish packing down a bit
diff --git a/megademo/bird_mountain.s b/megademo/bird_mountain.s
index 87acee50..4599fcd5 100644
--- a/megademo/bird_mountain.s
+++ b/megademo/bird_mountain.s
@@ -45,7 +45,7 @@ bird_mountain:
 	sta	LETTERX
 	lda	#1
 	sta	LETTERY
-	lda	#15
+	lda	#12
 	sta	LETTERD
 
 	;=================
@@ -487,26 +487,6 @@ green_loop:
 ; 4 + (40*55) + 6 - 1
 
 
-letters_bm:
-	;.byte	1,15
-	.byte	     "T A L B O T",128
-	.byte	2,14,"F A N T A S Y",128
-	.byte	3,16,"S E V E N",128
-	.byte	1,15," ",128
-	.byte	2,14," ",128
-	.byte	3,16," ",128
-	.byte	1,19,"BY",128
-	.byte	3,14,"VINCE WEAVER",128
-	.byte	1,19," ",128
-	.byte	3,14," ",128
-	.byte	1,16,"MUSIC BY",128
-	.byte	3,12,"HIROKAZU TANAKA",128
-	.byte	1,16," ",128
-	.byte	3,12," ",128
-	.byte	2,13,"CYCLE COUNTING",128
-	.byte	3,16,"IS HARD!"
-	.byte	255
-
 ;.align	$100
 ;.include "tfv_sprites.inc"
 
diff --git a/megademo/letters.s b/megademo/letters.s
new file mode 100644
index 00000000..c6aea000
--- /dev/null
+++ b/megademo/letters.s
@@ -0,0 +1,29 @@
+; The various strings printed by the sliding letters code
+; Kept in one place to try to allow for better alignment opportunities
+
+letters_bm:
+	;.byte	1,12
+	.byte	     "CYCLE",128
+	.byte	2,12,"COUNTING",128
+	.byte	3,12,"M E G A D E M O",150
+	.byte	1,12," ",128
+	.byte	2,12," ",128
+	.byte	3,12," ",128
+	.byte	1,19,"BY",128
+	.byte	3,10,"VINCE ",34,"DEATER",34," WEAVER",150
+	.byte	1,19," ",128
+	.byte	3,10," ",128
+	.byte	1,16,"MUSIC BY",128
+	.byte	3,16,"????????",150
+	.byte	1,16," ",128
+	.byte	3,16," ",128
+	.byte	1,16,"BMP2DHR",128
+	.byte	3,14,"BILL BUCKELS",150
+	.byte	1,16," ",128
+	.byte	3,14," ",128
+	.byte	1,16,"LZ4+DISK",128
+	.byte	3,17,"QKUMBA",150
+	.byte	1,16," ",128
+	.byte	3,17," "
+	.byte	255
+
diff --git a/megademo/megademo.s b/megademo/megademo.s
index 26d87793..7c694fba 100644
--- a/megademo/megademo.s
+++ b/megademo/megademo.s
@@ -122,24 +122,40 @@ loop_forever:
 	.include "tfv_sprites.inc"
 	.include "mode7_sprites.inc"
 
+;=================================
+; Include Text for Sliding Letters
+;  *DONT CROSS PAGES*
+;=================================
+.include "letters.s"
+
 ;============================
 ; Include Lores Graphics
+; No Alignment Needed
 ;============================
+
 ; leaving
 .include "leaving.inc"
+
 ; waterfall
 .include "waterfall_page1.inc"
 .include "waterfall_page2.inc"
+
 ; arrival
 .include "arrival.inc"
 
 ;============================
 ; Include Hires Graphics
+; No Alignment Needed
 ;============================
-sb_background_hgr:
-.incbin "SB_BACKGROUNDC.BIN.lz4",11
-sb_background_hgr_end:
+
+; bird mountain
 katahdin:
 .incbin "KATC.BIN.lz4",11               ; skip the header
 katahdin_end:
 
+; spacebars
+sb_background_hgr:
+.incbin "SB_BACKGROUNDC.BIN.lz4",11
+sb_background_hgr_end:
+
+