From f627c855d475ed0b3ace28ad79ef259ba60b9d87 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Fri, 20 Mar 2020 00:34:13 -0400
Subject: [PATCH] mist: meche: add a few more locations

---
 mist/common_defines.inc                |   2 ++
 mist/graphics_meche/Makefile           |   6 +++++-
 mist/graphics_meche/fort_entry_e.png   | Bin 0 -> 842 bytes
 mist/graphics_meche/fort_entry_n.png   | Bin 0 -> 829 bytes
 mist/graphics_meche/fort_entry_s.png   | Bin 0 -> 814 bytes
 mist/graphics_meche/meche_graphics.inc |   3 +++
 mist/leveldata_meche.inc               |  20 +++++++++++++++++++-
 7 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 mist/graphics_meche/fort_entry_e.png
 create mode 100644 mist/graphics_meche/fort_entry_n.png
 create mode 100644 mist/graphics_meche/fort_entry_s.png

diff --git a/mist/common_defines.inc b/mist/common_defines.inc
index 22b21f02..f2d19a8d 100644
--- a/mist/common_defines.inc
+++ b/mist/common_defines.inc
@@ -124,6 +124,8 @@ MECHE_ENTRANCE		=	4
 MECHE_FORT_VIEW		=	5
 MECHE_BRIDGE2		=	6
 MECHE_FORT_DOOR		=	7
+MECHE_FORT_ENTRY	=	8
+
 
 ; Selena Age
 
diff --git a/mist/graphics_meche/Makefile b/mist/graphics_meche/Makefile
index 26dde756..80b676bd 100644
--- a/mist/graphics_meche/Makefile
+++ b/mist/graphics_meche/Makefile
@@ -16,7 +16,8 @@ meche_graphics.inc:	\
 	meche_book_closed.lzsa meche_book_open.lzsa \
 	fort_view_n.lzsa fort_view_s.lzsa \
 	bridge2_n.lzsa bridge2_s.lzsa bridge2_e.lzsa bridge2_w.lzsa \
-	fort_door_n.lzsa
+	fort_door_n.lzsa \
+	fort_entry_n.lzsa fort_entry_s.lzsa fort_entry_e.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
@@ -32,6 +33,9 @@ meche_graphics.inc:	\
 	echo "bridge2_e_lzsa: .incbin \"bridge2_e.lzsa\"" >> meche_graphics.inc
 	echo "bridge2_w_lzsa: .incbin \"bridge2_w.lzsa\"" >> meche_graphics.inc
 	echo "fort_door_n_lzsa: .incbin \"fort_door_n.lzsa\"" >> meche_graphics.inc
+	echo "fort_entry_n_lzsa: .incbin \"fort_entry_n.lzsa\"" >> meche_graphics.inc
+	echo "fort_entry_s_lzsa: .incbin \"fort_entry_s.lzsa\"" >> meche_graphics.inc
+	echo "fort_entry_e_lzsa: .incbin \"fort_entry_e.lzsa\"" >> meche_graphics.inc
 
 
 %.gr: %.png
