driven: more intro logo

demos/driven/part00_intro/Makefile

@@ -19,7 +19,8 @@ intro.o:	intro.s \
 	../zp.inc ../hardware.inc ../qload.inc \
 	erase.s \
 	graphics/logo_frame01.hgr.zx02 \
-	graphics/logo_frame46.hgr.zx02
+	graphics/logo_frame46.hgr.zx02 \
+	graphics/d_sprites.inc
 	ca65 -o intro.o intro.s -l intro.lst
 
 ###
@@ -27,6 +28,9 @@ intro.o:	intro.s \
 graphics/logo_frame01.hgr.zx02:	
 	cd graphics && make
 
+graphics/d_sprites.inc:	
+	cd graphics && make
+
 ###
 
 

demos/driven/part00_intro/graphics/Makefile

@@ -3,8 +3,26 @@ include ../../../../Makefile.inc
 ZX02 = ~/research/6502_compression/zx02.git/build/zx02
 PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
 PNG2GR = ../../../../utils/gr-utils/png2gr
+HGR_SPRITE = ../../../../utils/hgr-utils/hgr_make_sprite
 
-all:	desire.hgr.zx02 logo_frame01.hgr.zx02 logo_frame46.hgr.zx02
+all:	desire.hgr.zx02 logo_frame01.hgr.zx02 logo_frame46.hgr.zx02 \
+	d_sprites.inc
+
+
+####
+
+d_sprites.inc:	logo_frame11.png logo_frame12.png logo_frame13.png \
+		logo_frame14.png logo_frame15.png logo_frame16.png \
+		logo_frame17.png logo_frame18.png logo_frame19.png
+	$(HGR_SPRITE) -s -l d11_sprite logo_frame11.png  70 55  125 109 > d_sprites.inc
+	$(HGR_SPRITE) -s -l d12_sprite logo_frame12.png  70 55  125 109 >> d_sprites.inc
+	$(HGR_SPRITE) -s -l d13_sprite logo_frame13.png  70 55  125 109 >> d_sprites.inc
+	$(HGR_SPRITE) -s -l d14_sprite logo_frame14.png  56 55  125 109 >> d_sprites.inc
+	$(HGR_SPRITE) -s -l d15_sprite logo_frame15.png  56 56  125 109 >> d_sprites.inc
+	$(HGR_SPRITE) -s -l d16_sprite logo_frame16.png  42 56  125 109 >> d_sprites.inc
+	$(HGR_SPRITE) -s -l d17_sprite logo_frame17.png  42 56  111 107 >> d_sprites.inc
+	$(HGR_SPRITE) -s -l d18_sprite logo_frame18.png  42 56   98 107 >> d_sprites.inc
+	$(HGR_SPRITE) -s -l d19_sprite logo_frame19.png  28 56   98 108 >> d_sprites.inc
 
 ####
 
@@ -34,4 +52,4 @@ desire.hgr.zx02:	desire.hgr
 ####
 
 clean:
-	rm -f *~ *.zx02 *.hgr
+	rm -f *~ *.zx02 *.hgr *.inc

demos/driven/part00_intro/intro.s

@@ -58,8 +58,39 @@ load_loop:
 
 	jsr	erase_frame
 
+	;==============================
+	; rotate D into place
+	;==============================
+
+	lda	#0
+	sta	X_OFFSET
+
+
+
+d_rotate_loop:
+	ldx	X_OFFSET
+
+	lda     d_sprite_x,X
+        sta     CURSOR_X
+
+        lda     d_sprite_y,X
+        sta     CURSOR_Y
+
+	lda	d_sprite_l,X
+	sta	INL
+	lda	d_sprite_h,X
+	sta	INH
+
+	jsr	hgr_draw_sprite
+
 	jsr	wait_until_keypress
 
+	inc	X_OFFSET
+	lda	X_OFFSET
+	cmp	#13
+	bne	d_rotate_loop
+
+
 	;==============================
 	; gradually load in final logo
 	;==============================
@@ -247,3 +278,24 @@ masks_reverse:
 
 .include "erase.s"
 .include "../wait_keypress.s"
+
+.include "graphics/d_sprites.inc"
+
+.include "../hgr_sprite.s"
+
+d_sprite_h:
+	.byte >d11_sprite,>d12_sprite,>d13_sprite
+	.byte >d14_sprite,>d15_sprite,>d16_sprite
+	.byte >d17_sprite,>d18_sprite,>d19_sprite
+d_sprite_l:
+	.byte <d11_sprite,<d12_sprite,<d13_sprite
+	.byte <d14_sprite,<d15_sprite,<d16_sprite
+	.byte <d17_sprite,<d18_sprite,<d19_sprite
+d_sprite_x:
+	.byte	10,10,10
+	.byte	 8, 8, 6
+	.byte	 6, 6, 4
+d_sprite_y:
+	.byte	55,55,55
+	.byte	55,56,56
+	.byte	56,56,56

demos/driven/part20_credits/Makefile

@@ -18,7 +18,7 @@ credits.o:	credits.s vertical_scroll.s \
 	./fonts/font_4am_1x8_data.s \
 	../zp.inc ../hardware.inc ../qload.inc \
 	graphics/guitar_sprites.inc \
-	hgr_sprite.s
+	../hgr_sprite.s
 	ca65 -o credits.o credits.s -l credits.lst
 
 ###

demos/driven/part20_credits/credits.s

@@ -262,7 +262,7 @@ skip_next_text:
 
 	.include	"../vblank.s"
 
-	.include	"hgr_sprite.s"
+	.include	"../hgr_sprite.s"
 
 	.include	"graphics/guitar_sprites.inc"