From af1feff1f6db227d0ef2d0ee0e7c99d1e92a7717 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Tue, 20 Aug 2019 11:39:37 -0400
Subject: [PATCH] ootw: l2: can now exit level to l3

---
 ootw/TODO                                  |  13 +++
 ootw/friend.s                              |  94 +++++++++++++++++++--
 ootw/ootw_c2.s                             |  12 +--
 ootw/ootw_c2_jail.s                        |  87 ++++++++++++++++---
 ootw/ootw_graphics/l2jail/ootw_c2_jail.inc |  14 +--
 ootw/ootw_graphics/l2jail/room_b3.png      | Bin 4426 -> 4440 bytes
 ootw/zp.inc                                |   1 +
 7 files changed, 194 insertions(+), 27 deletions(-)

diff --git a/ootw/TODO b/ootw/TODO
index a696f6b3..3f38097d 100644
--- a/ootw/TODO
+++ b/ootw/TODO
@@ -1,6 +1,19 @@
 TODO Before release:
 ====================
 
+
+	l2 -- alien behavior
+
+		
+
+
+		room5: alien appears to left of door.  Works on panel to
+			unlock it, comes in and bothers friend after
+			we call down.
+			also I think if you wait long enough more aliens
+			appear if you try to go left.
+
+
 	general -- fix laser collision detection.
 		add detection of shields
 		add detection of friend
diff --git a/ootw/friend.s b/ootw/friend.s
index 5b690e6e..f4250715 100644
--- a/ootw/friend.s
+++ b/ootw/friend.s
@@ -1,18 +1,51 @@
 ; draw/move our friend
 
-friend_out:		.byte	0
+friend_room:		.byte	0	; $FF means not out
 friend_x:		.byte	0
 friend_y:		.byte	0
 friend_state:		.byte	0
 friend_gait:		.byte	0
 friend_direction:	.byte	0
-friend_gun:		.byte	0
+;friend_gun:		.byte	0
+friend_ai_state:	.byte	0
 
 F_STANDING	= 0
 F_WALKING	= 1
 F_RUNNING	= 2
 F_CROUCHING	= 3
 F_TURNING	= 4
+F_KEYPAD	= 5
+F_OPEN_VENT	= 6
+
+FAI_FOLLOWING		=	0
+FAI_RUNTO_PANEL		=	1
+FAI_OPENING_PANEL	=	2
+FAI_END_L2		= 	3
+
+
+	;=======================================
+	; Process friend AI
+	;
+
+friend_ai:
+
+	; FAI_END_L2
+	;    crouch, holding panel open
+
+	; FAI_FOLLOWING
+	;    if x> phys_x by more than 8, walk left
+	;    if x< phys_x by more than 8, walk right
+
+	; FAI_RUNTO_PANEL
+
+	;    otherwise, if not in ROOM#2, run right
+	;    if in room#2, run to panel
+
+	; FAI_OPENING_PANEL
+	;    if door2 unlocked -> FAI_FOLLOWING
+
+	rts
+
 
 	;=======================================
 	; Move friend based on current state
@@ -89,6 +122,8 @@ fstate_table_lo:
 	.byte <friend_running	; 02
 	.byte <friend_crouching	; 03
 	.byte <friend_turning	; 04
+	.byte <friend_standing	; 05 KEYPAD
+	.byte <friend_open_vent	; 06
 
 fstate_table_hi:
 	.byte >friend_standing	; 00
@@ -96,6 +131,8 @@ fstate_table_hi:
 	.byte >friend_running	; 02
 	.byte >friend_crouching	; 03
 	.byte >friend_turning	; 04
+	.byte >friend_standing	; 05 KEYPAD
+	.byte >friend_open_vent	; 06
 
 ; Urgh, make sure this doesn't end up at $FF or you hit the
 ;	NMOS 6502 bug
@@ -113,8 +150,9 @@ fjump:
 
 draw_friend:
 
-	lda	friend_out
-	beq	no_friend
+	lda	friend_room
+	cmp	WHICH_ROOM
+	bne	no_friend
 
 	lda	friend_state
 	tay
@@ -158,6 +196,52 @@ friend_crouching:
 
 	jmp	finally_draw_friend
 
+;===================================
+; OPEN_VENT
+;===================================
+
+friend_open_vent:
+
+	; draw vent -- HACK
+
+	lda	#1
+	sta	VENT_OPEN
+
+	lda	#$00
+	sta	COLOR
+
+	; X, V2 at Y
+        ; from x=top, v2=bottom
+
+
+	ldy	#18
+	lda	#48
+	sta	V2
+	ldx	#24
+	jsr	vlin
+
+	ldy	#19
+	lda	#48
+	sta	V2
+	ldx	#24
+	jsr	vlin
+
+
+
+	lda	#21
+	sta	friend_x
+	lda	#8
+	sta	friend_y
+
+	lda	#<friend_crouch2
+	sta	INL
+
+	lda	#>friend_crouch2
+	sta	INH
+
+	jmp	finally_draw_friend
+
+
 
 ;===============================
 ; Walking