diff --git a/mist/graphics_meche/fort_entry_e.png b/mist/graphics_meche/fort_entry_e.png
new file mode 100644
index 0000000000000000000000000000000000000000..d32306b7ba0fef43c3ae3c2af5cdab9673e5974b
GIT binary patch
literal 842
zcmV-Q1GW5#P)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmP!xrasZx;^2Rn#3WT;LS#ELj-D-@wZs1;guFnQ@8G-*gu
zTpR`0f`dPcRR<SmT^(EnLGTB}$<ayCMM}IcDYS_3!XqE&-E;EZeSpxcGR^9p1T@_?
zGpU4_%dd*TR|F6S(1W<lEMs1h((tXXd+MXQi}5V~zCSCh7A!_T5{c)SVcNtS#50?=
z!FiuJ!pgErd`>)J(gBGdxvqHp#<}FOz%wIeHj^Zd5R0WQR=Sv#O^tY(II3zo<qJ8F
zRnA+SwQ8NU&&h8XD(EZAT&FdP6c(`r2_h8KQ9%_pV)WHXv5=wtgpYs3^-JVZ$W;L&
z#{z25AiI9>H~2kUs~Dg1l0pff@5OOG#(>~1&}ul&_p#%&PJqBOaHV(rwI(q8NqVEB
zMUQ~NZQ$a%qbYm9<qk0XWXPuMN&#9zu?W1M(KF?Np<7^J&6`_$AEysMmS&Z{0S*p<
z@e*aP``o*~dv5>swCDE&6T5PO*JwuI0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jl}312`S81t(Vk000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0002>Nkl<ZNXPBh(F(&L3<XdTp$07Z|G(X`EX09Yh5I15JalCn$J^M^
zETm?|s_OT{x9C%`QDF@<l1Pq6fy_Wq(!sz|QW6Xf<_rN#$?qbvP96g?%lUoh3;=}`
zuoPwxDElmDL_30dAL=XQl522rQ);pWrX>5lBk1)9&j4eDg4eY-D9=48C{I2hsIvnU
zgeFuDn9xQM5NNX(ETN7`u!Noulu*I`Ft-TWT*wScXzBC_0DX2HTyhArp!LpDc0l=X
z4zy(2!EQob^%<<G;VxS}gT_sO`o$6Gx3mB8>4LWM2=u-6K6ZQP>-NB3X#CTA0Ssz2
UjqO-1jQ{`u07*qoM6N<$f{j6TWdHyG

literal 0
HcmV?d00001

diff --git a/mist/graphics_meche/fort_entry_n.png b/mist/graphics_meche/fort_entry_n.png
new file mode 100644
index 0000000000000000000000000000000000000000..85e4f4370ded606f1296298d957bdd18b98cc43b
GIT binary patch
literal 829
zcmV-D1H$}?P)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmP!xrasZx;^2Rn#3WT;LS#ELj-D-@wZs1;guFnQ@8G-*gu
zTpR`0f`dPcRR<SmT^(EnLGTB}$<ayCMM}IcDYS_3!XqE&-E;EZeSpxcGR^9p1T@_?
zGpU4_%dd*TR|F6S(1W<lEMs1h((tXXd+MXQi}5V~zCSCh7A!_T5{c)SVcNtS#50?=
z!FiuJ!pgErd`>)J(gBGdxvqHp#<}FOz%wIeHj^Zd5R0WQR=Sv#O^tY(II3zo<qJ8F
zRnA+SwQ8NU&&h8XD(EZAT&FdP6c(`r2_h8KQ9%_pV)WHXv5=wtgpYs3^-JVZ$W;L&
z#{z25AiI9>H~2kUs~Dg1l0pff@5OOG#(>~1&}ul&_p#%&PJqBOaHV(rwI(q8NqVEB
zMUQ~NZQ$a%qbYm9<qk0XWXPuMN&#9zu?W1M(KF?Np<7^J&6`_$AEysMmS&Z{0S*p<
z@e*aP``o*~dv5>swCDE&6T5PO*JwuI0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jl}310@7B0^^GS000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0002!Nkl<ZNXPBf+YZAZ2nJwcV$>_%|7|B@*29n`g(b~auHCmEuq_0k
zpjIhSsD37H3U2TK5w8yB93x_?byW}`#!_-7_zys0Xm)Nh%$X=xuoQ;eK_VSnb_97T
zZjau2S#IzKe*~1D69Y)ES4S{}lw|TW2;lm1;Dpkr-jEPcYWg%t+!qqQlg5Pnb#_X~
zwPrLVY#E&st{F{B;Tg^u&0A*HY0KR3+_V{7=lBV%ztip^vt!db_&mSga=SX?1=qmW
zSq*G#&$tJVA!%ElSq*G|y9LMjjf;`N-ifl5@gBC)z&7m%N-sQNbqyge00000NkvXX
Hu0mjf9;a<r

literal 0
HcmV?d00001

