From 432085f8cded1671c368d6ccc13bce1f6d4f8ba8 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Fri, 21 Dec 2018 09:55:06 -0500
Subject: [PATCH] xmas2018: some fine tuning

---
 xmas_2018/ball.s     |  2 +-
 xmas_2018/wreath.s   | 10 ++++------
 xmas_2018/xmas2018.s |  7 ++++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/xmas_2018/ball.s b/xmas_2018/ball.s
index f0122c0d..fc5d2bf1 100644
--- a/xmas_2018/ball.s
+++ b/xmas_2018/ball.s
@@ -174,7 +174,7 @@ done_framing:
 
 
 	lda	FRAMEH						; 3
-	cmp	#30		; length of song?		; 2
+	cmp	#10		; length of song?		; 2
 	beq	ball_done					; 3
 								; -1
 							;===============
diff --git a/xmas_2018/wreath.s b/xmas_2018/wreath.s
index a8c011c5..2d206257 100644
--- a/xmas_2018/wreath.s
+++ b/xmas_2018/wreath.s
@@ -44,13 +44,11 @@ wreath:
 
 	; so we have 5070 + 4550 = 9620 to kill
 
-	; FIXME: clear page0 screen
+	; clear page0 screen
 
 	jsr	clear_top			; 6+5410
 
-	; now we have  left
-
-	; GR part
+	; Set graphics mode
 ;	bit	HIRES							; 4
 	bit	SET_GR							; 4
 	bit	FULLGR							; 4
@@ -327,7 +325,7 @@ wrloop2:dex								; 2
 
 
 	lda	FLAME1						; 3
-	cmp	#30		; length of song?		; 2
+	cmp	#15		; length of song?		; 2
 	beq	wreath_done					; 3
 								; -1
 							;===============
@@ -350,5 +348,5 @@ wreath_done:
 	rts						; 6
 
 
-
+;.assert         >wreath_begin_loop = >(wreath_done), error, "wreath crosses page"
 
diff --git a/xmas_2018/xmas2018.s b/xmas_2018/xmas2018.s
index 4f63d37d..842f5a34 100644
--- a/xmas_2018/xmas2018.s
+++ b/xmas_2018/xmas2018.s
@@ -30,7 +30,7 @@ apple_iie:
 	;===================
 	; Load graphics
 	;===================
-
+reload_everything:
 	; load WREATH.LZ4 to $a000
 	; then decompress it to $2000 (HGR PAGE0)
 
@@ -163,7 +163,9 @@ forever:
 
 	jsr	merry
 
-	jmp	forever
+	jsr	wait_until_keypress
+
+	jmp	reload_everything
 
 	;==================
 	; Game over
@@ -186,7 +188,6 @@ game_over_man:
 	.include	"delay_a.s"
 	.include	"wait_keypress.s"
 	.include	"gr_putsprite.s"
-;	.include	"text_print.s"
 	.include	"play_music.s"
 
 ; filename to open is 30-character Apple text: