From 35112198020ff982e3cf213e020776fd03d61246 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sat, 11 Jul 2020 13:11:39 -0400
Subject: [PATCH] mist: proper exit to clock puzzle

it predated the ability to turn around
---
 mist/TODO                             |  13 +++++++++----
 mist/clock_bridge_puzzle.s            |   6 +++++-
 mist/graphics_mist/Makefile           |   3 ++-
 mist/graphics_mist/clock_inside_n.png | Bin 0 -> 795 bytes
 mist/leveldata_mist.inc               |  12 ++++++------
 5 files changed, 22 insertions(+), 12 deletions(-)
 create mode 100644 mist/graphics_mist/clock_inside_n.png

diff --git a/mist/TODO b/mist/TODO
index 8187c23f..1b0c9db1 100644
--- a/mist/TODO
+++ b/mist/TODO
@@ -7,7 +7,9 @@ For release 1.0
 + SHIP  -- split off of STONEY
 
 + MIST
-	-- marker switches
+	-- white page appears
+	-- view back from clock puzzle
+	-- open door to clock puzzle
 
 + CABIN
 	-- safe puzzle
@@ -15,6 +17,7 @@ For release 1.0
 	-- up/down in tree
 
 + OCTAGON
+	-- marker switches update map
 	-- code book
 	-- red book seen when in fireplace
 	-- books destroyed at end
@@ -40,17 +43,19 @@ For release 1.0
 	-- turn on sprite crop in the viewer part
 
 + DNI
-	-- issue when turn when talking then back, grey stripes.
-		turn back on split in code?
 	-- add good ending
 		linking book to MYST
 
++ DENTIST
+	-- marker switch
+	-- can go both directions when leaving
+
 Done:
 + MECHE
 + MIST_TITLE
 + VIEWER
 + ARBOR
-+ DENTIST
+
 
 ================================
 
diff --git a/mist/clock_bridge_puzzle.s b/mist/clock_bridge_puzzle.s
index 310d0425..c44419b5 100644
--- a/mist/clock_bridge_puzzle.s
+++ b/mist/clock_bridge_puzzle.s
@@ -120,6 +120,10 @@ inside_done:
 
 draw_clock_inside:
 
+	lda	DIRECTION
+	cmp	#DIRECTION_S
+	bne	done_draw_clock_puzzle
+
 	; draw weight
 
 	lda	#<clock_weight_sprite
@@ -179,7 +183,7 @@ draw_clock_inside:
 	lda	#16
 	sta	YPOS
 	jsr	put_sprite_crop
-
+done_draw_clock_puzzle:
 	rts
 
 
diff --git a/mist/graphics_mist/Makefile b/mist/graphics_mist/Makefile
index 139cba44..05c9efaf 100644
--- a/mist/graphics_mist/Makefile
+++ b/mist/graphics_mist/Makefile
@@ -44,7 +44,7 @@ mist_graphics.inc:	\
 	tree4_n.lzsa tree4_s.lzsa tree4_w.lzsa tree4_e.lzsa \
 	clock_island_s.lzsa clock_island_n.lzsa \
 	clock_puzzle_s.lzsa clock_puzzle_bridge.lzsa \
-	clock_inside_s.lzsa clock_inside_open.lzsa \
+	clock_inside_n.lzsa clock_inside_s.lzsa clock_inside_open.lzsa \
 	gear_open_e.lzsa \
 	pad_n.lzsa pad_e.lzsa \
 	spaceship_door_n.lzsa spaceship_door_open_n.lzsa \
@@ -126,6 +126,7 @@ mist_graphics.inc:	\
 	echo "clock_puzzle_s_lzsa: .incbin \"clock_puzzle_s.lzsa\"" >> mist_graphics.inc
 	echo "clock_puzzle_bridge_lzsa: .incbin \"clock_puzzle_bridge.lzsa\"" >> mist_graphics.inc
 	echo "clock_inside_s_lzsa: .incbin \"clock_inside_s.lzsa\"" >> mist_graphics.inc