diff --git a/mist/graphics_meche/fort_entry_s.png b/mist/graphics_meche/fort_entry_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..4591440a1d6862abbad3113e75acd6565d27d1de
GIT binary patch
literal 814
zcmV+}1JV46P)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmP!xrasZx;^2Rn#3WT;LS#ELj-D-@wZs1;guFnQ@8G-*gu
zTpR`0f`dPcRR<SmT^(EnLGTB}$<ayCMM}IcDYS_3!XqE&-E;EZeSpxcGR^9p1T@_?
zGpU4_%dd*TR|F6S(1W<lEMs1h((tXXd+MXQi}5V~zCSCh7A!_T5{c)SVcNtS#50?=
z!FiuJ!pgErd`>)J(gBGdxvqHp#<}FOz%wIeHj^Zd5R0WQR=Sv#O^tY(II3zo<qJ8F
zRnA+SwQ8NU&&h8XD(EZAT&FdP6c(`r2_h8KQ9%_pV)WHXv5=wtgpYs3^-JVZ$W;L&
z#{z25AiI9>H~2kUs~Dg1l0pff@5OOG#(>~1&}ul&_p#%&PJqBOaHV(rwI(q8NqVEB
zMUQ~NZQ$a%qbYm9<qk0XWXPuMN&#9zu?W1M(KF?Np<7^J&6`_$AEysMmS&Z{0S*p<
z@e*aP``o*~dv5>swCDE&6T5PO*JwuI0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jl}31O^58<Ffex000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0002lNkl<ZNXPBgaSMYW5Cw3Z-BOtB`+wW{=8j>xE%xq@3LgZ4`Qy~+
za+gI!Vu>#a!F@;w7{_xW%lYmb=>4^mIx@gxgCG^0JJ}a_?__|-2kWbS77*J*fg<y4
z4vH9pAX{)fdlM+K2Kz^{2?PSMc03xCR{-MTD|~YJ4ubd_1c_-m$CyhLe2-AzRH9tY
z6o|W&0H$ONDoKJ^vN5P!C2>IHl3S2I<&;_wHIm@e<Ora16gaIiz}<mp0u*@b#1ur8
sW}q&c0?|vf@3lYe2B4B8C{2EY56Nvmg9&LYhyVZp07*qoM6N<$f_Tkj;s5{u

literal 0
HcmV?d00001

diff --git a/mist/graphics_meche/meche_graphics.inc b/mist/graphics_meche/meche_graphics.inc
index d75b8490..82e3c16d 100644
--- a/mist/graphics_meche/meche_graphics.inc
+++ b/mist/graphics_meche/meche_graphics.inc
@@ -13,3 +13,6 @@ bridge2_s_lzsa: .incbin "bridge2_s.lzsa"
 bridge2_e_lzsa: .incbin "bridge2_e.lzsa"
 bridge2_w_lzsa: .incbin "bridge2_w.lzsa"
 fort_door_n_lzsa: .incbin "fort_door_n.lzsa"
+fort_entry_n_lzsa: .incbin "fort_entry_n.lzsa"
+fort_entry_s_lzsa: .incbin "fort_entry_s.lzsa"
+fort_entry_e_lzsa: .incbin "fort_entry_e.lzsa"
diff --git a/mist/leveldata_meche.inc b/mist/leveldata_meche.inc
index 9acb0715..faddab09 100644
--- a/mist/leveldata_meche.inc
+++ b/mist/leveldata_meche.inc
@@ -6,6 +6,7 @@
 locations:
 	.word location0, location1, location2, location3
 	.word location4, location5, location6, location7
+	.word location8
 
 ; MECHE_INSIDE_GEAR		-- Inside gear on Mist
 location0:
@@ -134,7 +135,7 @@ location6:
 
 ; MECHE_FORT_DOOR			-- fort door
 location7:
-	.byte	$ff			; north exit
+	.byte	MECHE_FORT_ENTRY		; north exit
 	.byte	MECHE_BRIDGE2		; south exit
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit
@@ -149,3 +150,20 @@ location7:
 	.byte	BG_NORTH
 	.byte	$ff		; special exit
 
+; MECHE_FORT_ENTRY			-- fort entryway
+location8:
+	.byte	$ff			; north exit
+	.byte	MECHE_BRIDGE2		; south exit
+	.byte	$ff			; east exit
+	.byte	$ff			; west exit
+	.byte	DIRECTION_N	; north exit_dir
+	.byte	DIRECTION_S	; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	fort_entry_n_lzsa	; north bg
+	.word	fort_entry_s_lzsa	; south bg
+	.word	fort_entry_e_lzsa	; east bg
+	.word	$0000			; west bg
+	.byte	BG_NORTH|BG_SOUTH|BG_EAST
+	.byte	$ff		; special exit
+