@@ -243,7 +327,7 @@ friend_draw_turning:
 
 
 ;=============================
-; Actually Draw Alien
+; Actually Draw Friend
 ;=============================
 
 
diff --git a/ootw/ootw_c2.s b/ootw/ootw_c2.s
index 84a553fe..69037de8 100644
--- a/ootw/ootw_c2.s
+++ b/ootw/ootw_c2.s
@@ -57,13 +57,15 @@ c2_check_done:
 	cmp	#$ff
 	beq	quit_level
 
-	; only exit if done level
-	; FIXME: or quit pressed?
-
-	lda	WHICH_JAIL
-	cmp	#11
+	cmp	#77
 	bne	c2_new_room
 
+;=========================
+; end of level
+;=========================
+	lda	#3
+	sta	WHICH_LOAD
+	rts
 
 ;===========================
 ; quit_level
diff --git a/ootw/ootw_c2_jail.s b/ootw/ootw_c2_jail.s
index 5610a763..e4c418e0 100644
--- a/ootw/ootw_c2_jail.s
+++ b/ootw/ootw_c2_jail.s
@@ -11,6 +11,7 @@ ootw_jail_init:
 	sta	WHICH_JAIL
 	sta	DIRECTION		; left
 	sta	HAVE_GUN
+	sta	VENT_OPEN
 
 	sta	LASER_OUT
 	sta	ALIEN_OUT
@@ -19,12 +20,14 @@ ootw_jail_init:
 	sta	GUN_STATE
 	sta	GUN_FIRE
 
+	sta	friend_room
+	sta	friend_ai_state
+
 	lda	#100
 	sta	GUN_CHARGE
 
 	lda	#1
 	sta	JAIL_POWER_ON
-	sta	friend_out
 	sta	friend_direction
 
 	lda	#F_RUNNING
@@ -284,10 +287,6 @@ jail4_ok:
 	lda     #5
 	sta     jel_smc+1
 
-
-
-
-
 	; setup teleporter
 	lda	#(-4+128)
 	sta	td_left_smc1+1
@@ -310,11 +309,19 @@ jail4_ok:
 
 	jmp	jail_setup_done
 
+	;=====================
 	; room with vent shaft
 jail5:
 	cmp	#5
 	bne	jail6
 
+	; FIXME -- setup friend with open vent
+	sta	friend_room
+	lda	#F_OPEN_VENT
+	sta	friend_state
+	lda	#0
+	sta	friend_direction
+
 	; setup doors
 
 	lda	#2
@@ -346,7 +353,8 @@ jail5:
 	lda	#(39+128)
 	sta	td_right_smc1+1
 
-	lda	#(6+128)
+	; upper floor limits
+	lda	#(0+128)
 	sta	tu_left_smc1+1
 
 	lda	#(32+128)
@@ -359,6 +367,7 @@ jail5:
 
 	jmp	jail_setup_done
 
+	;======================
 	; tiny room with power
 jail6:
 	lda	#(17+128)
@@ -424,11 +433,13 @@ jail_loop:
 
 	;================================
 	; copy background to current page
+	;================================
 
 	jsr	gr_copy_to_current
 
 	;==================================
 	; draw background action
+	;==================================
 
 	lda	WHICH_JAIL
 
@@ -484,6 +495,7 @@ c2_no_bg_action:
 
 	;===============================
 	; check keyboard
+	;===============================
 
 	jsr	handle_keypress
 
@@ -500,14 +512,17 @@ c2_no_bg_action:
 	jsr	move_friend
 
 
-	;===============
+	;===================
 	; check room limits
+	;===================
+
 
 	jsr	check_screen_limit
 
 
 	;===============
 	; draw physicist
+	;================
 
 	lda	TELEPORTING
 	bne	actively_teleporting
@@ -529,8 +544,9 @@ actively_teleporting:
 	dec	TELEPORTING
 	bne	c2_done_draw_physicist
 
-	;================
+	;===============================
 	; recalc collision on new floor
+	;===============================
 
 	jsr	recalc_walk_collision
 
@@ -576,6 +592,7 @@ no_draw_alien:
 
 	;========================
 	; draw foreground action
+	;========================
 
 	lda	WHICH_JAIL
 	cmp	#1
@@ -696,11 +713,13 @@ dude_not_out:
 
 	;===============
 	; page flip
+	;===============
 
 	jsr	page_flip
 
 	;================
 	; inc frame count
+	;================
 
 	inc	FRAMEL
 	bne	jail_frame_no_oflo
@@ -710,6 +729,7 @@ jail_frame_no_oflo:
 
 	;====================
 	; handle teleporters
+	;===================
 
 	lda	WHICH_JAIL
 	cmp	#4
@@ -811,7 +831,7 @@ not_teleporting_today:
 	; see if picking up gun
 	;==========================
 
