From 5bc81743e537e20fc3d1443f3414adf9f76240ae Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Tue, 5 Nov 2019 23:56:51 -0500
Subject: [PATCH] ds: trying to put it all together

---
 demosplash/TODO                |  3 +--
 demosplash/demosplash.s        | 28 +++++++++++++++-------------
 linker_scripts/apple2_1400.inc |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/demosplash/TODO b/demosplash/TODO
index 4dad8715..74ffe20d 100644
--- a/demosplash/TODO
+++ b/demosplash/TODO
@@ -2,7 +2,7 @@ TODO if time:
 	+ when engines start, have only part of screen go lighter
 	+ memcpy() last frame in before star frame
 	+ better star animation (more frames?)
-	+ star fade in to book?
+	+ minor glitches in the book animation
 	+ Add colored bars for accent on Missing screen?
 
 General:
@@ -20,7 +20,6 @@ PACKAGE:   01234567890123456789012345678901234567
 	  "AN INTERESTING PACKAGE IS RECEIVED"
 
 STARBASE:
-	+ Keyboard emulation
 	+ change colors of shield? laser? blast?
 	+ room0	-- done
 	+ room1	- run in
diff --git a/demosplash/demosplash.s b/demosplash/demosplash.s
index 50f9e7dd..97df2adb 100644
--- a/demosplash/demosplash.s
+++ b/demosplash/demosplash.s
@@ -118,8 +118,10 @@ frame_decode_loop:
 	;===========================
 	; opening book scene
 	;============================
-
-	jsr	open_book
+	nop
+	nop
+	nop
+;	jsr	open_book
 
 	;===========================
 	; starbase scene
@@ -141,18 +143,18 @@ frame_decode_loop:
 	; escape scene
 	;===========================
 
-	nop
-	nop
-	nop
-;	jsr	escape
+;	nop
+;	nop
+;	nop
+	jsr	escape
 
 	;===========================
 	; book scene
 	;===========================
 
-	nop
-	nop
-	nop
+;	nop
+;	nop
+;	nop
 	jsr	end_book
 
 	;===========================
@@ -176,8 +178,8 @@ wait_until_keypressed:
 	lda	KEYPRESS
 	bpl	wait_until_keypressed
 	bit	KEYRESET
-	rts
-
+;	rts
+	jmp	demosplash2019
 
 ; Apple II intro
 .include "appleII_intro.s"
@@ -189,7 +191,7 @@ wait_until_keypressed:
 .include "gr_copy.s"
 .include "gr_offsets.s"
 
-.include "text_print.s"
+;.include "text_print.s"
 .include "gr_pageflip.s"
 .include "gr_clear_bottom.s"
 
@@ -213,7 +215,7 @@ wait_until_keypressed:
 .include "starbase.s"
 
 ; escape
-;.include "escape.s"
+.include "escape.s"
 
 ; reading
 .include "reading.s"
diff --git a/linker_scripts/apple2_1400.inc b/linker_scripts/apple2_1400.inc
index e9517c00..e8175c27 100644
--- a/linker_scripts/apple2_1400.inc
+++ b/linker_scripts/apple2_1400.inc
@@ -1,6 +1,6 @@
 MEMORY {
        ZP: start = $00, size = $1A, type = rw;
-       RAM: start = $1400, size = $7E00, file = %O;
+       RAM: start = $1400, size = $8E00, file = %O;
 }
 
 SEGMENTS {