From 8e696a16eb94d0fd015feee3e993791871240f02 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Wed, 26 Aug 2020 19:34:36 -0400
Subject: [PATCH] mist: arbor: complete the ring

---
 mist/common_defines.inc        |   6 ++++
 mist/graphics_arbor/Makefile   |  13 ++++++-
 mist/graphics_arbor/hut4_e.png | Bin 0 -> 1184 bytes
 mist/graphics_arbor/hut4_n.png | Bin 0 -> 1102 bytes
 mist/graphics_arbor/hut4_s.png | Bin 0 -> 1129 bytes
 mist/graphics_arbor/hut4_w.png | Bin 0 -> 1237 bytes
 mist/graphics_arbor/hut5_s.png | Bin 0 -> 1148 bytes
 mist/graphics_arbor/hut5_w.png | Bin 0 -> 1293 bytes
 mist/graphics_arbor/hut6_n.png | Bin 0 -> 1216 bytes
 mist/graphics_arbor/hut6_w.png | Bin 0 -> 1056 bytes
 mist/leveldata_arbor.inc       |  60 +++++++++++++++++++++++++++++++--
 11 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 mist/graphics_arbor/hut4_e.png
 create mode 100644 mist/graphics_arbor/hut4_n.png
 create mode 100644 mist/graphics_arbor/hut4_s.png
 create mode 100644 mist/graphics_arbor/hut4_w.png
 create mode 100644 mist/graphics_arbor/hut5_s.png
 create mode 100644 mist/graphics_arbor/hut5_w.png
 create mode 100644 mist/graphics_arbor/hut6_n.png
 create mode 100644 mist/graphics_arbor/hut6_w.png

diff --git a/mist/common_defines.inc b/mist/common_defines.inc
index 18949186..ddc4fc45 100644
--- a/mist/common_defines.inc
+++ b/mist/common_defines.inc
@@ -450,6 +450,12 @@ ARBOR_STEPS1		=	29
 ARBOR_STEPS_BOTTOM	=	30
 ARBOR_ARRIVAL_NOELEV	=	31
 ARBOR_IN_LONGSHACK3	=	32
+ARBOR_HUT6		=	33
+ARBOR_HUT5		=	34
+ARBOR_HUT4		=	35
+ARBOR_HUT7		=	36
+ARBOR_HUT3		=	37
+
 
 ; NIBEL, up in the clouds
 NIBEL_IN_ELEV2_TOP_CLOSED=	0
diff --git a/mist/graphics_arbor/Makefile b/mist/graphics_arbor/Makefile
index c70d49a5..6d664b3a 100644
--- a/mist/graphics_arbor/Makefile
+++ b/mist/graphics_arbor/Makefile
@@ -38,7 +38,10 @@ arbor_graphics.inc:	\
 	steps1_e.lzsa steps1_w.lzsa \
 	steps2_e.lzsa steps2_w.lzsa \
 	steps_bottom_e.lzsa steps_bottom_open_w.lzsa steps_bottom_closed_w.lzsa \
-	inlongshack3_n.lzsa inlongshack3_s.lzsa inlongshack3_e.lzsa inlongshack3_w.lzsa
+	inlongshack3_n.lzsa inlongshack3_s.lzsa inlongshack3_e.lzsa inlongshack3_w.lzsa \
+	hut6_n.lzsa hut6_w.lzsa \
+	hut5_s.lzsa hut5_w.lzsa \
+	hut4_n.lzsa hut4_s.lzsa hut4_e.lzsa hut4_w.lzsa
 	echo "arrival_e_lzsa: .incbin \"arrival_e.lzsa\"" > arbor_graphics.inc
 	echo "arrival_open_e_lzsa: .incbin \"arrival_open_e.lzsa\"" >> arbor_graphics.inc
 	echo "arrival_w_lzsa: .incbin \"arrival_w.lzsa\"" >> arbor_graphics.inc
@@ -112,6 +115,14 @@ arbor_graphics.inc:	\
 	echo "inlongshack3_s_lzsa: .incbin \"inlongshack3_s.lzsa\"" >> arbor_graphics.inc
 	echo "inlongshack3_e_lzsa: .incbin \"inlongshack3_e.lzsa\"" >> arbor_graphics.inc
 	echo "inlongshack3_w_lzsa: .incbin \"inlongshack3_w.lzsa\"" >> arbor_graphics.inc
