From a07936677cd26aac197f39d8701ea0d92fb225a9 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Fri, 10 May 2024 01:21:25 -0400
Subject: [PATCH] keen: hook up initial title screen

---
 games/keen/Makefile                   |   4 +-
 games/keen/graphics/Makefile          |   6 +-
 games/keen/graphics/title_sprites.png | Bin 0 -> 1485 bytes
 games/keen/hgr_sprite.s               |  88 ++++++++++++++++
 games/keen/hgr_tables.s               | 146 ++++++++++++++++++++++++++
 games/keen/title.s                    |  34 ++++++
 games/keen/zp.inc                     |   4 +
 7 files changed, 278 insertions(+), 4 deletions(-)
 create mode 100644 games/keen/graphics/title_sprites.png
 create mode 100644 games/keen/hgr_sprite.s
 create mode 100644 games/keen/hgr_tables.s

diff --git a/games/keen/Makefile b/games/keen/Makefile
index cd9ab73b..86454b1d 100644
--- a/games/keen/Makefile
+++ b/games/keen/Makefile
@@ -60,7 +60,9 @@ TITLE:	title.o
 
 title.o:	title.s zp.inc hardware.inc \
 		zx02_optim.s \
-		graphics/keen1_title.hgr.zx02
+		hgr_sprite.s hgr_tables.s \
+		graphics/keen1_title.hgr.zx02 \
+		graphics/title_sprites.inc
 	ca65 -o title.o title.s -l title.lst
 
 ####
diff --git a/games/keen/graphics/Makefile b/games/keen/graphics/Makefile
index ddc6f508..625916c5 100644
--- a/games/keen/graphics/Makefile
+++ b/games/keen/graphics/Makefile
@@ -11,12 +11,12 @@ PNG2SPRITES = ../../../utils/gr-utils/png2sprites
 HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite
 
 all:	keen1_title.hgr.zx02 level1_bg.gr.zx02 parts.gr.zx02 \
-	keen1_story.hgr.zx02
+	keen1_story.hgr.zx02 title_sprites.inc
 
 ####
 
-#disk_sprites.inc:	a2_fortnight_sprites.png
-#	$(HGR_SPRITE) -s -l disk_sprite0 a2_fortnight_sprites.png  14   7 41  34 > disk_sprites.inc
+title_sprites.inc:	title_sprites.png
+	$(HGR_SPRITE) -s -l title_sprite title_sprites.png  0   0 167  95 > title_sprites.inc
 
 ####
 
