From 49c6420f2e951e2265e62c55df88175c5c0eec65 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sat, 21 Mar 2020 15:13:36 -0400
Subject: [PATCH] mist: meche: can go into basement now

---
 mist/graphics_meche/Makefile                |   3 +-
 mist/graphics_meche/elevator_basement_e.png | Bin 0 -> 759 bytes
 mist/graphics_meche/meche_graphics.inc      |   1 +
 mist/init_state.s                           |   4 ++
 mist/leveldata_meche.inc                    |  12 ++--
 mist/meche.s                                |  73 ++++++++++++++++++++
 mist/zp.inc                                 |   2 +
 7 files changed, 90 insertions(+), 5 deletions(-)
 create mode 100644 mist/graphics_meche/elevator_basement_e.png

diff --git a/mist/graphics_meche/Makefile b/mist/graphics_meche/Makefile
index c860c06d..60ab2cb8 100644
--- a/mist/graphics_meche/Makefile
+++ b/mist/graphics_meche/Makefile
@@ -31,7 +31,7 @@ meche_graphics.inc:	\
 	red_button_of_oe_w.lzsa red_button_of_ce_w.lzsa \
 	red_button_cf_oe_w.lzsa red_button_cf_ce_w.lzsa \
 	basement_controls_w.lzsa \
-	elevator_basement_w.lzsa \
+	elevator_basement_e.lzsa elevator_basement_w.lzsa \
 	right_hall2_s.lzsa \
 	right_hall_corner_n.lzsa right_hall_corner_w.lzsa \
 	blue_room_center_n.lzsa blue_room_center_s.lzsa \
@@ -85,6 +85,7 @@ meche_graphics.inc:	\
 	echo "red_button_cf_ce_w_lzsa: .incbin \"red_button_cf_ce_w.lzsa\"" >> meche_graphics.inc
 	echo "basement_controls_w_lzsa: .incbin \"basement_controls_w.lzsa\"" >> meche_graphics.inc
 	echo "elevator_basement_w_lzsa: .incbin \"elevator_basement_w.lzsa\"" >> meche_graphics.inc
+	echo "elevator_basement_e_lzsa: .incbin \"elevator_basement_e.lzsa\"" >> meche_graphics.inc
 	echo "right_hall2_s_lzsa: .incbin \"right_hall2_s.lzsa\"" >> meche_graphics.inc
 	echo "right_hall_corner_n_lzsa: .incbin \"right_hall_corner_n.lzsa\"" >> meche_graphics.inc
 	echo "right_hall_corner_w_lzsa: .incbin \"right_hall_corner_w.lzsa\"" >> meche_graphics.inc