+	echo "clock_inside_n_lzsa: .incbin \"clock_inside_n.lzsa\"" >> mist_graphics.inc
 	echo "clock_inside_open_lzsa: .incbin \"clock_inside_open.lzsa\"" >> mist_graphics.inc
 	echo "gear_open_e_lzsa: .incbin \"gear_open_e.lzsa\"" >> mist_graphics.inc
 	echo "pad_n_lzsa: .incbin \"pad_n.lzsa\"" >> mist_graphics.inc
diff --git a/mist/graphics_mist/clock_inside_n.png b/mist/graphics_mist/clock_inside_n.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bddacf449eee63ef92ae928a09760a777e5e9b3
GIT binary patch
literal 795
zcmV+$1LXXPP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@I4v3U&~2$WWauh>AFB6^c+H)C#RSm|XfHG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_$<ayCMN0f%QfLw5!Ery{-Fw`<1B7~+X;x?q&~)2O
zClg{ew<3mL5k@ych@ekqmN6?yDfo`Bdj$A;7w1|2=l&c$YTjZ%KqQ`FhG`S86Hjg0
z2Iqa^C@aY-@j3CRNf#u3<htVV8|R|S0?&+^ne-fSlvpgbvC_t@WNO5d#4%OVDPPEX
zta9Gstd*;*c~AbrNM2uF;yTSCB(Z=+ND!f*iVc)uBTlPMiiI@oCw%;au3sXTLaq%k
za?GOw4YKP8|AXJ%T7`*mFDa4$I$j*-V;BhU0*#vEd>=bb;{*sk16O*>U#SDrpQP7X
zTI>ku-3BhMTbi;5T<!n^PljyDt`wvx6bium8GTa@=)VQJR=wVu`#607GSpS-1~@nb
zMv9cZ=JW2(_TK(I)9mjD=NxixB+7BZ0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jm9}5d|G5wfX)4000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0002SNkl<ZNXPBdT@S(_425Bqw3eFU{{O$#0}?TMV>s%P?M)zDJt_N0
z>F8*$tt)mBA}BQyC(=O@If4Wd2pv@Y5}0pIlkPdIx&x(xW;l_+2u#>O_h~Q!AQl~r
zAb=5gzeG@EoDlo;gdHrUEeaU1ETu*R^&TCZ{;=aII*7Igrle}ts8fx=rPQcPZ5qVh
zF$$<U&NmH$967>-X4DDW|3RIwUz+xoaq00nQmzcJp9tWCC4ltwrEP)srvE>+^9TI^
ZyaF(>7F`y5(Ifx>002ovPDHLkV1nz%Ql<a^

literal 0
HcmV?d00001

diff --git a/mist/leveldata_mist.inc b/mist/leveldata_mist.inc
index 47004114..b85431e4 100644
--- a/mist/leveldata_mist.inc
+++ b/mist/leveldata_mist.inc
@@ -457,19 +457,19 @@ location22:
 
 ; MYST_CLOCK_INSIDE		-- clock inside
 location23:
-	.byte	$ff			; north exit
-	.byte	MIST_CLOCK_ISLAND	; south exit
+	.byte	MIST_CLOCK_ISLAND	; north exit
+	.byte	$ff			; south exit
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit
-	.byte	$ff		; north exit_dir
-	.byte	DIRECTION_N	; south exit_dir
+	.byte	DIRECTION_N	; north exit_dir
+	.byte	$ff		; south exit_dir
 	.byte	$ff		; east exit_dir
 	.byte	$ff		; west exit_dir
-	.word	$0000			; north bg
+	.word	clock_inside_n_lzsa	; north bg
 	.word	clock_inside_s_lzsa	; south bg
 	.word	$0000			; east bg
 	.word	$0000			; west bg
-	.byte	BG_SOUTH
+	.byte	BG_SOUTH|BG_NORTH
 	.byte	DIRECTION_S	; special exit
 	.byte	12,30		; special x
 	.byte	8,32		; special y