From 5885ad8557dce8d36059be63e45054f589b37fb6 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Wed, 6 Dec 2017 01:34:28 -0500
Subject: [PATCH] dlowres: need to shift the colors

---
 dlowres_mode7/dlowres_flying.s  |  50 ++++++++++++++++++++++++++++++--
 dlowres_mode7/dlowres_mode7.dsk | Bin 143360 -> 143360 bytes
 dlowres_mode7/dlowres_zp.inc    |  13 +++++----
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/dlowres_mode7/dlowres_flying.s b/dlowres_mode7/dlowres_flying.s
index 58861547..066c5e10 100644
--- a/dlowres_mode7/dlowres_flying.s
+++ b/dlowres_mode7/dlowres_flying.s
@@ -31,7 +31,7 @@ flying_start:
 	lda	SET_GR		; graphics C050
 	lda	LORES		; lores    C056
 	lda	TEXTGR		; mixset   C053
-	sta	EIGHTYSTORE_OFF	; 80store  C001
+	sta	SET80COL	; 80store  C001
 	sta	EIGHTYCOL	; 80col    C00d
 	lda	AN3		; AN3      C05E
 
@@ -360,6 +360,7 @@ speed_loop:
 	;====================
 draw_background:
 	jsr	draw_background_mode7					; 6
+;	jsr	draw_background_mode7					; 6
 
 check_over_water:
 	;	See if we are over water
@@ -620,6 +621,8 @@ draw_background_mode7:
 	; not performance critical as this happens rarely
 
 	dec	DRAW_SKY	; usually 2 as we redraw both pages	; 5
+
+	bit	PAGE0
 	lda	#COLOR_BOTH_MEDIUMBLUE	; MEDIUMBLUE color		; 2
 	sta	COLOR							; 3
 	lda	#0							; 2
@@ -639,8 +642,30 @@ sky_loop:				; draw line across screen
 	bne	sky_loop						; 3/2nt
 								;=============
 								; (23+63+(X*16))*5
-	; Draw Hazy Horizon
 
+	bit	PAGE1
+	lda	#AUX_BOTH_MEDIUMBLUE	; MEDIUMBLUE color		; 2
+	sta	COLOR							; 3
+	lda	#0							; 2
+								;===========
+								;	 11
+
+sky_loop2:				; draw line across screen
+	ldy	#39			; from y=0 to y=6		; 2
+	sty	V2							; 3
+	ldy	#0							; 2
+	pha								; 3
+	jsr	hlin_double		; hlin y,V2 at A	; 63+(X*16)
+	pla								; 4
+	clc								; 2
+	adc	#2							; 2
+	cmp	#6							; 2
+	bne	sky_loop2						; 3/2nt
+								;=============
+								; (23+63+(X*16))*5
+
+	; Draw Hazy Horizon
+	bit	PAGE0
 	lda	#COLOR_BOTH_GREY	; Horizon is Grey		; 2
 	sta	COLOR							; 3
 	lda	#6			; draw single line at 6/7	; 2
@@ -650,6 +675,18 @@ sky_loop:				; draw line across screen
 	jsr	hlin_double		; hlin	0,40 at 6	; 63+(X*16)
 								;===========
 								; 63+(X*16)+14
+	; Draw Hazy Horizon
+	bit	PAGE1
+	lda	#AUX_BOTH_GREY		; Horizon is Grey		; 2
+	sta	COLOR							; 3
+	lda	#6			; draw single line at 6/7	; 2
+	ldy	#39							; 2
+	sty	V2			; hlin	Y,V2 at A		; 3
+	ldy	#0							; 2
+	jsr	hlin_double		; hlin	0,40 at 6	; 63+(X*16)
+								;===========
+								; 63+(X*16)+14
+
 
 no_draw_sky:
 
@@ -1038,6 +1075,15 @@ update_cache:
 								;	  6
 match:
 
