riven_hgr: hook up some more images

games/riven_hgr/common_defines.inc

@@ -59,6 +59,7 @@ RIVEN_MAGPATH	=	1
 
 RIVEN_PROJECTOR	=	0
 RIVEN_PROJ_DOOR	=	1
+RIVEN_PROJ_STEPS=	2
 
 ; Magsteps
 

games/riven_hgr/graphics_projector/Makefile

@@ -7,11 +7,14 @@ all:	projector_graphics.inc
 
 projector_graphics.inc:	\
 	doorway_n.hgr.zx02 doorway_s.hgr.zx02 \
+	steps_n.hgr.zx02 steps_s.hgr.zx02 \
 	projector_n.hgr.zx02 projector_s.hgr.zx02
 	echo "projector_n_zx02: .incbin \"projector_n.hgr.zx02\"" > projector_graphics.inc
 	echo "projector_s_zx02: .incbin \"projector_s.hgr.zx02\"" >> projector_graphics.inc
 	echo "doorway_n_zx02: .incbin \"doorway_n.hgr.zx02\"" >> projector_graphics.inc
 	echo "doorway_s_zx02: .incbin \"doorway_s.hgr.zx02\"" >> projector_graphics.inc
+	echo "steps_n_zx02: .incbin \"steps_n.hgr.zx02\"" >> projector_graphics.inc
+	echo "steps_s_zx02: .incbin \"steps_s.hgr.zx02\"" >> projector_graphics.inc
 
 
 ####

games/riven_hgr/leveldata_projector.inc

@@ -3,7 +3,7 @@
 ;===============================================
 
 locations:
-	.word location0,location1
+	.word location0,location1,location2
 
 ; RIVEN_PROJECTOR	-- looking at projector
 location0:
@@ -24,7 +24,7 @@ location0:
 
 ; RIVEN_PROJ_DOOR	-- doorway to projector room
 location1:
-	.byte	LOAD_OUTSIDE<<4 | RIVEN_MAGPATH	; north exit
+	.byte	RIVEN_PROJ_STEPS	; north exit
 	.byte	RIVEN_PROJECTOR		; south exit
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit
@@ -37,7 +37,23 @@ location1:
 	.word	$0000		; east bg
 	.word	$0000		; west bg
 	.byte	BG_NORTH|BG_SOUTH
-	.byte	DIRECTION_E	; special exit
-	.byte	9,29		; special x
-	.byte	2,46		; special y
-	.word	location1-1	; special function FIXME
+	.byte	$FF		; special exit
+
+; RIVEN_PROJ_STEPS	-- doorway to projector room
+location2:
+	.byte	LOAD_OUTSIDE<<4 | RIVEN_MAGPATH	; north exit
+	.byte	RIVEN_PROJ_DOOR		; 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	steps_n_zx02	; north bg
+	.word	steps_s_zx02	; south bg
+	.word	$0000		; east bg
+	.word	$0000		; west bg
+	.byte	BG_NORTH|BG_SOUTH
+	.byte	$FF		; special exit
+
+

games/riven_hgr/movie1.s

@@ -182,7 +182,7 @@ movie1_loop:
 
 	inc	SCENE_COUNT
 	lda	SCENE_COUNT
-	cmp	#24
+	cmp	#27
 	beq	done_play_movie1
 
 	ldx	#2
@@ -359,6 +359,9 @@ frames_l:
 	.byte	<img075_bg_zx02
 	.byte	<img076_bg_zx02
 	.byte	<img077_bg_zx02
+	.byte	<img078_bg_zx02
+	.byte	<img079_bg_zx02
+	.byte	<img080_bg_zx02
 
 frames_h:
 	.byte	>img025_bg_zx02
@@ -385,6 +388,9 @@ frames_h:
 	.byte	>img075_bg_zx02
 	.byte	>img076_bg_zx02
 	.byte	>img077_bg_zx02
+	.byte	>img078_bg_zx02
+	.byte	>img079_bg_zx02
+	.byte	>img080_bg_zx02
 
 
 

games/riven_hgr/movie1/Makefile

@@ -13,7 +13,8 @@ movie1.inc:	\
 	img064_bg.gr.zx02 img065_bg.gr.zx02 img066_bg.gr.zx02 \
 	img070_bg.gr.zx02 img071_bg.gr.zx02 img072_bg.gr.zx02 \
 	img073_bg.gr.zx02 img074_bg.gr.zx02 img075_bg.gr.zx02 \
-	img076_bg.gr.zx02 img077_bg.gr.zx02
+	img076_bg.gr.zx02 img077_bg.gr.zx02 img078_bg.gr.zx02 \
+	img079_bg.gr.zx02 img080_bg.gr.zx02
 	echo "img025_bg_zx02: .incbin \"img025_bg.gr.zx02\"" > movie1.inc
 	echo "img055_bg_zx02: .incbin \"img055_bg.gr.zx02\"" >> movie1.inc
 	echo "img056_bg_zx02: .incbin \"img056_bg.gr.zx02\"" >> movie1.inc
@@ -38,7 +39,9 @@ movie1.inc:	\
 	echo "img075_bg_zx02: .incbin \"img075_bg.gr.zx02\"" >> movie1.inc
 	echo "img076_bg_zx02: .incbin \"img076_bg.gr.zx02\"" >> movie1.inc
 	echo "img077_bg_zx02: .incbin \"img077_bg.gr.zx02\"" >> movie1.inc
-
+	echo "img078_bg_zx02: .incbin \"img078_bg.gr.zx02\"" >> movie1.inc
+	echo "img079_bg_zx02: .incbin \"img079_bg.gr.zx02\"" >> movie1.inc
+	echo "img080_bg_zx02: .incbin \"img080_bg.gr.zx02\"" >> movie1.inc
 
 ####