From f215f585e4b6105881c219b8726ae901b9391d65 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Mon, 4 Dec 2023 22:35:11 -0500
Subject: [PATCH] xmas2023: actually starts up

---
 demos/xmas_2023/Makefile | 16 +++++++---------
 demos/xmas_2023/music.s  |  2 +-
 demos/xmas_2023/start.s  |  5 +++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/demos/xmas_2023/Makefile b/demos/xmas_2023/Makefile
index 75663c4e..27d1e1f9 100644
--- a/demos/xmas_2023/Makefile
+++ b/demos/xmas_2023/Makefile
@@ -9,16 +9,14 @@ LINKER_SCRIPTS = ../../linker_scripts/
 all:	xmas_2023.dsk
 
 xmas_2023.dsk:	QBOOT QLOAD music.inc qload.inc \
-	MUSIC \
-	XMAS
+	MUSIC XMAS
 	cp $(EMPTY_DISK) xmas_2023.dsk
-	$(DOS33_RAW) second_d1.dsk 0 0 QBOOT		0 1
-	$(DOS33_RAW) second_d1.dsk 0 2 QBOOT		1 1
-	$(DOS33_RAW) second_d1.dsk 0 4 QBOOT		2 1
-	$(DOS33_RAW) second_d1.dsk 1 0 QLOAD		0 0
-#	$(DOS33_RAW) second_d1.dsk 2 0 MUSIC_INTRO	0 0
-#	$(DOS33_RAW) second_d1.dsk 4 0 MUSIC		0 0
-	$(DOS33_RAW) second_d1.dsk 12 0 XMAS	0 0
+	$(DOS33_RAW) xmas_2023.dsk 0 0 QBOOT		0 1
+	$(DOS33_RAW) xmas_2023.dsk 0 2 QBOOT		1 1
+	$(DOS33_RAW) xmas_2023.dsk 0 4 QBOOT		2 1
+	$(DOS33_RAW) xmas_2023.dsk 1 0 QLOAD		0 0
+	$(DOS33_RAW) xmas_2023.dsk 4 0 MUSIC		0 0
+	$(DOS33_RAW) xmas_2023.dsk 12 0 XMAS		0 0
 
 
 ####
diff --git a/demos/xmas_2023/music.s b/demos/xmas_2023/music.s
index 915da3e9..16e7766a 100644
--- a/demos/xmas_2023/music.s
+++ b/demos/xmas_2023/music.s
@@ -11,7 +11,7 @@ music_lib:
 
 PT3_ENABLE_APPLE_IIC = 1
 
-	nop		; urgh to keep interrupt_handler from starting at $C4
+;	nop		; urgh to keep interrupt_handler from starting at $C4
 			; which broke auto-patcher
 
 	; pt3 player
diff --git a/demos/xmas_2023/start.s b/demos/xmas_2023/start.s
index 9df7c122..f03e45a5 100644
--- a/demos/xmas_2023/start.s
+++ b/demos/xmas_2023/start.s
@@ -6,7 +6,6 @@
 
 
 xmas_start:
-	jmp	xmas_start
 
 	;=====================
 	; initializations
@@ -21,6 +20,7 @@ xmas_start:
 	; restart?
 	;===================
 restart:
+
 	lda	#0
 	sta	DRAW_PAGE
 
@@ -81,9 +81,10 @@ skip_all_checks:
 
 	;=======================
 	;=======================
-	; Load intro
+	; Load xmas
 	;=======================
 	;=======================
+load_xmas:
 
 	; load from disk