mist: arbor: some more stops

mist/common_defines.inc

@@ -365,3 +365,7 @@ ARBOR_ARRIVAL_OPEN	=	3
 ARBOR_BRIDGE1		=	4
 ARBOR_HUT1		=	5
 ARBOR_BRIDGE2		=	6
+ARBOR_SHACK1		=	7
+ARBOR_BRIDGE3		=	8
+ARBOR_LONGSHACK1	=	9
+ARBOR_LONGSHACK2	=	10

mist/graphics_arbor/Makefile

@@ -13,7 +13,11 @@ arbor_graphics.inc:	\
 	inside_elevator1_closed_w.lzsa inside_elevator1_open_w.lzsa \
 	bridge1_e.lzsa bridge1_w.lzsa \
 	hut1_e.lzsa hut1_w.lzsa \
-	bridge2_n.lzsa bridge2_s.lzsa
+	bridge2_n.lzsa bridge2_s.lzsa \
+	shack1_n.lzsa shack1_s.lzsa shack1_e.lzsa shack1_w.lzsa \
+	bridge3_e.lzsa bridge3_w.lzsa \
+	longshack1_e.lzsa longshack1_w.lzsa \
+	longshack2_e.lzsa longshack2_w.lzsa longshack2_n.lzsa longshack2_s.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
@@ -25,7 +29,18 @@ arbor_graphics.inc:	\
 	echo "hut1_w_lzsa: .incbin \"hut1_w.lzsa\"" >> arbor_graphics.inc
 	echo "bridge2_n_lzsa: .incbin \"bridge2_n.lzsa\"" >> arbor_graphics.inc
 	echo "bridge2_s_lzsa: .incbin \"bridge2_s.lzsa\"" >> arbor_graphics.inc
-
+	echo "shack1_n_lzsa: .incbin \"shack1_n.lzsa\"" >> arbor_graphics.inc
+	echo "shack1_s_lzsa: .incbin \"shack1_s.lzsa\"" >> arbor_graphics.inc
+	echo "shack1_e_lzsa: .incbin \"shack1_e.lzsa\"" >> arbor_graphics.inc
+	echo "shack1_w_lzsa: .incbin \"shack1_w.lzsa\"" >> arbor_graphics.inc
+	echo "bridge3_e_lzsa: .incbin \"bridge3_e.lzsa\"" >> arbor_graphics.inc
+	echo "bridge3_w_lzsa: .incbin \"bridge3_w.lzsa\"" >> arbor_graphics.inc
+	echo "longshack1_e_lzsa: .incbin \"longshack1_e.lzsa\"" >> arbor_graphics.inc
+	echo "longshack1_w_lzsa: .incbin \"longshack1_w.lzsa\"" >> arbor_graphics.inc
+	echo "longshack2_e_lzsa: .incbin \"longshack2_e.lzsa\"" >> arbor_graphics.inc
+	echo "longshack2_w_lzsa: .incbin \"longshack2_w.lzsa\"" >> arbor_graphics.inc
+	echo "longshack2_n_lzsa: .incbin \"longshack2_n.lzsa\"" >> arbor_graphics.inc
+	echo "longshack2_s_lzsa: .incbin \"longshack2_s.lzsa\"" >> arbor_graphics.inc
 
 %.gr: %.png
 	$(PNG2GR) $< $@

mist/leveldata_arbor.inc

@@ -4,7 +4,9 @@
 
 locations:
 	.word location0, location1, location2, location3
-	.word location4, location5, location6
+	.word location4, location5, location6, location7
+	.word location8, location9, location10
+
 
 ; ARBOR_INSIDE_ELEV1		-- arrival in elevator1
 location0:
@@ -116,11 +118,11 @@ location5:
 
 ; ARBOR_BRIDGE2		-- second bridge
 location6:
-	.byte	$ff		; north exit
+	.byte	ARBOR_SHACK1	; north exit
 	.byte	ARBOR_HUT1	; south exit
 	.byte	$ff		; east exit
 	.byte	$ff		; west exit
-	.byte	$ff		; north exit_dir
+	.byte	DIRECTION_N	; north exit_dir
 	.byte	DIRECTION_E	; south exit_dir
 	.byte	$ff		; east exit_dir
 	.byte	$ff		; west exit_dir
@@ -130,3 +132,72 @@ location6:
 	.word	$0000			; west bg
 	.byte	BG_NORTH|BG_SOUTH
 	.byte	$ff
+
+; ARBOR_SHACK1		-- first shack
+location7:
+	.byte	$ff		; north exit
+	.byte	ARBOR_BRIDGE2	; south exit
+	.byte	ARBOR_BRIDGE3	; east exit
+	.byte	$ff		; west exit
+	.byte	$ff		; north exit_dir
+	.byte	DIRECTION_S	; south exit_dir
+	.byte	DIRECTION_E	; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	shack1_n_lzsa		; north bg
+	.word	shack1_s_lzsa		; south bg
+	.word	shack1_e_lzsa		; east bg
+	.word	shack1_w_lzsa		; west bg
+	.byte	BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
+	.byte	$ff
+
+; ARBOR_BRIDGE3		-- third bridge
+location8:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+	.byte	ARBOR_LONGSHACK1	; east exit
+	.byte	ARBOR_SHACK1		; west exit
+	.byte	$ff		; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	DIRECTION_E	; east exit_dir
+	.byte	DIRECTION_W	; west exit_dir
+	.word	$0000			; north bg
+	.word	$0000			; south bg
+	.word	bridge3_e_lzsa		; east bg
+	.word	bridge3_w_lzsa		; west bg
+	.byte	BG_EAST|BG_WEST
+	.byte	$ff
+
+; ARBOR_LONGSHACK1		-- extra long shack
+location9:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+	.byte	ARBOR_LONGSHACK2	; east exit
+	.byte	ARBOR_BRIDGE3		; west exit
+	.byte	$ff		; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	DIRECTION_E	; east exit_dir
+	.byte	DIRECTION_W	; west exit_dir
+	.word	$0000			; north bg
+	.word	$0000			; south bg
+	.word	longshack1_e_lzsa	; east bg
+	.word	longshack1_w_lzsa	; west bg
+	.byte	BG_EAST|BG_WEST
+	.byte	$ff
+
+; ARBOR_LONGSHACK2		-- extra long shack part 2
+location10:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+	.byte	$ff			; east exit
+	.byte	ARBOR_LONGSHACK1	; west exit
+	.byte	$ff		; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	DIRECTION_W	; west exit_dir
+	.word	longshack2_n_lzsa	; north bg
+	.word	longshack2_s_lzsa	; south bg
+	.word	longshack2_e_lzsa	; east bg
+	.word	longshack2_w_lzsa	; west bg
+	.byte	BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
+	.byte	$ff
+