From 5bd0d77d185a40453662e9a481b442e43e00b5f7 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Thu, 11 Apr 2024 00:33:20 -0400
Subject: [PATCH] keen1: closer to getting mars working again

---
 games/keen/level1.s        |  4 +-
 games/keen/mars.s          | 18 ++++-----
 games/keen/mars_keyboard.s | 82 +++++++++++++++++++++++++++++++++-----
 games/keen/zp.inc          |  8 ++--
 4 files changed, 87 insertions(+), 25 deletions(-)

diff --git a/games/keen/level1.s b/games/keen/level1.s
index afd5e7f6..92552d2f 100644
--- a/games/keen/level1.s
+++ b/games/keen/level1.s
@@ -271,8 +271,8 @@ level1_levelover:
 	;==========================
 
 	; level graphics
-level1_bg_zx02:
-	.incbin	"graphics/level1_bg.gr.zx02"
+;level1_bg_zx02:
+;	.incbin	"graphics/level1_bg.gr.zx02"
 
 	.include	"text_print.s"
 	.include	"gr_offsets.s"
diff --git a/games/keen/mars.s b/games/keen/mars.s
index f3d08033..e6084cd0 100644
--- a/games/keen/mars.s
+++ b/games/keen/mars.s
@@ -66,16 +66,16 @@ plenty_of_keens:
 	beq	return_to_title
 
 
-	; TODO: get this from MARS_X and MARS_Y
+	; TODO: set this in title, don't over-write
 
 	lda	#1
-	sta	KEEN_TILEX
-	lda	#13
-	sta	KEEN_TILEY
+	sta	MARS_TILEX
+	lda	#6
+	sta	MARS_TILEY
 
 	lda	#0
-	sta	KEEN_X
-	sta	KEEN_Y
+	sta	MARS_X
+	sta	MARS_Y
 
 	;====================================
 	; load mars tilemap
@@ -93,11 +93,11 @@ plenty_of_keens:
 	; copy in tilemap subset
 	;====================================
 	; FIXME: start values
-	;	center around KEEN_X, KEEN_Y
+	;	center around MARS_TILEX, MARS_TILEY
 
-	lda	#0
+	lda	MARS_TILEX
 	sta	TILEMAP_X
-	lda	#5
+	lda	MARS_TILEY
 	sta	TILEMAP_Y
 
 	jsr	copy_tilemap_subset
diff --git a/games/keen/mars_keyboard.s b/games/keen/mars_keyboard.s
index 426f33db..00f31dce 100644
--- a/games/keen/mars_keyboard.s
+++ b/games/keen/mars_keyboard.s
@@ -108,12 +108,37 @@ check_left:
 	bne	check_right
 
 left_pressed:
-	ldy	MARS_X
-	dey
-	ldx	MARS_Y
-	jsr	check_valid_feet
-	bcc	done_left_pressed
+
+	lda	TILEMAP_X
+	beq	keen_walk_left
+
+	sec
+	lda	MARS_TILEX
+	sbc	TILEMAP_X
+	cmp	#7
+	bcs	keen_walk_left
+
+keen_scroll_left:
+	dec	TILEMAP_X
+	dec	MARS_TILEX
+
+	jsr	copy_tilemap_subset
+	jmp	done_move_keen
+
+keen_walk_left:
 	dec	MARS_X
+	bpl	dwl_noflo
+	lda	#1
+	sta	MARS_X
+	dec	MARS_TILEX
+dwl_noflo:
+
+;	ldy	MARS_X
+;	dey
+;	ldx	MARS_Y
+;	jsr	check_valid_feet
+;	bcc	done_left_pressed
+;	dec	MARS_X
 done_left_pressed:
 	jmp	done_keypress
 
@@ -124,12 +149,47 @@ check_right:
 	bne	check_up
 
 right_pressed:
-	ldy	MARS_X
-	iny
-	ldx	MARS_Y
-	jsr	check_valid_feet
-	bcc	done_right_pressed
+
+
+move_right:
+	lda	TILEMAP_X
+	cmp	#50			; 70-20
+	bcs	keen_walk_right
+
+	sec
+	lda	MARS_TILEX
+	sbc	TILEMAP_X
+	cmp	#11
+	bcc	keen_walk_right
+
+keen_scroll_right:
+
+	inc	TILEMAP_X
+	inc	MARS_TILEX
+
+	jsr	copy_tilemap_subset
+
+	jmp	done_move_keen
+
+keen_walk_right:
 	inc	MARS_X
+	lda	MARS_X
+	cmp	#2
+	bne	dwr_noflo
+
+	lda	#0
+	sta	MARS_X
+
+	inc	MARS_TILEX
+
+dwr_noflo:
+
+;	ldy	MARS_X
+;	iny
+;	ldx	MARS_Y
+;	jsr	check_valid_feet
+;	bcc	done_right_pressed
+;	inc	MARS_X
 done_right_pressed:
 	jmp	done_keypress
 
@@ -194,7 +254,7 @@ check_escape:
 	jmp	done_keypress
 
 
-
+done_move_keen:
 done_keypress:
 no_keypress:
 	bit	KEYRESET
diff --git a/games/keen/zp.inc b/games/keen/zp.inc
index cc908f97..ec7f1c90 100644
--- a/games/keen/zp.inc
+++ b/games/keen/zp.inc
@@ -138,9 +138,11 @@ TILEMAP_OFFSET		= $9F
 
 MARS_X			= $A0
 MARS_Y			= $A1
-INITIAL_SOUND		= $A2
-PLAY_END_SOUND		= $A3
-APPLEII_MODEL		= $A4
+MARS_TILEX		= $A2
+MARS_TILEY		= $A3
+INITIAL_SOUND		= $A4
+PLAY_END_SOUND		= $A5
+APPLEII_MODEL		= $A6
 
 WHICH_SLOT	=	$DA
 JS_BUTTON_STATE	=	$DB