From 59e8379b72844a7d3e8fb2e75413def867797667 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sat, 29 Aug 2020 01:14:38 -0400
Subject: [PATCH] mist: meche: add blue throne

---
 mist/common_defines.inc                      |   2 +
 mist/graphics_meche/Makefile                 |   5 +-
 mist/graphics_meche/blue_throne_closed_w.png | Bin 0 -> 1227 bytes
 mist/graphics_meche/blue_throne_open_w.png   | Bin 0 -> 1236 bytes
 mist/leveldata_meche.inc                     |  55 +++++++++++++++++--
 mist/meche_rotation.s                        |  12 +++-
 6 files changed, 66 insertions(+), 8 deletions(-)
 create mode 100644 mist/graphics_meche/blue_throne_closed_w.png
 create mode 100644 mist/graphics_meche/blue_throne_open_w.png

diff --git a/mist/common_defines.inc b/mist/common_defines.inc
index 112ea55a..8e95f5a1 100644
--- a/mist/common_defines.inc
+++ b/mist/common_defines.inc
@@ -213,6 +213,8 @@ MECHE_RED_THRONE	=	48
 MECHE_RED_ROOM_EAST	=	49
 MECHE_TELESCOPE_SKELETON=	50
 MECHE_TELESCOPE_PLAIN	=	51
+MECHE_BLUE_THRONE	=	52
+MECHE_BLUE_THRONE_OPEN	=	53
 
 ; Selena Age
 
diff --git a/mist/graphics_meche/Makefile b/mist/graphics_meche/Makefile
index 9f282eae..789d0148 100644
--- a/mist/graphics_meche/Makefile
+++ b/mist/graphics_meche/Makefile
@@ -67,7 +67,8 @@ meche_graphics.inc:	\
 	north_close_n.lzsa north_close_s.lzsa \
 	red_throne_s.lzsa \
 	red_room_east_e.lzsa red_room_east_n.lzsa red_room_east_w.lzsa \
-	red_skeleton.lzsa red_no_skeleton.lzsa
+	red_skeleton.lzsa red_no_skeleton.lzsa \
+	blue_throne_open_w.lzsa blue_throne_closed_w.lzsa
 	echo "departure_e_lzsa: .incbin \"departure_e.lzsa\"" > meche_graphics.inc
 	echo "arrival_w_lzsa: .incbin \"arrival_w.lzsa\"" >> meche_graphics.inc
 	echo "entrance_e_lzsa: .incbin \"entrance_e.lzsa\"" >> meche_graphics.inc
@@ -185,6 +186,8 @@ meche_graphics.inc:	\
 	echo "red_room_east_w_lzsa: .incbin \"red_room_east_w.lzsa\"" >> meche_graphics.inc
 	echo "red_skeleton_lzsa: .incbin \"red_skeleton.lzsa\"" >> meche_graphics.inc
 	echo "red_no_skeleton_lzsa: .incbin \"red_no_skeleton.lzsa\"" >> meche_graphics.inc
+	echo "blue_throne_open_w_lzsa: .incbin \"blue_throne_open_w.lzsa\"" >> meche_graphics.inc
+	echo "blue_throne_closed_w_lzsa: .incbin \"blue_throne_closed_w.lzsa\"" >> meche_graphics.inc
 
 
 
