From 4a7cf594e2139441bfff6b3cc738b1e3c013587d Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Thu, 15 Aug 2019 10:30:07 -0400
Subject: [PATCH] ootw: initial door support

slowing things down...
---
 ootw/door.s                                |  40 +++++++++++---------
 ootw/ootw_c4_city.s                        |  42 +++++++++++++++++----
 ootw/ootw_c5.s                             |   7 +++-
 ootw/ootw_graphics/l4city/ootw_c4_city.inc |  34 ++++-------------
 ootw/ootw_graphics/l4city/recharge.png     | Bin 336 -> 2827 bytes
 ootw/zp.inc                                |   2 +
 6 files changed, 72 insertions(+), 53 deletions(-)

diff --git a/ootw/door.s b/ootw/door.s
index d791a4d8..1b331f16 100644
--- a/ootw/door.s
+++ b/ootw/door.s
@@ -7,14 +7,7 @@ DOOR_STATUS	= 0
 	DOOR_STATUS_EXPLODED	= $10
 	DOOR_STATUS_LOCKED	= $20
 	DOOR_STATUS_EXPLODING	= $40
-DOOR_EXPLODE_DIR	= 1
-DOOR_LEFT_TRIGGER	= 2
-DOOR_RIGHT_TRIGGER	= 3
-DOOR_STEP		= 4
-DOOR_XPOS		= 5
-DOOR_YPOS		= 6
 
-door_state:
 
 door_state0:
 	.byte $0	; status
@@ -24,17 +17,17 @@ door_state0:
 	.byte $0	; step
 
 
+	;==================================
+	; draw_doors
+	;==================================
+	; be sure to smc to point to right place
+
 draw_doors:
+	lda	NUM_DOORS
+	beq	done_draw_doors
 
-	lda	door_state+DOOR_STATUS
-	and	#(DOOR_STATUS_OPEN | DOOR_STATUS_EXPLODED)
-	bne	done_draw_doors
-
-	lda	door_state+DOOR_STATUS
-	cmp	#DOOR_STATUS_CLOSED
-	bne	door_not_closed
-
-door_closed:
+	ldx	#0
+draw_doors_loop:
 	lda	#<door_closed_sprite
 	sta	INL
 	lda	#>door_closed_sprite
@@ -46,13 +39,24 @@ door_not_closed:
 
 
 actually_draw_door:
-	lda	door_state+DOOR_XPOS
+	lda	door_x,X
 	sta	XPOS
-	lda	door_state+DOOR_YPOS
+	lda	door_y,X
 	sta	YPOS
 
+	txa
+	pha
+
 	jsr	put_sprite
 
+	pla
+	tax
+
+draw_doors_continue:
+	inx
+	cmp	NUM_DOORS
+	bne	draw_doors_loop
+
 done_draw_doors:
 
 	rts
diff --git a/ootw/ootw_c4_city.s b/ootw/ootw_c4_city.s
index 44a5f5fe..9a6874d9 100644
--- a/ootw/ootw_c4_city.s
+++ b/ootw/ootw_c4_city.s
@@ -17,18 +17,13 @@ ootw_city_init:
 	sta	CHARGER_COUNT
 	sta	GUN_STATE
 	sta	GUN_FIRE
-
-	lda	#100
-	sta	GUN_CHARGE
+	sta	NUM_DOORS
 
 	sta	ACTION_TRIGGERED
 	sta	ACTION_COUNT
 
-;	lda	#1
-;	sta	ACTION_COUNT
-
-
-
+	lda	#100
+	sta	GUN_CHARGE
 
 	;===============
 	; set up aliens
@@ -91,6 +86,7 @@ ootw_city:
 	lda	#0
 	sta	GAIT
 	sta	GAME_OVER
+	sta	NUM_DOORS
 
 	;============================
 	; init shields
@@ -127,12 +123,20 @@ alien_room_continue:
 
 	;==============================
 	; setup per-room variables
