riven: start work on next part of intro

games/riven_hgr/Makefile

@@ -44,7 +44,8 @@ prorwts_ca65.o:	prorwts_ca65.s
 riven_disk00.dsk:	QBOOT QLOAD TITLE_00 \
 	disk00_files/DISK00 \
 	disk00_files/ATRUS \
-	disk00_files/CYAN
+	disk00_files/CYAN \
+	disk00_files/CAPTURED
 	cp $(EMPTY_DISK)/empty.dsk riven_disk00.dsk
 	$(DOS33_RAW) riven_disk00.dsk  0  0 QBOOT                0   1
 	$(DOS33_RAW) riven_disk00.dsk  0  2 QBOOT                1   1
@@ -54,6 +55,7 @@ riven_disk00.dsk:	QBOOT QLOAD TITLE_00 \
 	$(DOS33_RAW) riven_disk00.dsk  1  0 QLOAD                0   0
 	$(DOS33_RAW) riven_disk00.dsk  2  0 disk00_files/CYAN    0   0
 	$(DOS33_RAW) riven_disk00.dsk  10  0 disk00_files/ATRUS  0   0
+	$(DOS33_RAW) riven_disk00.dsk  18  0 disk00_files/CAPTURED  0   0
 
 
 ###

games/riven_hgr/disk00_files/Makefile

@@ -3,7 +3,7 @@ include ../../../Makefile.inc
 LINKER_SCRIPTS = ../../../linker_scripts/
 
 
-all:	DISK00 ATRUS CYAN
+all:	DISK00 ATRUS CYAN CAPTURED
 
 ####
 
@@ -23,6 +23,17 @@ atrus.o:	atrus.s \
 		graphics_atrus/atrus_graphics.inc
 	ca65 -o atrus.o atrus.s -l atrus.lst
 
+####
+
+CAPTURED:	captured.o
+	ld65 -o CAPTURED captured.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+
+captured.o:	captured.s \
+		../zp.inc ../hardware.inc ../qload.inc \
+		graphics_captured/captured_graphics.inc
+	ca65 -o captured.o captured.s -l captured.lst
+
+
 
 ####
 
@@ -40,6 +51,9 @@ cyan.o:	cyan.s \
 graphics_atrus/atrus_graphics.inc:
 	cd graphics_atrus && make
 
+graphics_captured/captured_graphics.inc:
+	cd graphics_captured && make
+
 graphics_cyan/cyan_graphics.inc:
 	cd graphics_cyan && make
 
@@ -47,7 +61,7 @@ graphics_cyan/cyan_graphics.inc:
 
 clean:		
 	rm -f *~ *.o *.lst \
-		DISK00 ATRUS CYAN
+		DISK00 ATRUS CYAN CAPTURED
 
 ####
 
@@ -56,4 +70,5 @@ distclean:
 		DISK00 ATRUS CYAN
 	cd graphics_atrus && make clean
 	cd graphics_cyan && make clean
+	cd graphics_captured && make clean
 

games/riven_hgr/disk00_files/atrus.s

@@ -109,7 +109,7 @@ page_loop:
 
 	bit     KEYRESET
 
-	lda     #LOAD_ATRUS
+	lda     #LOAD_CAPTURED
 	sta     WHICH_LOAD
 
 	lda     #$1

games/riven_hgr/disk00_files/captured.s