diff --git a/mist/graphics_meche/blue_throne_closed_w.png b/mist/graphics_meche/blue_throne_closed_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb60852a50e4fa54cbd09a26acc3933d6cf716fb
GIT binary patch
literal 1227
zcmV;+1T_1JP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ^g_`2P;T*$WWauNELC^DionYsTEpvFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|<mja6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La)
zC*oo@w<`9$B7k8GB8ITUOnokuO2Tt|-NVP%yC~1{KKJM7Q}QMQd?N8I(+!JwgLrz=
z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I<dJ$fW0qL&RdSgXIopB|{~iB917kM)^Y4
zWrgz=XSGset$Xqp2J_m=GS_L2Ab~|JAq5dKYAB-u3sG7%QcR?2KknfVJN^{8WO9|k
z$gzMbR7j2={11M2YZfMBZc;D~bidg4$0*RV3pDGt{e5iP%@e@?3|wh#f3*S3e3D*o
zYmp<Me;c^CZfo)$aJd5vJ?WAmIg+2IP$&TJXY@@uVBi+$U2}VD?c?+T$WT|w8{ps&
z7%Nity2rZ%oxS~grq$mMv@LSM{ku;?0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jmDH1T`!~;xRq|000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0007ZNkl<ZNXM;~;j*hB420DIksl22|F*Z=B_<$H_1w(Z(rNhIgb-M^
zk1azxju`Fl7>|P^=LS;<96<#ruT|i_t5-@LU~A8S>skSONUFXA1a4hVm2ZKP!`0YN
z;I{RF7*ip&;W@*;1B?-4j%pxbihTvdSoHljATk(&;D{`F)FOEfq%!93T<aR}BxEQg
zM%MbfFz<jYnh>NGMeA!I7e#@(;(t&GAB#MTdkhR=rmzJ<<DhV4Q;vaD2oIWQEIYd2
z!b0#qgqcE}L9A&Jt$9BOio#ZcNrC+7ixKGk6X2!IdSi2-ggivffG`4KEpP}$Tk^g}
zZd*z~2oR$l(ALQmh{?xcfiPsyEmI(1BOrB2xI}Z~ZC(4~=y)H<)-V9tU1E_aQ4Lvu
zb<qrf_GA$lcO`*TC0QITi3yptrofbb0jCO60)ms+FJN|+A1V|eH=p7x&|Z~(DvS|0
z3vBB!8oLDqG9|b!i{fnAsA(NqNJ>@6fJs5v!ht$GOQ}_U_Z14VxYB(DgyFZowznuu
zTiJH_bgl(5Ji8^SaNkEc{6eYjv)wO1s%e4wWAq(dQUP?X2MmEX#Jj+=ZMkA?gW&mq
z7xD<=;_>#{1D2~OJBM>jczvemdBzvWA>>@n6Ck@AGbTvAXoSXchC&2B1VSSUL-w=x
zIYZO3V6yjZmjn(oTcq5+&sr29TxUQ8OfRcb3b6ERKB#v(-cd-;E)X@x!!jk}cx&Ku
z1&TTwcm))V1oA}21TKzD6%2B2fkdABU2yo!*#fEa3Z%k1aMM8K@WE#dl#9q!A&^pT
p7odiWMd4o>at}xtS_F|b@E;+-J5l9q?u-Bc002ovPDHLkV1jJ>8GZl&

literal 0
HcmV?d00001

diff --git a/mist/graphics_meche/blue_throne_open_w.png b/mist/graphics_meche/blue_throne_open_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..572f1f22d239aca5350be491f5a42272f459703c
GIT binary patch
literal 1236
zcmV;_1S|WAP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ^g_`2P;T*$WWauNELC^DionYsTEpvFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|<mja6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La)
zC*oo@w<`9$B7k8GB8ITUOnokuO2Tt|-NVP%yC~1{KKJM7Q}QMQd?N8I(+!JwgLrz=
z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I<dJ$fW0qL&RdSgXIopB|{~iB917kM)^Y4
zWrgz=XSGset$Xqp2J_m=GS_L2Ab~|JAq5dKYAB-u3sG7%QcR?2KknfVJN^{8WO9|k
z$gzMbR7j2={11M2YZfMBZc;D~bidg4$0*RV3pDGt{e5iP%@e@?3|wh#f3*S3e3D*o
zYmp<Me;c^CZfo)$aJd5vJ?WAmIg+2IP$&TJXY@@uVBi+$U2}VD?c?+T$WT|w8{ps&
z7%Nity2rZ%oxS~grq$mMv@LSM{ku;?0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jmDH1po-!5`As}000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0007iNkl<ZNXM;~;f{nL420Ey=nvxizwO=ZFt#Xo>RuC#yW;1R4#i>m
zjiDRMvabI3x-JW^Lg+j~U=J#wUTeU4woy4ZfX8?S9LEaSLQ?e|AaLWjt9%R89F8vj
z1Wr>Mh-)gOHXM7}cYy1PYhKkr!VLQgh->NlHy~y(CE<uH^Jpe{4x}>9-(Kq)@FZm@
zBu2IV6y_a}rb$U&l-Ack7R7*8@h=o&j7RR~?gLZ0Qg{SHW5+mJlzku-Vgy4P%ZhHd
zu#{p<=}MtJL9A;L$B6M7D1}D}ZVGfWmLM?3C%{vijV`W%O1X=?0wM@R9D!XZ+ER=)
za+-1mLO@)#fZit^p#FokJrIEz48tW5FauhV@Gx~LU81@0re=I_97wbHs`r3w4IQ9g
zC4NQ)<m&{iP16DTo#m`hsx*telDL%VwI{$!g*nFvb9mskeW6f5TYTFm%r^G9bW7p7
z0w<tQHPGS~5XhWaSAYaH+gO+nJtXHUWx!+z=|eyrj-hx}uV^V0vJB;L{$WWAh`<W6
z*S3nnX)DVP=MbpSG%`KE#;I_gdvo}KQr+)z52kS2(7LGR2*h2E?R=yH7=nO?L;I%}
z?*jK#8%iKW!vUxlatmVd`1RTXmQPW3ju1HE>eKAlwx96@+Jr(t$+|#xH_q5JSx@vp
z3lwdhX{!zp8et4p6*#6%o5y(E7=V+p8o*)qqJS8B1w_K${whfU62$|4=fFD(IkE|a
z=eSwsOdP)&c$|U0BMDgnrIA2Z8V|5I)+~s@oO>XV`+64+=WX*q>O2Ffuuj}H5N$p<
y*Fb%UoD~8oyPbfRGK#`mmU0V77+M68HSh;qKsx^>2OxC-0000<MNUMnLSTY%Pa-M+

literal 0
HcmV?d00001

diff --git a/mist/leveldata_meche.inc b/mist/leveldata_meche.inc
index 0f5692f8..8bb97593 100644
--- a/mist/leveldata_meche.inc
+++ b/mist/leveldata_meche.inc
@@ -17,6 +17,7 @@ locations:
 	.word location40,location41,location42,location43
 	.word location44,location45,location46,location47
 	.word location48,location49,location50,location51
+	.word location52,location53
 
 ; MECHE_INSIDE_GEAR		-- Inside gear on Mist
 location0:
@@ -441,20 +442,21 @@ location23:
 	.byte	MECHE_CENTER_HALL2		; north exit
 	.byte	MECHE_RIGHT_HALL_CORNER		; south exit
 	.byte	$ff				; east exit
-	.byte	$ff				; west exit
+	.byte	MECHE_BLUE_THRONE		; west exit
 	.byte	DIRECTION_N		; north exit_dir
 	.byte	DIRECTION_W		; south exit_dir
 	.byte	$ff			; east exit_dir
-	.byte	$ff			; west exit_dir
+	.byte	DIRECTION_W		; west exit_dir
 	.word	blue_room_center_n_lzsa		; north bg
 	.word	blue_room_center_s_lzsa		; south bg
 	.word	blue_room_center_e_lzsa		; east bg
 	.word	blue_room_center_w_lzsa		; west bg
 	.byte	BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
-	.byte	DIRECTION_W
-	.byte	9,14		; special x
-	.byte	24,44		; special y
-	.word	enter_blue_secret-1	; special function
+	.byte	$ff
+;	.byte	DIRECTION_W
+;	.byte	9,14		; special x
+;	.byte	24,44		; special y
+;	.word	enter_blue_secret-1	; special function
 
 
 ; MECHE_CENTER_HALL2		-- center hall 2
@@ -958,4 +960,45 @@ location51:
 	.byte	BG_NORTH
 	.byte	$ff		; special exit
 
+; MECHE_BLUE_THRONE		-- blue room throne
+location52:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+	.byte	$ff			; east exit
+	.byte	MECHE_BLUE_ROOM_CENTER	; west exit
+	.byte	$ff			; north exit_dir
+	.byte	$ff			; south exit_dir
+	.byte	$ff			; east exit_dir
+	.byte	DIRECTION_W		; west exit_dir
+	.word	$0000				; north bg
+	.word	$0000				; south bg
+	.word	$0000				; east bg
+	.word	blue_throne_closed_w_lzsa	; west bg
+	.byte	BG_WEST
+	.byte	DIRECTION_W
+	.byte	5,13		; special x
+	.byte	16,40		; special y
+	.word	open_blue_secret-1	; special function
+
+; MECHE_BLUE_THRONE_OPEN	-- blue room throne, open passage
+location53:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+	.byte	$ff			; east exit
+	.byte	MECHE_BLUE_ROOM_CENTER	; west exit
+	.byte	$ff			; north exit_dir
+	.byte	$ff			; south exit_dir
+	.byte	$ff			; east exit_dir
+	.byte	DIRECTION_W		; west exit_dir
+	.word	$0000				; north bg
+	.word	$0000				; south bg
+	.word	$0000				; east bg
+	.word	blue_throne_open_w_lzsa	; west bg
+	.byte	BG_WEST
+	.byte	DIRECTION_W
+	.byte	5,13		; special x
+	.byte	16,40		; special y
+	.word	enter_blue_secret-1	; special function
+
+
 
diff --git a/mist/meche_rotation.s b/mist/meche_rotation.s
index 56249144..24d69f64 100644
--- a/mist/meche_rotation.s
+++ b/mist/meche_rotation.s
@@ -144,10 +144,20 @@ missing_page:
 	rts
 
 
+open_blue_secret:
+	lda	#MECHE_BLUE_THRONE_OPEN
+	sta	LOCATION
+	jmp	change_location
 
 enter_blue_secret:
-
+	lda	CURSOR_Y
+	cmp	#24
+	bcc	close_blue_secret	; blt
 	lda	#MECHE_BLUE_SECRET_DOOR
+	bne	done_blue_secret	; bra
+close_blue_secret:
+	lda	#MECHE_BLUE_THRONE
+done_blue_secret:
 	sta	LOCATION
 	jmp	change_location