From ec22cc583fbcafec74bb8302b19fa53f4a2cf29b Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Wed, 1 Apr 2020 11:00:10 -0400
Subject: [PATCH] mist: can get closer to some things

---
 mist/common_defines.inc                     |   3 +-
 mist/graphics_octagon/Makefile              |   6 ++-
 mist/graphics_octagon/bookshelf_close_n.png | Bin 0 -> 882 bytes
 mist/graphics_octagon/tower_rotation.png    | Bin 0 -> 873 bytes
 mist/leveldata_octagon.inc                  |  43 +++++++++++++++++---
 5 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 mist/graphics_octagon/bookshelf_close_n.png
 create mode 100644 mist/graphics_octagon/tower_rotation.png

diff --git a/mist/common_defines.inc b/mist/common_defines.inc
index a0e57c0f..a93341a8 100644
--- a/mist/common_defines.inc
+++ b/mist/common_defines.inc
@@ -122,7 +122,8 @@ OCTAGON_FRAME_SHELF	=	7
 OCTAGON_BOOKSHELF	=	8
 OCTAGON_FRAME_DOOR	=	9
 OCTAGON_BLUE_BOOKSHELF	=	10
-
+OCTAGON_TOWER_ROTATION	=	11
+OCTAGON_BOOKSHELF_CLOSE	=	12
 
 ; Mechanical Engineering
 
diff --git a/mist/graphics_octagon/Makefile b/mist/graphics_octagon/Makefile
index ba0f7fa4..f7f05975 100644
--- a/mist/graphics_octagon/Makefile
+++ b/mist/graphics_octagon/Makefile
@@ -21,8 +21,8 @@ octagon_graphics.inc:	\
 	frame_door_open.lzsa \
 	frame_bookcase_open.lzsa \
 	blue_book_shelf.lzsa \
-	bookshelf_n.lzsa \
-	map.lzsa
+	bookshelf_n.lzsa bookshelf_close_n.lzsa \
+	map.lzsa tower_rotation.lzsa
 	echo "temple_door_n_lzsa: .incbin \"temple_door_n.lzsa\"" > octagon_graphics.inc
 	echo "temple_door_s_lzsa: .incbin \"temple_door_s.lzsa\"" >> octagon_graphics.inc
 	echo "temple_center_n_lzsa: .incbin \"temple_center_n.lzsa\"" >> octagon_graphics.inc
@@ -42,7 +42,9 @@ octagon_graphics.inc:	\
 	echo "frame_bookcase_open_lzsa: .incbin \"frame_bookcase_open.lzsa\"" >> octagon_graphics.inc
 	echo "blue_book_shelf_lzsa: .incbin \"blue_book_shelf.lzsa\"" >> octagon_graphics.inc
 	echo "bookshelf_n_lzsa: .incbin \"bookshelf_n.lzsa\"" >> octagon_graphics.inc
+	echo "bookshelf_close_n_lzsa: .incbin \"bookshelf_close_n.lzsa\"" >> octagon_graphics.inc
 	echo "map_lzsa: .incbin \"map.lzsa\"" >> octagon_graphics.inc
+	echo "tower_rotation_lzsa: .incbin \"tower_rotation.lzsa\"" >> octagon_graphics.inc
 
 %.gr: %.png
 	$(PNG2GR) $< $@