diff --git a/games/keen/graphics/title_sprites.png b/games/keen/graphics/title_sprites.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c659dc4e524a360957abbc329181023c6e69d1a
GIT binary patch
literal 1485
zcmbu8`#aMM9LK+V$TD-Q<X$9&j;w~{(wWV$GWX17Wz@{I)~u6;%{r+_ZfEQGA~hsZ
zEos$R5=m(nl}jDEX$+;dYBY~YXZ;Q5^E{vT=l#6iKfa$&QFv&OA<PN}0DvJbI3N-L
zAQoERrK_V=S78!P3;s;QV8U@2j2)GBFeNRM3;<3Q`4xV_Jt&J4@0wO)<843L$;x@&
zBUr3WhFNjA{SfS`cNK8~inpp<WggTm7#n+<Jlx$IM}QLiO%@@C{-8$ED^}d!1#?aA
z7{7B;-Kmx<d{C(|V9MNj0DoH=;^I8{tu<M>39Tq0p;FFn*@#P<FXiXz&NI!Y;+77x
zN>9aKw=gj&S}8$f$qZ#6{?%AVm<^d6=eT2I9pb~Whh;>9FLRtoiyH$YkTu}O(iNvK
zZjKRFaq(wzs=b=hz2yem%XarC)C$ti36xI~EjCYY5)&_Z6t7y{rmMeh)lh`LnWyaL
zOk-@{v!er#f0r#d(wrwQ7gX$nc%+u^`F(!vqT=fA+UnWL2ROS~nb+EVDCOp7>0bTn
zw(*;x1!G9+#UqP?4G0a6(a_LaTF{*}CKEO|=XS}B5R3c!nm+CHk4LvH?>PT_o1D!{
zxWJOmBxr0d8KcfJxSbFqBlg!7WWJ{3F8}VqpD%7|)H-@RTJE*e$Q{~NEW$&gvD#}b
zhD^9G{rve;ngFq`UeXQ(0zvy9%-3f6)Zn;m05DkjYau{&?XOaybQ~TFon8jhwRh=m
zce<fPmUL_^9dj@%i+q3%U})qdI(fg{ku-X$T@Vf*PGB3E1Aq<(7vLYAGy1tkdY~0y
zQW#W?O&o`{Xd+w%ZqK08O`70}*q}FG7R<lALlrC{JmYKzoAr4UgYV~aGOgCVypGJ2
zSuHScn5tQs`aO3^)q&nG1u?IvoqG_jU>p4|srgWo2tM^nNA;p}#5p_twW{vJD-dq2
zE}Kds=IXz}!G&gX-b(g|eu(VH-#z-5qS3Q}ghJs-f>fIEus%Pdh-3Apr!>ne4zUc$
zoz-dpv&MmmD1tU@l8T&Fb1xSsjFsGA#AYWflVwI0P9`o<<>wk<!%>e8vwS0xzXZEq
z*SkDWlPSDav30dH1Pr2)KU-vzldlDoHBO0;86)ipmbU>Ule(7qzR(!W)sm<Hun~Q{
z$gemDnJe-8ixkk^7XorWZ6O45!cLr@Cq}#Q$z}gg%8?l&-^lyXPe6{_bDzhK2+bP$
z5woZvBq!+@`lK_GZOR`=5<L_*wojtS<w)y$X>BJgg^an{uMTb3(kl6dGcK5Ryy5UR
z<m0_yc!MuADhjOf`5G~Z+>*UP@9lB_{^(iBJyoMi-B%{af8K0G$qO~(@VwF~+&n;t
zE5rymxWSe6PkO~F$GtY5qMX3p3<Bc8N15#yI3Hg|h{jk>NE+rOevemK*Cf|Xj|S4S
z+7Y=<zUi%RdtGXVGtT{6$g#g@BKNS05S3h(Chc@`sO9Q=gb*8^2=L3uw6oO6R0Y`4
zKP6)5ZEqKj9(ADHiWxANgyUa)tEb#bDwdb5=~m@83q{QnctneEX0R%Qv0=XfKBnz;
zU_Rkcp)cdnyNym);Izr5k?u3(vW4yA$ikFtM{}vIue;j~m^@^98{;fW@lm13`yS^+
z`34K<;JdRUT8J^0es1xx#-&QP9?s?26!CZcz&9XL4OeWlXY=43_EzX7hu;>rib@ba
za@O<iSTT(?>wi#!YdtGiYf9akBp2`lL0+H5%GRvouB{<^Ygc^#IKhIypFLG<%AGBt
z_1AChk@FfWYn~=Z7*XGK!$|cfha9cS4wv@Ef=>w|%lcjSLBZa3ajE#Y()LQ1yR^lp
zhN&F82@M<-&*Uk)qQUohKBV|@rR}FaOMBI$u%5j8;W}^<pkvVm=phOq|HD=_jI#KO
WwEP2!kDRqn4B)V#0oTx^WB&mvx~o9|

literal 0
HcmV?d00001

