From bd0d1b418ab81208194b5649ea3f6fae49562316 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Thu, 30 Jul 2020 20:53:13 -0400
Subject: [PATCH] mist: selena: add another location along chasm path

---
 mist/common_defines.inc                |   1 +
 mist/graphics_selena/Makefile          |   3 +++
 mist/graphics_selena/chasm_path2_e.png | Bin 0 -> 1161 bytes
 mist/graphics_selena/chasm_path2_w.png | Bin 0 -> 952 bytes
 mist/leveldata_selena.inc              |  24 ++++++++++++++++++++----
 5 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 mist/graphics_selena/chasm_path2_e.png
 create mode 100644 mist/graphics_selena/chasm_path2_w.png

diff --git a/mist/common_defines.inc b/mist/common_defines.inc
index 1df0ee3c..323e16b5 100644
--- a/mist/common_defines.inc
+++ b/mist/common_defines.inc
@@ -253,6 +253,7 @@ SELENA_BUNKER_KEYPAD	=	41
 SELENA_WALKWAY2		=	42
 SELENA_WATER_PATH2	=	43
 SELENA_WATER_PATH3	=	44
+SELENA_CHASM_PATH2	=	45
 
 ; Submarine on Selena
 SUB_BUNKER_ENTRY	=	0
diff --git a/mist/graphics_selena/Makefile b/mist/graphics_selena/Makefile
index db2526c4..7dedaabd 100644
--- a/mist/graphics_selena/Makefile
+++ b/mist/graphics_selena/Makefile
@@ -25,6 +25,7 @@ selena_graphics.inc:	\
 	water_note_n.lzsa water_note_e.lzsa water_note_w.lzsa water_note_s.lzsa \
 	tower_view_n.lzsa tower_view_s.lzsa tower_view_e.lzsa tower_view_w.lzsa \
 	chasm_path_e.lzsa chasm_path_w.lzsa \
+	chasm_path2_e.lzsa chasm_path2_w.lzsa \
 	chasm_e.lzsa chasm_w.lzsa chasm_s.lzsa chasm_n.lzsa \
 	clock_path_e.lzsa clock_path_w.lzsa \
 	clock_n.lzsa clock_s.lzsa clock_e.lzsa clock_w.lzsa \
@@ -83,6 +84,8 @@ selena_graphics.inc:	\
 	echo "tower_view_w_lzsa: .incbin \"tower_view_w.lzsa\"" >> selena_graphics.inc
 	echo "chasm_path_e_lzsa: .incbin \"chasm_path_e.lzsa\"" >> selena_graphics.inc
 	echo "chasm_path_w_lzsa: .incbin \"chasm_path_w.lzsa\"" >> selena_graphics.inc
+	echo "chasm_path2_e_lzsa: .incbin \"chasm_path2_e.lzsa\"" >> selena_graphics.inc
+	echo "chasm_path2_w_lzsa: .incbin \"chasm_path2_w.lzsa\"" >> selena_graphics.inc
 	echo "chasm_e_lzsa: .incbin \"chasm_e.lzsa\"" >> selena_graphics.inc
 	echo "chasm_w_lzsa: .incbin \"chasm_w.lzsa\"" >> selena_graphics.inc
 	echo "chasm_n_lzsa: .incbin \"chasm_n.lzsa\"" >> selena_graphics.inc
