mist: arbor: slowly working our way to elevator2

mist/common_defines.inc

@@ -373,3 +373,15 @@ ARBOR_SWITCH_BRIDGE1	=	11
 ARBOR_SWITCH_HUT1	=	12
 ARBOR_SWITCH_BRIDGE2	=	13
 ARBOR_SWITCH_HUT	=	14
+ARBOR_BRIDGE4		=	15
+ARBOR_HUT2		=	16
+ARBOR_HUT2_INSIDE	=	17
+ARBOR_BRIDGE5		=	18
+ARBOR_LONGSHACK3	=	19
+ARBOR_BRIDGE6		=	20
+ARBOR_SHACK2		=	21
+ARBOR_BRIDGE7		=	22
+ARBOR_DOORS		=	23
+ARBOR_DOORS_ELEV2_OPEN	=	24
+ARBOR_INSIDE_ELEV2_OPEN	=	25
+ARBOR_INSIDE_ELEV2_CLOSED=	26

mist/graphics_arbor/Makefile

@@ -21,7 +21,9 @@ arbor_graphics.inc:	\
 	switch_bridge1_n.lzsa switch_bridge1_s.lzsa \
 	switch_hut1_n.lzsa switch_hut1_e.lzsa \
 	switch_bridge2_e.lzsa switch_bridge2_w.lzsa \
-	switch_hut_w.lzsa switch_hut_closed_s.lzsa switch_hut_open_s.lzsa
+	switch_hut_w.lzsa switch_hut_closed_s.lzsa switch_hut_open_s.lzsa \
+	bridge4_e.lzsa bridge4_w.lzsa \
+	hut2_e.lzsa hut2_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
@@ -54,7 +56,10 @@ arbor_graphics.inc:	\
 	echo "switch_hut_w_lzsa: .incbin \"switch_hut_w.lzsa\"" >> arbor_graphics.inc
 	echo "switch_hut_closed_s_lzsa: .incbin \"switch_hut_closed_s.lzsa\"" >> arbor_graphics.inc
 	echo "switch_hut_open_s_lzsa: .incbin \"switch_hut_open_s.lzsa\"" >> arbor_graphics.inc
-
+	echo "bridge4_e_lzsa: .incbin \"bridge4_e.lzsa\"" >> arbor_graphics.inc
+	echo "bridge4_w_lzsa: .incbin \"bridge4_w.lzsa\"" >> arbor_graphics.inc
+	echo "hut2_e_lzsa: .incbin \"hut2_e.lzsa\"" >> arbor_graphics.inc
+	echo "hut2_w_lzsa: .incbin \"hut2_w.lzsa\"" >> arbor_graphics.inc
 
 %.gr: %.png
 	$(PNG2GR) $< $@

mist/leveldata_arbor.inc

@@ -6,8 +6,8 @@ locations:
 	.word location0, location1, location2, location3
 	.word location4, location5, location6, location7
 	.word location8, location9, location10,location11
-	.word location12,location13,location14
+	.word location12,location13,location14,location15
-
+	.word location16
 
 ; ARBOR_INSIDE_ELEV1		-- arrival in elevator1
 location0:
@@ -189,11 +189,11 @@ location9:
 location10:
 	.byte	$ff			; north exit
 	.byte	ARBOR_SWITCH_BRIDGE1	; south exit
-	.byte	$ff			; east exit
+	.byte	ARBOR_BRIDGE4		; east exit
 	.byte	ARBOR_LONGSHACK1	; west exit
 	.byte	$ff		; north exit_dir
 	.byte	DIRECTION_S	; south exit_dir
-	.byte	$ff		; east exit_dir
+	.byte	DIRECTION_E	; east exit_dir
 	.byte	DIRECTION_W	; west exit_dir
 	.word	longshack2_n_lzsa	; north bg
 	.word	longshack2_s_lzsa	; south bg
@@ -273,3 +273,36 @@ location14:
 	.byte	28,40		; special y
 	.word	hut_handle-1	; special function
 
+; ARBOR_BRIDGE4		-- bridge out of the longshack
+location15:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+	.byte	ARBOR_HUT2		; east exit
+	.byte	ARBOR_LONGSHACK2	; 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	bridge4_e_lzsa		; east bg
+	.word	bridge4_w_lzsa		; west bg
+	.byte	BG_WEST|BG_EAST
+	.byte	$ff
+
+; ARBOR_HUT2		-- next hut
+location16:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+.byte $ff ;	.byte	ARBOR_HUT2_INSIDE	; east exit
+	.byte	ARBOR_BRIDGE4		; west exit
+	.byte	$ff		; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	DIRECTION_S	; east exit_dir
+	.byte	DIRECTION_W	; west exit_dir
+	.word	$0000			; north bg
+	.word	$0000			; south bg
+	.word	hut2_e_lzsa		; east bg
+	.word	hut2_w_lzsa		; west bg
+	.byte	BG_WEST|BG_EAST
+	.byte	$ff