From 447b21d42059b23f459fa4cfae07abe5b818edb6 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sat, 10 Jun 2023 23:08:49 -0400
Subject: [PATCH] sb: your head, can in fact, now asplode

---
 games/sb/asplode.s      | 49 +++++++++++++++++++++++++++++++++++------
 games/sb/asplode_head.s |  6 ++---
 2 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/games/sb/asplode.s b/games/sb/asplode.s
index 6c0d4754..f34e7fd1 100644
--- a/games/sb/asplode.s
+++ b/games/sb/asplode.s
@@ -279,13 +279,47 @@ walls_good:
 	cmp	#17
 	bcc	bullet_still_good
 
-	; new bullet position
-	; FIXME: better
-
 	lda	#0
 	sta	BULLET_Y
 bullet_still_good:
 
+	;==========================
+	; check bullet collisions
+	;===========================
+
+	;===========================
+	; check player
+	;   if (bullet_x > player_x+2) &&
+	;	(bullet_x<player_x+6)
+	; if 2 < px - bx < 6 ???
+
+	; 012345678
+	; b-p
+	; --------
+	; 8765432101234567890123456
+	; p-b      ----------------
+	; 8765432101234567890123456
+	; NNNNNNNNNNYYYYNNNNNNNNNNN
+	; XXXXXXXXPPOOOOPPXXXXXXXXX
+
+	; only if BULLET_Y=16?
+
+	lda	BULLET_Y
+	cmp	#16
+	bne	skip_check_player_collide
+check_player_collide:
+	sec
+	lda	BULLET_X
+	sbc	PLAYER_X
+	cmp	#2
+	bcc	skip_check_player_collide	; blt
+	cmp	#6
+	bcs	skip_check_player_collide
+
+	jmp	asplode_asplode
+
+skip_check_player_collide:
+
 	;==========================
 	; draw bullet
 	;===========================
@@ -327,7 +361,8 @@ check_keypress:
 	; clear high bit
 	and	#$7f
 
-	; FIXME: adjust for lowercase too
+	and	#$df			; convert lowercase to upper
+
 	cmp	#'Q'
 	beq	done_game
 
@@ -492,9 +527,9 @@ bullet_sprite_h:
 bullet_sprite_y:
 .byte 90,94,98,102
 .byte 106,110,114,118
-.byte 122,126,130,134
-.byte 139,144,149,154
-.byte 159
+.byte 123,128,133,138
+.byte 143,148,153,158
+.byte 163
 
 ; original
 ; 1 =  6
diff --git a/games/sb/asplode_head.s b/games/sb/asplode_head.s
index 0b28862d..40f7918d 100644
--- a/games/sb/asplode_head.s
+++ b/games/sb/asplode_head.s
@@ -113,7 +113,7 @@ done_extra_sprites:
 
 
 	ldx	FRAME
-	cpx	#17
+	cpx	#16
 	bne	sound_check_head
 sound_check_your:
 	; play sound
@@ -121,12 +121,12 @@ sound_check_your:
 	beq	do_play_asplode
 
 sound_check_head:
-	cpx	#23
+	cpx	#22
 	bne	sound_check_a
 	ldy	#1
 	bne	do_play_asplode
 sound_check_a:
-	cpx	#29
+	cpx	#28
 	bne	sound_check_splode
 	ldy	#2
 	bne	do_play_asplode