From 5ecfdbee192fcbaaa84c767100cd3c365b5a1417 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Wed, 31 Oct 2018 12:52:28 -0400
Subject: [PATCH] vapor_lock: update all demos with the improved code

---
 fireworks/fireworks.dsk   | Bin 143360 -> 143360 bytes
 fireworks/vapor_lock.s    |  38 ++++--
 kfest2018/Makefile        |   2 +-
 kfest2018/delay_a.s       |  25 ++++
 kfest2018/raster.s        |   7 ++
 kfest2018/vapor_lock.s    | 238 ++++++++++++++++++++++++++++++++++++++
 space_bars/space_bars.dsk | Bin 143360 -> 143360 bytes
 split_screen/split.dsk    | Bin 143360 -> 143360 bytes
 split_screen/vapor_lock.s |  38 ++++--
 waterfall/vapor_lock.s    |  38 ++++--
 waterfall/waterfall.dsk   | Bin 143360 -> 143360 bytes
 11 files changed, 361 insertions(+), 25 deletions(-)
 create mode 100644 kfest2018/delay_a.s
 create mode 100644 kfest2018/vapor_lock.s

diff --git a/fireworks/fireworks.dsk b/fireworks/fireworks.dsk
index d47092c587033c039b42b71daac0e90c24678a55..702490ca5b9f76a51ed2226712f531a84426a6b1 100644
GIT binary patch
delta 264
zcmWNLF-yZx6oqqM6HQ}U-zI9(dr`5AVB;X2+yxg0!7)S^i%WljU9!4lc(dS=L2(e@
z+KLEnt`1@cC!rEU6~u}@IGm63O{X_>dnVUtNwA6}PE;&mt1Ahq?<6{PkXk1!33k*A
zp`p8k>@ky`8xTlPg>0H3pK4U6S+*D~xWaY@?<tgfHQxN;{RvwOYqFnP>3cd#lYApR
z$OF|FV6OU+uI547<c`{k5IW0dhAJN5QXDU8d5ekA{wH2tU5s#OuLL{{^3c@9ZvWxA
z7#nQ=wU1iH#OF!j+$TG~s#_w!nK~^Ip{e>M+L+hhC4AxW6i>6uRrbumx0^5cp7x~}
F(?55(RfYfn

delta 191
zcmZp8z|jCiTNn)l80DuM3NY4B-y*;$u(?{<fpMD<qaH7#+;n|;MkOYB*6H`<8RfPY
z$}>*Bu$6@=fJye5!cCc#kATG5zyqHDEiw&&%!DOLA6Sni`FxvR!NerPIBWV;CMH8h
zh3Utcm@F8DwlOpDFijTVV&Bg5mGKG3<`1<pOi~Jr3QP*j3S0`@3OowD3VaIuiVTX3
qicE^klNq^gZ)Tjx&CI31s=%heuE3$d2^4#^X(|u*b{+wyFY*AVsx-F%

diff --git a/fireworks/vapor_lock.s b/fireworks/vapor_lock.s
index b6bba96a..dfaf8247 100644
--- a/fireworks/vapor_lock.s
+++ b/fireworks/vapor_lock.s
@@ -48,15 +48,15 @@ vapor_lock:
 
 	lda	#$dd
 	ldy	#40
-	jsr	clear_page_loop			; make top half grey2 $aa
+	jsr	clear_page_loop			; make bottom half yellow $dd
 
 	lda	#$aa
 	ldy	#24
-	jsr	clear_page_loop			; make top half grey2 $aa
+	jsr	clear_page_loop			; make middle grey2 $aa
 
 	lda	#$ee
 	ldy	#10
-	jsr	clear_page_loop			; make top half grey2 $aa
+	jsr	clear_page_loop			; make top half aqua $ee
 
 	; set up a rainbow to aid in exact lock
 
@@ -149,6 +149,11 @@ qloop:
 	; 6 17 28 39, clock at 40
 
 
+
+
+;btt:
+;	jmp	btt
+
 	; In theory near end of line 104
 
 	; now skip ahead 8 lines and read from the rainbow pattern we set
@@ -158,15 +163,32 @@ qloop:
 	; we back off a few to make sure we're not in the horiz blank
 	; try to delay 510
 
-	lda	#230				; 2
-	jsr	delay_a				; delay 25+230 = 255
+	; *NOTE* sometimes we end up going one (or rarely, two??) lines too far
+	; so instead try going 7 lines ahead, and if still dd then one more
 
-	lda	#226				; 2
-	jsr	delay_a				; delay 25+226 = 251
+	; so single step until we get a rainbow color
+
+	; go to next line, -10
+	lda	#28				; 2
+	jsr	delay_a				; delay 25+28 = 53
+						; total delay = 55
+
+vl_try_again:
+	lda	#29				; 2
+	jsr	delay_a				; delay 25+29 = 54
+						; total delay = 56
+
+
+
+	lda	$C051				; 4
+	cmp	#$dd				; 2
+	beq	vl_try_again			; 3
+						; -1
 
 
 	; now near end of line 112
-
+	;lda	$0	; nop to match old code	; 3
+;	nop	; nop to match old code	; 2
 
 	lda	$C051				; 4
 ;kbb:
diff --git a/kfest2018/Makefile b/kfest2018/Makefile
index bd77d64d..47415a8d 100644
--- a/kfest2018/Makefile
+++ b/kfest2018/Makefile
@@ -9,7 +9,7 @@ kfest18.dsk:	RASTER RASTER_C
 	$(DOS33) -y kfest18.dsk BSAVE -a 0x2000 RASTER
 	$(DOS33) -y kfest18.dsk BSAVE -a 0x1000 RASTER_C
 
-raster.o:	raster.s
+raster.o:	raster.s vapor_lock.s
 	ca65 -o raster.o raster.s -l raster.lst
 
 RASTER.lz4: RASTER
diff --git a/kfest2018/delay_a.s b/kfest2018/delay_a.s
new file mode 100644
index 00000000..2d0802da
--- /dev/null
+++ b/kfest2018/delay_a.s
@@ -0,0 +1,25 @@
+; From http://6502org.wikidot.com/software-delay
+
+; 25+A cycles (including JSR), 19 bytes (excluding JSR)
+;
+; The branches must not cross page boundaries!
+;
+
+			;       Cycles              Accumulator         Carry flag
+			; 0  1  2  3  4  5  6          (hex)           0 1 2 3 4 5 6
+
+;	jsr	delay_a	; 6  6  6  6  6  6  6   00 01 02 03 04 05 06
+
+dly0:	sbc	#7
+delay_a:cmp	#7	; 2  2  2  2  2  2  2   00 01 02 03 04 05 06   0 0 0 0 0 0 0
+	bcs	dly0	; 2  2  2  2  2  2  2   00 01 02 03 04 05 06   0 0 0 0 0 0 0
+	lsr		; 2  2  2  2  2  2  2   00 00 01 01 02 02 03   0 1 0 1 0 1 0
+	bcs	dly1	; 2  3  2  3  2  3  2   00 00 01 01 02 02 03   0 1 0 1 0 1 0
+dly1:	beq	dly2	; 3  3  2  2  2  2  2   00 00 01 01 02 02 03   0 1 0 1 0 1 0
+	lsr		;       2  2  2  2  2         00 00 01 01 01       1 1 0 0 1
+	beq	dly3	;       3  3  2  2  2         00 00 01 01 01       1 1 0 0 1
+	bcc	dly3	;             3  3  2               01 01 01           0 0 1
+dly2:	bne	dly3	; 2  2              3   00 00             01   0 1         0
+dly3:	rts		; 6  6  6  6  6  6  6   00 00 00 00 01 01 01   0 1 1 1 0 0 1
+	;
+	; Total cycles:	 25 26 27 28 29 30 31
diff --git a/kfest2018/raster.s b/kfest2018/raster.s
index 51d68b6a..77988404 100644
--- a/kfest2018/raster.s
+++ b/kfest2018/raster.s
@@ -133,7 +133,11 @@ data_loop2:
 	bne	data_loop2
 
 
+	; NOTE: proper vapor_lock code that handles most corner cases
+	;	was written later.  The code included below fails sometimes
+	;	but that's all I had time for at kfest
 
+;	jsr	vapor_lock
 
 	;=====================================================
 	; attempt vapor lock
@@ -1075,3 +1079,6 @@ write_ay_both:
 								;       65
 
 
+; added post kfest18
+;.include	"vapor_lock.s"
+;.include	"delay_a.s"
diff --git a/kfest2018/vapor_lock.s b/kfest2018/vapor_lock.s
new file mode 100644
index 00000000..dfaf8247
--- /dev/null
+++ b/kfest2018/vapor_lock.s
@@ -0,0 +1,238 @@
+; This took a while to track down
+; On Apple II/II+ the horiz blanking addr are $1000 higher than on IIe
+; So on II+ were outside video area, so unlikely to be our set value
+;	(unless I foolishly use $ff which some uninitialized mem is set to)
+; Lots of this color fiddling is to make sure you don't accidentally
+;	get runs of colors on IIe due to the horiz blank
+
+; 0-5 aqua 6-12 = grey, 13 - 20 = yellow, 21-23 = aqua rainbow 14
+;
+;
+;16	0	YA
+;17	1	YA
+;18	2	YA
+;19	3	YA
+;20	4	YA
+;21	5	AA
+;22	6	AG
+;23	7	AG
+;0	8	AG
+;1	9	AG
+;2	10	AG
+;3	11	AG
+;4	12	AG
+;5	13	AY ****
+;6	14	GY RAINBOW
+;7	15	GY
+;8	16	GY
+;9	17	GY
+;10	18	GY
+;11	19	GY
+;12	20	GY
+;13	21	YA
+;14	22	YA
+;15	23	YA
+
+
+
+	;==============================
+	; setup graphics for vapor lock
+	;==============================
+vapor_lock:
+
+	; Clear Page0
+	lda	#$0
+	sta	DRAW_PAGE
+	lda	#$ee				; full screen white $ff
+	jsr	clear_gr
+
+	lda	#$dd
+	ldy	#40
+	jsr	clear_page_loop			; make bottom half yellow $dd
+
+	lda	#$aa
+	ldy	#24
+	jsr	clear_page_loop			; make middle grey2 $aa
+
+	lda	#$ee
+	ldy	#10
+	jsr	clear_page_loop			; make top half aqua $ee
+
+	; set up a rainbow to aid in exact lock
+
+	ldy	#00
+rainbow_loop:
+	tya
+	sta	$728+20,Y
+	iny
+	cpy	#20
+	bne	rainbow_loop
+
+;btt:
+;	jmp	btt
+
+
+	;=====================================================
+	; attempt vapor lock
+	;  by reading the "floating bus" we can see most recently
+	;  written value of the display
+	;=====================================================
+	; See:
+	;	Have an Apple Split by Bob Bishop
+        ;	Softalk, October 1982
+
+	; Challenges: each scan line scans 40 bytes.
+	; The blanking happens at the *beginning*
+	; So 65 bytes are scanned, starting at adress of the line - 25
+
+	; the scan takes 8 cycles, look for 4 repeats of the value
+	; to avoid false positive found if the horiz blanking is mirroring
+	; the line (max 3 repeats in that case)
+
+vapor_lock_loop:
+
+	; first make sure we have a full line of $aa
+
+	lda	#$aa							; 2
+zxloop:
+	ldx	#$04							; 2
+wiloop:
+	cmp	$C051		; read the floating bus			; 4
+	bne	zxloop		; if not, start from scratch		; 2/3
+	dex			; we were, dec				; 2
+	bne	wiloop		; if not 4 of them, restart		; 3/2
+
+	; if we get here we read 4 proper pixels, 11 apart (2+4+2+2+3)
+	; 0 11 22 33, clock at 34
+	; 1 12 23 34, clock at 35
+	; 2 13 24 35, clock at 36
+	; 3 14 25 36, clock at 37
+	; 4 15 26 37, clock at 38
+	; 5 16 27 38, clock at 39
+	; 6 17 28 39, clock at 40
+
+
+;                                 X          X          X          X
+;                                  X          X          X          X
+;                                   X          X          X          X
+;                                    X          X          X          X
+;                                     X          X          X          X
+;                                      X          X          X          X
+;                                       X          X          X          X
+;	0123456789012345678901234 0123456789012345678901234567890123456789
+;                 1         2               1         2         3
+;	hsync                     pixels
+;       XXXXXXXXXXXXXXXXXXXXXXXXX 4444444444444444444444444444440123456789
+
+	; now look for the color change that
+	; happens at line 13*8 = 104
+
+	lda	#$dd							; 2
+zloop:
+	ldx	#$04							; 2
+qloop:
+	cmp	$C051		; read floating bus			; 4
+	bne	zloop							; 2/3
+	dex								; 2
+	bne	qloop							; 3/2
+								;============
+								;	11
+
+	; Found it!
+	; if we get here we read 4 proper pixels, 11 apart (2+4+2+2+3)
+	; 0 11 22 33, clock at 34
+	; 1 12 23 34, clock at 35
+	; 2 13 24 35, clock at 36
+	; 3 14 25 36, clock at 37
+	; 4 15 26 37, clock at 38
+	; 5 16 27 38, clock at 39
+	; 6 17 28 39, clock at 40
+
+
+
+
+;btt:
+;	jmp	btt
+
+	; In theory near end of line 104
+
+	; now skip ahead 8 lines and read from the rainbow pattern we set
+	; up to find our exact location
+
+	; delay 65 * 8 = 520
+	; we back off a few to make sure we're not in the horiz blank
+	; try to delay 510
+
+	; *NOTE* sometimes we end up going one (or rarely, two??) lines too far
+	; so instead try going 7 lines ahead, and if still dd then one more
+
+	; so single step until we get a rainbow color
+
+	; go to next line, -10
+	lda	#28				; 2
+	jsr	delay_a				; delay 25+28 = 53
+						; total delay = 55
+
+vl_try_again:
+	lda	#29				; 2
+	jsr	delay_a				; delay 25+29 = 54
+						; total delay = 56
+
+
+
+	lda	$C051				; 4
+	cmp	#$dd				; 2
+	beq	vl_try_again			; 3
+						; -1
+
+
+	; now near end of line 112
+	;lda	$0	; nop to match old code	; 3
+;	nop	; nop to match old code	; 2
+
+	lda	$C051				; 4
+;kbb:
+;	jmp	kbb
+
+        ; we are in theory on line $728 = 14*8 = 112
+        ; so 112*65 = 7280 cycles from start
+
+        ; we are actualy 25+20+A pixels in
+        ; 7325+A
+
+        ; Our goal is line 114 at 7410 cycles
+	; 7410 - 7325 = 85
+
+        ; so kill 85-A cycles
+	; -6 to do subtraction
+	; -6 for rts
+	; -25 for delay_a overhead
+
+        eor	#$ff				; 2
+        sec					; 2
+        adc	#48				; 2
+
+	jsr	delay_a				; should total 48 cycles
+
+
+done_vapor_lock:
+	rts                                                     ; 6
+
+
+
+
+	; Some random related work
+	; Docs:
+	;	Lancaster
+	;	Bishop
+	;	Sather
+
+	; Vaguely relevant but no help with the Apple II+ issue
+	;
+	;	Eamon: Screen display and timing synchronization
+	;		on the Apple IIe and Apple IIgs
+	;
+	;	Adams: Visually presented verbal stimuli by assembly
+	;		language on the Apple II computer.
+	;	Cavanagh and Anstis: Visual psychophysics on the
+	;		Apple II: Getting started
diff --git a/space_bars/space_bars.dsk b/space_bars/space_bars.dsk
index 47ee8473c42ec9cc0cf8544f66c46945de308cf3..94b432117e18432901679f7fb8a12dc3fa562497 100644
GIT binary patch
delta 557
zcmb_Y&ubGw6rOK(v%87;u?jP4YspacP$)4i2nrsWOQ}JatUcu5Wey7QB;rAD&1J=7
zB!>l0MX0z1A(GO?TP{`NY3;$AAc8?D$RgT8sg1L={s%theeZqqz4-=S`?J&5X9HCi
zlfj&e=G1shNSZ6h^&clX4uhJDa)0IgHEf<jrGSaxQW*kgqedAU)vlX!Dh!M=gPAPD
zEM_x@Wm%4$V0l(xMONa3gHvvBlV`Za?JjcfBGh1%(#KI=fg&o_@UyUa4@H``yTv1^
zeJmaEAm2fSPB_|N%UIYs-8bhx0ABaw{6#GH59XICyDvlHKMGC%M>s8J7D7iiq<j1F
zORnUT`1fpMFxwo2P5)20<R1v)MbnG;l1)Dg@~hf>@_(CO$lW?8lnkddyz&OaPsuM`
zu8*(Wt?C=~-5%P#{d$iinR;S&XiU^95kt9D*O8nQ+j3p($u+WNuHkE@cU4QilR~yN
zQxe<3vj)nGd$Q$|mX8|`WJ|p!BNEdQ)N?$xho#u{Ej_<}=8n~&Bl}yDC{3Tz5!FM6
e5<BvJy#LmYca`4iVPJZ=2`_4T2(1@y@bE9I?Y!9l