-	lda	WHICH_JAIL
+	lda	WHICH_JAIL		; only in room 0
 	bne	not_picking_up_gun
 
 	lda	HAVE_GUN
@@ -837,10 +857,57 @@ not_teleporting_today:
 
 not_picking_up_gun:
 
+	;==========================
+	; see if falling down vent
+	;==========================
+check_vent_falling:
+	lda	WHICH_JAIL		; only in room 5
+	cmp	#5
+	bne	not_falling_down_vent
+
+	lda	VENT_OPEN
+	beq	not_falling_down_vent
+
+	lda	PHYSICIST_STATE
+	cmp	#P_STANDING
+	bne	not_falling_down_vent
+
+	; vent at 18/19
+	lda	PHYSICIST_X
+	cmp	#17
+	beq	falling_down_vent
+	cmp	#18
+	bne	not_falling_down_vent
+
+falling_down_vent:
+	lda	#P_FALLING_DOWN
+	sta	PHYSICIST_STATE
+
+	lda     #48
+        sta     fall_down_destination_smc+1
+
+not_falling_down_vent:
+
+
+	;=====================
+	; check if fell into L3
+	;=======================
+
+	lda	PHYSICIST_Y
+	cmp	#48
+	bne	not_l3_yet
+
+	lda	#77
+	sta	GAME_OVER
+
+not_l3_yet:
+
+
 	;==========================
 	; check if done this level
 	;==========================
 
+
 	lda	GAME_OVER
 	beq	still_in_jail
 
@@ -1163,7 +1230,7 @@ door_c2_r5:
 	.word door_c2_r5_xmax
 
 door_c2_r5_status:
-	c2_r5_door0_status:	.byte DOOR_STATUS_CLOSED
+	c2_r5_door0_status:	.byte DOOR_STATUS_LOCKED
 	c2_r5_door1_status:	.byte DOOR_STATUS_CLOSED
 
 door_c2_r5_x:
diff --git a/ootw/ootw_graphics/l2jail/ootw_c2_jail.inc b/ootw/ootw_graphics/l2jail/ootw_c2_jail.inc
index 560f91e0..f3be0384 100644
--- a/ootw/ootw_graphics/l2jail/ootw_c2_jail.inc
+++ b/ootw/ootw_graphics/l2jail/ootw_c2_jail.inc
@@ -249,16 +249,16 @@ room_b3_rle:	.byte $28 ; ysize=48
 	.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 $65, $62,$62, $65,$65, $A4,$62, $65, $A4,$62, $A3,$02
 	.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
-	.byte $A6,$20, $AA,$80, $A0,$13,$88, $00,$00, $A9,$22, $A0,$1D,$88, $00,$00
+	.byte $02, $AC,$00, $0F,$0F, $5F, $AA,$00, $02, $22,$22
+	.byte $20, $A3,$00, $88,$88, $AD,$00, $80, $AF,$88, $00,$00
+	.byte $02, $22,$22, $20, $A0,$10,$00, $80, $A0,$11,$88, $00,$00
+	.byte $A3,$22, $A6,$20, $AA,$80, $A0,$13,$88, $00,$00, $A9,$22, $A0,$1D,$88
+	.byte $00,$00, $A9,$22, $A0,$1D,$88, $00,$00, $A9,$22, $A0,$1D,$88, $00,$00
 	.byte $A9,$22, $A0,$1D,$88, $00,$00, $A9,$22, $A0,$1D,$88, $00,$00, $A9,$22
 	.byte $A0,$1D,$88, $00,$00, $A9,$22, $A0,$1D,$88, $00,$00, $A9,$22, $A0,$1D,$88
-	.byte $00,$00, $A9,$22, $A0,$1D,$88, $00,$00, $A9,$22, $A0,$1D,$88, $00,$00
-	.byte $A9,$05
+	.byte $00,$00, $A9,$05
 	.byte $A1
 room_b4_rle:	.byte $28 ; ysize=48
 	.byte $A0,$59,$88, $A0,$1F,$00, $A9,$88, $00, $65, $A3,$25, $27
diff --git a/ootw/ootw_graphics/l2jail/room_b3.png b/ootw/ootw_graphics/l2jail/room_b3.png
index 2a8208b1447d3938c7d65e764e947137d9e431a4..1d6413b62c42e47ad195aa88561bdb4f7e4fe571 100644
GIT binary patch
delta 4323
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
RS`+{P002ovPDHLkV1f=VX+;14

delta 4309
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
D`}kS!

diff --git a/ootw/zp.inc b/ootw/zp.inc
index aaba6bb8..64ff40fc 100644
--- a/ootw/zp.inc
+++ b/ootw/zp.inc
@@ -133,6 +133,7 @@ DOOR_XMAX_H	= $C9
 
 BEAST_ZAPPING	= $CA		; 1
 BEAST_DEAD	= $CB		; 1
+VENT_OPEN	= $CC		; 2
 
 LEFT_SHOOT_TARGET = $CF		; ALL
 RIGHT_SHOOT_TARGET = $D0	; ALL