From 48384448e158bf052b91f3a418b4bfda105e3b20 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sun, 26 Jul 2020 13:34:21 -0400
Subject: [PATCH] mist: channelwood: hook up first valve

---
 mist/channel_switches.s               |  81 ++++++++++++++++++++++++++
 mist/common_defines.inc               |   7 +++
 mist/default_save.s                   |  10 +++-
 mist/graphics_channel/wind_path_s.png | Bin 1063 -> 10346 bytes
 mist/leveldata_channel.inc            |  34 ++++++++++-
 mist/zp.inc                           |  12 ++--
 6 files changed, 134 insertions(+), 10 deletions(-)

diff --git a/mist/channel_switches.s b/mist/channel_switches.s
index a98920b6..a26a729e 100644
--- a/mist/channel_switches.s
+++ b/mist/channel_switches.s
@@ -1,3 +1,83 @@
+;===========================
+;===========================
+; handle valve 1 (elevator2)
+;===========================
+;===========================
+handle_valve1:
+
+	lda	CHANNEL_VALVES
+	eor	#CHANNEL_VALVE1
+	sta	CHANNEL_VALVES
+
+	jsr	adjust_valve_backgrounds
+
+	jsr	change_direction	; update background
+
+	rts
+
+;===========================
+;===========================
+; goto valve1
+;===========================
+;===========================
+goto_valve1:
+
+	lda	#CHANNEL_VALVE1_ELEVATOR2
+	sta	LOCATION
+
+	jmp	change_location
+
+
+;===========================
+;===========================
+; adjust valve backgrounds
+;===========================
+;===========================
+adjust_valve_backgrounds:
+
+	;=======================
+	; for valve1
+
+check_valve1:
+	lda	CHANNEL_VALVES
+	and	#CHANNEL_VALVE1
+	beq	valve1_is_off
+
+valve1_is_on:
+	ldy	#LOCATION_NORTH_BG
+	lda	#<valve_bottom_on_lzsa
+	sta	location38,Y				; CHANNEL_VALVE1_ELEVATOR2
+	lda	#>valve_bottom_on_lzsa
+	sta	location38+1,Y				; CHANNEL_VALVE1_ELEVATOR2
+
+	ldy	#LOCATION_SOUTH_BG
+	lda	#<valve_top_on_lzsa
+	sta	location38,Y				; CHANNEL_VALVE1_ELEVATOR2
+	lda	#>valve_top_on_lzsa
+	sta	location38+1,Y				; CHANNEL_VALVE1_ELEVATOR2
+
+	jmp	check_valve2
+
+valve1_is_off:
+	ldy	#LOCATION_NORTH_BG
+	lda	#<valve_bottom_off_lzsa
+	sta	location38,Y				; CHANNEL_VALVE1_ELEVATOR2
+	lda	#>valve_bottom_off_lzsa
+	sta	location38+1,Y				; CHANNEL_VALVE1_ELEVATOR2
+
+	ldy	#LOCATION_SOUTH_BG
+	lda	#<valve_top_off_lzsa
+	sta	location38,Y				; CHANNEL_VALVE1_ELEVATOR2
+	lda	#>valve_top_off_lzsa
+	sta	location38+1,Y				; CHANNEL_VALVE1_ELEVATOR2
+
+
+check_valve2:
+
+
+	rts
+
+
 ;===========================
 ;===========================
 ; pick up myst linking book
@@ -233,6 +313,7 @@ no_extend_pipe:
 	; should call this when entering level
 adjust_after_changes:
 
+	jsr	adjust_valve_backgrounds
 
 adjust_bridge:
 	;=======================
diff --git a/mist/common_defines.inc b/mist/common_defines.inc
index f68435dc..31edfae1 100644
--- a/mist/common_defines.inc
+++ b/mist/common_defines.inc
@@ -360,6 +360,13 @@ CHANNEL_BOOK_CLOSED	=	34
 CHANNEL_BOOK_OPEN	=	35
 CHANNEL_ELEV1_OPEN	=	36
 CHANNEL_IN_ELEV1_CLOSED	=	37