+	ldy	DISP_PAGE
+	beq	mask_label
+	tay
+	and	#$01
+	cmp	#$01
+	tya
+	ror			; adjust for 80-column color
+
+
 mask_label:
 	and	#0	; COLOR_MASK (self modifying)			; 2
 
diff --git a/dlowres_mode7/dlowres_mode7.dsk b/dlowres_mode7/dlowres_mode7.dsk
index e65a5ffb3c0c9842a62a197ce0e0609efb00fb2f..71de8f6fa6cc9a3e130fdef71e82debc97f578dd 100644
GIT binary patch
delta 1051
zcmZ`&TWAwm7@kREoO;c)YtISp>ZzBQtgRF;P^nnmr!AIc(dw$~YFddlsn(>Iq@py5
z?dgVulkIwx`qCvVJtap8`mmsVC=P<55y80ZgW!uSG20bdVpkEhwVpBc#^OAD^UwEv
z|9}4Zm<c{qf)ACeig#VwjG!4AOSuu-xrA+K|FlEgC(&OeXre^0g^F(SK3-^5D;hQP
zJRYwPQ(N15b68z7W!{pTVpH~_d{KQLZ9Kci6ju38p_8_Q@*_Il_O<+ssy%C!;=-(A
zx}&`T_)Dr;<)c@Z#^VyJ`qi4V-p;&mAV0m_Ub`(?(hOaOv@J8`;Bj2VZMZTneT(Mk
zDnW~dlizE}eOhvlMr4gF){=)bRB1-v(DL35E2GQUnY<x&1_6~lN&k>3W!bdazc`gm
zWpiC9N?Uu&<S31F98#`>^qou%x<d0E;LDiGm*W{;i>LWg{2$BWrzob1sVTi@1qQN>
z)^vUa8!WhaY($`o9kDN6kkHFkK~PU;`JyY!*m3M;ZP<gZ)4|SNhL}p9bd<?4D*MU>
zuIK{-YkaE(9`=F2+?j)TI_LQG)cWsASr-m0(68!$6|%jIox<IG7KeBc2dmM~u<s~7
z=3tThkEuvSgT{}FsHFJ1-jBmFWhN{3YJAgYq=xMp-zzjzp-n`ryDxph@H~!k1vlAW
zCs?#@7Dq`tsGF@a@C@;t^V_zHJ$%^DjzE|4HjT{|92y%D7=-$c&3a7GW&FQJ8~te8
z2RC!$0BgbB`kO)L3EUEK>PZ$N{>bJLHt$;-9reRN7%&$(3kr!qXN%tF7JaQaL@oe!
z5(mjIK;Hy9z1SOZda&nr8*`H(V6VmQ1oM#J^vWYrhEBJpTwOHe5ok(`{0;g|_LYf|
zRgfgW&_sTI!Y-%fi*CCVm+}VHs(-bRj^4G<pTY__&)jJ#6XR0-F_3FwO=+9>A3zxm
zb)n+-lLpog%N<L0!|_2WmU%pR08Z|L1Ic088raCX$qh(uL6U`J0@lrvn~;n_@((0=
z$O7apB=;eCt_y!c@&J;Ta5z{!D#d1`bE8uKjC7vJmbquL#4<+}TZTjL$f9@T{P(^u
ZERahs3HNY%@6?MP<LPV0)AIBmZvcy|w4DF|

delta 966
zcmZ`%T}YEr82-Ms<inrbCi8pMXh$mBN=t*#D3b0JETSKZB2a7PX4#g%q0H$#Vb0^s
zQ>~lAtRp*-U>JoLf>+j{a2H)fS6#?ZDe<S9!k^AJHH+w6Jm)>n`@HXY&dc$BQM_N2
zLB+l2gMmx<8`^3>N($Fwn>bm~xy4ek&!A5xG-nd*YDD+BrxSJ?v&%*en|W_ZC(UZz
zW9T&Qm^U1V&a-*jrrAv;9ki@<M_i|o9~F6j>v?&KMq78wKd8~SQ%PFwl|+yDPRot-
zZnaq;_Z33GQ~?fM*czEH<-ItUTX9aWRD=ROZAhOdoYBm-y_SHPHO=bAnox$3&4tfK
zQrJY;*qt;sF*XrxKmmHACRG<O)AaYJ=;xaFLmoB!K5_^RnRy0Y;=Ax7H{k_f4GxQK
z8GlDT#u#5H_+-4mCSnxIGmL4iEVXJ}wkcc`(Fe!-WJpU-!xis_1v=OzTXK9z3#&BZ
z!BZI}4Vl?B>|{5w3whLF&QtjS9j`T~t=;hN&2*_YQ|_UbI#pnP-S$&!%KZO$e1sRH
zrGL9DIhn#5aC5x23Z@j2oXT!t4`0D8+>5;h=oo!*J6#tr1@o@R=4}BJpT&Nz;Bwn?
zi1~|Gu%8@Mi&t`WJVFlBef8FZ$KZAyu4k9Pp~N2e6L8DBVS!#iB3Gfk931+8bF{l2
z9o|qgCvIky*dr_e*stTt4!bs+)v5g<a|xL{CZk{L;p%afIY^Njvo7i?wK}J$tHLeh
zg34}SFFB)XPQdQQ?hd;PyZWrmNt~*!5IaN6MJ{WRON;~T&QWDB@tI3tTxd9?cE{N)
zq2WoDRH<}uJd0jzHzgLR(Q;NEwu&D+NgLZU<2Pi%?0&g=3&7+fsVg!)V}ThX1PA)%
ztmgg9Log6Okmo>#pm>F}1L*=X0OU2WW^y0MV<011;vtYHKt`e8TQDMZElE8iQumT{
xkGzGoGx-Q>)Hw9Ftdrq&^22Z4X8<laB<$n##7pbY_d5x)Pv7`P-zYD>`UM`>m^J_a

diff --git a/dlowres_mode7/dlowres_zp.inc b/dlowres_mode7/dlowres_zp.inc
index ec422f23..760386be 100644
--- a/dlowres_mode7/dlowres_zp.inc
+++ b/dlowres_mode7/dlowres_zp.inc
@@ -120,8 +120,8 @@ KEYPRESS	EQU	$C000
 KEYRESET	EQU	$C010
 
 ;; SOFT SWITCHES
-EIGHTYSTORE_ON	EQU	$C000
-EIGHTYSTORE_OFF	EQU	$C001
+CLR80COL	EQU	$C000	; PAGE0/PAGE1 normal
+SET80COL	EQU	$C001	; PAGE0/PAGE1 switches PAGE0 in Aux instead
 EIGHTYCOL	EQU	$C00D
 SET_GR		EQU	$C050
 SET_TEXT	EQU	$C051
@@ -129,9 +129,9 @@ FULLGR		EQU	$C052
 TEXTGR		EQU	$C053
 PAGE0		EQU	$C054
 PAGE1		EQU	$C055
-LORES		EQU	$C056
-HIRES		EQU	$C057
-AN3		EQU	$C05E
+LORES		EQU	$C056	; Enable LORES graphics
+HIRES		EQU	$C057	; Enable HIRES graphics
+AN3		EQU	$C05E	; Annunciator 3
 
 PADDLE_BUTTON0	EQU	$C061
 PADDL0		EQU	$C064
@@ -192,3 +192,6 @@ COLOR_BOTH_ORANGE	EQU	$99
 COLOR_BOTH_LIGHTGREEN	EQU	$CC
 COLOR_BOTH_YELLOW	EQU	$DD
 COLOR_BOTH_WHITE	EQU	$FF
+
+AUX_BOTH_MEDIUMBLUE	EQU	$33	; 0011 0011
+AUX_BOTH_GREY		EQU	$AA	; 1010 1010