driven: try to add catherine and moiety sprites

tiny Apple II sprites are a pain

demos/driven/part20_credits/Makefile

@@ -18,6 +18,8 @@ credits.o:	credits.s vertical_scroll.s \
 	./fonts/font_4am_1x8_data.s \
 	../zp.inc ../hardware.inc ../qload.inc ../common_defines.inc \
 	graphics/guitar_sprites.inc \
+	graphics/moiety1_sprites.inc \
+	graphics/moiety2_sprites.inc \
 	graphics/other_sprites.inc \
 	../hgr_sprite.s
 	ca65 -o credits.o credits.s -l credits.lst

demos/driven/part20_credits/credits.s

@@ -201,12 +201,12 @@ draw_sprites:
 
 
 	;===========================
-	; keeper1
+	; catherine
 
 	lda	GUITAR_FRAME
 	and	#$1f
 	tax
-	lda	keeper1_pattern,X
+	lda	catherine_pattern,X
 	tax
 
 
@@ -216,20 +216,20 @@ draw_sprites:
 	lda	#160
 	sta	CURSOR_Y
 
-	lda	keeper_l,X
+	lda	moiety_l,X
 	sta	INL
-	lda	keeper_h,X
+	lda	moiety_h,X
 	sta	INH
 
 	jsr	hgr_draw_sprite
 
 	;====================
-	; keeper2
+	; moiety2
 
 	lda	GUITAR_FRAME
 	and	#$1f
 	tax
-	lda	keeper2_pattern,X
+	lda	moiety2_pattern,X
 	tax
 
 
@@ -239,9 +239,9 @@ draw_sprites:
 	lda	#160
 	sta	CURSOR_Y
 
-	lda	keeper_l,X
+	lda	moiety_l,X
 	sta	INL
-	lda	keeper_h,X
+	lda	moiety_h,X
 	sta	INH
 
 	jsr	hgr_draw_sprite
@@ -395,32 +395,32 @@ guitar_l:
 guitar_h:
 	.byte >guitar0,>guitar1,>guitar2
 
-	.include	"graphics/keeper1_sprites.inc"
+	.include	"graphics/catherine_sprites.inc"
-	.include	"graphics/keeper2_sprites.inc"
+	.include	"graphics/moiety2_sprites.inc"
 
-keeper_l:
+moiety_l:
-	.byte <keeper_r0,<keeper_r1,<keeper_r2
+	.byte <moiety_r0,<moiety_r1,<moiety_r2
-	.byte <keeper_r3,<keeper_r4,<keeper_r5
+	.byte <moiety_r3,<moiety_r4,<moiety_r5
-	.byte <keeper_r6,<keeper_r7
+	.byte <moiety_r6,<moiety_r7
-	.byte <keeper_l0,<keeper_l1,<keeper_l2
+	.byte <moiety_l0,<moiety_l1,<moiety_l2
-	.byte <keeper_l3,<keeper_l4,<keeper_l5
+	.byte <moiety_l3,<moiety_l4,<moiety_l5
-	.byte <keeper_l6,<keeper_l7
+	.byte <moiety_l6,<moiety_l7
 
-keeper_h:
+moiety_h:
-	.byte >keeper_r0,>keeper_r1,>keeper_r2
+	.byte >moiety_r0,>moiety_r1,>moiety_r2
-	.byte >keeper_r3,>keeper_r4,>keeper_r5
+	.byte >moiety_r3,>moiety_r4,>moiety_r5
-	.byte >keeper_r6,>keeper_r7
+	.byte >moiety_r6,>moiety_r7
-	.byte >keeper_l0,>keeper_l1,>keeper_l2
+	.byte >moiety_l0,>moiety_l1,>moiety_l2
-	.byte >keeper_l3,>keeper_l4,>keeper_l5
+	.byte >moiety_l3,>moiety_l4,>moiety_l5
-	.byte >keeper_l6,>keeper_l7
+	.byte >moiety_l6,>moiety_l7
 
-keeper1_pattern:
+catherine_pattern:
 .byte 1,1,2,2,1,1,2,2
 .byte 1,2,3,4,5,4,3,4
 .byte 5,4,3,4,5,6,7,5
 .byte 7,6,5,4,3,2,1,2
 
-keeper2_pattern:
+moiety2_pattern:
 .byte 1+8,1+8,2+8,2+8,1+8,1+8,2+8,2+8
 .byte 1+8,2+8,3+8,4+8,5+8,4+8,3+8,4+8
 .byte 5+8,4+8,3+8,4+8,5+8,6+8,7+8,5+8

demos/driven/part20_credits/graphics/Makefile

@@ -1,9 +1,9 @@
 
 HGR_SPRITE = ../../../../utils/hgr-utils/hgr_make_sprite
 
-all:	keeper1_sprites.inc \
+all:	moiety1_sprites.inc \
-	keeper2_sprites.inc guitar_sprites.inc \
+	moiety2_sprites.inc guitar_sprites.inc \
-	other_sprites.inc
+	other_sprites.inc catherine_sprites.inc
 
 other_sprites.inc:	other_sprites.png
 	$(HGR_SPRITE) -s -l star0_sprite other_sprites.png  0 0  13 1 > other_sprites.inc
@@ -37,27 +37,36 @@ other_sprites.inc:	other_sprites.png
 
 
 
+catherine_sprites.inc:	catherine_sprites.png
+	$(HGR_SPRITE) -s -l moiety_r0 catherine_sprites.png  14 128  27 156 > catherine_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r1 catherine_sprites.png  42 128  62 156 >> catherine_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r2 catherine_sprites.png  70 128  90 156 >> catherine_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r3 catherine_sprites.png  98 128 118 156 >> catherine_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r4 catherine_sprites.png 126 128 146 156 >> catherine_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r5 catherine_sprites.png 154 128 174 156 >> catherine_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r6 catherine_sprites.png 182 128 202 156 >> catherine_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r7 catherine_sprites.png 210 128 230 156 >> catherine_sprites.inc
 
 
-keeper1_sprites.inc:	keeper1_sprites.png
+moiety1_sprites.inc:	moiety1_sprites.png
-	$(HGR_SPRITE) -s -l keeper_r0 keeper1_sprites.png  14 128  27 156 > keeper1_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r0 moiety1_sprites.png  14 128  27 156 > moiety1_sprites.inc
-	$(HGR_SPRITE) -s -l keeper_r1 keeper1_sprites.png  42 128  62 156 >> keeper1_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r1 moiety1_sprites.png  42 128  62 156 >> moiety1_sprites.inc
-	$(HGR_SPRITE) -s -l keeper_r2 keeper1_sprites.png  70 128  90 156 >> keeper1_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r2 moiety1_sprites.png  70 128  90 156 >> moiety1_sprites.inc
-	$(HGR_SPRITE) -s -l keeper_r3 keeper1_sprites.png  98 128 118 156 >> keeper1_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r3 moiety1_sprites.png  98 128 118 156 >> moiety1_sprites.inc
-	$(HGR_SPRITE) -s -l keeper_r4 keeper1_sprites.png 126 128 146 156 >> keeper1_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r4 moiety1_sprites.png 126 128 146 156 >> moiety1_sprites.inc
-	$(HGR_SPRITE) -s -l keeper_r5 keeper1_sprites.png 154 128 174 156 >> keeper1_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r5 moiety1_sprites.png 154 128 174 156 >> moiety1_sprites.inc
-	$(HGR_SPRITE) -s -l keeper_r6 keeper1_sprites.png 182 128 202 156 >> keeper1_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r6 moiety1_sprites.png 182 128 202 156 >> moiety1_sprites.inc
-	$(HGR_SPRITE) -s -l keeper_r7 keeper1_sprites.png 210 128 230 156 >> keeper1_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_r7 moiety1_sprites.png 210 128 230 156 >> moiety1_sprites.inc
 
-keeper2_sprites.inc:	keeper2_sprites.png
+moiety2_sprites.inc:	moiety2_sprites.png
-	$(HGR_SPRITE) -s -l keeper_l0 keeper2_sprites.png  14 128  34 156 > keeper2_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_l0 moiety2_sprites.png  14 128  34 156 > moiety2_sprites.inc
-	$(HGR_SPRITE) -s -l keeper_l1 keeper2_sprites.png  42 128  62 156 >> keeper2_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_l1 moiety2_sprites.png  42 128  62 156 >> moiety2_sprites.inc
-	$(HGR_SPRITE) -s -l keeper_l2 keeper2_sprites.png  70 128  90 156 >> keeper2_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_l2 moiety2_sprites.png  70 128  90 156 >> moiety2_sprites.inc
-	$(HGR_SPRITE) -s -l keeper_l3 keeper2_sprites.png  98 128 118 156 >> keeper2_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_l3 moiety2_sprites.png  98 128 118 156 >> moiety2_sprites.inc
-	$(HGR_SPRITE) -s -l keeper_l4 keeper2_sprites.png 126 128 146 156 >> keeper2_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_l4 moiety2_sprites.png 126 128 146 156 >> moiety2_sprites.inc
-	$(HGR_SPRITE) -s -l keeper_l5 keeper2_sprites.png 154 128 174 156 >> keeper2_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_l5 moiety2_sprites.png 154 128 174 156 >> moiety2_sprites.inc
-	$(HGR_SPRITE) -s -l keeper_l6 keeper2_sprites.png 182 128 202 156 >> keeper2_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_l6 moiety2_sprites.png 182 128 202 156 >> moiety2_sprites.inc
-	$(HGR_SPRITE) -s -l keeper_l7 keeper2_sprites.png 210 128 230 156 >> keeper2_sprites.inc
+	$(HGR_SPRITE) -s -l moiety_l7 moiety2_sprites.png 210 128 230 156 >> moiety2_sprites.inc
 
 guitar_sprites.inc:	guitar_sprites.png
 	$(HGR_SPRITE) -s -l guitar0 guitar_sprites.png  14  32  41 62 > guitar_sprites.inc
@@ -69,8 +78,6 @@ guitar_sprites.inc:	guitar_sprites.png
 
 
 clean:
-	rm -f *~ \
+	rm -f *~ *.inc
-		keeper1_sprites.inc \
+
-		keeper2_sprites.inc guitar_sprites.inc \
-		other_sprites.inc