From f67c1381fc144274500d28d39feba56ce547bb60 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Fri, 15 Nov 2019 22:17:49 -0500
Subject: [PATCH] ds: getting closer

---
 demosplash/demosplash.s        | 10 +++++-----
 demosplash/escape.s            |  5 ++---
 demosplash/starbase_keyboard.s |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/demosplash/demosplash.s b/demosplash/demosplash.s
index 8c173330..ec08ec65 100644
--- a/demosplash/demosplash.s
+++ b/demosplash/demosplash.s
@@ -168,11 +168,11 @@ repeat_ending:
 	;======================
 	; wait until keypressed
 	;======================
-wait_until_keypressed:
-	lda	KEYPRESS
-	bpl	wait_until_keypressed
-	bit	KEYRESET
-	rts
+;wait_until_keypressed:
+;	lda	KEYPRESS
+;	bpl	wait_until_keypressed
+;	bit	KEYRESET
+;	rts
 
 
 
diff --git a/demosplash/escape.s b/demosplash/escape.s
index 3d87b7f7..aca72138 100644
--- a/demosplash/escape.s
+++ b/demosplash/escape.s
@@ -11,8 +11,7 @@ escape:
 	; setup music
 
 	; we are roughly at the beginning of pattern 0x18
-	; pattern $18
-	; line   $15
+	; pattern $18, line   $00
 
 	lda	#$18
 	sta	current_pattern_smc+1
@@ -25,7 +24,7 @@ escape:
         sta     FRAME_PAGE
         jsr     update_pt3_play
 
-	lda	#$3F		; assume on line $15, speed=3
+	lda	#$0		; assume on line $15, speed=3
 	sta	FRAME_PLAY_OFFSET
 
 	lda	#1
diff --git a/demosplash/starbase_keyboard.s b/demosplash/starbase_keyboard.s
index fc1ad6e7..3a9596e9 100644
--- a/demosplash/starbase_keyboard.s
+++ b/demosplash/starbase_keyboard.s
@@ -455,7 +455,7 @@ starbase_keypresses:
 	.byte	'.',80		; start charging laser, wait 180
 	.byte	'L',10		; release, blasting door, wait 2
 	.byte	'D',20		; walk right
-	.byte	'D',180		; run right
+	.byte	'D',135		; run right until we hit door
 	.byte	'A',2		; walk left	; turn
 	.byte	'A',50		; walk left	; walk left
 	.byte	'D',2		; stop