mist: meche: add blue throne

mist/common_defines.inc

@@ -213,6 +213,8 @@ MECHE_RED_THRONE	=	48
 MECHE_RED_ROOM_EAST	=	49
 MECHE_TELESCOPE_SKELETON=	50
 MECHE_TELESCOPE_PLAIN	=	51
+MECHE_BLUE_THRONE	=	52
+MECHE_BLUE_THRONE_OPEN	=	53
 
 ; Selena Age
 

mist/graphics_meche/Makefile

@@ -67,7 +67,8 @@ meche_graphics.inc:	\
 	north_close_n.lzsa north_close_s.lzsa \
 	red_throne_s.lzsa \
 	red_room_east_e.lzsa red_room_east_n.lzsa red_room_east_w.lzsa \
-	red_skeleton.lzsa red_no_skeleton.lzsa
+	red_skeleton.lzsa red_no_skeleton.lzsa \
+	blue_throne_open_w.lzsa blue_throne_closed_w.lzsa
 	echo "departure_e_lzsa: .incbin \"departure_e.lzsa\"" > meche_graphics.inc
 	echo "arrival_w_lzsa: .incbin \"arrival_w.lzsa\"" >> meche_graphics.inc
 	echo "entrance_e_lzsa: .incbin \"entrance_e.lzsa\"" >> meche_graphics.inc
@@ -185,6 +186,8 @@ meche_graphics.inc:	\
 	echo "red_room_east_w_lzsa: .incbin \"red_room_east_w.lzsa\"" >> meche_graphics.inc
 	echo "red_skeleton_lzsa: .incbin \"red_skeleton.lzsa\"" >> meche_graphics.inc
 	echo "red_no_skeleton_lzsa: .incbin \"red_no_skeleton.lzsa\"" >> meche_graphics.inc
+	echo "blue_throne_open_w_lzsa: .incbin \"blue_throne_open_w.lzsa\"" >> meche_graphics.inc
+	echo "blue_throne_closed_w_lzsa: .incbin \"blue_throne_closed_w.lzsa\"" >> meche_graphics.inc
 
 
 

mist/leveldata_meche.inc

@@ -17,6 +17,7 @@ locations:
 	.word location40,location41,location42,location43
 	.word location44,location45,location46,location47
 	.word location48,location49,location50,location51
+	.word location52,location53
 
 ; MECHE_INSIDE_GEAR		-- Inside gear on Mist
 location0:
@@ -441,20 +442,21 @@ location23:
 	.byte	MECHE_CENTER_HALL2		; north exit
 	.byte	MECHE_RIGHT_HALL_CORNER		; south exit
 	.byte	$ff				; east exit
-	.byte	$ff				; west exit
+	.byte	MECHE_BLUE_THRONE		; west exit
 	.byte	DIRECTION_N		; north exit_dir
 	.byte	DIRECTION_W		; south exit_dir
 	.byte	$ff			; east exit_dir
-	.byte	$ff			; west exit_dir
+	.byte	DIRECTION_W		; west exit_dir
 	.word	blue_room_center_n_lzsa		; north bg
 	.word	blue_room_center_s_lzsa		; south bg
 	.word	blue_room_center_e_lzsa		; east bg
 	.word	blue_room_center_w_lzsa		; west bg
 	.byte	BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
-	.byte	DIRECTION_W
+	.byte	$ff
-	.byte	9,14		; special x
+;	.byte	DIRECTION_W
-	.byte	24,44		; special y
+;	.byte	9,14		; special x
-	.word	enter_blue_secret-1	; special function
+;	.byte	24,44		; special y
+;	.word	enter_blue_secret-1	; special function
 
 
 ; MECHE_CENTER_HALL2		-- center hall 2
@@ -958,4 +960,45 @@ location51:
 	.byte	BG_NORTH
 	.byte	$ff		; special exit
 
+; MECHE_BLUE_THRONE		-- blue room throne
+location52:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+	.byte	$ff			; east exit
+	.byte	MECHE_BLUE_ROOM_CENTER	; west exit
+	.byte	$ff			; north exit_dir
+	.byte	$ff			; south exit_dir
+	.byte	$ff			; east exit_dir
+	.byte	DIRECTION_W		; west exit_dir
+	.word	$0000				; north bg
+	.word	$0000				; south bg
+	.word	$0000				; east bg
+	.word	blue_throne_closed_w_lzsa	; west bg
+	.byte	BG_WEST
+	.byte	DIRECTION_W
+	.byte	5,13		; special x
+	.byte	16,40		; special y
+	.word	open_blue_secret-1	; special function
+
+; MECHE_BLUE_THRONE_OPEN	-- blue room throne, open passage
+location53:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+	.byte	$ff			; east exit
+	.byte	MECHE_BLUE_ROOM_CENTER	; west exit
+	.byte	$ff			; north exit_dir
+	.byte	$ff			; south exit_dir
+	.byte	$ff			; east exit_dir
+	.byte	DIRECTION_W		; west exit_dir
+	.word	$0000				; north bg
+	.word	$0000				; south bg
+	.word	$0000				; east bg
+	.word	blue_throne_open_w_lzsa	; west bg
+	.byte	BG_WEST
+	.byte	DIRECTION_W
+	.byte	5,13		; special x
+	.byte	16,40		; special y
+	.word	enter_blue_secret-1	; special function
+
+
 

mist/meche_rotation.s

@@ -144,10 +144,20 @@ missing_page:
 	rts
 
 
+open_blue_secret:
+	lda	#MECHE_BLUE_THRONE_OPEN
+	sta	LOCATION
+	jmp	change_location
 
 enter_blue_secret:
-
+	lda	CURSOR_Y
+	cmp	#24
+	bcc	close_blue_secret	; blt
 	lda	#MECHE_BLUE_SECRET_DOOR
+	bne	done_blue_secret	; bra
+close_blue_secret:
+	lda	#MECHE_BLUE_THRONE
+done_blue_secret:
 	sta	LOCATION
 	jmp	change_location