+	echo "hut6_n_lzsa: .incbin \"hut6_n.lzsa\"" >> arbor_graphics.inc
+	echo "hut6_w_lzsa: .incbin \"hut6_w.lzsa\"" >> arbor_graphics.inc
+	echo "hut5_s_lzsa: .incbin \"hut5_s.lzsa\"" >> arbor_graphics.inc
+	echo "hut5_w_lzsa: .incbin \"hut5_w.lzsa\"" >> arbor_graphics.inc
+	echo "hut4_n_lzsa: .incbin \"hut4_n.lzsa\"" >> arbor_graphics.inc
+	echo "hut4_s_lzsa: .incbin \"hut4_s.lzsa\"" >> arbor_graphics.inc
+	echo "hut4_e_lzsa: .incbin \"hut4_e.lzsa\"" >> arbor_graphics.inc
+	echo "hut4_w_lzsa: .incbin \"hut4_w.lzsa\"" >> arbor_graphics.inc
 
 %.gr: %.png
 	$(PNG2GR) $< $@
diff --git a/mist/graphics_arbor/hut4_e.png b/mist/graphics_arbor/hut4_e.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c7962df42de8c02d2dc07d898c188739fea718d
GIT binary patch
literal 1184
zcmV;R1Yi4!P)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iKg1#x2Ro=ZWT>4ih>CR7DionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|<mja6A|?JWDYS_3;J6>}?mh0_0sdx{sb+8jP&LcQ
zq>@4|zbf>;B7|WCkw8phramW%X?TvWd-(Wz7w1{t=l&f1O2K4+PavLUx?vG-5YKE{
zI_G`j2rEkp@j3ChK^G)`<htzg8|RY4ex4aIvYC0}2(eJ=V!4Z1*-(k6iKB|DQNBOt
zvch?bvs$gQ_C5Iv!v$?+nd>x1k-{RDAVPqQIx48bLY!8O6cZWRPkQ)A9KT2|nOqex
zax9<*6_Voz|AXJ%n#HL}Hz}M1dR}b%V+`os1zHW;{yw(t)(H@J2ClS@zt#j2pQJZB
zTJ#7Q*aj}HJDR))T<!ovPr77CjufEjFBXCKGy0}HFn9~}t+~Cm_i_3FWT~t44RCM>
z#7dOC?(yzWcW?imY4`U7v21d{=*JtO0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jmDE7YiJqNk4x8000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0006@Nkl<ZNXLzr+m6C83`Fw)YV&~d|9`u9hpESx6e58(>E?87PuwzI
z|6_c{dGfF4^E{u=hm7+*)_Oc}WsJJ#GwqRU*)}2#WI&tSsv{H57CI!htmPW*2C5mz
zjC;@L?2zYaN-9tjU@HY@UvuWbku3lb_F55$up<yD`rn+9wh<aRB9J#zph;NkqlQR8
z?eY$&D+)B6<SQaOpaDufg^;F>L}K~rx8KhNXvhft2FPV8Ko6ZYL!Q=R4rzDPxQ$|7
zgGj2-?<$}TH|G%J8}Kfl@0GKR3}l_nQVdmfCj2kJwO-fg6$<<p;Olh{3`)Hi9T2A@
z0##Sr54FM(Nc+GnfJcuu)?tM+(5(SrEW{7CQ6K7Ai3<Hh>rJ;lbcGdIt)l<6J<EHA
zEKsd-DN086z|PFAZMx<Vft{^t_*<a%o8H(hX55^V*kTPhCxd26y5_Jw%N4lRoY0qn
z4e}1inE_p4d?hGetQpKXwDZn>;|9`fwpG@?oq=}>+xFGB2L~SS0fon5b0Qrr_zbJI
zF(9u22oyhGih??3AYDk{jmnDafc5AB)F`bu57}~uKvjdy>|+pZ#T#G@xi&LZ59_2S
zO~w5NM73d}Rw2W^1J-Wcyjn$^KZIzJ>dXi%U0cIN33foc846N?NnwYJK>RAenqP6C
z`*V1>RUg0kGa~}^Gz+lDVG|AQ52&n=<2bIzm*R45cR)=Ce<<<gbO7i2?txjOj|<u1
ydZ4c9j))w@?e*<%qOVItj!s1es-6z0_WA?5rA);J*DRg@0000<MNUMnLSTZ8dL3Z^

literal 0
HcmV?d00001

diff --git a/mist/graphics_arbor/hut4_n.png b/mist/graphics_arbor/hut4_n.png
new file mode 100644
index 0000000000000000000000000000000000000000..63ed94fb54ad3d01f1104c5b8e0f85ec851e5c10
GIT binary patch
literal 1102
zcmV-U1hM;xP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iKg1#x2Ro=ZWT>4ih>CR7DionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|<mja6A|?JWDYS_3;J6>}?mh0_0sdx{sb+8jP&LcQ
zq>@4|zbf>;B7|WCkw8phramW%X?TvWd-(Wz7w1{t=l&f1O2K4+PavLUx?vG-5YKE{
zI_G`j2rEkp@j3ChK^G)`<htzg8|RY4ex4aIvYC0}2(eJ=V!4Z1*-(k6iKB|DQNBOt
zvch?bvs$gQ_C5Iv!v$?+nd>x1k-{RDAVPqQIx48bLY!8O6cZWRPkQ)A9KT2|nOqex
zax9<*6_Voz|AXJ%n#HL}Hz}M1dR}b%V+`os1zHW;{yw(t)(H@J2ClS@zt#j2pQJZB
zTJ#7Q*aj}HJDR))T<!ovPr77CjufEjFBXCKGy0}HFn9~}t+~Cm_i_3FWT~t44RCM>
z#7dOC?(yzWcW?imY4`U7v21d{=*JtO0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jmDE1SB6dJWGK9000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0005`Nkl<ZNXM<0-Liuq41~FHl#34U|F&&T8aE+}pr_1eTf~pe4}_Ll
zOF52G^zJXYSK9Jech$?rr@6dZ8_hWHr6XG_AC=4VmmZd$D{u~4z5eF<MKkT?SGb^1
zOzs=&8})kMe}USzt(`5V&v969b4}jWZviO7RCo_Tt96#I=K|5;*(<DX)JuH$f8c^b
z-uTERg)h=%B%6Xpc?^_+2INLlh0!QUkbWKLnA<@yumZQuzn~^RjIsbVPvukbX3G?q
zhl~}nH;BR<6nQ4NtT5-~GSDj&Wbf@sl<z6@zXw5y2F(@1n`y_+8Z{_0g?@4Z^e<SH
zQINR8xHWvP4Dz3`+KqwkV%|ep=<6?EdJ~{eBLjKY<jrgfv^}n`x_q2307Ibk?7KHO
zF1?#3$DY?qfil5kpqjhyUg1L^j&XvMof@Tl-*5S_uMmpU0-&P|xD@4n=a4%pisA&w
zGV#)6q==O!1V^i0F0<5R_zs2$&|r$^^?9mLHzW-RQU@L#pS`|73xytzZ6(8d0<s`2
zqzxi#aG(w7*E7=?{#JM#)Y;Jz`c@9arw`-onw0=Tm0yZX?+Nq|eR7z-_`8P$f<L)f
zWX+En*Z##(XdDneP&I(yn~!lJb`imN1?il%V4ZWLL*Sv%r!!CFt9YjYrt=B#4JS-u
U$wUS)p8x;=07*qoM6N<$g7O&pmH+?%

literal 0
HcmV?d00001

diff --git a/mist/graphics_arbor/hut4_s.png b/mist/graphics_arbor/hut4_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bf633edb6fd487c0dedb5b19f75dc16476afe94
GIT binary patch
literal 1129
zcmV-v1eW`WP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iKg1#x2Ro=ZWT>4ih>CR7DionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|<mja6A|?JWDYS_3;J6>}?mh0_0sdx{sb+8jP&LcQ
zq>@4|zbf>;B7|WCkw8phramW%X?TvWd-(Wz7w1{t=l&f1O2K4+PavLUx?vG-5YKE{
zI_G`j2rEkp@j3ChK^G)`<htzg8|RY4ex4aIvYC0}2(eJ=V!4Z1*-(k6iKB|DQNBOt
zvch?bvs$gQ_C5Iv!v$?+nd>x1k-{RDAVPqQIx48bLY!8O6cZWRPkQ)A9KT2|nOqex
zax9<*6_Voz|AXJ%n#HL}Hz}M1dR}b%V+`os1zHW;{yw(t)(H@J2ClS@zt#j2pQJZB
zTJ#7Q*aj}HJDR))T<!ovPr77CjufEjFBXCKGy0}HFn9~}t+~Cm_i_3FWT~t44RCM>
z#7dOC?(yzWcW?imY4`U7v21d{=*JtO0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jmDE1O_cySzI9i000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0006MNkl<ZNXN~W&9cKF2!-7^i3_Li|F#W1K|mndJ9klL^3xc<90Adm
z^Ixr$a-Ox)Sq}RvJK`s;O~5@^_I7L6wbsAE{PDq+4{#pzTG?+~9^pIAPcKFGx~$gM
zi|*=e{W9|5@FIU5&FDf`I^!wbleg(CXn<h^ywYZ^&$n}UMlye_wL8wM$Yrhb^D*Qf
z0$SSwS}%zq7+)zA6wX~4M>hpp<gDsEyR$9eoCX4<S1BJ+?C5uEz1uf|GczUkBXveQ
z(i-V+`#9iJl#hcBQ7AstY5gTIQmA_lAV1Cr4WRa+j<N&Vf*vOjd`J`DE9Aar$QtCK
ztdM|SAtN7s=<|>jayPAzQ!7pE8EWet|FS@QYLu@m%3S+sxEM07)`vPMcY$4%2L@tb
zvIHz<N^YcwP^iigP@J)q*bJm@SaI|$0cHv8T>~*F_)vfvVSsbx@CwB(t?^>?=)+te
z5?i+&M<ieY)Zdp%17o1A=%|om$U8t$Pg7ABW(MB(F)mk#xotm9z8%2T(m5-f^+S*Y
z%4EWB5xW|#*6pT8E1?WfI~O1VqVQ)6mlS0n$rLc&>9Oi~3k6R~y8+r&7t6ZdY2_OM
z{gIKM-aE6Gg8w6~$g#>4m}PzppWg0?Mf$e3;L&UbuxwOJE-+@*i)HK$9f7;&ayIee
v-E}^6MwZxf-~B_8^iF^}8}~lM$<zBA<aa;kuHMjs00000NkvXXu0mjfu~`G0

literal 0
HcmV?d00001

diff --git a/mist/graphics_arbor/hut4_w.png b/mist/graphics_arbor/hut4_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab775595010425c76bf92a211446de3124ce37db
GIT binary patch
literal 1237
zcmV;`1S<Q9P)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iKg1#x2Ro=ZWT>4ih>CR7DionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|<mja6A|?JWDYS_3;J6>}?mh0_0sdx{sb+8jP&LcQ
zq>@4|zbf>;B7|WCkw8phramW%X?TvWd-(Wz7w1{t=l&f1O2K4+PavLUx?vG-5YKE{
zI_G`j2rEkp@j3ChK^G)`<htzg8|RY4ex4aIvYC0}2(eJ=V!4Z1*-(k6iKB|DQNBOt
zvch?bvs$gQ_C5Iv!v$?+nd>x1k-{RDAVPqQIx48bLY!8O6cZWRPkQ)A9KT2|nOqex
zax9<*6_Voz|AXJ%n#HL}Hz}M1dR}b%V+`os1zHW;{yw(t)(H@J2ClS@zt#j2pQJZB
zTJ#7Q*aj}HJDR))T<!ovPr77CjufEjFBXCKGy0}HFn9~}t+~Cm_i_3FWT~t44RCM>
z#7dOC?(yzWcW?imY4`U7v21d{=*JtO0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jmDE7B3`tVGM8p000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0007jNkl<ZNXNyO+irv~3`Fw)DtSQp|G(`H!{Bj9wzQR6OWjSuIT>F9
z*;2~3<-gWyUDsu4ZQGV*eOYVkX&7zWy21m#npG>mc`f1S3?QZe3lj`u05dXhC(w~_
zZ4J0(0T9SgM<7SFat?8qJ~16feFRFOR1ydSkor1xyrI=viy)~`+N4uJEY8`1J3b}(
zxVcIXPy%{kGEg{DPArF~+|!jHhP)<opwCS}IO&FPp->uS4vbj|SWM^k)-q5tfV%-*
zwygjEeuZVh)d>*d(cDY|TilJ)sF0-)h|q)e6NLo22VlqE(W+kh?}Qv9=C`mtV^79<
z5zaFp%Va<*bP%0l7e_RYfq4R*w0Fk9y!e&FSy7%SRC<!aynS+_wdEd%Jl6=Io;2SC
zjy3)Za8MN0`QF-p0_;8B0J&Fu$`hdSI0bsD$00j%0MyGSw~d^}IrJC;I{@~s^P=<%
zKLF|p_X}WDS#K5r@h<7x#)BUMy|D@0Ulu2xkC)AWjE2wfLN^EEn=oPby_6o<hkgP5
zxZ?*OfoM?3cii|z3m`l$ptns%QLXpr82Se2MxfG>4jdh}Rwii(j6)uQYN>sfzH{>R
z9<mp`19_PNDs)vkbZ`OP^@B_Ylrq&fG^*Y@4SJ5b1V0l{eaDH{;nDIW<=#$Hh5flJ
z4r=?3>R}HE7%@Z=fbA4sl8aZ7C2^qVkEm$yBi|8n{1V6q`6y9%dC0)93y<Xkc*pg?
z*pSguxRbU+e#T^Q9tX6fUpIMQrJ~#e&&T9FS(J$5^J@N$(F0Ko?oqcKzQYTr#AeH?
zc#lB;%ykZhDfM@K?|>XR@G93_-`BvLRnGYY2f%B^jR+d*00000NkvXXu0mjf7Xvdf

literal 0
HcmV?d00001

diff --git a/mist/graphics_arbor/hut5_s.png b/mist/graphics_arbor/hut5_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..b507e05ce34f74ef9ab8693e1392fb4997de4408
GIT binary patch
literal 1148
zcmV-?1cUpDP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iKg1#x2Ro=ZWT>4ih>CR7DionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|<mja6A|?JWDYS_3;J6>}?mh0_0sdx{sb+8jP&LcQ
zq>@4|zbf>;B7|WCkw8phramW%X?TvWd-(Wz7w1{t=l&f1O2K4+PavLUx?vG-5YKE{
zI_G`j2rEkp@j3ChK^G)`<htzg8|RY4ex4aIvYC0}2(eJ=V!4Z1*-(k6iKB|DQNBOt
zvch?bvs$gQ_C5Iv!v$?+nd>x1k-{RDAVPqQIx48bLY!8O6cZWRPkQ)A9KT2|nOqex
zax9<*6_Voz|AXJ%n#HL}Hz}M1dR}b%V+`os1zHW;{yw(t)(H@J2ClS@zt#j2pQJZB
zTJ#7Q*aj}HJDR))T<!ovPr77CjufEjFBXCKGy0}HFn9~}t+~Cm_i_3FWT~t44RCM>
z#7dOC?(yzWcW?imY4`U7v21d{=*JtO0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jmDD6$A(@I*d&K000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0006fNkl<ZNXMm?iEe{15JZWHWhV&n|9{(Vr_;S`L&-`8g3Zh9;e}<n
zZLR6~IF_Xpj1LTt3s9~Iy#e84a&GMdpm(aZDe#P4e$1{WP<|68XJ_e#fhiDI0DA4_
z`BL70H~c~m#MpOg!?6o24oDP72HN7`%=38*xbFhw@d7aC)yFUc#RT?Gg)*xsUf%!`
zM}XCK2^d|5DTWY*4S~?5HLt*Ti7|_ofP#U-9`N<*7d?B<MTPhi;DGdhYd68A7!r6K
zI6@KH0oHnjt~o@PRgVR75SaJ#uRZ>34pc=xhK#mRNZj1z+^sJF`wAbAoRm^d6wYFZ
zS)UZ`iBn+TWj_nxL?P0$ZD(2b^O{%OOF$s6XIWhy0@t<ga%*_Mam3P*@%px|Ld3%>
z%s~HM83LtnW<Ub=U3F^aJ1&oaF@~-A7Zt_;s8*|tQfieWUjf=&y~{&|wXQ3#dO(dH
zn(hz?jDX|_SOi9OS_?xU)n=D-u^=@BhAfMtQia$pSz#_}etU6cQmESKI)m;@!~zAO
zKsg4J(q?*mDfe~?G!1}EiS6AA@j5R7krauc1u9f)&VM9LTn5l9jKQZ$yY)_hQ6Y6<
z@dya_1JGueNzo|kVq4gZ;Q+X8>b5!?lc8-vlLCiBQY0<na5F|^Op5)&o&aT+c%YU{
z-X}hWwRRQS29|Z^opJ(<9WmCR-7PW86JXvS8E74+&J&<tZdK+v1%3hY+b}`iffGsq
O0000<MNUMnLSTZh=KgE|

literal 0
HcmV?d00001

diff --git a/mist/graphics_arbor/hut5_w.png b/mist/graphics_arbor/hut5_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..524c944042f0bf79215cc2c0ef596a0b3beec77f
GIT binary patch
literal 1293
zcmV+o1@iidP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iKg1#x2Ro=ZWT>4ih>CR7DionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|<mja6A|?JWDYS_3;J6>}?mh0_0sdx{sb+8jP&LcQ
zq>@4|zbf>;B7|WCkw8phramW%X?TvWd-(Wz7w1{t=l&f1O2K4+PavLUx?vG-5YKE{
zI_G`j2rEkp@j3ChK^G)`<htzg8|RY4ex4aIvYC0}2(eJ=V!4Z1*-(k6iKB|DQNBOt
zvch?bvs$gQ_C5Iv!v$?+nd>x1k-{RDAVPqQIx48bLY!8O6cZWRPkQ)A9KT2|nOqex
zax9<*6_Voz|AXJ%n#HL}Hz}M1dR}b%V+`os1zHW;{yw(t)(H@J2ClS@zt#j2pQJZB
zTJ#7Q*aj}HJDR))T<!ovPr77CjufEjFBXCKGy0}HFn9~}t+~Cm_i_3FWT~t44RCM>
z#7dOC?(yzWcW?imY4`U7v21d{=*JtO0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jmDD6df}M^QJ}s000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0008GNkl<ZNXMO)i?T#85Ja<u604N||J$pzHZzG}Z>m`GIC>tLY#O$<
zuG2IO)85i!tLKDu0^(vDhI_yZAk;}Aft-LR_P+(@d;+6Fud@c$nlFH*LIK(D-BA15
zdN$y?mOxGcVqG;IbNYT=X@{&KPJK;<<|z;CdjJW;g?IbBQ)oaTg&~mN@Asw;3#ieC
zLQP*5A4`6wKN_C6*n9COAT?k#=Lj4}pI8MjXThdv>)Zy=W8X*e6G)SZ@lLq`asWMA
zs3^+@c<%*}>dt5-PBN1jWrE_4sel9lh$S`+SOFCjDdgL&Lc6F?sZ&RpCXb`S!`wV~
z3Kn=EhTuaPbq(Yj#|t1M7!{(YRtUFvAZHZ7+T^HEKqifH5hgc)wL(Q1cNK!1Ifr-5
z`2iR=6@8d9GgArgQ|A$gVVbPTr9#ElQsx1u9P}o8g?{V301Cw?7N=!z{Pn3H(`L7;
z1yqy?tW9P`k3KwrWnx>Dg=+(&$p=v8c;I=4B}G|QSaFD@;RG&=H<?CgH~TY1;jnsW
z3Iou5$aL{Q3ks_ubp9KNgTR19VrB#?Y?nZ}m!`(BuviV>al~(#Ha806#`7iv^gVz&
zp0o)rfk0xifH0X!+ydekPZ;OZ4&)TyQsN-@%N4LbQ3@cY`&y%*+$rRT8wv%K$(AzO
z)dVWhZG(1udj$F@63E?TVM?j%1f1utQ$c<KBmg+mjkhke7eJoYzL2pd(qw3xXK3U7
z0jRWK`l!HK<k6(<HIV-$1n~QtAL_c#)&%4~wp*Ye%1y5ki$5P?U;9uIRz1WU6`MbE
zhDK;DfM^k@^TY})aJ*}&kib0vmAICN2#%sGoz|FA7eFoMu8`-Lhg!%4kIlQ`5@_2?
zRZ;3v7E&V-+W_*4?q{(uUzTPEpg;E%SEa~xYb*Q%@g-iAf~?L^00000NkvXXu0mjf
DR((Oc

literal 0
HcmV?d00001

diff --git a/mist/graphics_arbor/hut6_n.png b/mist/graphics_arbor/hut6_n.png
new file mode 100644
index 0000000000000000000000000000000000000000..f62fbb28edbcf4d753105211576554491a2bb95d
GIT binary patch
literal 1216
zcmV;x1V8(UP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iKg1#x2Ro=ZWT>4ih>CR7DionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|<mja6A|?JWDYS_3;J6>}?mh0_0sdx{sb+8jP&LcQ
zq>@4|zbf>;B7|WCkw8phramW%X?TvWd-(Wz7w1{t=l&f1O2K4+PavLUx?vG-5YKE{
zI_G`j2rEkp@j3ChK^G)`<htzg8|RY4ex4aIvYC0}2(eJ=V!4Z1*-(k6iKB|DQNBOt
zvch?bvs$gQ_C5Iv!v$?+nd>x1k-{RDAVPqQIx48bLY!8O6cZWRPkQ)A9KT2|nOqex
zax9<*6_Voz|AXJ%n#HL}Hz}M1dR}b%V+`os1zHW;{yw(t)(H@J2ClS@zt#j2pQJZB
zTJ#7Q*aj}HJDR))T<!ovPr77CjufEjFBXCKGy0}HFn9~}t+~Cm_i_3FWT~t44RCM>
z#7dOC?(yzWcW?imY4`U7v21d{=*JtO0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jmDD4=)T%mXn(R000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0007ONkl<ZNXMO*OOnGN3`ALk!YnA?|F)A(yCaF8ouSHujp4Z^A%#i#
z-D<^k9JQu&o++VMtJOboq<^-N<4CX99Ee`ik8kUN7<mZXDI}P<3GnqI5RZH%FyU-J
zm<(VkG>xy$vsQ2Nd16H1Uh`661hN+}U#+_4f%^OcD6@K?=HV^xQlf1N;u}~BfVc?E
zd94t4cm@RXOflYuC>s!v)~J#F2&7g31<m=ZkR}@tkU5ac6qpzkgzW+z$30Le0kv1L
z4>b~iIRUf=wgwb*J_6Dl0WmxRTk}A_z3Ep6#MeDgX{99s(vzdY2~g85%9v<rsJKQT
z=Wl>sA)#8J5BVs23vPg3p#jIBEES^4aVRR3(Q6<zdf=yG0w<FM<n?c0R2b{X9O%9H
zKp{)RULm0rVAXS~kiQ((?}M@c5@ZT}3}--J7A8QNto=r1gzXi|WWQ-HpuQ7RPt(`H
zv3R{#`%GXMY~z?hmWSTtDNsSN)bl{9?15X8$6OwP?P?Ew2oK#U+-1rF7=uzu^kL5B
z-SBs;HX9%p3uZu~42T)H(~Kz)3kcLPXb-fC&9yf`?L+wxy1mIUTc$ueFwvkL5P!Xw
zCqQcKeP}=hN=}GQ(NXjZq`5uN3Y5NYC)yu?Hr;^z0eA~6#RL71fB{>xLvTEE+w%=j
zyUbEgOCnCSbPKcy`{LkrkB9gU2;>|{uL5WPR-_aarcZ&<=mO~T;2y|h)e`6fqA0R_
z`7G*@4}kvkb@?ZGZ~Y5s+eSE3*|!0xRKq>Wt*<&Bx6*jsvGYJ(oMJmLs{9d19DQd7
eU5h4xvFAVbSY=?a?Q_fk0000<MNUMnLSTZwAt8AH

literal 0
HcmV?d00001

diff --git a/mist/graphics_arbor/hut6_w.png b/mist/graphics_arbor/hut6_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c2caadac5ce4f859ceb4254271fc12a923ea861
GIT binary patch
literal 1056
zcmV+*1mF9KP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iKg1#x2Ro=ZWT>4ih>CR7DionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|<mja6A|?JWDYS_3;J6>}?mh0_0sdx{sb+8jP&LcQ
zq>@4|zbf>;B7|WCkw8phramW%X?TvWd-(Wz7w1{t=l&f1O2K4+PavLUx?vG-5YKE{
zI_G`j2rEkp@j3ChK^G)`<htzg8|RY4ex4aIvYC0}2(eJ=V!4Z1*-(k6iKB|DQNBOt
zvch?bvs$gQ_C5Iv!v$?+nd>x1k-{RDAVPqQIx48bLY!8O6cZWRPkQ)A9KT2|nOqex
zax9<*6_Voz|AXJ%n#HL}Hz}M1dR}b%V+`os1zHW;{yw(t)(H@J2ClS@zt#j2pQJZB
zTJ#7Q*aj}HJDR))T<!ovPr77CjufEjFBXCKGy0}HFn9~}t+~Cm_i_3FWT~t44RCM>
z#7dOC?(yzWcW?imY4`U7v21d{=*JtO0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jmDD6E6qOcn}8w000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0005YNkl<ZNXM;~*>1!j3`OS!B|ISh|8GaG>-u_O38^KTMlpx$Wq{A;
z$V%~VGCuEs{Co*S*ejq1S;RwNDZR6M@A4NBrO<!;ZA+5^*#u}k4Nz8yZlxfw_xsM5
zZY>4UpedMgu?QsZ)?|<^fjlyW3Yr4*hE;`Xn?O;BDqAas1}lu9hd?sI9Rg#>z9<3^
zqop?$vYQ23*b$KW%Qv=wWbpfa9{}Zh4ul@fa;SkQkP!&ekpjI!a>B-b1r)a&=)+zB
zadKXiSe#`JGaxEt|AUZU0lmWdV_fNf0k&4_NTKh?WyrjPw?E6uaR6j>xKrCh;6ca;
z#4x$xQDLppvC|{KD%2d>Jx6CPf&65cKLRXpq7d!67<gR@#Qf>>0gwPRBtIDtYi%_@
z1k&(l9a^meU>>sn5-&zWU{pxBc>O>i&)ZNK_rDmy5a{|m{T=u!Q*Gs0e+?#bV7R&J
zQaNxMG6U`AZiBYKWezc53(m8+0n|fNH!D$v$=D280BV`iah2IO9Ap-#?^tiY!A^k~
zat5`?1@LxeOM-dC?QH^V&6dRXpFf!5g<uM_NPpAv_pS`+!p)Gj+B!WAIp!}5JSwx@
aTFMu4);51=J0S!B0000<MNUMnLSTYPCDs%G

literal 0
HcmV?d00001

diff --git a/mist/leveldata_arbor.inc b/mist/leveldata_arbor.inc
index fe0eea4d..dab09d2d 100644
--- a/mist/leveldata_arbor.inc
+++ b/mist/leveldata_arbor.inc
@@ -11,7 +11,7 @@ locations:
 	.word location20,location21,location22,location23
 	.word location24,location25,location26,location27
 	.word location28,location29,location30,location31
-	.word location32
+	.word location32,location33,location34,location35
 
 ; ARBOR_INSIDE_ELEV1		-- arrival in elevator1
 location0:
@@ -589,11 +589,11 @@ location31:
 location32:
 	.byte	ARBOR_LONGSHACK3	; north exit
 	.byte	ARBOR_BRIDGE6		; south exit
-	.byte	$ff			; east exit
+	.byte	ARBOR_HUT6		; east exit
 	.byte	$ff			; west exit
 	.byte	DIRECTION_N	; north exit_dir
 	.byte	DIRECTION_S	; south exit_dir
-	.byte	$ff		; east exit_dir
+	.byte	DIRECTION_N	; east exit_dir
 	.byte	$ff		; west exit_dir
 	.word	inlongshack3_n_lzsa	; north bg
 	.word	inlongshack3_s_lzsa	; south bg
@@ -601,3 +601,57 @@ location32:
 	.word	inlongshack3_w_lzsa	; west bg
 	.byte	BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
 	.byte	$ff
+
+; ARBOR_HUT6		-- inside hut6
+location33:
+	.byte	ARBOR_HUT5		; north exit
+	.byte	$ff			; south exit
+	.byte	$ff			; east exit
+	.byte	ARBOR_IN_LONGSHACK3	; west exit
+	.byte	DIRECTION_W	; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	DIRECTION_W	; west exit_dir
+	.word	hut6_n_lzsa		; north bg
+	.word	$ff			; south bg
+	.word	$ff			; east bg
+	.word	hut6_w_lzsa		; west bg
+	.byte	BG_NORTH|BG_WEST
+	.byte	$ff
+
+; ARBOR_HUT5		-- inside hut5
+location34:
+	.byte	$ff			; north exit
+	.byte	ARBOR_HUT6		; south exit
+	.byte	$ff			; east exit
+	.byte	ARBOR_HUT4		; west exit
+	.byte	$ff		; north exit_dir
+	.byte	DIRECTION_W	; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	DIRECTION_W	; west exit_dir
+	.word	$ff			; north bg
+	.word	hut5_s_lzsa		; south bg
+	.word	$ff			; east bg
+	.word	hut5_w_lzsa		; west bg
+	.byte	BG_SOUTH|BG_WEST
+	.byte	$ff
+
+; ARBOR_HUT4		-- inside hut4
+location35:
+	.byte	$ff			; north exit
+	.byte	ARBOR_HUT2_INSIDE	; south exit
+	.byte	ARBOR_HUT5		; east exit
+	.byte	$ff		; west exit
+	.byte	$ff		; north exit_dir
+	.byte	DIRECTION_S	; south exit_dir
+	.byte	DIRECTION_S	; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	hut4_n_lzsa		; north bg
+	.word	hut4_s_lzsa		; south bg
+	.word	hut4_e_lzsa		; east bg
+	.word	hut4_w_lzsa		; west bg
+	.byte	BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
+	.byte	$ff
+
+
+