+CHANNEL_VALVE1_ELEVATOR2=	38
+CHANNEL_VALVE2_TREE	=	39
+CHANNEL_VALVE3_BROKEN	=	40
+CHANNEL_VALVE4_ELEVATOR1=	41
+CHANNEL_VALVE5_ENTRY	=	42
+CHANNEL_VALVE6_BRIDGE	=	43
+
 
 ; Cabin lost in woods
 CABIN_OUTSIDE		=	0
diff --git a/mist/default_save.s b/mist/default_save.s
index 4c2bcd4b..7e53906c 100644
--- a/mist/default_save.s
+++ b/mist/default_save.s
@@ -11,13 +11,21 @@
 .byte ARBOR_ARRIVAL_CLOSED	; LOCATION	=	$82
 .endif
 
-.if 1
+.if 0
 ; MECHE
 .byte LOAD_MECHE	; WHICH_LOAD		= 	$80
 .byte DIRECTION_W	; DIRECTION		= 	$81
 .byte MECHE_ARRIVAL	; LOCATION	=	$82
 .endif
 
+.if 1
+; CHANNEL
+.byte LOAD_CHANNEL	; WHICH_LOAD		= 	$80
+.byte DIRECTION_S	; DIRECTION		= 	$81
+.byte CHANNEL_ARRIVAL	; LOCATION	=	$82
+.endif
+
+
 
 
 .byte $00	; RED_PAGES_TAKEN	=	$83
diff --git a/mist/graphics_channel/wind_path_s.png b/mist/graphics_channel/wind_path_s.png
index 8446364d8e383cb67bbe779af709ffad4e84d50a..814a239f6565402acbea45854920b6a5d499e86f 100644
GIT binary patch
delta 10273
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

