From ec072179a4774b4bcfb76fd9eef0c3579969fdeb Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sat, 18 Jul 2020 23:23:41 -0400
Subject: [PATCH] mist: fix marker switch

the sound consolidation broke marker switch
A was not preserved
---
 mist/dni_ending.s    | 16 ++++++++++++----
 mist/marker_switch.s |  5 ++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/mist/dni_ending.s b/mist/dni_ending.s
index bcecb4cd..2be8774f 100644
--- a/mist/dni_ending.s
+++ b/mist/dni_ending.s
@@ -30,8 +30,9 @@
 ;	back to writing
 
 ; says variations of "give me the page" while holding out hand
-; click on him with 
+; click on him with
 
+HAVE_PAGE_START = 5
 ATRUS_WRITING = 10
 
 atrus_text:
@@ -473,9 +474,6 @@ visit_atrus:
 	lda	#$80
 	sta	FRAMEL		; want consistent timers
 
-
-	; FIXME: check for white page or not
-
 	; see if it's the first time we've opened book
 	lda	DNI_PROGRESS
 	beq	actually_talk_with_atrus
@@ -486,6 +484,16 @@ visit_atrus:
 
 actually_talk_with_atrus:
 
+	lda	HOLDING_PAGE
+	and	#$c0
+	cmp	#HOLDING_WHITE_PAGE
+	bne	not_holding_page
+
+	lda	#HAVE_PAGE_START
+	sta	DNI_PROGRESS
+
+not_holding_page:
+
 	lda	#DIRECTION_N|DIRECTION_SPLIT
 	sta	DIRECTION
 
diff --git a/mist/marker_switch.s b/mist/marker_switch.s
index fcb83975..b396f0e2 100644
--- a/mist/marker_switch.s
+++ b/mist/marker_switch.s
@@ -34,9 +34,6 @@ click_marker_switch:
 
 	; click
 
-	jsr	click_speaker
-	jsr	click_speaker
-
 	eor	MARKER_SWITCHES		; toggle switch
 	sta	MARKER_SWITCHES
 
@@ -52,6 +49,8 @@ dont_open_secret:
 done_handle_secret:
 	sta	COMPARTMENT_OPEN
 
+	jsr	click_speaker
+	jsr	click_speaker
 
 	rts