riven: work on cho animation

games/riven_hgr/disk00_files/cho.s

@@ -9,7 +9,7 @@
 .include "disk00_defines.inc"
 
 
-NUM_OVERLAYS	=	6
+NUM_OVERLAYS	=	21
 
 
 cho_start:
@@ -41,6 +41,12 @@ cho_start:
 	;===============================
 	;===============================
 
+	lda	#<captured_cage_bg
+	sta	scene_bg_l_smc+1
+
+	lda	#>captured_cage_bg
+	sta	scene_bg_h_smc+1
+
 	lda	#0
 	sta	WHICH_OVERLAY
 
@@ -55,7 +61,9 @@ cho_loop:
 	cmp	#NUM_OVERLAYS
 	beq	done_cho
 
-	ldx	#2
+	; in theory we are 500ms (10*50) long here...
+
+	ldx	#7
 	jsr	wait_a_bit
 
 	jmp	cho_loop
@@ -70,7 +78,7 @@ done_cho:
 
 	bit     KEYRESET
 
-	lda     #LOAD_CAPTURED
+	lda     #LOAD_CHO
 	sta     WHICH_LOAD
 
 	lda     #$1
@@ -82,20 +90,30 @@ done_cho:
 	.include "draw_scene.s"
 
 frames_l:
-;	.byte <trap_overlay0
-;	.byte <trap_overlay1
-;	.byte <trap_overlay2
-;	.byte <trap_overlay3
-;	.byte <trap_overlay4
-;	.byte <trap_overlay5
+	.byte <empty			; 0
+	.byte <empty			; 1
+	.byte <empty			; 2
+	.byte <empty			; 3
+	.byte <empty			; 4
+	.byte <empty			; 5
+	.byte <cho_overlay006,<cho_overlay007,<cho_overlay008	; 6,7,8
+	.byte <cho_overlay009,<cho_overlay010,<cho_overlay011	; 9,10,11
+	.byte <cho_overlay012,<cho_overlay013,<cho_overlay014	; 12,13,14
+	.byte <cho_overlay015,<cho_overlay016,<cho_overlay017	; 15,16,17
+	.byte <cho_overlay018,<cho_overlay019,<cho_overlay020	; 18,19,20
 
 frames_h:
-;	.byte >trap_overlay0
-;	.byte >trap_overlay1
-;	.byte >trap_overlay2
-;	.byte >trap_overlay3
-;	.byte >trap_overlay4
-;	.byte >trap_overlay5
+	.byte >empty			; 0
+	.byte >empty			; 1
+	.byte >empty			; 2
+	.byte >empty			; 3
+	.byte >empty			; 4
+	.byte >empty			; 5
+	.byte >cho_overlay006,>cho_overlay007,>cho_overlay008	; 6,7,8
+	.byte >cho_overlay009,>cho_overlay010,>cho_overlay011	; 9,10,11
+	.byte >cho_overlay012,>cho_overlay013,>cho_overlay014	; 12,13,14
+	.byte >cho_overlay015,>cho_overlay016,>cho_overlay017	; 15,16,17
+	.byte >cho_overlay018,>cho_overlay019,>cho_overlay020	; 18,19,20
 
 cho_graphics:
 	.include	"graphics_cho/cho_graphics.inc"

games/riven_hgr/disk00_files/draw_scene.s

@@ -13,12 +13,11 @@ draw_scene:
 	;===============================
 
 before:
-;	ldx	SCENE_COUNT
 
-;	lda	frames_l,X
+scene_bg_l_smc:
 	lda	#<captured_bg
 	sta	ZX0_src
-;	lda	frames_h,X
+scene_bg_h_smc:
 	lda	#>captured_bg
         sta	ZX0_src+1
 

games/riven_hgr/disk00_files/graphics_cho/Makefile

@@ -7,8 +7,39 @@ PNG2GR = ../../../../utils/gr-utils/png2gr
 all:	cho_graphics.inc
 
 cho_graphics.inc:	\
-	captured_bg.gr.zx02
+	captured_bg.gr.zx02 \
+	captured_cage_bg.gr.zx02 \
+	empty.gr.zx02 \
+	cho_overlay006.gr.zx02 cho_overlay007.gr.zx02 \
+	cho_overlay008.gr.zx02 cho_overlay009.gr.zx02 \
+	cho_overlay010.gr.zx02 cho_overlay011.gr.zx02 \
+	cho_overlay012.gr.zx02 cho_overlay013.gr.zx02 \
+	cho_overlay014.gr.zx02 cho_overlay015.gr.zx02 \
+	cho_overlay016.gr.zx02 cho_overlay017.gr.zx02 \
+	cho_overlay018.gr.zx02 cho_overlay019.gr.zx02 \
+	cho_overlay020.gr.zx02
 	echo "captured_bg: .incbin \"captured_bg.gr.zx02\"" > cho_graphics.inc
+	echo "captured_cage_bg: .incbin \"captured_cage_bg.gr.zx02\"" >> cho_graphics.inc
+	echo "empty: .incbin \"empty.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay006: .incbin \"cho_overlay006.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay007: .incbin \"cho_overlay007.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay008: .incbin \"cho_overlay008.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay009: .incbin \"cho_overlay009.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay010: .incbin \"cho_overlay010.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay011: .incbin \"cho_overlay011.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay012: .incbin \"cho_overlay012.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay013: .incbin \"cho_overlay013.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay014: .incbin \"cho_overlay014.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay015: .incbin \"cho_overlay015.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay016: .incbin \"cho_overlay016.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay017: .incbin \"cho_overlay017.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay018: .incbin \"cho_overlay018.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay019: .incbin \"cho_overlay019.gr.zx02\"" >> cho_graphics.inc
+	echo "cho_overlay020: .incbin \"cho_overlay020.gr.zx02\"" >> cho_graphics.inc
+
+
+
+
 
 ####
 

games/riven_hgr/title.s

@@ -326,9 +326,11 @@ done_setup_sound:
 
 .if DISK=00
 
-;	lda	#LOAD_CYAN
-	lda	#LOAD_CAPTURED
 
+;	lda	#LOAD_CAPTURED
+	lda	#LOAD_CHO
+
+;	lda	#LOAD_CYAN
 	sta	WHICH_LOAD		; assume CYAN opener
 
 	lda	#0			; not needed...