From 2024e6edc22216e45ce41c3a1871c23d4c7f6841 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sat, 1 Aug 2020 01:29:40 -0400
Subject: [PATCH] mist: generator: add another step on path

not sure it helps much
---
 mist/common_defines.inc                    |   1 +
 mist/graphics_generator/Makefile           |   3 ++
 mist/graphics_generator/green_steps3_n.png | Bin 0 -> 834 bytes
 mist/graphics_generator/green_steps3_s.png | Bin 0 -> 1036 bytes
 mist/leveldata_generator.inc               |  38 +++++++++++++++------
 5 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 mist/graphics_generator/green_steps3_n.png
 create mode 100644 mist/graphics_generator/green_steps3_s.png

diff --git a/mist/common_defines.inc b/mist/common_defines.inc
index 35cfdbef..60b90b54 100644
--- a/mist/common_defines.inc
+++ b/mist/common_defines.inc
@@ -115,6 +115,7 @@ GEN_TOWER1_TRAIL	=	5
 GEN_TOWER1_TRAIL2	=	6
 GEN_TOWER1_BOTTOM	=	7
 GEN_TOWER1_TOP		=	8
+GEN_GREEN_STEPS3	=	9
 
 
 ; Mist Octagon Building
diff --git a/mist/graphics_generator/Makefile b/mist/graphics_generator/Makefile
index 70177c7a..a09416dd 100644
--- a/mist/graphics_generator/Makefile
+++ b/mist/graphics_generator/Makefile
@@ -13,6 +13,7 @@ generator_graphics.inc:	\
 	generator_n.lzsa generator_s.lzsa \
 	green_house_w.lzsa green_house_e.lzsa \
 	green_steps1_n.lzsa green_steps1_s.lzsa \
+	green_steps3_n.lzsa green_steps3_s.lzsa \
 	gen_door_closed_n.lzsa gen_door_open_n.lzsa gen_door_s.lzsa \
 	green_steps6_n.lzsa green_steps6_w.lzsa \
 	tower1_trail_w.lzsa tower1_trail_e.lzsa \
@@ -25,6 +26,8 @@ generator_graphics.inc:	\
 	echo "green_house_e_lzsa: .incbin \"green_house_e.lzsa\"" >> generator_graphics.inc
 	echo "green_steps1_n_lzsa: .incbin \"green_steps1_n.lzsa\"" >> generator_graphics.inc
 	echo "green_steps1_s_lzsa: .incbin \"green_steps1_s.lzsa\"" >> generator_graphics.inc
+	echo "green_steps3_n_lzsa: .incbin \"green_steps3_n.lzsa\"" >> generator_graphics.inc
+	echo "green_steps3_s_lzsa: .incbin \"green_steps3_s.lzsa\"" >> generator_graphics.inc
 	echo "gen_door_closed_n_lzsa: .incbin \"gen_door_closed_n.lzsa\"" >> generator_graphics.inc
 	echo "gen_door_open_n_lzsa: .incbin \"gen_door_open_n.lzsa\"" >> generator_graphics.inc
 	echo "gen_door_s_lzsa: .incbin \"gen_door_s.lzsa\"" >> generator_graphics.inc