diff --git a/mist/graphics_selena/chasm_path2_e.png b/mist/graphics_selena/chasm_path2_e.png
new file mode 100644
index 0000000000000000000000000000000000000000..91cf1ae9a15924454339f8dc35f94a179df39809
GIT binary patch
literal 1161
zcmV;41a|w0P)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vm1v`i+M5s;{#ELj-6^c-y)C#RSm|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfa&%I3krMxx6k5c1aNLh~_a1le0HI!Hs@X9CsG4P@
z;xRFkT@?eb2w)g}h+;%yraqTUCg3@~?&0I>U4&<OpZjz4C^?e>K9P8q>4rtTK|H-_
z>74h8L#!w%#OK8023?T&k?XR{Z=4Gb3p_Jqq*L?6A!4!6#&R38qM;H`5r-93qkJLb
zvch?bvs$jQ<~{ifgE?(wnd>x%5XT~xkc0>sRg_SMg$S)0DJD|1AM@}JI{qZNWO9|j
z$gzM5R7j2={11M2Yv!YqZc;D?biUa3$0!ik1sXNm{yw(t#tGnm2ClT0zfuQgK1r{&
zwD1woyA51iw={VVxZD8-o^;8O9LY~p$mfCgGy0}1(0>bbuerT7_i_3Fq^YaK4RCM>
zj1?$*-Q(R|?Y;ebrrF;Qz7ulA^${4!0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jmAH7a$$14Dtp5000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0006sNkl<ZNXO-t(Q>OW3`B()CuTAo|Nq|>u`H5pncSPnTlaw!j8Ath
zBar9U^f)Bn1?DW@_4kK>#ML?gYkfa?4h$UDn$kO9&i@Ro^&Jq?JTjkpJZcSq>Cg;U
z3W5AJ4Qp5m{1Hhf%b}lL&!--9)?+C-l$db^rc2iig5OdU0#pRtHVu3MF{P9qSc=H9
z&|?d1kq#(gKtu8h9pVfi99!fC6yYS^l#;HKU7<sw=+6VUU0RYIhykroxzqxChaSk$
z0Vq<62SR=kIN}2ns5k`Pw+#ncq==ojkz0SNZ3}@dQg7*Fd0>m30DGkUZ4PZYJko$E
zNo$|Tb&VbNP(x0DK(2@ET1wud)!GA5;{d40b@fHj$i2t0KsP`lePnnX?`(m(y+WV{
z_CUo&9z7B(*j3qpZDf5k^}oj+fkfczNx27d<3tXLyaA%ZEf9hE07kK~f)gM*kiUk&
zQDk~lplc5AfCxNB-cBh}{RKr~eaFbwb4H*d(Ub$A4);ZoQ!xy!Bm}-*3hXCaqo3jM
z<Ogf`dWq=Z*bn=nL_lp3()*L4hx>Qi3`gKTZw%Z6BZnUW*}!^-TPSvU=>zvb`lG|`
zM#sF^AI^Gze8bIg9nk#YY;-vD=suR>zywC$SCO}z`LdNbFoC?y94^a8K<>y0IEGdn
zkunRc=j$3pwyhI>aNYw)f7smSjJ=#51=F!fTA=D<AXcocu>$jd=>)=`2QqN%&<fxk
b!eh?AwBcnl8Ns(a00000NkvXXu0mjfO7{m5

literal 0
HcmV?d00001

diff --git a/mist/graphics_selena/chasm_path2_w.png b/mist/graphics_selena/chasm_path2_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..a68b4bd1340625740840c8b5f443942889a7e1e7
GIT binary patch
literal 952
zcmV;p14sOcP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vm1v`i+M5s;{#ELj-6^c-y)C#RSm|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfa&%I3krMxx6k5c1aNLh~_a1le0HI!Hs@X9CsG4P@
z;xRFkT@?eb2w)g}h+;%yraqTUCg3@~?&0I>U4&<OpZjz4C^?e>K9P8q>4rtTK|H-_
z>74h8L#!w%#OK8023?T&k?XR{Z=4Gb3p_Jqq*L?6A!4!6#&R38qM;H`5r-93qkJLb
zvch?bvs$jQ<~{ifgE?(wnd>x%5XT~xkc0>sRg_SMg$S)0DJD|1AM@}JI{qZNWO9|j
z$gzM5R7j2={11M2Yv!YqZc;D?biUa3$0!ik1sXNm{yw(t#tGnm2ClT0zfuQgK1r{&
zwD1woyA51iw={VVxZD8-o^;8O9LY~p$mfCgGy0}1(0>bbuerT7_i_3Fq^YaK4RCM>
zj1?$*-Q(R|?Y;ebrrF;Qz7ulA^${4!0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jmAH7A+|`)Dp=6000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0004FNkl<ZNXO-t+m3@U3`8AF6y*W&|9{(>SvSs&l9Jtr?ntrPfDYqJ
zXerFqPX7)Vz5uv9H4Uh+5$N9nLs(b;)VfZqq5sh&p!dH3BpO400dTa69U#$kV2-@q
zWx)|KFUv$=2m*w3pLr^f8Nhf*3vvNSgc=Ia9YX2=#+O<ZrhWwh+zttlImXFASr(|s
zp_I2RMgdB?0(9;ppmW+3)DY>)!uLU78WQQSv;^)%7I?YKJ)rD3myoTIzYN64<iNqV
z4QJA^QJ{3Y3&i}F$BH`wu6y)E@@#Z5MLl%(6^0$8o>m3S9comd9z8?=b%bP9V*_A}
z@R{P7Lkleb1iW?VeTm!)6~MitR?0})`+XO<#sX+B*-w3kw}GX{sSaiTW(`}w{PC5;
zmOl&3Q+BSt-y$yq^>?Lp{~)kbt2`e%tdrIT4mD*Em|sdxYoJZq#wz7^!1F3LnlcVN
a>+%EOg<%tb?x`>U0000<MNUMnLSTXgv82ub

literal 0
HcmV?d00001

diff --git a/mist/leveldata_selena.inc b/mist/leveldata_selena.inc
index cd8b35aa..681e68d9 100644
--- a/mist/leveldata_selena.inc
+++ b/mist/leveldata_selena.inc
@@ -15,7 +15,7 @@ locations:
 	.word location32,location33,location34,location35
 	.word location36,location37,location38,location39
 	.word location40,location41,location42,location43
-	.word location44
+	.word location44,location45
 
 ; SELENA_INSIDE_SHIP		-- Inside Ship
 location0:
@@ -223,11 +223,11 @@ location11:
 	.byte	$ff			; north exit
 	.byte	$ff			; south exit
 	.byte	SELENA_TOWER_VIEW	; east exit
-	.byte	SELENA_CHASM		; west exit
+	.byte	SELENA_CHASM_PATH2	; west exit
 	.byte	$ff		; north exit_dir
 	.byte	$ff		; south exit_dir
 	.byte	DIRECTION_E	; east exit_dir
-	.byte	DIRECTION_S	; west exit_dir
+	.byte	DIRECTION_W	; west exit_dir
 	.word	$0000				; north bg
 	.word	$0000				; south bg
 	.word	chasm_path_e_lzsa		; east bg
@@ -237,7 +237,7 @@ location11:
 
 ; SELENA_CHASM			-- chasm
 location12:
-	.byte	SELENA_CHASM_PATH	; north exit
+	.byte	SELENA_CHASM_PATH2	; north exit
 	.byte	$ff			; south exit
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit
@@ -837,3 +837,19 @@ location44:
 	.byte	BG_EAST|BG_WEST
 	.byte	$ff
 
+; SELENA_CHASM_PATH2		-- another path to chasm
+location45:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+	.byte	SELENA_CHASM_PATH	; east exit
+	.byte	SELENA_CHASM		; west exit
+	.byte	$ff		; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	DIRECTION_E	; east exit_dir
+	.byte	DIRECTION_S	; west exit_dir
+	.word	$0000				; north bg
+	.word	$0000				; south bg
+	.word	chasm_path2_e_lzsa		; east bg
+	.word	chasm_path2_w_lzsa		; west bg
+	.byte	BG_EAST|BG_WEST
+	.byte	$ff