From da1ff3aaa61af387cc8b8a3c4740720cf5c0cbc0 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Thu, 30 Jul 2020 14:24:07 -0400
Subject: [PATCH] mist: add step on spaceship path

one way, we are more or less totally out of room here
---
 mist/TODO                               |   2 +-
 mist/common_defines.inc                 |   1 +
 mist/graphics_mist/Makefile             |   2 ++
 mist/graphics_mist/spaceship_path_w.png | Bin 0 -> 968 bytes
 mist/leveldata_mist.inc                 |  30 +++++++++++++++---------
 5 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 mist/graphics_mist/spaceship_path_w.png

diff --git a/mist/TODO b/mist/TODO
index e78d2d01..2e26bad2 100644
--- a/mist/TODO
+++ b/mist/TODO
@@ -7,7 +7,7 @@ For release 1.0
 + MIST
 	-- open door to clock puzzle?
 	-- only allow entering ship if it's up
-	-- maybe another location on dock to ship
+	-- another stop on path to spaceship.  Out of room though :(
 	-- MIST_ROCKET_PATH_PAD probably missing ship-raised background
 
 + OCTAGON
diff --git a/mist/common_defines.inc b/mist/common_defines.inc
index db9b9fe0..b224a2eb 100644
--- a/mist/common_defines.inc
+++ b/mist/common_defines.inc
@@ -103,6 +103,7 @@ MIST_PILLAR_ARROW	=	35
 MIST_PILLAR_LEAF	=	36
 MIST_PILLAR_CROSS	=	37
 MIST_PILLAR_EMU		=	38
+MIST_SPACESHIP_PATH	=	39
 
 ; Mist Generator Building
 GEN_GREEN_SHACK		=	0
diff --git a/mist/graphics_mist/Makefile b/mist/graphics_mist/Makefile
index 38dbcfdf..f0603d05 100644
--- a/mist/graphics_mist/Makefile
+++ b/mist/graphics_mist/Makefile
@@ -41,6 +41,7 @@ mist_graphics.inc:	\
 	gear_shipup_s.lzsa \
 	gear_base_n.lzsa \
 	spaceship_switch_s.lzsa spaceship_switch_n.lzsa \
+	spaceship_path_w.lzsa \
 	tree4_n.lzsa tree4_s.lzsa tree4_w.lzsa tree4_e.lzsa \
 	clock_island_s.lzsa clock_island_n.lzsa \
 	clock_puzzle_s.lzsa clock_puzzle_bridge.lzsa \
@@ -118,6 +119,7 @@ mist_graphics.inc:	\
 	echo "gear_base_n_lzsa: .incbin \"gear_base_n.lzsa\"" >> mist_graphics.inc
 	echo "spaceship_switch_n_lzsa: .incbin \"spaceship_switch_n.lzsa\"" >> mist_graphics.inc
 	echo "spaceship_switch_s_lzsa: .incbin \"spaceship_switch_s.lzsa\"" >> mist_graphics.inc
+	echo "spaceship_path_w_lzsa: .incbin \"spaceship_path_w.lzsa\"" >> mist_graphics.inc
 	echo "tree4_n_lzsa: .incbin \"tree4_n.lzsa\"" >> mist_graphics.inc
 	echo "tree4_s_lzsa: .incbin \"tree4_s.lzsa\"" >> mist_graphics.inc
 	echo "tree4_w_lzsa: .incbin \"tree4_w.lzsa\"" >> mist_graphics.inc
diff --git a/mist/graphics_mist/spaceship_path_w.png b/mist/graphics_mist/spaceship_path_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..9eed5c000a15f45173a8f92a4f2ce2934fb54f29
GIT binary patch
literal 968
zcmV;(12_DMP)<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`2jmAH5)cd@F(&K)000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0004VNkl<ZNXPBf!IFa@5Cl*Tl8`D!|Nn27PBV@O5;bmB4)$ToCCPIb
zLELn4+zsB~4c_3dgD$5rdLFYB6}IoSm+MS<FWW1?_3z)W@5DnXCnqW1i-eSuAOR5g
z>s$!llf(aqL9IwZ)`f&X_5kSL0SGLF$Ab(jJOL6l!21ipX)@sTQqXd8>urNAbO-o+
z2UF&i_P5P`1cwwb=$Q8I@Y_b4{mcmgY>Y$BnA802ILD=H0y;TVGt8;Mbrv9gE}|82
za~bBng1j0#$)GM`UCtr~)%ghGOK7?E410Ch%q|eq#NxOVB=-*>o-;;%57ZuV+FygZ
zXl!@j9gXxskqwZq0IN_*REiswAU-E25+gB;%pg~xfx3fHAuC^k+)3mBqDqcrkR5D+
zAoqYeQh-a2Z)!}o2JH|qkcU`W!EI1?Oby1A8YG!PJs1tNCk<!`mfRYApWOg?gez6{
qaS6uQ25r(A)C$*+r37oP1^xl@$gMZIdbL{s0000<MNUMnLSTZBBd4YS

literal 0
HcmV?d00001

diff --git a/mist/leveldata_mist.inc b/mist/leveldata_mist.inc
index 62a93245..2a662d4a 100644
--- a/mist/leveldata_mist.inc
+++ b/mist/leveldata_mist.inc
@@ -13,7 +13,7 @@ locations:
 	.word location24,location25,location26,location27
 	.word location28,location29,location30,location31
 	.word location32,location33,location34,location35
-	.word location36,location37,location38
+	.word location36,location37,location38,location39
 
 ; MIST_ARRIVAL_DOCK	-- dock
 location0:
@@ -497,11 +497,11 @@ location24:
 
 ; MIST_ROCKET_PATH_PAD		-- pad on way to rocket
 location25:
-	.byte	MIST_SPACESHIP_FAR	; north exit
+	.byte	MIST_SPACESHIP_PATH	; north exit
 	.byte	$ff			; south exit
 	.byte	MIST_OUTSIDE_TEMPLE	; east exit
 	.byte	$ff			; west exit
-	.byte	DIRECTION_N	; north exit_dir
+	.byte	DIRECTION_W	; north exit_dir
 	.byte	$ff		; south exit_dir
 	.byte	DIRECTION_E	; east exit_dir
 	.byte	$ff		; west exit_dir
@@ -772,11 +772,19 @@ location38:
 	.byte	12,30		; special y
 	.word	touch_pillar-1	; special function
 
-
-
-
-
-
-
-
-
+; MIST_SPACESHIP_PATH		-- spaceship path
+location39:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+	.byte	$ff			; east exit
+	.byte	MIST_SPACESHIP_FAR	; west exit
+	.byte	$ff		; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	DIRECTION_N	; west exit_dir
+	.word	$0000			; north bg
+	.word	$0000			; south bg
+	.word	$0000			; east bg
+	.word	spaceship_path_w_lzsa	; west bg
+	.byte	BG_WEST
+	.byte	$ff		; special exit