diff --git a/mist/graphics_meche/elevator_basement_e.png b/mist/graphics_meche/elevator_basement_e.png
new file mode 100644
index 0000000000000000000000000000000000000000..8191832d12f3547b47f8744b104caefa49631684
GIT binary patch
literal 759
zcmV<T0to$yP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmP!xqvQ$>-AgB3&^0#+xBq9Tr3g(6f4wL+^7CNKSiCJjl7
zi=*ILaPVib>fqw6tAnc`2>yULIXWr2NQw6)g%&YBxV(?^-Z|WNA0X69Otad?0Zq5f
zWIQIOGpl09D}v~w8pDvxEMrcR67XGL_XzO)F3Pj~@BO*D)vU#UfJi*c4AUmwAfDc|
z4bJ<-VOEe;;&b9rlNuy`<htVV8|S>s0?!PaspLFym{`oWu+qY;U~0ru#1U1~DPKr?
zta9Gstd%OP(I<alD66k5bDe4saV%m95=1DdpokJ|L}}Mav5=(mn2&$J^-JVZ$W;U*
z#{$aGAiI9>KlnXcD>pgeC52)@`-|gz3<DjzK)vcX-^Y$qKLLWzz?I(gmutYxC+XFu
z7C8cXwt<W5rl#xxmpefJlOdb3D+Q^9Tn>0Yqi@Opy|+Nunm4z`IZhvd6wNAe0~{Oz
zBYDbR_jz|`>)igm)0p26dRTI*CoLCE0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jl}46ABQRUdxUE000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0001@Nkl<ZNXPBf-3ovp3<Y2b#(DoY4v}b%*|eD{crN|<+PqjHWC4gJ
ztsN|B<vsy~=d1=MQi6PcgKxlm-v9v#M$!cm4F=_I?5Qhg)VL-{v_U@zmL^cYaE)0x
zTB|^!&K2rl_X<0M5OIU@RKvU(1X?XWG_B7XtHL6vf87Pvyr2_=8V9Jq^#<!f6f+B0
p{#9&ndayu#48qLcU@$WbJOK*UD&YkHgXsVO002ovPDHLkV1ll+MlApU

literal 0
HcmV?d00001

diff --git a/mist/graphics_meche/meche_graphics.inc b/mist/graphics_meche/meche_graphics.inc
index 8d32b1fb..abd4cfb3 100644
--- a/mist/graphics_meche/meche_graphics.inc
+++ b/mist/graphics_meche/meche_graphics.inc
@@ -47,6 +47,7 @@ red_button_of_ce_w_lzsa: .incbin "red_button_of_ce_w.lzsa"
 red_button_cf_ce_w_lzsa: .incbin "red_button_cf_ce_w.lzsa"
 basement_controls_w_lzsa: .incbin "basement_controls_w.lzsa"
 elevator_basement_w_lzsa: .incbin "elevator_basement_w.lzsa"
+elevator_basement_e_lzsa: .incbin "elevator_basement_e.lzsa"
 right_hall2_s_lzsa: .incbin "right_hall2_s.lzsa"
 right_hall_corner_n_lzsa: .incbin "right_hall_corner_n.lzsa"
 right_hall_corner_w_lzsa: .incbin "right_hall_corner_w.lzsa"
diff --git a/mist/init_state.s b/mist/init_state.s
index 1d66f3d9..ade80665 100644
--- a/mist/init_state.s
+++ b/mist/init_state.s
@@ -33,4 +33,8 @@ init_state:
 	sta	ROCKET_NOTE3
 	sta	ROCKET_NOTE4
 
+	; meche elevator
+	sta	MECHE_ELEVATOR
+	sta	MECHE_ROTATION
+
 	rts
diff --git a/mist/leveldata_meche.inc b/mist/leveldata_meche.inc
index cf5d7bbd..fad94ea0 100644
--- a/mist/leveldata_meche.inc
+++ b/mist/leveldata_meche.inc
@@ -334,13 +334,17 @@ location18:
 	.byte	DIRECTION_W		; north exit_dir
 	.byte	DIRECTION_S		; south exit_dir
 	.byte	$ff			; east exit_dir
-	.byte	$ff			; west exit_dir
+	.byte	DIRECTION_W		; west exit_dir
 	.word	red_button_n_lzsa	; north bg
 	.word	red_button_s_lzsa	; south bg
 	.word	red_button_e_lzsa	; east bg
 	.word	red_button_cf_ce_w_lzsa	; west bg
 	.byte	BG_WEST|BG_EAST|BG_SOUTH|BG_NORTH
-	.byte	$ff		; special exit
+	.byte	DIRECTION_W	; special exit
+	.byte	28,33		; special x
+	.byte	14,24		; special y
+	.word	basement_button-1		; special function
+
 
 ; MECHE_BASEMENT			-- Basement
 location19:
@@ -354,9 +358,9 @@ location19:
 	.byte	DIRECTION_W		; west exit_dir
 	.word	$0000				; north bg
 	.word	$0000				; south bg
-	.word	$0000				; east bg
+	.word	elevator_basement_e_lzsa	; east bg
 	.word	elevator_basement_w_lzsa	; west bg
-	.byte	BG_WEST
+	.byte	BG_WEST|BG_EAST
 	.byte	$ff		; special exit
 
 ; MECHE_ELEVATOR_ROTATE			-- elevator rotate mechanism
diff --git a/mist/meche.s b/mist/meche.s
index c954f755..345cd705 100644
--- a/mist/meche.s
+++ b/mist/meche.s
@@ -39,6 +39,7 @@ meche_start:
 	lda	#0
 	sta	ANIMATE_FRAME
 
+	jsr	adjust_basement_door
 
 game_loop:
 	;=================
@@ -136,6 +137,77 @@ really_exit:
 	jmp	end_level
 
 
+	;==================================
+	; elevator stuff
+	;==================================
+
+basement_button:
+
+	; flip switch
+
+	lda	#$80
+	eor	MECHE_ELEVATOR
+	sta	MECHE_ELEVATOR
+
+	jsr	adjust_basement_door
+
+	jsr	change_location
+
+	rts
+
+
+adjust_basement_door:
+
+	lda	MECHE_ELEVATOR
+	bmi	floor_open
+
+
+floor_closed:
+	jmp	floor_closed_elevator_off
+
+floor_open:
+	jmp	floor_open_elevator_off
+
+floor_open_elevator_on:
+
+floor_open_elevator_off:
+
+	ldy	#LOCATION_WEST_EXIT
+	lda	#MECHE_BASEMENT
+	sta	location18,Y
+
+	ldy	#LOCATION_WEST_BG
+
+	lda	#<red_button_of_ce_w_lzsa
+	sta	location18,Y
+	lda	#>red_button_of_ce_w_lzsa
+	jmp	adjust_basement_door_done
+
+floor_closed_elevator_on:
+
+floor_closed_elevator_off:
+
+	ldy	#LOCATION_WEST_EXIT
+	lda	#$ff
+	sta	location18,Y
+
+	ldy	#LOCATION_WEST_BG
+
+	lda	#<red_button_cf_ce_w_lzsa
+	sta	location18,Y
+	lda	#>red_button_cf_ce_w_lzsa
+	jmp	adjust_basement_door_done
+
+
+adjust_basement_door_done:
+	sta	location18+1,Y
+	rts
+
+adjust_fortress_rotation:
+
+	rts
+
+
 
 	;==========================
 	; includes
@@ -162,6 +234,7 @@ really_exit:
 	; linking books
 
 	.include	"link_book_meche.s"
+	.include	"link_book_mist.s"
 
 	.include	"common_sprites.inc"
 
diff --git a/mist/zp.inc b/mist/zp.inc
index 5ddab64c..eca1e3f6 100644
--- a/mist/zp.inc
+++ b/mist/zp.inc
@@ -87,6 +87,8 @@ ROCKET_NOTE1	=	$9B
 ROCKET_NOTE2	=	$9C
 ROCKET_NOTE3	=	$9D
 ROCKET_NOTE4	=	$9E
+MECHE_ELEVATOR	=	$9F
+MECHE_ROTATION	=	$A0
 
 
 ; done game puzzle state