delta 917
zcmV;G18V&0P^SoxBYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ)@*k9jqYY
zkfAzR5EXUQDionYs1;guFuC+YXws0RxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi<J1k
zq|hSPgX4a@yZ5+z2MDzi)2xnBK+|nAm57U(?1~tCMJECXV}A;LGP8_XNlK#a__~LW
zuXiz?)&AU{qesnI4DgA>Gt4k;;&tN5P21qSPaI)IStULv9x>^H#E)E8JbvR`a9QA)
z5i^~dBaRS@g%(y?m=#Tpc!D^pYC7c$8IM)YTb#90g*EQUUl_{i%S&9RIfw)num}kv
z6jZQ*5^Th1)qhE`kfQx~8~=dom&m1%YXgiN^C&}u?E1m~;CHuHetgVJ3dMoIi{pF@
z0l{6MUUi)BW5=nV0RCs-N^knhHDLOa^lDR!9s%KP;NrTeDSN=>4$%K($foQ{ewso)
z54@kzH)Vm|TcCT@>#ebm(+40;T_taTgF|4rK-p_;-V)u_+S|Wp8vXqMXytOF<`CUa
zlkz2A2?huQFgs`dPxX^oCMbW=Nkl<ZNXOllfo_8^3`C<y8DUbj|Nq<JUXODUT$-*`
zrCBN%7e6j`5=hHZ%CgjI=Thos<!0V9yKH86{cMID%d)e@;nkWVAZ}=Z<vRl6VFM5$
z;w*w|0ul2-15taZ5FV0+?SY6%;R%omTcD|-Axeco4Oy2Mh?uV-hkSon!!w19y%^Yb
z*?@L@qK1r(z->b9(`y3AY3_mM+dtGd)fAi7y+Q!h<0&BgwkdxG0_i9A3xH7gkAd30
z*p^QMwUfLRs4Z&*UM}wk=3Gk7wdTC80(xJ-)!8Xf2tfMOW6K$0?6?DYsURLPn&ER+
z#$BKf=Eg>7d&k4TubY1fmNo;_BM*VC76I+(D`wCh36B*|QqopNG1Zv9LD$Z9g-R0I
zKVmdPrxbNR&Eg1cfk`%k&S0z;QNHfiA<yFcnnI&kh-)!sVbCXa1k%zR%;QE_2lVZE
z1ZVXRfj$&#?YD}fd(xPE4CMMa1<v3+5Dgi#(m4(rsp0%L?D%O=<fi*Q70ht_w2X$k
zD~#GefN=g>I|N2^kf|K36v7XH@wA2_)8~~DTkG+t?yO}2TNr*(p;Ejxya=eJ=Yf0+
r_rMYP5YV^c359yU^guuKXdeCoXAfPg@yZVi00000NkvXXu0mjf*4?<#

diff --git a/mist/leveldata_channel.inc b/mist/leveldata_channel.inc
index 1baeab9a..eca7de9f 100644
--- a/mist/leveldata_channel.inc
+++ b/mist/leveldata_channel.inc
@@ -12,7 +12,7 @@ locations:
 	.word location24,location25,location26,location27
 	.word location28,location29,location30,location31
 	.word location32,location33,location34,location35
-	.word location36,location37
+	.word location36,location37,location38
 
 ; CHANNEL_ARRIVAL		-- arrival in channelwood
 location0:
@@ -223,7 +223,10 @@ location11:
 	.word	$0000			; east bg
 	.word	steps_fork_w_lzsa	; west bg
 	.byte	BG_NORTH|BG_SOUTH|BG_WEST
-	.byte	$ff
+	.byte	DIRECTION_N	; special exit
+	.byte	18,25		; special x
+	.byte	38,46		; special y
+	.word	goto_valve1-1	; special function
 
 ; CHANNEL_STEPS_PATH		-- path going to steps
 location12:
@@ -277,7 +280,11 @@ location14:
 	.word	$0000			; east bg
 	.word	$0000			; west bg
 	.byte	BG_NORTH|BG_SOUTH
-	.byte	$ff
+	.byte	DIRECTION_S	; special exit
+	.byte	25,31		; special x
+	.byte	24,32		; special y
+	.word	goto_valve1-1	; special function
+
 
 ; CHANNEL_WIND_PATH2		-- path to windmill too
 location15:
@@ -700,3 +707,24 @@ location37:
 	.byte	28,36		; special y
 	.word	elev1_handle-1	; special function
 
+; CHANNEL_VALVE1_ELEVATOR2	-- valve for elevator2
+location38:
+	.byte	CHANNEL_STEPS_FORK	; north exit
+	.byte	CHANNEL_WIND_PATH	; south exit
+	.byte	$ff			; east exit
+	.byte	$ff			; west exit
+	.byte	DIRECTION_N	; north exit_dir
+	.byte	DIRECTION_S	; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	valve_bottom_off_lzsa	; north bg
+	.word	valve_top_off_lzsa	; south bg
+	.word	$0000			; east bg
+	.word	$0000			; west bg
+	.byte	BG_NORTH|BG_SOUTH
+	.byte	DIRECTION_N|DIRECTION_S	; special exit
+	.byte	15,25		; special x
+	.byte	14,34		; special y
+	.word	handle_valve1-1	; special function
+
+
diff --git a/mist/zp.inc b/mist/zp.inc
index ddf8bdba..9ef69a79 100644
--- a/mist/zp.inc
+++ b/mist/zp.inc
@@ -186,12 +186,12 @@ CHANNEL_SWITCHES=	$B5		; channelwood switches
 	CHANNEL_SW_FAUCET	= $80
 
 CHANNEL_VALVES	=	$B6		; channelwood valves
-	CHANNEL_VALVE1		= $01
-	CHANNEL_VALVE2		= $02
-	CHANNEL_VALVE3		= $04
-	CHANNEL_VALVE4		= $08
-	CHANNEL_VALVE5		= $10
-	CHANNEL_VALVE6		= $20
+	CHANNEL_VALVE1		= $01		; elevator2
+	CHANNEL_VALVE2		= $02		; big tree
+	CHANNEL_VALVE3		= $04		; broken
+	CHANNEL_VALVE4		= $08		; elevator1
+	CHANNEL_VALVE5		= $10		; entry
+	CHANNEL_VALVE6		= $20		; bridge
 
 DENTIST_LIGHT	=	$B7		; dentist lightswitch
 DENTIST_MONTH	=	$B8		; dentist panel: month