ootw: l2: more hooking up doors

ootw/TODO

@@ -20,6 +20,7 @@ Before release:
 	L2 -- add aliens
 	L2 -- add minimal friend AI
 	L2 -- add way to leave L2 to L3
+		-- on cart screen, cart is still there at edge of screen?
 
 	L5 -- add ending scenes?
 

ootw/ootw_c2_jail.s

@@ -240,14 +240,18 @@ jail4:
 	cmp	#4
 	bne	jail5
 
+
+	; setup doors
+
+	lda	#4
+	sta	NUM_DOORS
+
 	lda	#<door_c2_r4
 	sta	setup_door_table_loop_smc+1
 	lda	#>door_c2_r4
 	sta	setup_door_table_loop_smc+2
 	jsr	setup_door_table
 
-	lda	#4
-	sta	NUM_DOORS
 
 
 
@@ -306,10 +310,23 @@ jail4_ok:
 
 	jmp	jail_setup_done
 
+	; room with vent shaft
 jail5:
 	cmp	#5
 	bne	jail6
 
+	; setup doors
+
+	lda	#2
+	sta	NUM_DOORS
+
+	lda	#<door_c2_r5
+	sta	setup_door_table_loop_smc+1
+	lda	#>door_c2_r5
+	sta	setup_door_table_loop_smc+2
+	jsr	setup_door_table
+
+
 	lda	#(30+128)
 	sta	LEFT_LIMIT
 	lda	#(39+128)
@@ -1120,10 +1137,10 @@ door_c2_r4_x:
 	c2_r4_door3_x:	.byte 32
 
 door_c2_r4_y:
-	c2_r4_door0_y:	.byte 28
-	c2_r4_door1_y:	.byte 28
-	c2_r4_door2_y:	.byte 28
-	c2_r4_door3_y:	.byte 6
+	c2_r4_door0_y:	.byte 26
+	c2_r4_door1_y:	.byte 26
+	c2_r4_door2_y:	.byte 26
+	c2_r4_door3_y:	.byte 4
 
 door_c2_r4_xmin:
 	c2_r4_door0_xmin:	.byte 9		; 18-4-5
@@ -1138,4 +1155,30 @@ door_c2_r4_xmax:
 	c2_r4_door3_xmax:	.byte 36	; 32+4
 
 
+door_c2_r5:
+	.word door_c2_r5_status
+	.word door_c2_r5_x
+	.word door_c2_r5_y
+	.word door_c2_r5_xmin
+	.word door_c2_r5_xmax
+
+door_c2_r5_status:
+	c2_r5_door0_status:	.byte DOOR_STATUS_CLOSED
+	c2_r5_door1_status:	.byte DOOR_STATUS_CLOSED
+
+door_c2_r5_x:
+	c2_r5_door0_x:	.byte 6
+	c2_r5_door1_x:	.byte 26
+
+door_c2_r5_y:
+	c2_r5_door0_y:	.byte 4
+	c2_r5_door1_y:	.byte 4
+
+door_c2_r5_xmin:
+	c2_r5_door0_xmin:	.byte 4		; 6-4-5
+	c2_r5_door1_xmin:	.byte 17	; 26-4-5
+
+door_c2_r5_xmax:
+	c2_r5_door0_xmax:	.byte 10	; 6+4
+	c2_r5_door1_xmax:	.byte 30	; 26+4
 

ootw/ootw_graphics/l2jail/ootw_c2_jail.inc

@@ -242,20 +242,15 @@ room_b2_rle:	.byte $28 ; ysize=48
 room_b3_rle:	.byte $28 ; ysize=48
 	.byte $AE,$00, $80, $AA,$88, $A3,$00, $AC,$88, $AC,$00, $80
 	.byte $AC,$88, $A3,$00, $AC,$88, $A0,$26,$00, $88,$88, $22,$22, $55
-	.byte $A3,$22, $00, $A0,$13,$22, $00, $A9,$22, $00,$00, $88,$88
-	.byte $22,$22, $55, $A3,$22, $00, $A0,$13,$22, $00, $A9,$22
-	.byte $00,$00, $88,$88, $22,$22, $55, $22, $02, $22
-	.byte $00, $A0,$13,$22, $00, $A9,$22, $00,$00, $88,$88, $22,$22
-	.byte $25,$25, $00, $22, $00, $A0,$13,$22, $00, $A9,$22
-	.byte $00,$00, $88,$88, $A4,$22, $55, $22, $00, $A0,$13,$22
-	.byte $00, $A8,$22, $02, $00,$00, $88,$88, $55, $A3,$22
-	.byte $55, $22, $00, $A0,$13,$22, $00, $A8,$22, $A3,$00
-	.byte $88,$88, $55, $A3,$22, $55, $22, $00, $A0,$13,$22
-	.byte $00, $A8,$22, $A3,$00, $88,$88, $55, $A3,$22, $55
-	.byte $22, $00, $22, $52, $A0,$11,$22, $00, $A8,$22
-	.byte $A3,$00, $88,$88, $65,$65, $62,$62, $65, $62, $60
-	.byte $65,$65, $A4,$62, $65, $A4,$62, $A3,$F2, $A5,$62, $60
-	.byte $A4,$62, $02, $A3,$22, $A3,$00, $88,$88, $A4,$00, $20
+	.byte $A0,$21,$22, $00,$00, $88,$88, $22,$22, $55, $A0,$21,$22, $00,$00
+	.byte $88,$88, $22,$22, $55, $22, $02, $A0,$1F,$22, $00,$00
+	.byte $88,$88, $22,$22, $25,$25, $00, $A0,$1F,$22, $00,$00, $88,$88
+	.byte $A4,$22, $55, $A0,$1E,$22, $02, $00,$00, $88,$88, $55
+	.byte $A3,$22, $55, $A0,$1E,$22, $A3,$00, $88,$88, $55, $A3,$22
+	.byte $55, $A0,$1E,$22, $A3,$00, $88,$88, $55, $A3,$22, $55
+	.byte $A3,$22, $52, $A0,$1A,$22, $A3,$00, $88,$88, $65,$65, $62,$62
+	.byte $65, $62,$62, $65,$65, $A4,$62, $65, $A4,$62, $A3,$F2
+	.byte $AA,$62, $02, $A3,$22, $A3,$00, $88,$88, $A4,$00, $20
 	.byte $02, $AE,$00, $05, $AA,$00, $02, $22,$22, $20
 	.byte $A3,$00, $88,$88, $AD,$00, $80, $AF,$88, $00,$00, $02
 	.byte $22,$22, $20, $A0,$10,$00, $80, $A0,$11,$88, $00,$00, $A3,$22