+	;==============================
 
 	lda	WHICH_ROOM
 	bne	room1
 
+	;======================
 	; Room0 with recharger
 room0:
+
+	; set up doors
+
+	lda	#5
+	sta	NUM_DOORS
+
 	lda	#(6+128)
 	sta	LEFT_LIMIT
 	lda	#(39+128)
@@ -698,6 +702,12 @@ no_fire_laser:
 
 	jsr	draw_shields
 
+	;================
+	; draw doors
+	;================
+
+	jsr	draw_doors
+
 	;========================
 	; draw foreground cover
 	;========================
@@ -1014,3 +1024,19 @@ pit_door_cover:
 
 
 
+door_x:
+	c4_r0_door0_x:	.byte 7
+	c4_r0_door1_x:	.byte 18
+	c4_r0_door2_x:	.byte 29
+	c4_r0_door3_x:	.byte 31
+	c4_r0_door4_x:	.byte 33
+
+door_y:
+	c4_r0_door0_y:	.byte 24
+	c4_r0_door1_y:	.byte 24
+	c4_r0_door2_y:	.byte 24
+	c4_r0_door3_y:	.byte 24
+	c4_r0_door4_y:	.byte 24
+
+
+
diff --git a/ootw/ootw_c5.s b/ootw/ootw_c5.s
index eae2baf0..ec45c7fb 100644
--- a/ootw/ootw_c5.s
+++ b/ootw/ootw_c5.s
@@ -87,13 +87,18 @@ end_message:
 .include "gr_putsprite_crop.s"
 .include "gr_offsets.s"
 .include "gr_offsets_hl.s"
+.include "gr_hlin.s"
 .include "random16.s"
 .include "keyboard.s"
 
 .include "physicist.s"
 .include "alien.s"
 
-.include "door.s"
+.include "gun.s"
+.include "blast.s"
+.include "shield.s"
+
+;.include "door.s"
 
 ; room backgrounds
 .include "ootw_graphics/l5cave/ootw_c5_cave.inc"
diff --git a/ootw/ootw_graphics/l4city/ootw_c4_city.inc b/ootw/ootw_graphics/l4city/ootw_c4_city.inc
index fc0b3ab0..c59ed7dc 100644
--- a/ootw/ootw_graphics/l4city/ootw_c4_city.inc
+++ b/ootw/ootw_graphics/l4city/ootw_c4_city.inc
@@ -11,32 +11,14 @@ recharge_rle:	.byte $28 ; ysize=48
 	.byte $A0,$13,$00, $A4,$22, $00, $A5,$22, $00, $22, $00
 	.byte $22, $00, $A6,$22, $A0,$13,$00, $A4,$22, $00, $A5,$22
 	.byte $00, $22, $00, $22, $00, $A6,$22, $A5,$00