diff --git a/mist/graphics_octagon/bookshelf_close_n.png b/mist/graphics_octagon/bookshelf_close_n.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1f11914ea9fbd2963043172f6b99b4077001ff3
GIT binary patch
literal 882
zcmV-&1C9KNP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vmK|2(2$WS|35EXIMDionYs1;guFuC*#ni!H4
z7e~Rh;NZt%)xpJCR|i)?5c~jfa&%I3krMxx6k5c1aNLh~_a1le0HIN3n$<N1Xu54?
zQb{qFUlBvE2qKCB#1NO6Wz0%a8ouM}9s$1IC3u$qxj#prTCf-p5Q%4)VcNv&#8aEL
z!FiuJ!pgErd`>)S(glehxvqHp#<}FOz%wIeHZw;YAr?y=taLCdn;P*XaZJ^8$`^7T
ztDLtuYt<TS-IKpCT+o-7xK48zDJ)<S5=1Ddp@J%GBxu!1v5=wtq>q2d^-JVZ$W;L&
z$2>NmL3aJ%fAG6ot2i<4C54kf_lx6vi~ylspjmgE?_<Ylo&dpT;7V`%HyXh7C+YRJ
z7CQp^w}Ff6wx;X>mpef8$&gLim4Y;dVi9;hqi@OsgSSBMs@Gd<AEysMmbyyc00)Oa
zyhPb+KJV`7?Csw(t^R%hlX7yjENZ=<0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jm0+1uq)qh%s#d000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0003UNkl<ZNXO0A+YZ7Y3<ls1Ct(-t{U2AlrnXEBFuIKYf<(nH99%7g
zBLFh?299hSeIITGx6AnpzEePDO@Tr}z?m+ER%ZytlnRJbcwACSoH+=9Gx1Xckmj3$
zI1YeLh1Yi(#9Katv`!;Xo{WpPjNnU!xw$~+@>6^kG_N-1VE#<_6#W{nC7-b#c@D$_
z$Af1`gLGK~poVE>h9Dv#n1RGKf{O}W${A!1zzpPyV+2Y8YXa9SWspzU2=w1HficUB
z;QZx_nkCwBsY!Ytk)IB|Hw?<(eIuwl(=w>ZCNRbjetW}x7f?4P6_B3RIw*Zu6{It)
zgWP&{fYLK)(5sk(om<YkhTFg;OBd*~+y?5J*}3ImaKiHS0n-Lhx#E~O?f?J)07*qo
IM6N<$f@|-6U;qFB

literal 0
HcmV?d00001

diff --git a/mist/graphics_octagon/tower_rotation.png b/mist/graphics_octagon/tower_rotation.png
new file mode 100644
index 0000000000000000000000000000000000000000..d31eaeff33d9f76ae06aa662b074f5d9aa502bf1
GIT binary patch
literal 873
zcmV-v1D5=WP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vmK|2(2$WS|35EXIMDionYs1;guFuC*#ni!H4
z7e~Rh;NZt%)xpJCR|i)?5c~jfa&%I3krMxx6k5c1aNLh~_a1le0HIN3n$<N1Xu54?
zQb{qFUlBvE2qKCB#1NO6Wz0%a8ouM}9s$1IC3u$qxj#prTCf-p5Q%4)VcNv&#8aEL
z!FiuJ!pgErd`>)S(glehxvqHp#<}FOz%wIeHZw;YAr?y=taLCdn;P*XaZJ^8$`^7T
ztDLtuYt<TS-IKpCT+o-7xK48zDJ)<S5=1Ddp@J%GBxu!1v5=wtq>q2d^-JVZ$W;L&
z$2>NmL3aJ%fAG6ot2i<4C54kf_lx6vi~ylspjmgE?_<Ylo&dpT;7V`%HyXh7C+YRJ
z7CQp^w}Ff6wx;X>mpef8$&gLim4Y;dVi9;hqi@OsgSSBMs@Gd<AEysMmbyyc00)Oa
zyhPb+KJV`7?Csw(t^R%hlX7yjENZ=<0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jm0+1sDX6fUG(I000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0003LNkl<ZNXPBg!4AS83<h9gc3=kH|8-rhP3geNUpSDsUNnq;){Qbk
zI3iZDo5)4jD|Ke*0sF3ipv(io><j~z{)(Wz135n&u^L#<8UkB$Tp+JHc>qHor_++A
z>#dm}xbMWpm=bk0qqa^6lom_x7zU+ZQxQtKKpsyfcpGzqXNW&#w*f&)-;QX5oB@H9
zd<}AqonX$}Ct9H9bb^%p4YWA}Am0K42P-_ow!Wz#uxx6u>=pUb&^okaj7-uu0l`jD
zkgL-A^qmZXGI|De4DMy#RfH)kbb><KZGSpQH4cE1&;r5TrhGj1NA$kB!1~3h-8|_i
z;#!B-Al%Epk0k4!zCduok$7@EC&yjkKUDYv85U%FBiYe700000NkvXXu0mjfW^sHE

literal 0
HcmV?d00001

diff --git a/mist/leveldata_octagon.inc b/mist/leveldata_octagon.inc
index 5518d8f5..bd34cd33 100644
--- a/mist/leveldata_octagon.inc
+++ b/mist/leveldata_octagon.inc
@@ -6,7 +6,8 @@
 locations:
 	.word location0, location1, location2, location3
 	.word location4, location5, location6, location7
-	.word location8, location9, location10
+	.word location8, location9, location10,location11
+	.word location12
 
 ; OCTAGON_TEMPLE_DOORWAY	-- temple doorway
 location0:
@@ -126,11 +127,11 @@ location6:
 	.byte	$ff			; north exit
 	.byte	$ff			; south exit
 	.byte	$ff			; east exit
-	.byte	OCTAGON_TEMPLE_CENTER	; west exit
+	.byte	OCTAGON_TOWER_ROTATION	; west exit
 	.byte	$ff		; north exit_dir
 	.byte	$ff		; south exit_dir
 	.byte	$ff		; east exit_dir
-	.byte	DIRECTION_W|DIRECTION_ONLY_POINT	; west exit_dir
+	.byte	DIRECTION_W	; west exit_dir
 	.word	$0000			; north bg
 	.word	$0000			; south bg
 	.word	$0000			; east bg
@@ -158,11 +159,11 @@ location7:
 
 ; OCTAGON_BOOKSHELF		-- the bookcase
 location8:
-	.byte	OCTAGON_TEMPLE_CENTER	; north exit
+	.byte	OCTAGON_BOOKSHELF_CLOSE	; north exit
 	.byte	$ff			; south exit
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit
-	.byte	DIRECTION_N|DIRECTION_ONLY_POINT	; north exit_dir
+	.byte	DIRECTION_N	; north exit_dir
 	.byte	$ff		; south exit_dir
 	.byte	$ff		; east exit_dir
 	.byte	$ff		; west exit_dir
@@ -207,4 +208,36 @@ location10:
 	.byte	BG_EAST
 	.byte	$ff
 
+; OCTAGON_TOWER_ROTATION		-- looking at tower rotation
+location11:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+	.byte	$ff			; east exit
+	.byte	OCTAGON_TEMPLE_CENTER	; west exit
+	.byte	$ff		; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	DIRECTION_W|DIRECTION_ONLY_POINT	; west exit_dir
+	.word	$0000			; north bg
+	.word	$0000			; south bg
+	.word	$0000			; east bg
+	.word	tower_rotation_lzsa	; west bg
+	.byte	BG_WEST
+	.byte	$ff
 
+; OCTAGON_BOOKSHELF_CLOSE		-- the bookcase close in
+location12:
+	.byte	OCTAGON_TEMPLE_CENTER	; north exit
+	.byte	$ff			; south exit
+	.byte	$ff			; east exit
+	.byte	$ff			; west exit
+	.byte	DIRECTION_N|DIRECTION_ONLY_POINT	; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	bookshelf_close_n_lzsa	; north bg
+	.word	$0000			; south bg
+	.word	$0000			; east bg
+	.word	$0000			; west bg
+	.byte	BG_NORTH
+	.byte	$ff