delta 778
zcmbV}PiqrF7{>S6o$PM1ZFY)(2+TqTJe3@h-n6GyMN~{TIfdT#Vu>J>egbpZo-0A-
z+7?<!p^$2EPF4vTYfHlV4XWr;@Uj<s=)pLpdWrVXyv)2X@Xn9teV)dV-B4#2C5mfe
zilUa*R1MU9CaM$#5m4A-m4e89iiIq$ieerdIa$eLw<Jg#x39!}-fw+XZM*vJ!QkeT
z5}y}A8@b7jfB&JXWP%_1TRibMv=3wh-&5^dyyJ)VSxeU^U4AIm+Q{Ea{CcR>Lp*xw
z*Ml7`)*?Mdu#RQxlN-^{RP$T8$L5M2TgOQfsONJ%*42;^@NfP>blSC|lRyl1P(wx5
zUZQ0-X@*F$kB*sn(<r~tj*rHo6Y+Tu)pQ~J)tU<jyeA58@kKfT48VQmPE8x6SLQug
zevdrRYcBn4o?!&(qGDiuQ`Wjzw1;@5*Ne#NBm5t~NKa!lJ<k7m!dXGFiOk3B%#Z6_
z&hp|Ne&a45dEa6GgtK}{zEpm8hHV_i7BvQ@GlLP9VkWbg&C)Ex95%+rS(dq;=E2iF
g!y{hGGd=6y4e5EJ{W9<WNwohr(Q^f|yNBte-@V`%eE<Le

diff --git a/split_screen/split.dsk b/split_screen/split.dsk
index 16a366af94d43de0a0ae6e4a58ab30d3e86ec475..daa265bc6b4f91af51d3968daf0f1e7d0efb4fc3 100644
GIT binary patch
delta 9840
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

delta 3451
zcmeHJUu+ab7@u!;_HJ+g-0t=6_Ih&c?bV)X%K{fe&_E2*RG`TL2QicwqFk|&V&a1j
zJgBkwu!cyC;52L#NxYn1WfL^@F7^U3ra>hZqh63i)M)BUpQNJY0YjnAUTI4a@WB{}
zVK%!v-}n7yCiBhr{pQ;@ChQv%3K^=2gpyoK#d=~414lz^e`6}X0#8bSIUfb_k8(i<
zA181DPGsUlxn1Ufb3&V8vb;_P`tbS{I4nByDrkQ|M>^<O=X9d;x=;7(f*#OCUD9P;
z(Sy1gLotY9HcMAhLz~Q%m(A@{Zo<yHX}jA+_JI4S?XdnXH$u$~vA)OkR}T*!zQCF1
zqs-cDr`=)usvEJV%@fh_^esLNnRYq5*&K|zW&s^)8Bd?OUbs#_KCid7jaa!6YwL*l
zOxWrgaSKKARr8jS+MlOum)s5}%=VFs3J(>VPS>vNuU*Qb5Zg@K9&3v?&W+hu-2L`c
zDQ{1*U0pO$xUi@QGf*}uTc8f14ARXYMjcYx*_v$CE=YA##-7SP6{>f4*i$YVpY$F#
zG>4|ob?S2HRKAqY@Pqm6!4N&z8DWa<Qa4j{XNN*`sI%Eh>y56jr{C@`;&%r=r1l|m
zUc=p>8N3Wy`2`u;dCYS>;d$Q2`+0#6@FFkqGOzGKUL}YC!Gt4(@We;_L?8ho5{bw}
zAwi;Yhy{grvXv^VhG~U{_IJ?40lAuc4TjV=a~2D*b5JEO!IUz58Hn~yAPto4vZ|TY
zP*aL;gBOW+og@3^-S*Fp>@Ny8xVFC-nA5OxhQ^)&d!Xd>BHI~#tQIN_jA}Kt9`r2u
zvl|-Nf%m#B!p3{YdkfDO{imb#Ff(5d7x?1P^)YwEAqgB6QLM3N(!P2eVsy>M2XR-}
z=}O@B5{lU^OlP;ch#oj*;QJ!ZXacW*2>m@9aT*rmqkX1nwz2n?ZP|<kU4vZ{Zw_b1
zS=`M5^IC?huj{RU+lI{BELk_r*wKPnZaoH-(&EwMp1+zs-vnYk6L#xPMh4Cs2EJcD
z5p{_@!6;?7Jwf~4Uy0K?{bb`$bV+tO&1`O=*5+*$F1^WL{=mW&>-aB>02}Z;Rf6P%
zo(4}Qb-I)Sk|;^DbcrQ}btfyZPJ#wW6_E%c7CDiKyyz4CRDN$K_DfWLvCRoL;Qtpl
zQu1?Kb=jA2MlFA@;1H(}g;#uvUlEjmA}VaxKW3bh8a%>$x7Xv2B}&!$0nVz$3&e9L
z<A~Pk(y!q==_3M`hJ(}ed{djVLxX7J7+TQQOd~YSUe(EK5XLCUoSv^vYp`6wDR43d
zbOaJWK0WjKXQOAGSCT9p4#o-O80=XGlCTuVc_)*ER3PrhCr7{i;+vZDauQ;E0i$@p
z*_(t8yhwFEX8+y)KG(e*Uy$qfQhh-xUlZ<Fstd!**o`-LMQL<j&Z=5DI4cfk!6FrF
z`#H|L&xE97?16ULuy*F^n*)xiIPMitEbqNyDlV}8OfeM~<I<ua6DNx8c<=}`l{;jB
z1XEnBbA%Il3sxl-s|GT_zy@a!gExGJ-w=#|AsUh)JMypWzBYrVnqs52->atn%WCS5
y6agMR+$#d^#v)*=@OM%;7o4GjU<#+W6iM+ZU&@~n9Jvv%m}Le|tCA)>rThgqF*W%B

diff --git a/split_screen/vapor_lock.s b/split_screen/vapor_lock.s
index b6bba96a..dfaf8247 100644
--- a/split_screen/vapor_lock.s
+++ b/split_screen/vapor_lock.s
@@ -48,15 +48,15 @@ vapor_lock:
 
 	lda	#$dd
 	ldy	#40
-	jsr	clear_page_loop			; make top half grey2 $aa
+	jsr	clear_page_loop			; make bottom half yellow $dd
 
 	lda	#$aa
 	ldy	#24
-	jsr	clear_page_loop			; make top half grey2 $aa
+	jsr	clear_page_loop			; make middle grey2 $aa
 
 	lda	#$ee
 	ldy	#10
-	jsr	clear_page_loop			; make top half grey2 $aa
+	jsr	clear_page_loop			; make top half aqua $ee
 
 	; set up a rainbow to aid in exact lock
 
@@ -149,6 +149,11 @@ qloop:
 	; 6 17 28 39, clock at 40
 
 
+
+
+;btt:
+;	jmp	btt
+
 	; In theory near end of line 104
 
 	; now skip ahead 8 lines and read from the rainbow pattern we set
@@ -158,15 +163,32 @@ qloop:
 	; we back off a few to make sure we're not in the horiz blank
 	; try to delay 510
 
-	lda	#230				; 2
-	jsr	delay_a				; delay 25+230 = 255
+	; *NOTE* sometimes we end up going one (or rarely, two??) lines too far
+	; so instead try going 7 lines ahead, and if still dd then one more
 
-	lda	#226				; 2
-	jsr	delay_a				; delay 25+226 = 251
+	; so single step until we get a rainbow color
+
+	; go to next line, -10
+	lda	#28				; 2
+	jsr	delay_a				; delay 25+28 = 53
+						; total delay = 55
+
+vl_try_again:
+	lda	#29				; 2
+	jsr	delay_a				; delay 25+29 = 54
+						; total delay = 56
+
+
+
+	lda	$C051				; 4
+	cmp	#$dd				; 2
+	beq	vl_try_again			; 3
+						; -1
 
 
 	; now near end of line 112
-
+	;lda	$0	; nop to match old code	; 3
+;	nop	; nop to match old code	; 2
 
 	lda	$C051				; 4
 ;kbb:
diff --git a/waterfall/vapor_lock.s b/waterfall/vapor_lock.s
index b6bba96a..dfaf8247 100644
--- a/waterfall/vapor_lock.s
+++ b/waterfall/vapor_lock.s
@@ -48,15 +48,15 @@ vapor_lock:
 
 	lda	#$dd
 	ldy	#40
-	jsr	clear_page_loop			; make top half grey2 $aa
+	jsr	clear_page_loop			; make bottom half yellow $dd
 
 	lda	#$aa
 	ldy	#24
-	jsr	clear_page_loop			; make top half grey2 $aa
+	jsr	clear_page_loop			; make middle grey2 $aa
 
 	lda	#$ee
 	ldy	#10
-	jsr	clear_page_loop			; make top half grey2 $aa
+	jsr	clear_page_loop			; make top half aqua $ee
 
 	; set up a rainbow to aid in exact lock
 
@@ -149,6 +149,11 @@ qloop:
 	; 6 17 28 39, clock at 40
 
 
+
+
+;btt:
+;	jmp	btt
+
 	; In theory near end of line 104
 
 	; now skip ahead 8 lines and read from the rainbow pattern we set
@@ -158,15 +163,32 @@ qloop:
 	; we back off a few to make sure we're not in the horiz blank
 	; try to delay 510
 
-	lda	#230				; 2
-	jsr	delay_a				; delay 25+230 = 255
+	; *NOTE* sometimes we end up going one (or rarely, two??) lines too far
+	; so instead try going 7 lines ahead, and if still dd then one more
 
-	lda	#226				; 2
-	jsr	delay_a				; delay 25+226 = 251
+	; so single step until we get a rainbow color
+
+	; go to next line, -10
+	lda	#28				; 2
+	jsr	delay_a				; delay 25+28 = 53
+						; total delay = 55
+
+vl_try_again:
+	lda	#29				; 2
+	jsr	delay_a				; delay 25+29 = 54
+						; total delay = 56
+
+
+
+	lda	$C051				; 4
+	cmp	#$dd				; 2
+	beq	vl_try_again			; 3
+						; -1
 
 
 	; now near end of line 112
-
+	;lda	$0	; nop to match old code	; 3
+;	nop	; nop to match old code	; 2
 
 	lda	$C051				; 4
 ;kbb:
diff --git a/waterfall/waterfall.dsk b/waterfall/waterfall.dsk
index f6aac8b5c64eabf644de3d6f32d9f256e585f0e2..66583280283aa0052e946fb28246299f8b9047d7 100644
GIT binary patch
delta 2631
zcmd7TUq};i902frcQ?JQUv{U>T)N-yc3Wz&oS`lW%an>nd#IQd_~J`ZZ$0(uOcp+9
zWy5|C5*<R&1%cGV5g5!c%zBZi-h{pMa*+)Qq6pUSw1ZpIFrvCW{Qi8|@B97m-S2kk
zypYZdYFfYE2R!I}55!@QrpPS~(Y{>ST+iYo1uoeZQb{zG(|ES0Ap`uL^5r}553WX8
zqPrsdwqaDcIKw>NA5xKdyrhh6Z<U!38Oa*SRr=9pSy7c=k7wnx&ZA1j?qs5MoJ@ao
z17}QOPOA+z-)bGUx9UtPrgI<*zWtQ%1$-oI7z?QNvxbb!_>`cz<vaCE{Bs6dW-C)$
zcmr^${YPU{WsMDQ4m=<J)5b>ZPTK{rIoa~?T4T$cvB>5wz+{9u>G(0|e0VkPWBq-}
ziO;rY`Mvw(?o6ZBkZF>?N%CNghBCV~SEiXo8a2EcrTs%dJfWge46}0?%3pyR+PngI
z#~Eo#R-?(|(gG9&wmfSj%@9o{AV4p#K$MOr;C*(wEtM60?T`3&zd!@0-~c^63d6Ne
zC2dJ<mggkxzFKEa%c@VFqaR0M*UkoZGqoTa9-PcAEEPVnDN*da*ebW^O=IxNeN#Qe
zEVG>06`=eObk~*Q{bl$_vGE_^b%qaeSu`Ejd(!~$OV-TaYog`IImEH(5J%o2j)Ef`
z69^pOsOBh$5OWK~><2}uFkex{96cyPExjZ{mpLGF5cTIGoUZ~ejS-NcRzE>tI(O>^
zpbiY!jXBI?53azKSioNF!&@-ITX7ZMMqC7ln{b3D9#TOni9o!>NA#XFyoKL*27`*L
z`r3^27^>^eEss5sE=)DuUi7>WzYeG^@;zx}MEqjDxH@#tFue9|@b|X%WKvXEYyF%5
W1eic>2mJIwjv~=15ZMV3iTe(Mih@W0

delta 1763
zcmdT^O=uHA6wXUFahmKVv#q6VsL8fb+tgyMmF-0+Z7hV6g9#Oa6}uox4_>TS4^>(y
zh^0D|!9Z~v2-sU;51|J`KoBb^1@YcqdRSBfIrsxoCx3Of*%0*R&a%9H^Sz(%y*IP4
zhZgpbx<Ig-4<bNz<Uky9A{RP=5Nbhg<Uu?VkQez}#G`c42?bth5cl{9zd9h8aCBUO
zoE=}$9Pt*mtzIJ1DpxkJ<B6(rO9popH$fcn7Y^w#M8G|(aS7xld|n2R)wb(E$tYp0
zxf6DV+LeKCj@pw!Fre0*(ji-=U}kRx8NAJLYdpx{`-2-!AzM#nnO%MpC}0?Z0QuY-
zBBP;x`T)ZPr;R-YI*y?u`xe6;FPx%7L6D$3do>7K`D|(oILLD2FbN)g@LE2D*+<uD
zJ_-KjiUEU(*XGcd3y#=Gj~X1D&a>a6H-mMZJbctnyCdKOv$$B%)?!VUg3m-CP=>Y9
zog|30y>en=1pJNmiV;{df&ZPwe5e77YQD!<RJqlHmszAHAy88^O}#|Rud}+b29&I8
z)l8q(V*ycNy?#x(o2*Nv>RFVfj%mpuYfqiSk+aQ-)pKM#jy%zs*}o*#Zm_NqyVXa3
zMc}ciKy@T66;?wx-`{|hVdxC3s-jhW++mexT#sg#3DxnnsQR&C?6f!z=`d>`eHw-P
z?5;~_+-1a3zQ7K(WH{8b=%ctPs-4m&62Ipsi^E-}Q{Gj%hNh;bUgn<Tl?|Lr;gvML
zyMakZB79~}OiSuu?1s1l1;oUp9xJOB^$e~orXbg!jgD=JJE-7d>e#yYrnm`9`<Y@m
zxKxbU#Awdey7FG!hStv8U!Qys=hA)ayUus`r=p&hw#DUT{6o?9FP;<Dc)JWe|7r4+
o$1M9^L-ywT6q_m?&84)HiSGjCC1!;iTKNoCDICpdZHX_!ZxG67#sB~S