riven: better riven logo intro

though it looks a bit odd due to the cycling colors in the original

games/riven_hgr/Makefile

@@ -365,6 +365,7 @@ qload.inc:	generate_common QLOAD
 	./generate_common -a 0x1600 -s set_normal qload.lst >> qload.inc
 	./generate_common -a 0x1600 -s force_uppercase qload.lst >> qload.inc
 	./generate_common -a 0x1600 -s gr_offsets qload.lst >> qload.inc
+	./generate_common -a 0x1600 -s clear_gr_all qload.lst >> qload.inc
 
 submit:	riven_disk00.dsk riven_disk01.dsk \
 	riven_disk39.dsk \

games/riven_hgr/disk00_files/Makefile

@@ -26,7 +26,7 @@ atrus.o:	atrus.s \
 ####
 
 CAPTURED:	captured.o
-	ld65 -o CAPTURED captured.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+	ld65 -o CAPTURED captured.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
 
 captured.o:	captured.s \
 		flip_pages.s draw_scene.s gr_fade.s \

games/riven_hgr/disk00_files/captured.s

@@ -9,7 +9,23 @@
 .include "disk00_defines.inc"
 
 
-RIVEN_FRAMES	=	4
+RIVEN_FRAMES	=	23
+
+; new
+; 1 = 163.5
+; 2 = 163.75
+; 3 = 164
+; 5 = 164.5
+; 7 = 165
+; 9 = 165.5
+;11 = 166
+;13 = 166.5
+;15 = 167
+;17 = 167.5
+;19 = 168
+;21 = 168.5
+;23 = 169 = end (empty)
+
 
 NUM_OVERLAYS	=	6
 
@@ -36,6 +52,9 @@ captured_start:
 	;===============================
 	;===============================
 
+	lda	#$20
+	sta	DRAW_PAGE
+
 riven_logo_loop:
 
 	; decompress graphics
@@ -46,12 +65,31 @@ riven_logo_loop:
 	lda	riven_h,X
 	sta	ZX0_src+1
 
-	lda	#$20		; hgr page1
+	lda	DRAW_PAGE
 	jsr	full_decomp
 
+	; flip pages
+
+	lda	DRAW_PAGE
+	cmp	#$20
+	beq	hgr_flip_page2
+
+hgr_flip_page1:
+	bit	PAGE2
+	lda	#$20
+	bne	done_hgr_flip
+
+hgr_flip_page2:
+
+	bit	PAGE1
+	lda	#$40
+done_hgr_flip:
+	sta	DRAW_PAGE
+
+
 	; wait a bit before continuing
 
-	ldx	#30
+	ldx	#2
 	jsr	wait_a_bit
 
 	inc	SCENE_COUNT
@@ -66,6 +104,10 @@ riven_logo_loop:
         ; Setup lo-res graphics
         ;===================
 
+	; clear it first
+
+	jsr	clear_gr_all
+
         bit     SET_GR
         bit     LORES
         bit     FULLGR
@@ -222,14 +264,52 @@ riven_l:
 	.byte <riven02_zx02
 	.byte <riven03_zx02
 	.byte <riven04_zx02
+	.byte <riven05_zx02
+	.byte <riven06_zx02
+	.byte <riven07_zx02
+	.byte <riven08_zx02
+	.byte <riven09_zx02
+	.byte <riven10_zx02
+	.byte <riven11_zx02
+	.byte <riven12_zx02
+	.byte <riven13_zx02
+	.byte <riven14_zx02
+	.byte <riven15_zx02
+	.byte <riven16_zx02
+	.byte <riven17_zx02
+	.byte <riven18_zx02
+	.byte <riven19_zx02
+	.byte <riven20_zx02
+	.byte <riven21_zx02
+	.byte <riven22_zx02
+	.byte <riven23_zx02
+
+
 
 riven_h:
 	.byte >riven01_zx02
 	.byte >riven02_zx02
 	.byte >riven03_zx02
 	.byte >riven04_zx02
-
-
+	.byte >riven05_zx02
+	.byte >riven06_zx02
+	.byte >riven07_zx02
+	.byte >riven08_zx02
+	.byte >riven09_zx02
+	.byte >riven10_zx02
+	.byte >riven11_zx02
+	.byte >riven12_zx02
+	.byte >riven13_zx02
+	.byte >riven14_zx02
+	.byte >riven15_zx02
+	.byte >riven16_zx02
+	.byte >riven17_zx02
+	.byte >riven18_zx02
+	.byte >riven19_zx02
+	.byte >riven20_zx02
+	.byte >riven21_zx02
+	.byte >riven22_zx02
+	.byte >riven23_zx02
 
 frames_l:
 	.byte <trap_overlay0

games/riven_hgr/disk00_files/disk00.s

@@ -4,7 +4,7 @@ which_disk:
 	.byte	$00		; BCD
 
 load_address_array:
