From b9bd74e5a8c5674e5f7c37240b297dc0e13183d8 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Fri, 7 Feb 2020 16:01:43 -0500
Subject: [PATCH] ootw: c15: guard shooting

---
 ootw/TODO                                     |   6 +
 ootw/ootw_c15.s                               | 163 +++++++++++-------
 ootw/ootw_graphics/l15final/bath_33.png       | Bin 5917 -> 6027 bytes
 ootw/ootw_graphics/l15final/ootw_c15_bath.inc |  49 +++---
 .../ootw_graphics/l15final/ootw_c15_final.inc |  12 +-
 ootw/ootw_graphics/l15final/walkway1.png      | Bin 981 -> 9249 bytes
 6 files changed, 133 insertions(+), 97 deletions(-)

diff --git a/ootw/TODO b/ootw/TODO
index bc62b006..73055841 100644
--- a/ootw/TODO
+++ b/ootw/TODO
@@ -131,6 +131,12 @@ BEHAVIOR DIFFERENCES:
 + Level/Checkpoint #5
 	* Allow falling into first pit
 
++ Level/Checkpoint #15
+	* Bath: shooting guard isn't quite so regular, every other shot is
+		a double one?
+	* Bath: one guard repeatedly re-arrives but that seems to be a bug
+		in the original
+	* Bath: guards shooting eventually wear away the column
 
 FUTURE WORK:
 ============
diff --git a/ootw/ootw_c15.s b/ootw/ootw_c15.s
index 52cfaf64..246a57fa 100644
--- a/ootw/ootw_c15.s
+++ b/ootw/ootw_c15.s
@@ -393,12 +393,12 @@ room_loop:
 	;==================================
 	; draw background action
 
-	lda	WHICH_CAVE
+;	lda	WHICH_ROOM
 
 bg_room0:
 
 ;	cmp	#0
-;	bne	c4_no_bg_action
+;	bne	c15_no_bg_action
 
 ;	lda	FRAMEL
 ;	and	#$c
@@ -418,7 +418,7 @@ bg_room0:
 
 ;	jsr	put_sprite
 
-c5_no_bg_action:
+c15_no_bg_action:
 
 	;===============================
 	; check keyboard
@@ -439,38 +439,9 @@ c5_no_bg_action:
 	jsr	check_screen_limit
 
 	;===============================
-	; adjust floor
+	; adjust floor if necessary
 	;===============================
-
-;	lda	PHYSICIST_STATE
-;	cmp	#P_FALLING_DOWN
-;	beq	check_floor0_done
-
-;	lda	WHICH_CAVE
-;	cmp	#0
-;	bne	check_floor1
-
-;	lda	#14
-;	sta	PHYSICIST_Y
-
-;	lda	PHYSICIST_X
-;	cmp	#19
-;	bcc	check_floor0_done
-
-;	lda	#12
-;	sta	PHYSICIST_Y
-
-;	lda	PHYSICIST_X
-;	cmp	#28
-;	bcc	check_floor0_done
-
-;	lda	#10
-;	sta	PHYSICIST_Y
-
-check_floor0_done:
-
-check_floor1:
-
+	; no sloped floors in c15
 
 	;=====================================
 	; draw physicist
@@ -489,42 +460,66 @@ check_floor1:
 	; draw foreground action
 	;=====================================
 
-;	lda	WHICH_CAVE
-;	cmp	#0
-;	bne	c5_no_fg_action
+	lda	WHICH_ROOM
+	cmp	#0
+	bne	c15_no_fg_action
 
-c5_draw_rocks:
-;	lda	#1
-;	sta	XPOS
-;	lda	#26
-;	sta	YPOS
-;	lda	#<small_rock
-;	sta	INL
-;	lda	#>small_rock
-;	sta	INH
-;	jsr	put_sprite
+	; Room 0 draw guard
+c15_draw_fg_guard:
 
-;	lda	#10
-;	sta	XPOS
-;	lda	#18
-;	sta	YPOS
-;	lda	#<medium_rock
-;	sta	INL
-;	lda	#>medium_rock
-;	sta	INH
-;	jsr	put_sprite
+	; real game it's not quite so regular, double shot eventually
 
-;	lda	#31
-;	sta	XPOS
-;	lda	#14
-;	sta	YPOS
-;	lda	#<large_rock
-;	sta	INL
-;	lda	#>large_rock
-;	sta	INH
-;	jsr	put_sprite
+	; every so often, shoots
+	; for frames 0 and 1 every 32 ($1F)
 
-c5_no_fg_action:
+	lda	FRAMEL
+	and	#$1f
+	cmp	#3
+	bcs	fg_guard_noshoot	; bgt
+
+fg_guard_shoot:
+	lda	#$ff
+	bne	fg_guard_draw
+
+fg_guard_noshoot:
+	lda	#$00
+
+fg_guard_draw:
+	sta	XPOS
+	lda	#22
+	sta	YPOS
+	lda	#<guard_sprite
+	sta	INL
+	lda	#>guard_sprite
+	sta	INH
+	jsr	put_sprite_crop
+
+
+	; draw laser
+
+	lda	FRAMEL
+	and	#$1f
+	cmp	#3
+	bcs	fg_guard_no_laser		; bge
+
+	lda	#9
+	sta	XPOS
+	lda	#20
+	sta	YPOS
+	lda	#<guard_laser
+	sta	INL
+	lda	#>guard_laser
+	sta	INH
+	jsr	put_sprite
+
+fg_guard_no_laser:
+
+	jmp	c15_no_fg_action
+
+	; Room 5 friend slowly working to left
+c15_draw_friend_cliff:
+
+c15_no_fg_action:
 
 	;====================
 	; activate fg objects
@@ -543,7 +538,7 @@ c5_no_fg_action:
 	;================
 	; move fg objects
 	;================
-c4_move_fg_objects:
+c15_move_fg_objects:
 
 ;	lda	CART_OUT
 ;	cmp	#1
@@ -777,3 +772,37 @@ bath_arrival_sequence:
 	.byte 0
 
 
+;=======================
+; guard sprite
+guard_sprite:
+	.byte 10,13
+	.byte $7A,$7A,$7A,$7A,$AA,$AA,$AA,$AA,$AA,$AA
+	.byte $77,$77,$77,$77,$77,$AA,$AA,$AA,$AA,$AA
+	.byte $77,$77,$77,$77,$77,$AA,$AA,$AA,$0A,$00
+	.byte $00,$00,$00,$77,$A7,$AA,$AA,$7A,$70,$AA
+	.byte $00,$00,$00,$00,$AA,$7A,$77,$77,$77,$7A
+	.byte $00,$00,$00,$70,$77,$77,$77,$77,$77,$77
+	.byte $00,$00,$70,$77,$77,$77,$77,$77,$AA,$AA
+	.byte $00,$00,$07,$77,$77,$77,$A7,$AA,$AA,$AA
+	.byte $00,$00,$00,$07,$A7,$A7,$AA,$AA,$AA,$AA
+	.byte $00,$00,$00,$00,$AA,$AA,$AA,$AA,$AA,$AA
+	.byte $00,$00,$00,$00,$AA,$AA,$AA,$AA,$AA,$AA
+	.byte $00,$00,$00,$00,$AA,$AA,$AA,$AA,$AA,$AA
+	.byte $00,$00,$00,$00,$AA,$AA,$AA,$AA,$AA,$AA
+
+;=======================
+; guard laser
+guard_laser:
+;	.byte 15,4
+;	.byte $AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$1A,$1A,$A1
+;	.byte $AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$1A,$1A,$A1,$A1,$AA,$AA,$AA
+;	.byte $AA,$AA,$AA,$AA,$1A,$1A,$11,$A1,$A1,$AA,$AA,$AA,$AA,$AA,$AA
+;	.byte $1A,$1A,$11,$A1,$A1,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA
+
+	.byte 15,3
+	.byte $AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$1A,$1A,$1A
+	.byte $AA,$AA,$AA,$AA,$AA,$AA,$1A,$1A,$1A,$11,$A1,$A1,$A1,$AA,$AA
+	.byte $1A,$1A,$1A,$11,$A1,$A1,$A1,$AA,$AA,$AA,$AA,$AA,$AA,$AA,$AA
+
+
+
diff --git a/ootw/ootw_graphics/l15final/bath_33.png b/ootw/ootw_graphics/l15final/bath_33.png
index 433c1079f6a5dd875a7c491090ff2b420abf990d..574acc94821ac53a36764b017d37cb95a4d07826 100644
GIT binary patch
delta 5876
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
KMNUMnLSTZ3Xd5N~

delta 5765
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
D{<ZDc

diff --git a/ootw/ootw_graphics/l15final/ootw_c15_bath.inc b/ootw/ootw_graphics/l15final/ootw_c15_bath.inc
index 5a350d45..17265c7a 100644
--- a/ootw/ootw_graphics/l15final/ootw_c15_bath.inc
+++ b/ootw/ootw_graphics/l15final/ootw_c15_bath.inc
@@ -598,30 +598,31 @@ bath_32_rle:	.byte $28 ; ysize=48
 ; cycles=1337
 bath_33_rle:	.byte $28 ; ysize=48
 	.byte $A0,$FF,$AA, $A0,$7E,$AA, $1A,$1A, $A0,$01,$A1, $A0,$21,$AA, $1A,$1A, $A0,$02,$A1
-	.byte $A0,$01,$AA, $9A,$9A, $A0,$10,$AA, $A4,$7A, $A9,$AA, $1A,$1A, $11
-	.byte $A0,$02,$A1, $A4,$AA, $99, $BB, $A0,$10,$AA, $A5,$77, $A5,$AA
-	.byte $1A, $11, $A0,$02,$A1, $A8,$AA, $0B, $A0,$11,$AA, $A5,$77
-	.byte $A3,$AA, $0A, $00, $77, $A6,$AA, $0A, $6A
-	.byte $A3,$AA, $BB, $BA, $A6,$AA, $77,$77, $A8,$AA, $A3,$00
-	.byte $77, $A0,$01,$A7, $A0,$02,$AA, $7A, $70, $15, $10
-	.byte $7A, $A4,$AA, $00,$00, $66, $A3,$AA, $40, $A7,$AA
-	.byte $70, $00, $A8,$AA, $A4,$00, $A0,$01,$AA, $7A, $A3,$77
-	.byte $70, $50, $A5,$AA, $00,$00, $06, $6A,$6A, $A0,$01,$AA
-	.byte $C4, $4A, $A6,$AA, $01,$01, $A0,$01,$A5, $A7,$AA, $A3,$00
-	.byte $70, $A6,$77, $55, $A5,$AA, $A5,$00, $A0,$01,$AA, $CC
-	.byte $44, $A6,$AA, $77, $55, $A8,$AA, $00,$00, $70
-	.byte $A5,$77, $A9,$AA, $A3,$00, $A0,$01,$A0, $A0,$01,$AA, $A0,$01,$AF, $F4
-	.byte $FA, $A3,$AA, $8A,$8A, $87, $A0,$01,$A5, $A8,$AA, $00,$00
-	.byte $07, $A3,$77, $27, $A0,$11,$AA, $00, $A0,$01,$AA, $00
-	.byte $A0,$01,$AA, $00, $A5,$AA, $00,$00, $A4,$AA, $A3,$00, $07
-	.byte $27,$27, $A0,$01,$A2, $A0,$11,$AA, $00, $0A, $00, $A0,$01,$AA
-	.byte $00, $0A,$0A, $A0,$02,$AA, $00,$00, $0A, $A4,$AA, $A4,$00
-	.byte $22,$22, $A0,$12,$AA, $A3,$22, $A0,$01,$AA, $22,$22, $A0,$01,$A2, $A0,$02,$AA
-	.byte $22,$22, $A0,$01,$A2, $2A, $A3,$AA, $A4,$00, $22,$22, $A0,$12,$AA
-	.byte $A3,$22, $A0,$01,$AA, $A3,$22, $A0,$02,$AA, $A4,$22, $A3,$AA, $A4,$00
-	.byte $22,$22, $A0,$11,$AA, $A4,$82, $A0,$01,$AA, $A3,$82, $A0,$01,$AA, $8A
-	.byte $A3,$82, $A0,$01,$A2, $A3,$AA, $A4,$00, $88,$88, $A0,$11,$AA, $A4,$A8
-	.byte $A5,$AA, $A4,$A8, $A4,$AA
+	.byte $A0,$01,$AA, $9A,$9A, $A0,$10,$AA, $A3,$7A, $AA,$AA, $1A,$1A, $11
+	.byte $A0,$02,$A1, $A4,$AA, $99, $BB, $A0,$10,$AA, $A4,$77, $A5,$AA
+	.byte $1A,$1A, $11, $A0,$02,$A1, $A8,$AA, $0B, $A0,$11,$AA, $A4,$77
+	.byte $A3,$AA, $0A, $00, $77,$77, $A6,$AA, $0A, $6A
+	.byte $A3,$AA, $BB, $BA, $A6,$AA, $77,$77, $A8,$AA, $00,$00
+	.byte $77, $A0,$01,$A7, $A0,$02,$AA, $7A, $70, $A0,$01,$AA, $15
+	.byte $10, $7A, $A4,$AA, $00,$00, $66, $A3,$AA, $40
+	.byte $A7,$AA, $70, $00, $A8,$AA, $A3,$00, $A0,$01,$AA, $7A
+	.byte $A3,$77, $A0,$01,$AA, $70, $50, $A5,$AA, $00,$00, $06
+	.byte $6A,$6A, $A0,$01,$AA, $C4, $4A, $A6,$AA, $01,$01, $A0,$01,$A5
+	.byte $A7,$AA, $00,$00, $70, $A5,$77, $A0,$01,$AA, $77, $55
+	.byte $A5,$AA, $A5,$00, $A0,$01,$AA, $CC, $44, $A6,$AA, $77
+	.byte $55, $A8,$AA, $00, $70, $A5,$77, $AA,$AA, $A3,$00
+	.byte $A0,$01,$A0, $A0,$01,$AA, $A0,$01,$AF, $F4, $FA, $A3,$AA, $8A,$8A
+	.byte $87, $A0,$01,$A5, $A8,$AA, $00, $07, $A4,$77, $22
+	.byte $A0,$11,$AA, $00, $A0,$01,$AA, $00, $A0,$01,$AA, $00, $A5,$AA
+	.byte $00,$00, $A4,$AA, $00,$00, $07, $27,$27, $22, $A0,$01,$A2
+	.byte $A0,$11,$AA, $00, $0A, $00, $A0,$01,$AA, $00, $0A,$0A
+	.byte $A0,$02,$AA, $00,$00, $0A, $A4,$AA, $A3,$00, $A3,$22, $A0,$12,$AA
+	.byte $A3,$22, $A0,$01,$AA, $22,$22, $A0,$01,$A2, $A0,$02,$AA, $22,$22, $A0,$01,$A2
+	.byte $2A, $A3,$AA, $A3,$00, $A3,$22, $A0,$12,$AA, $A3,$22, $A0,$01,$AA
+	.byte $A3,$22, $A0,$02,$AA, $A4,$22, $A3,$AA, $A3,$00, $A3,$22, $A0,$11,$AA
+	.byte $A4,$82, $A0,$01,$AA, $A3,$82, $A0,$01,$AA, $8A, $A3,$82, $A0,$01,$A2
+	.byte $A3,$AA, $A3,$00, $A3,$88, $A0,$11,$AA, $A4,$A8, $A5,$AA, $A4,$A8
+	.byte $A4,$AA
 	.byte $A1
 ; cycles=1337
 bath_34_rle:	.byte $28 ; ysize=48
diff --git a/ootw/ootw_graphics/l15final/ootw_c15_final.inc b/ootw/ootw_graphics/l15final/ootw_c15_final.inc
index 2d264bd1..efd6d4e9 100644
--- a/ootw/ootw_graphics/l15final/ootw_c15_final.inc
+++ b/ootw/ootw_graphics/l15final/ootw_c15_final.inc
@@ -1,11 +1,11 @@
 walkway1_rle:	.byte $28 ; ysize=48
-	.byte $22, $55, $05, $22, $55, $A8,$66, $A3,$22
-	.byte $A0,$12,$66, $A3,$22, $A3,$66, $22, $55, $00, $02
-	.byte $55, $22, $26, $A4,$66, $26, $A5,$22, $26
-	.byte $A5,$66, $26, $22,$22, $26, $A5,$66, $26, $22
+	.byte $22, $55, $05, $22, $55, $A8,$66, $A4,$22
+	.byte $A0,$10,$66, $A4,$22, $A3,$66, $22, $55, $00, $02
+	.byte $55, $22, $26, $A4,$66, $26, $A6,$22, $26
+	.byte $A4,$66, $26, $22,$22, $26, $A4,$66, $26, $22,$22
 	.byte $02,$02, $22,$22, $26, $66, $22, $55, $00,$00
-	.byte $55, $22,$22, $A4,$26, $22,$22, $02, $40,$40, $10
-	.byte $22,$22, $A3,$26, $A6,$22, $A4,$26, $22, $10, $04,$04
+	.byte $55, $22,$22, $A4,$26, $22,$22, $02, $40,$40, $12
+	.byte $22,$22, $A3,$26, $A6,$22, $A3,$26, $22,$22, $10, $04,$04
 	.byte $10, $02, $22, $26, $22, $55, $00,$00
 	.byte $55, $A7,$22, $00, $01, $90, $00, $01
 	.byte $10, $AE,$22, $11, $00, $01, $00, $91
diff --git a/ootw/ootw_graphics/l15final/walkway1.png b/ootw/ootw_graphics/l15final/walkway1.png
index 992290e4af321ca5dd8cad6060fa6898d6692edf..35648aad8879b242d20b0322c77b6f83dba9da1c 100644
GIT binary patch
delta 9168
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
a_yK$q5h8UPw-Ubq0000<MNUMnLSTXij#;4q

delta 835
zcmV-J1HAm9NYw|BBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmP!xqvQ;Q-k4t5ZA
z$WWauh>AFB6^c+H)C#RSn7s54nlvOSE{=k0!NH%!s)LKOt`4q(Aov5~<mja6A|>9J
z6k5c1;qgAsyXWxUeSpxYFwN>32Q=L_)5(OG&8>>vuLxiWA%6f7nOVl1B&Fb6U-#5a
zbr<JZ{(XN|M9o_a2#Cb9%rI@@4dUrd+u*!U9Azb0B|aw}GwFiFk6c$ge&bwpS>Tyb
zGn1YtjuMN-4pustl}wFzia4ffI^_#lk5$fFoV7}gweHDZ7|!b}%Uq{5j3gGZ1PLM(
z)KEqRHsZAFq<>gQ(|N+jKj``;aw+60gOOtaRcMf1KlmT~o~>1wobZyu2_W?1I3FWG
z_b$+^JI?p9<1|lz;4^TgxBb-yF!M=zy{*NLfWB?u;<~LVd%)!mFz{r^rtC^VT0)@!
zyr0oG<$(TMpm)uiTk9OB4?u=ymAU~A4uR1kWv~0ZyAh{zZvXbQ=Jx~LL~?6WG*Oz9
z0wP`s0UZ`J7Kum9qLXPND1U%SL_t(Y$JLg>j>8}fL=9@XLdyStZ!?{B2n1{&$e|-`
z)vX>68=R_=^L7NU?=Jb9cOX|%pb~jR*e=dz?u$n{{rq1j0%1jSll$WK6Rg+IO`(XQ
z_iZXE@;ahiC%lGWO4&(DSdZ85s+o{T1udQaIYN<AsPyXtOU@8NM}MU)gmOPpiYY7w
zd-_85u<u|)XNaruD<o?Q0iuzJ5WVPG8x=yA5=O^snQc2ljOw+OS-`PEw`J;ZIleGZ
zA%&%Q!aA+)8S?(Hz!G9ZTwI`KZN{sRa~KlpB-#~1SieS$mI2}Z>}Q$6`pg@T9?uWW
z*e!GT0~K<*^s94TA%BPmgzlxtC6Pz(6#gxa<i+_x;kNO&j-N3pBPb%BafZ-R&N=BZ
zOeE)WE~JKJSUCD|(sJXiJ7LAF8iT?XvxU-RD(tbbvgbNs{pT(mpW{eaxh29YcfK8A
z<8xdroN+<ny=iabMZ(HGCDfswgVBvop-iJhj0+0&&=(5rh8Q0degIR4BDr+Q(ux28
N002ovPDHLkV1im+klz3R