diff --git a/mist/graphics_generator/green_steps3_n.png b/mist/graphics_generator/green_steps3_n.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c3dd2965f3d40495c5be24ba7714d9309e00bed
GIT binary patch
literal 834
zcmV-I1HJr-P)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vm1v`icW~fdUKM_Z*LJ=y2TA@`3lj|omX-HCB
z90k{cgCC1k2N!2u9b5%L@B_rj(Mi!oO8j3^Xc6PVaX;SOd)&PPgj$KIX4@E`YL=0R
zMa5KlRSdi$fI;+N9HTNb^*Kq3!*hJy!^hXV2+#69_vh%!WK9P6MB-Vd8y4{f@${yp
zbKWNov4Wf-J|`YA=z_$LTvuFv<D7R`;F%#KnV2UI5sUd2R$7=943&6_IGj;6$`?{D
zXE<+hR!bGuxF>&MFsrRBbDib@VpzlyB#2N@K@lZbh|sE$Vj@BNQ4fE=<Cn;#kgEtr
zjs=vVLU#P%fAG6oGdDTmCIzEF`-^RV3;}^%pkB4@?_=App8)=6;7V)y%Qax;lk{p+
z3m*a9+rY(jQ&aYU%N?NaNtX@Tk^D4;Tn>0Yqi;$By|+N;n%i4rAEysMlDdlD00)P_
zaGtW)J>K2X+S|Wp8vXqM;PG<P+vPL|0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jmC=1R4<(S*>LN000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0002(Nkl<ZNXO;XK@Nl<3<Xd&P2BYU*BuRFp?qjT$I;ABOpK97F$F`Y
zvYblzI=C!<4$_(@gS6*KAmYZzUx9wI2@*XKY%kbPI_rA}=p*j|iQWo&$U8uyH-pRr
zp!EfLjr~`2gS_V=kdIh38sG-7$_X%Hnw$m&8zBuaVwZq|jFC-nLlRSygJ52rd_{TM
z+k^njA-PXatX&O`{~Rh89fEyObik60mwooY1=mS$O@P6O-r<uKN{vF|7E&O0BWU~d
zae+BgH25)A>MXz>q`Ol$mI6@+wg=;P0Ei%j;VC0|fS5u<Thm7H1Dj`J>Jg5prT_o{
M07*qoM6N<$f_e>MssI20

literal 0
HcmV?d00001

diff --git a/mist/graphics_generator/green_steps3_s.png b/mist/graphics_generator/green_steps3_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..f890ee1bf00e0833ad97ccb7ac795c70fe5d5363
GIT binary patch
literal 1036
zcmV+n1oQieP)<h;3K|Lk000e1NJLTq002+`001xu0{{R3u{#aL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vm1v`icW~fdUKM_Z*LJ=y2TA@`3lj|omX-HCB
z90k{cgCC1k2N!2u9b5%L@B_rj(Mi!oO8j3^Xc6PVaX;SOd)&PPgj$KIX4@E`YL=0R
zMa5KlRSdi$fI;+N9HTNb^*Kq3!*hJy!^hXV2+#69_vh%!WK9P6MB-Vd8y4{f@${yp
zbKWNov4Wf-J|`YA=z_$LTvuFv<D7R`;F%#KnV2UI5sUd2R$7=943&6_IGj;6$`?{D
zXE<+hR!bGuxF>&MFsrRBbDib@VpzlyB#2N@K@lZbh|sE$Vj@BNQ4fE=<Cn;#kgEtr
zjs=vVLU#P%fAG6oGdDTmCIzEF`-^RV3;}^%pkB4@?_=App8)=6;7V)y%Qax;lk{p+
z3m*a9+rY(jQ&aYU%N?NaNtX@Tk^D4;Tn>0Yqi;$By|+N;n%i4rAEysMlDdlD00)P_
zaGtW)J>K2X+S|Wp8vXqM;PG<P+vPL|0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT
z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X
zmRIYN00007bV*G`2jmC=1P(O@^q%1W000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H
zM@dakSAh-}0005ENkl<ZNXPBh&2qya3<O{fW$Z&4zyI6T3T#(G0z=d3sXDd9e6xff
zlT=ityUtd+4OL8?-=#lG7Ss<Cyzc73^IQVu13qXo&bTSqlSmkI0%C08kZndGd+<CL
z!P@9SCifV=zX|BOjgsl_F94Y$rQ9kFOMlw+o`J^^bGF@%FZls;p-9KiuB4Tq<XiwT
zV1UP~at6pTNQIzXxEL_OQkFq37R%uq6eQ>Cl9mc$QhJcnlXgK#+k;%k3*bkq7_@^9
zHa<a+1S|J8h?XTVo?#0DkgSU!NekA6qlb(&IU)xjc8b&v*k)LhdfOwT2S<Z8p!^LE
zTdxO?V+OW;Vo~k`2PWow1WEECg8JZM+mO_tenh(USu_~!Xa(wn)q?uSUjqFKTurFS
z4UpFpB&^4SB^{Xa81%cR=GLTp>qTJgsuR|XJitgkg3R(GFwO@s%5C4>YWqEbayzgI
z`?&|Hz?|O)&1-Z9N{6S_xdGM-k-iwkF9CJSiMa?QI|AE@y$8zw(V3n6ZrlTh<e!4L
zxt6YCu#qzmiTqVK24Cdwf;agOF3obC=WUQbcuI-LxZf98mSh2ajap3r0000<MNUMn
GLSTYRHO!0v

literal 0
HcmV?d00001

diff --git a/mist/leveldata_generator.inc b/mist/leveldata_generator.inc
index 9a81de56..ee48adb9 100644
--- a/mist/leveldata_generator.inc
+++ b/mist/leveldata_generator.inc
@@ -6,7 +6,7 @@
 locations:
 	.word location0, location1, location2, location3
 	.word location4, location5, location6, location7
-	.word location8
+	.word location8, location9
 
 ; GEN_GREEN_SHACK
 location0:
@@ -31,8 +31,8 @@ location0:
 
 ; GEN_GREEN_STEPS1		-- green shack steps 1
 location1:
-	.byte	GEN_GREEN_STEPS6	; north exit
-	.byte	GEN_GREEN_SHACK	; south exit
+	.byte	GEN_GREEN_STEPS3	; north exit
+	.byte	GEN_GREEN_SHACK		; south exit
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit
 	.byte	DIRECTION_N	; north exit_dir
@@ -49,18 +49,18 @@ location1:
 ; GEN_GREEN_STEPS6		-- green shack steps 6
 location2:
 	.byte	GEN_GENERATOR_DOOR	; north exit
-	.byte	$ff			; south exit
+	.byte	GEN_GREEN_STEPS3	; south exit
 	.byte	$ff			; east exit
-	.byte	GEN_GREEN_STEPS1	; west exit
+	.byte	$ff			; west exit
 	.byte	DIRECTION_N	; north exit_dir
-	.byte	$ff		; south exit_dir
+	.byte	DIRECTION_S	; south exit_dir
 	.byte	$ff		; east exit_dir
-	.byte	DIRECTION_S	; west exit_dir
+	.byte	$ff		; west exit_dir
 	.word	green_steps6_n_lzsa	; north bg
-	.word	$0000			; south bg
+	.word	green_steps6_w_lzsa	; south bg
 	.word	$0000			; east bg
-	.word	green_steps6_w_lzsa	; west bg
-	.byte	BG_NORTH | BG_WEST
+	.word	$0000			; west bg
+	.byte	BG_NORTH | BG_SOUTH
 	.byte	$ff
 
 ; GEN_GENERATOR_DOOR		-- generator room door
@@ -70,7 +70,7 @@ location3:
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit
 	.byte	$ff		; north exit_dir
-	.byte	DIRECTION_W	; south exit_dir
+	.byte	DIRECTION_S	; south exit_dir
 	.byte	$ff		; east exit_dir
 	.byte	$ff		; west exit_dir
 	.word	gen_door_closed_n_lzsa	; north bg
@@ -181,3 +181,19 @@ location8:
 	.byte	10,18		; special y
 	.word	circuit_breaker-1	; special function
 
+; GEN_GREEN_STEPS3		-- green shack steps 3
+location9:
+	.byte	GEN_GREEN_STEPS6	; north exit
+	.byte	GEN_GREEN_STEPS1	; 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	green_steps3_n_lzsa	; north bg
+	.word	green_steps3_s_lzsa	; south bg
+	.word	$0000			; east bg
+	.word	$0000			; west bg
+	.byte	BG_NORTH | BG_SOUTH
+	.byte	$ff