diff --git a/games/keen/hgr_sprite.s b/games/keen/hgr_sprite.s
new file mode 100644
index 00000000..7d8fab18
--- /dev/null
+++ b/games/keen/hgr_sprite.s
@@ -0,0 +1,88 @@
+	;===========================================
+	; hgr draw sprite (only at 7-bit boundaries)
+	;===========================================
+	; SPRITE in INL/INH
+	; Location at SPRITE_X SPRITE_Y
+
+	; xsize, ysize  in first two bytes
+
+	; sprite AT INL/INH
+
+hgr_draw_sprite:
+
+	ldy	#0
+	lda	(INL),Y			; load xsize
+	clc
+	adc	SPRITE_X
+	sta	sprite_width_end_smc+1	; self modify for end of line
+
+	iny				; load ysize
+	lda	(INL),Y
+	sta	sprite_ysize_smc+1	; self modify
+
+	; point smc to sprite
+	lda	INL			; 16-bit add
+	sta	sprite_smc1+1
+	lda	INH
+	sta	sprite_smc1+2
+
+
+	ldx	#0			; X is pointer offset
+	stx	CURRENT_ROW		; actual row
+
+	ldx	#2
+
+hgr_sprite_yloop:
+
+	lda	CURRENT_ROW		; row
+
+	clc
+	adc	SPRITE_Y		; add in cursor_y
+
+	; calc GBASL/GBASH
+
+	tay				; get output ROW into GBASL/H
+	lda	hposn_low,Y
+	sta	GBASL
+	lda	hposn_high,Y
+
+	; eor	#$00 draws on page2
+	; eor	#$60 draws on page1
+;hgr_sprite_page_smc:
+;	eor	#$00
+	clc
+	adc	DRAW_PAGE
+	sta	GBASH
+;	eor	#$60
+;	sta	INH
+
+	ldy	SPRITE_X
+
+sprite_inner_loop:
+
+
+sprite_smc1:
+        lda	$f000,X			; load sprite data
+	sta	(GBASL),Y		; store to screen
+
+	inx				; increment sprite offset
+	bne	not_oflo
+	inc	sprite_smc1+2
+not_oflo:
+	iny				; increment output position
+
+
+sprite_width_end_smc:
+	cpy	#6			; see if reached end of row
+	bne	sprite_inner_loop	; if not, loop
+
+
+	inc	CURRENT_ROW		; row
+	lda	CURRENT_ROW		; row
+
+sprite_ysize_smc:
+	cmp	#31			; see if at end
+	bne	hgr_sprite_yloop	; if not, loop
+
+	rts
+
diff --git a/games/keen/hgr_tables.s b/games/keen/hgr_tables.s
new file mode 100644
index 00000000..d98f96f8
--- /dev/null
+++ b/games/keen/hgr_tables.s
@@ -0,0 +1,146 @@
+;div7_table	= $9C00
+;mod7_table	= $9D00
+;hposn_high	= $9E00
+;hposn_low	= $9F00
+
+
+
+	;=====================
+	; make /7 %7 tables
+	;=====================
+
+
+	; HGR_PAGE should be $20/$40 to select if default for hposn
+	;	is page1 or page2
+
+hgr_make_tables:
+
+	ldy	#0
+	lda	#0
+	ldx	#0
+div7_loop:
+	sta	div7_table,Y
+
+	inx
+	cpx	#7
+	bne	div7_not7
+
+	clc
+	adc	#1
+	ldx	#0
+div7_not7:
+	iny
+	bne	div7_loop
+
+
+	ldy	#0
+	lda	#0
+mod7_loop:
+	sta	mod7_table,Y
+	clc
+	adc	#1
+	cmp	#7
+	bne	mod7_not7
+	lda	#0
+mod7_not7:
+	iny
+	bne	mod7_loop
+
+
+	; Hposn table
+
+	lda	#0
+hposn_loop:
+	ldy	#0
+	ldx	#0
+	pha
+	jsr	hposn	; (Y,X),(A)
+	pla
+	tax
+
+	lda	GBASL
+	sta	hposn_low,X
+
+	lda	GBASH
+	sta	hposn_high,X
+
+	inx
+	txa
+
+	cmp	#192
+	bne	hposn_loop
+
+	rts
+
+	; left masks
+	;	in memory	on screen
+	;	x111 1111	1111111		start at 0
+	;	x111 1110	0111111		start at 1
+	;	x111 1100	0011111		start at 2
+	; ...
+	;	x100 0000	0000001		start at 6
+
+left_masks:
+	.byte $FF,$FE,$FC,$F8, $F0,$E0,$C0
+
+	; right masks
+	;	in memory	on screen
+	;	x000 0001	1000000		end at 0
+	;	x000 0011	1100000		end at 1
+	;	x000 0111	1110000		end at 2
+	; ...
+	;	x011 1111	1111110		end at 5
+	;	x111 1111	1111111		end at 6
+right_masks:
+	.byte $81,$83,$87, $8F,$9F,$BF,$FF
+
+
+
+
+	; from the Apple II firmware
+hposn:
+;	sta	HGR_Y			; save Y and X positions
+;	stx	HGR_X
+;	sty	HGR_X+1
+
+	pha				; Y pos on stack
+
+	and	#$C0			; calc base addr for Y-pos
+
+	sta	GBASL
+	lsr
+	lsr
+	ora	GBASL
+	sta	GBASL
+	pla
+
+	sta	GBASH
+	asl
+	asl
+	asl
+	rol	GBASH
+	asl
+	rol	GBASH
+	asl
+	ror	GBASL
+	lda	GBASH
+
+	and	#$1F
+
+	ora	HGR_PAGE	; default is $40 in this game
+
+	sta	GBASH
+
+;	txa
+;	cpy	#0
+;	beq	xpos_lessthan_256
+;	ldy	#35
+;	adc	#4
+;label_1:
+;	iny
+;xpos_lessthan_256:
+;	sbc	#7
+;	bcs	label_1
+
+	rts
+
diff --git a/games/keen/title.s b/games/keen/title.s
index bb6f4e1c..5e3c45df 100644
--- a/games/keen/title.s
+++ b/games/keen/title.s
@@ -9,6 +9,11 @@
 	.include "hardware.inc"
 	.include "common_defines.inc"
 