@@ -274,21 +269,21 @@ room_b4_rle:	.byte $28 ; ysize=48
 	.byte $A0,$1D,$22, $A8,$88, $00,$00, $66, $A0,$1D,$22, $A8,$88, $00,$00
 	.byte $66, $A6,$22, $52, $A0,$16,$22, $A8,$88, $00,$00, $66
 	.byte $A6,$22, $55, $A0,$16,$22, $A8,$88, $00,$00, $66, $A4,$22
-	.byte $62,$62, $55, $A6,$62, $52, $A7,$62, $02, $A7,$62
-	.byte $A6,$88, $A5,$00, $20, $22,$22, $02, $A0,$24,$00, $20
-	.byte $22,$22, $02, $A0,$19,$00, $A3,$25, $2E, $2F, $2E
-	.byte $25, $55, $A3,$25, $A0,$16,$22, $55, $00,$00, $A4,$88
-	.byte $A7,$22, $55, $A0,$11,$22, $A3,$00, $20, $00, $22
-	.byte $02, $22, $55, $00,$00, $A4,$88, $A7,$22, $25
-	.byte $A0,$11,$22, $A3,$00, $22, $00, $22, $20, $22
-	.byte $55, $00,$00, $A4,$88, $A0,$19,$22, $A3,$00, $22, $00
-	.byte $A3,$22, $55, $00,$00, $A4,$88, $A3,$22, $02, $A0,$15,$22
-	.byte $A3,$00, $22, $00, $A3,$22, $55, $00,$00, $A4,$88
-	.byte $22,$22, $02, $20, $22, $20, $22,$22, $20
-	.byte $A0,$10,$22, $A3,$00, $22, $00, $A3,$22, $55, $00,$00
-	.byte $A4,$88, $A4,$22, $20, $22,$22, $20, $A0,$11,$22, $A3,$00
-	.byte $22, $00, $A3,$22, $55, $A3,$00, $A3,$88, $A0,$19,$22
-	.byte $A3,$00, $22, $00, $A3,$22, $66, $A3,$00, $A3,$88
-	.byte $50, $52, $A0,$17,$62, $A3,$60, $62, $60, $A3,$62
-	.byte $66, $A3,$00, $A3,$88, $A0,$22,$06, $A3,$00, $A3,$88
+	.byte $62,$62, $55, $A6,$62, $52, $AF,$62, $A6,$88, $A5,$00
+	.byte $20, $22,$22, $02, $A0,$24,$00, $20, $22,$22, $02
+	.byte $A0,$19,$00, $A3,$25, $2E, $2F, $2E, $25, $55
+	.byte $A3,$25, $A0,$16,$22, $55, $00,$00, $A4,$88, $A7,$22, $55
+	.byte $A0,$11,$22, $A3,$00, $20, $00, $22, $02, $22
+	.byte $55, $00,$00, $A4,$88, $A7,$22, $25, $A0,$11,$22, $A3,$00
+	.byte $22, $00, $22, $20, $22, $55, $00,$00
+	.byte $A4,$88, $A0,$19,$22, $A3,$00, $22, $00, $A3,$22, $55
+	.byte $00,$00, $A4,$88, $A3,$22, $02, $A0,$15,$22, $A3,$00, $22
+	.byte $00, $A3,$22, $55, $00,$00, $A4,$88, $22,$22, $02
+	.byte $20, $22, $20, $22,$22, $20, $A0,$10,$22, $A3,$00
+	.byte $22, $00, $A3,$22, $55, $00,$00, $A4,$88, $A4,$22
+	.byte $20, $22,$22, $20, $A0,$11,$22, $A3,$00, $22, $00
+	.byte $A3,$22, $55, $A3,$00, $A3,$88, $A0,$19,$22, $A3,$00, $22
+	.byte $00, $A3,$22, $66, $A3,$00, $A3,$88, $50, $52
+	.byte $A0,$17,$62, $A3,$60, $62, $60, $A3,$62, $66, $A3,$00
+	.byte $A3,$88, $A0,$22,$06, $A3,$00, $A3,$88
 	.byte $A1