-	.byte $E0, $20, $00, $A4,$20, $F0, $A5,$20, $00
-	.byte $A4,$22, $00, $A5,$22, $00, $22, $00, $22
-	.byte $00, $A6,$22, $A5,$00, $FF, $22, $00, $A3,$22
-	.byte $27, $62, $A5,$22, $00, $A4,$22, $00, $A5,$22
-	.byte $00, $22, $00, $22, $00, $A6,$22, $A5,$00
-	.byte $EE, $22, $00, $A3,$22, $26, $F2, $A5,$22
-	.byte $00, $22, $82, $A8,$22, $00, $22, $00
-	.byte $22, $00, $A6,$22, $A5,$00, $FF, $22, $00
-	.byte $A3,$22, $2F, $F2, $A5,$22, $00, $22, $88
-	.byte $A8,$22, $00, $22, $00, $22, $00, $A6,$22
-	.byte $A5,$00, $EE, $22, $00, $A3,$22, $27, $72
-	.byte $A5,$22, $00, $88, $22, $52, $A7,$22, $00
-	.byte $22, $00, $22, $00, $A6,$22, $A5,$00, $FF
-	.byte $22, $00, $A3,$22, $27, $72, $A5,$22, $00
-	.byte $28, $82, $55, $A7,$22, $00, $22, $00
-	.byte $22, $00, $A6,$22, $A5,$00, $EE, $22, $00
-	.byte $A3,$22, $27, $F2, $A5,$22, $00, $22, $88
-	.byte $A8,$22, $00, $22, $00, $22, $00, $A6,$22
-	.byte $A5,$00, $FF, $22, $00, $A3,$22, $72, $A6,$22
-	.byte $00, $88, $22, $52, $A7,$22, $00, $22
-	.byte $00, $22, $00, $A6,$22, $A5,$00, $EF, $22
-	.byte $00, $A3,$22, $62, $2F, $A5,$22, $00, $28
-	.byte $82, $55, $A7,$22, $00, $22, $00, $22
-	.byte $00, $A6,$22, $A5,$00, $0E, $02, $00, $A4,$02
-	.byte $06, $A5,$02, $00, $02, $08, $05, $A7,$02
-	.byte $00, $02, $00, $02, $00, $A6,$02, $A0,$50,$00
+	.byte $AE,$20, $A4,$22, $00, $A5,$22, $20, $22, $20
+	.byte $22, $20, $A6,$22, $A5,$00, $A0,$12,$22, $00, $A0,$10,$22
+	.byte $A5,$00, $AF,$22, $82, $A0,$13,$22, $A5,$00, $AF,$22, $88
+	.byte $A0,$13,$22, $A5,$00, $AE,$22, $88, $22, $52, $A0,$12,$22
+	.byte $A5,$00, $AE,$22, $28, $82, $55, $A0,$12,$22, $A5,$00
+	.byte $AF,$22, $88, $A0,$13,$22, $A5,$00, $AE,$22, $88, $22
+	.byte $52, $A0,$12,$22, $A5,$00, $AE,$22, $28, $82, $55
+	.byte $A0,$12,$22, $A5,$00, $AF,$02, $08, $05, $A0,$12,$02, $A0,$50,$00
 	.byte $A1
 hallway_rle:	.byte $28 ; ysize=48
 	.byte $A0,$28,$00, $20, $A4,$00, $20, $A4,$00, $20, $A4,$00
diff --git a/ootw/ootw_graphics/l4city/recharge.png b/ootw/ootw_graphics/l4city/recharge.png
index 010419869ddfe7c08cf310bb29a3c7e6650dda5b..7d99f19435a601ab7a0758b16ea7a022376d2e16 100644
GIT binary patch
delta 2696
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
Ck4?(}

delta 189
zcmV;u07CzZ7SIBaBa;>iSqTRp5Hu`viexd9cnT<gj!8s8R5;7+lF<!-APhvA<#uuf
zR$v9DWd%%VKrz;yiXR%wSINuuuBk&`PA!&m7Zu+FVmydD;Qo}sV6h-Z%2W3y-yBFQ
z{@}A<k~X6;3Ybe9K!WflD5L#K5tPTMf-*XT1PR5|rH-b@P{HYV^rC2hRS|LGJepzX
rJ;F{TeKt%s!Oc-vsoR<9;74i(Va1oet39}u00000NkvXXu0mjf#9&d%

diff --git a/ootw/zp.inc b/ootw/zp.inc
index cc5ac659..94a0ee4b 100644
--- a/ootw/zp.inc
+++ b/ootw/zp.inc
@@ -118,6 +118,8 @@ LZ4_DONE	= $96
 ; More zero-page addresses
 ; we try not to conflict with anything DOS, MONITOR or BASIC related
 
+NUM_DOORS	= $D5		; 2+
+
 GUN_FIRE	= $D6		; 2+
 
 GUN_STATE	= $D7		; 2+