@@ -0,0 +1,85 @@
+; Riven then Captured
+
+; by deater (Vince Weaver) <vince@deater.net>
+
+.include "../zp.inc"
+.include "../hardware.inc"
+.include "../qload.inc"
+
+.include "disk00_defines.inc"
+
+NUM_SCENES	=	4
+
+
+captured_start:
+
+	;===================
+	; Setup graphics
+	;===================
+
+	bit	SET_GR
+	bit	HIRES
+	bit	TEXTGR
+	bit	PAGE1
+
+	lda	#0
+	sta	SCENE_COUNT
+
+	bit	KEYRESET
+
+	;===============================
+	;===============================
+	; main loop
+	;===============================
+	;===============================
+
+riven_loop:
+
+	; decompress graphics
+
+	ldx	SCENE_COUNT
+	lda	frames_l,X
+	sta	ZX0_src
+	lda	frames_h,X
+	sta	ZX0_src+1
+
+	lda	#$20		; hgr page1
+	jsr	full_decomp
+
+	; wait a bit before continuing
+
+	ldx	#30
+	jsr	wait_a_bit
+
+	inc	SCENE_COUNT
+	lda	SCENE_COUNT
+	cmp	#NUM_SCENES
+
+	bne	riven_loop
+
+	bit     KEYRESET
+
+	lda     #LOAD_CAPTURED
+	sta     WHICH_LOAD
+
+	lda     #$1
+	sta     LEVEL_OVER
+
+	rts
+
+
+captured_graphics:
+	.include	"graphics_captured/captured_graphics.inc"
+
+frames_l:
+	.byte <riven01_zx02
+	.byte <riven02_zx02
+	.byte <riven03_zx02
+	.byte <riven04_zx02
+
+frames_h:
+	.byte >riven01_zx02
+	.byte >riven02_zx02
+	.byte >riven03_zx02
+	.byte >riven04_zx02
+

games/riven_hgr/disk00_files/disk00.s

@@ -4,19 +4,19 @@ which_disk:
 	.byte	$00		; BCD
 
 load_address_array:
-	.byte	$40,$40,$40,$40	; TITLE, CYAN, ATRUS
-	.byte	$00,$00,$00,$00
+	.byte	$40,$40,$40,$40	; TITLE, CYAN, ATRUS, CAPTURED
+	.byte	$40,$00,$00,$00	; CHO
 
 track_array:
-        .byte	0, 2, 10,18	; TITLE, CYAN, ATRUS
-	.byte	0,0,0,0
+        .byte	0, 2, 10,18	; TITLE, CYAN, ATRUS, CAPTURED
+	.byte	26,0,0,0	; CHO
 
 sector_array:
-        .byte	8, 0, 0, 0	; TITLE, CYAN, ATRUS
-	.byte	0,0,0,0
+        .byte	8, 0, 0, 0	; TITLE, CYAN, ATRUS, CAPTURED
+	.byte	0,0,0,0		; CHO
 length_array:
-        .byte	8, 127,127,178	; TITLE, CYAN, ATRUS
-	.byte	0,0,0,0
+        .byte	8, 127,127,127	; TITLE, CYAN, ATRUS, CAPTURED
+	.byte	127,0,0,0	; CHO
 
 
 disk_exit_disk: ; note: BCD (yes I'm lazy)

games/riven_hgr/disk00_files/disk00_defines.inc

@@ -1,4 +1,6 @@
 LOAD_TITLE      =       0
 LOAD_CYAN	=	1
 LOAD_ATRUS	=	2
-LOAD_OPENER	=	3
+LOAD_CAPTURED	=	3
+LOAD_CHO	=	4
+

games/riven_hgr/disk00_files/graphics_captured/Makefile

@@ -0,0 +1,29 @@
+include ../../../../Makefile.inc
+
+ZX02 = ~/research/6502_compression/zx02.git/build/zx02
+PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
+
+all:	captured_graphics.inc
+
+captured_graphics.inc:	\
+	riven01_iipix.hgr.zx02 \
+	riven02_iipix.hgr.zx02 \
+	riven03_iipix.hgr.zx02 \
+	riven04_iipix.hgr.zx02
+	echo "riven01_zx02: .incbin \"riven01_iipix.hgr.zx02\"" > 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
+
+####
+
+%.hgr: %.png
+	$(PNG_TO_HGR) $< > $@
+
+%.hgr.zx02: %.hgr
+	$(ZX02) -f $< $@
+
+####
+
+clean:
+	rm -f *~ *.o *.lst  *.zx02 *.hgr captured_graphics.inc