riven: add more locations

games/riven_hgr/NOTES

@@ -94,7 +94,7 @@ Disk03 Map (disk has 35 tracks, each 4k in size)
 T         0 = Qboot
 T       0.5 = TITLE	 1805 bytes	 8S = 0T8S	(2048) 400B free
 T         1 = QLOAD      2314 bytes      16S= 1T0S	(4096)   2k free
-T         2 = STEPS1     ???? bytes         = 6T0S	(24576) 15k free
+T         2 = DOWNSTEPS 18318 bytes         = 6T0S	(24576) 6k free
 T         9 = STEPS3     ???? bytes         = 6T0S	(24576)  ?? free
 T        16 = OUTSIDE    9582 bytes         = 6T0S	(24576)  ?? free
 

games/riven_hgr/TODO

@@ -8,17 +8,17 @@ disk02:	(steps)
 	three	E
 	four	E
 
-	five
+	alcove (EW)?
 
 	bridge1	(nsew)
 	
 	
 
 disk03: (down other side)
-	one
-	two
-	three
-	four (by door)
+	one		E
+	two		E
+	three		E
+
 	under door
 	inside
 	up ladder
@@ -61,7 +61,6 @@ disk06: more tunnel
 	+ allow pressing escape to back-out disk change?
 
 + Keyboard handling
-	- still buggy, especially when clicking on something???
 	- Better keyboard handling on IIe
 	-> was actually one of the main reasons I started working on this
 

games/riven_hgr/disk02_files/disk02.s

@@ -55,12 +55,12 @@ disk_exit_dni_l:
 			;
 disk_exit_load:
 	.byte	LOAD_PATH
-	.byte	LOAD_OUTSIDE
+	.byte	LOAD_DSTEPS1
 	.byte	LOAD_TUNNEL3
 	.byte	LOAD_CYAN
 disk_exit_level:
 	.byte	RIVEN_STEPS_BASE
-	.byte	RIVEN_OUTSIDE
+	.byte	RIVEN_DOWN1
 	.byte	RIVEN_TUNNEL3
 	.byte	0
 disk_exit_direction:

games/riven_hgr/disk02_files/leveldata_steps3.inc

@@ -28,7 +28,7 @@ location1:
 	.byte	RIVEN_STEPS3	; south exit
 	.byte	$ff		; east exit
 	.byte	$ff		; west exit
-	.byte	DIRECTION_N	; north exit_dir
+	.byte	DIRECTION_E	; north exit_dir	; yes, it turns you
 	.byte	DIRECTION_S	; south exit_dir
 	.byte	$ff		; east exit_dir
 	.byte	$ff		; west exit_dir

games/riven_hgr/disk03_files/disk03.s

@@ -21,7 +21,7 @@ sector_array:
 	.byte	0,0,0,0		;
 
 length_array:
-	.byte	8, 96,84, 96	; TITLE, DSTEPS1,DSTEPS3,OUTSIDE
+	.byte	8, 96,96, 96	; TITLE, DSTEPS1,DSTEPS3,OUTSIDE
 	.byte	80,0,0,0
 
 

games/riven_hgr/disk03_files/graphics_downsteps/Makefile

@@ -6,9 +6,13 @@ PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
 all:	downsteps_graphics.inc
 
 downsteps_graphics.inc:	\
-	down1_n.hgr.zx02 down1_s.hgr.zx02
+	down1_n.hgr.zx02 down1_s.hgr.zx02 \
+	down2_n.hgr.zx02 down2_s.hgr.zx02
 	echo "down1_n_zx02: .incbin \"down1_n.hgr.zx02\"" > downsteps_graphics.inc
 	echo "down1_s_zx02: .incbin \"down1_s.hgr.zx02\"" >> downsteps_graphics.inc
+	echo "down2_n_zx02: .incbin \"down2_n.hgr.zx02\"" >> downsteps_graphics.inc
+	echo "down2_s_zx02: .incbin \"down2_s.hgr.zx02\"" >> downsteps_graphics.inc
+
 
 
 

games/riven_hgr/disk03_files/leveldata_downsteps.inc

@@ -1,17 +1,17 @@
 ;===============================================
-; level data for outside
+; level data for going down steps
 ;===============================================
 
 locations:
-	.word location0
+	.word location0, location1
 
-; RIVEN_DOWN1	-- outside the door
+; RIVEN_DOWN1	-- starting down
 location0:
-	.byte	LOAD_OUTSIDE<<4|RIVEN_OUTSIDE		; north exit
+	.byte	RIVEN_DOWN2	; north exit
 	.byte	$E0		; south exit
 	.byte	$ff		; east exit
 	.byte	$ff		; west exit
-	.byte	DIRECTION_E	; north exit_dir
+	.byte	DIRECTION_N	; north exit_dir
 	.byte	DIRECTION_S	; south exit_dir
 	.byte	$ff		; east exit_dir
 	.byte	$ff		; west exit_dir
@@ -21,3 +21,21 @@ location0:
 	.word	$0000		; west bg
 	.byte	BG_NORTH|BG_SOUTH
 	.byte	$ff		; special exit
+
+; RIVEN_DOWN2	-- continuing down
+location1:
+	.byte	LOAD_OUTSIDE<<4|RIVEN_OUTSIDE		; north exit
+	.byte	RIVEN_DOWN1	; south exit
+	.byte	$ff		; east exit
+	.byte	$ff		; west exit
+	.byte	DIRECTION_E	; north exit_dir
+	.byte	DIRECTION_S	; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	down2_n_zx02	; north bg
+	.word	down2_s_zx02	; south bg
+	.word	$0000		; east bg
+	.word	$0000		; west bg
+	.byte	BG_NORTH|BG_SOUTH
+	.byte	$ff		; special exit
+

games/riven_hgr/disk03_files/leveldata_outside.inc

@@ -8,7 +8,7 @@ locations:
 ; RIVEN_OUTSIDE	-- outside the door
 location0:
 	.byte	$FF		; north exit
-	.byte	LOAD_DSTEPS1<<4|RIVEN_DOWN1		; south exit
+	.byte	LOAD_DSTEPS1<<4|RIVEN_DOWN2		; south exit
 	.byte	$ff		; east exit
 	.byte	$ff		; west exit
 	.byte	$FF		; north exit_dir