-	.byte	$40,$40,$40,$40	; TITLE, CYAN, ATRUS, CAPTURED
+	.byte	$40,$40,$40,$60	; TITLE, CYAN, ATRUS, CAPTURED
 	.byte	$40,$00,$00,$00	; CHO
 
 track_array:
@@ -15,7 +15,7 @@ sector_array:
         .byte	8, 0, 0, 0	; TITLE, CYAN, ATRUS, CAPTURED
 	.byte	0,0,0,0		; CHO
 length_array:
-        .byte	8, 127,127,127	; TITLE, CYAN, ATRUS, CAPTURED
+        .byte	8, 127,127,80	; TITLE, CYAN, ATRUS, CAPTURED
 	.byte	127,0,0,0	; CHO
 
 

games/riven_hgr/disk00_files/graphics_captured/Makefile

@@ -11,6 +11,25 @@ captured_graphics.inc:	\
 	riven02_iipix.hgr.zx02 \
 	riven03_iipix.hgr.zx02 \
 	riven04_iipix.hgr.zx02 \
+	riven05_iipix.hgr.zx02 \
+	riven06_iipix.hgr.zx02 \
+	riven07_iipix.hgr.zx02 \
+	riven08_iipix.hgr.zx02 \
+	riven09_iipix.hgr.zx02 \
+	riven10_iipix.hgr.zx02 \
+	riven11_iipix.hgr.zx02 \
+	riven12_iipix.hgr.zx02 \
+	riven13_iipix.hgr.zx02 \
+	riven14_iipix.hgr.zx02 \
+	riven15_iipix.hgr.zx02 \
+	riven16_iipix.hgr.zx02 \
+	riven17_iipix.hgr.zx02 \
+	riven18_iipix.hgr.zx02 \
+	riven19_iipix.hgr.zx02 \
+	riven20_iipix.hgr.zx02 \
+	riven21_iipix.hgr.zx02 \
+	riven22_iipix.hgr.zx02 \
+	riven23_iipix.hgr.zx02 \
 	captured_bg.gr.zx02 \
 	trap_overlay0.gr.zx02 \
 	trap_overlay1.gr.zx02 \
@@ -22,6 +41,25 @@ captured_graphics.inc:	\
 	echo "riven02_zx02: .incbin \"riven02_iipix.hgr.zx02\"" >> captured_graphics.inc
 	echo "riven03_zx02: .incbin \"riven03_iipix.hgr.zx02\"" >> captured_graphics.inc
 	echo "riven04_zx02: .incbin \"riven04_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven05_zx02: .incbin \"riven05_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven06_zx02: .incbin \"riven06_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven07_zx02: .incbin \"riven07_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven08_zx02: .incbin \"riven08_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven09_zx02: .incbin \"riven09_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven10_zx02: .incbin \"riven10_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven11_zx02: .incbin \"riven11_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven12_zx02: .incbin \"riven12_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven13_zx02: .incbin \"riven13_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven14_zx02: .incbin \"riven14_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven15_zx02: .incbin \"riven15_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven16_zx02: .incbin \"riven16_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven17_zx02: .incbin \"riven17_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven18_zx02: .incbin \"riven18_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven19_zx02: .incbin \"riven19_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven20_zx02: .incbin \"riven20_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven21_zx02: .incbin \"riven21_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven22_zx02: .incbin \"riven22_iipix.hgr.zx02\"" >> captured_graphics.inc
+	echo "riven23_zx02: .incbin \"riven23_iipix.hgr.zx02\"" >> captured_graphics.inc
 	echo "captured_bg: .incbin \"captured_bg.gr.zx02\"" >> captured_graphics.inc
 	echo "trap_overlay0: .incbin \"trap_overlay0.gr.zx02\"" >> captured_graphics.inc
 	echo "trap_overlay1: .incbin \"trap_overlay1.gr.zx02\"" >> captured_graphics.inc

games/riven_hgr/text_print.s

@@ -113,10 +113,21 @@ move_and_print_list:
 
 	rts
 
+
 	;==============================
-	; clear bottom of text screen
+	; clear all of gr screen (page1)
 	;==============================
+clear_gr_all:
+	ldx	#0
+	stx	clear_value_smc+1
+	beq	clear_bottom_loop_outer		; bra
+
+	;====================================
+	; clear bottom of text screen (page1)
+	;====================================
 clear_bottom:
+	lda	#' '+$80
+	sta	clear_value_smc+1
 	ldx	#20
 clear_bottom_loop_outer:
 	txa
@@ -128,6 +139,7 @@ clear_bottom_loop_outer:
 	lda	gr_offsets,Y
 	sta	OUTH
 
+clear_value_smc:
 	lda	#' '+$80
 	ldy	#39
 clear_bottom_loop_inner: