mist: can now go from selena/sub and back

mist/leveldata_selena.inc

@@ -749,7 +749,7 @@ location39:
 location40:
 	.byte	SELENA_WATER_TURN	; north exit
 	.byte	SELENA_WALKWAY4		; south exit
-	.byte	$ff	; east exit
+	.byte	$ff			; east exit
 	.byte	$ff			; west exit
 	.byte	DIRECTION_N	; north exit_dir
 	.byte	DIRECTION_S	; south exit_dir
@@ -760,8 +760,10 @@ location40:
 	.word	bunker_open_e_lzsa	; east bg
 	.word	$0000			; west bg
 	.byte	BG_NORTH|BG_SOUTH|BG_EAST
-	.byte	$ff
-
+	.byte	DIRECTION_E		; special exit
+	.byte	15,27		; special x
+	.byte	6,42		; special y
+	.word	goto_sub-1	; special function
 
 ; SELENA_BUNKER_KEYPAD	-- bunker keypad
 location41:

mist/leveldata_sub.inc

@@ -12,7 +12,7 @@ location0:
 	.byte	$ff			; north exit
 	.byte	$ff			; south exit
 	.byte	SUB_HALLWAY		; east exit
-	.byte	SELENA_BUNKER		; west exit
+	.byte	$ff			; west exit
 	.byte	$ff		; north exit_dir
 	.byte	$ff		; south exit_dir
 	.byte	DIRECTION_E	; east exit_dir
@@ -22,7 +22,10 @@ location0:
 	.word	bunker_entry_e_lzsa		; east bg
 	.word	bunker_entry_w_lzsa		; west bg
 	.byte	BG_EAST|BG_WEST
-	.byte	$ff
+	.byte	DIRECTION_W		; special exit
+	.byte	15,24		; special x
+	.byte	8,42		; special y
+	.word	goto_selena-1	; special function
 
 ; SUB_HALLWAY	-- hallway to the sub room
 location1:

mist/loader.s

@@ -204,7 +204,7 @@ generator_filename:
 dni_filename:
 	.byte "D'NI",0
 sub_filename:
-	.byte "SUB",3
+	.byte "SUB",0
 
 
 	;===================================================

mist/selena.s

@@ -247,6 +247,10 @@ really_exit:
 	jmp	end_level
 
 
+	;===================================
+	; back to mist
+	;	from rocket
+	;===================================
 back_to_mist:
 	lda	#$ff
 	sta	LEVEL_OVER
@@ -263,6 +267,27 @@ back_to_mist:
 
 	rts
 
+	;===================================
+	; goto sub
+	;===================================
+
+goto_sub:
+	lda	#$ff
+	sta	LEVEL_OVER
+
+	lda	#SUB_BUNKER_ENTRY	; inside bunker door
+	sta	LOCATION
+
+	lda	#DIRECTION_E
+	sta	DIRECTION
+
+	lda	#LOAD_SUB
+	sta	WHICH_LOAD
+
+	rts
+
+
+
 	; save rocket state
 save_rocket_state:
 	lda	rocket_notes
@@ -405,7 +430,6 @@ keypad_press:
 	.include	"selena_sound_puzzle.s"
 
 	; linking books
-;	.include	"link_book_mist.s"
 
 	.include	"handle_pages.s"
 

mist/sub.s

@@ -132,6 +132,28 @@ really_exit:
 
 
 
+	;===================================
+	; goto selena
+	;	go back out bunker door
+        ;===================================
+
+goto_selena:
+	lda	#$ff
+	sta	LEVEL_OVER
+
+	lda     #SELENA_BUNKER		; outside bunker door
+	sta	LOCATION
+
+	lda	#DIRECTION_N
+	sta	DIRECTION
+
+	lda	#LOAD_SELENA
+	sta	WHICH_LOAD
+
+	rts
+
+
+
 	;===============================
 	; draw mist book animation
 	;===============================