+div7_table     = $9C00
+mod7_table     = $9D00
+hposn_high     = $9E00
+hposn_low      = $9F00
+
 keen_title_start:
 	;===================
 	; init screen
@@ -158,6 +163,13 @@ mockingboard_notfound:
 done_setup_sound:
 
 
+	;===================================
+	; init
+	;===================================
+
+	lda	#$0
+	sta	HGR_PAGE
+	jsr	hgr_make_tables
 
 	;===================================
 	; Do Intro Sequence
@@ -168,6 +180,25 @@ done_setup_sound:
 	lda	#100
 	jsr	wait_a_bit
 
+	lda	#<title_sprite
+	sta	INL
+	lda	#>title_sprite
+	sta	INH
+
+	lda	#8
+	sta	SPRITE_X
+
+	lda	#48
+	sta	SPRITE_Y
+
+	lda	#$20
+	sta	DRAW_PAGE
+
+	jsr	hgr_draw_sprite
+
+
+	lda	#100
+	jsr	wait_a_bit
 
 done_intro:
 
@@ -233,6 +264,8 @@ init_vars:
 	.include	"text_help.s"
 	.include	"gr_fast_clear.s"
 	.include	"text_print.s"
+	.include	"hgr_sprite.s"
+	.include	"hgr_tables.s"
 
 ;	.include	"lc_detect.s"
 
@@ -247,6 +280,7 @@ init_vars:
 new_title:
 .incbin "graphics/keen1_title.hgr.zx02"
 
+.include "graphics/title_sprites.inc"
 
 
 	;====================================
diff --git a/games/keen/zp.inc b/games/keen/zp.inc
index e51ec3b7..f6dc3fac 100644
--- a/games/keen/zp.inc
+++ b/games/keen/zp.inc
@@ -159,6 +159,10 @@ SOUNDL			= $B2
 SOUNDH			= $B3
 START_LINE_L		= $B4	; story
 START_LINE_H		= $B5	; story
+SPRITE_Y		= $B6	; title
+CURRENT_ROW		= $B7	; title
+SPRITE_X		= $B8	; title
+HGR_PAGE		= $B9	; title
 
 WHICH_SLOT	=	$DA
 JS_BUTTON_STATE	=	$DB