peasant: add opening animation

games/peasant/Makefile

@@ -8,14 +8,15 @@ EMPTY_DISK = ../../empty_disk
 
 all:	peasant.dsk
 
-peasant.dsk:	QBOOT QLOAD PEASANT
+peasant.dsk:	QBOOT QLOAD INTRO PEASANT
 	cp $(EMPTY_DISK)/empty.dsk peasant.dsk
 #	$(DOS33) -y peasant.dsk BSAVE -a 0x6000 PEASANT
 	$(DOS33_RAW) peasant.dsk  0  0 QBOOT      0   1
 	$(DOS33_RAW) peasant.dsk  0  2 QBOOT      1   1
 	$(DOS33_RAW) peasant.dsk  0  4 QBOOT      2   1
 	$(DOS33_RAW) peasant.dsk  1  0 QLOAD      0   0
-	$(DOS33_RAW) peasant.dsk  3  0 PEASANT    0   0
+	$(DOS33_RAW) peasant.dsk  3  0 INTRO      0   0
+#	$(DOS33_RAW) peasant.dsk  3  0 PEASANT    0   0
 
 ###
 
@@ -42,6 +43,14 @@ qload.o:	qload.s qboot.inc
 
 ###
 
+INTRO:	intro.o
+	ld65 -o INTRO intro.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
+
+intro.o:	intro.s graphics_intro/intro_graphics.inc
+	ca65 -o intro.o intro.s -l intro.lst
+
+###
+
 PEASANT:	peasant.o
 	ld65 -o PEASANT peasant.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
 

games/peasant/graphics/Makefile

@@ -9,7 +9,6 @@ all:	graphics.inc
 
 
 graphics.inc:	\
-	videlectrix.lzsa \
 	peasant_title.lzsa \
 	tips.lzsa \
 	cottage.lzsa \
@@ -17,8 +16,7 @@ graphics.inc:	\
 	lake_w.lzsa \
 	river.lzsa \
 	knight.lzsa
-	echo "videlectrix_lzsa: .incbin \"videlectrix.lzsa\"" > graphics.inc
-	echo "title_lzsa: .incbin \"peasant_title.lzsa\"" >> graphics.inc
+	echo "title_lzsa: .incbin \"peasant_title.lzsa\"" > graphics.inc
 	echo "tips_lzsa: .incbin \"tips.lzsa\"" >> graphics.inc
 	echo "cottage_lzsa: .incbin \"cottage.lzsa\"" >> graphics.inc
 	echo "lake_w_lzsa: .incbin \"lake_w.lzsa\"" >> graphics.inc

games/peasant/graphics_intro/Makefile

@@ -0,0 +1,70 @@
+
+PNG2RLE = ../../../utils/gr-utils/png2rle
+PNG2GR = ../../../utils/gr-utils/png2gr
+PNG2HGR = ../../../utils/hgr-utils/png2hgr
+LZSA = ~/research/lzsa/lzsa/lzsa
+B2D = ../../../utils/bmp2dhr/b2d
+
+all:	intro_graphics.inc
+
+intro_graphics.inc:	\
+	videlectrix.lzsa \
+	title_anim01.lzsa title_anim02.lzsa title_anim03.lzsa \
+	title_anim04.lzsa title_anim05.lzsa title_anim06.lzsa \
+	title_anim07.lzsa title_anim08.lzsa title_anim09.lzsa \
+	title_anim10.lzsa title_anim11.lzsa title_anim12.lzsa \
+	title_anim13.lzsa title_anim14.lzsa title_anim15.lzsa \
+	title_anim16.lzsa title_anim17.lzsa title_anim18.lzsa \
+	title_anim19.lzsa title_anim20.lzsa title_anim21.lzsa \
+	title_anim22.lzsa title_anim23.lzsa title_anim24.lzsa \
+	title_anim25.lzsa title_anim26.lzsa title_anim27.lzsa \
+	title_anim28.lzsa title_anim29.lzsa title_anim30.lzsa \
+	title_anim31.lzsa title_anim32.lzsa title_anim33.lzsa \
+	title_anim34.lzsa
+	echo "videlectrix_lzsa: .incbin \"videlectrix.lzsa\"" > intro_graphics.inc
+	echo "title_anim01_lzsa: .incbin \"title_anim01.lzsa\"" >> intro_graphics.inc
+	echo "title_anim02_lzsa: .incbin \"title_anim02.lzsa\"" >> intro_graphics.inc
+	echo "title_anim03_lzsa: .incbin \"title_anim03.lzsa\"" >> intro_graphics.inc
+	echo "title_anim04_lzsa: .incbin \"title_anim04.lzsa\"" >> intro_graphics.inc
+	echo "title_anim05_lzsa: .incbin \"title_anim05.lzsa\"" >> intro_graphics.inc
+	echo "title_anim06_lzsa: .incbin \"title_anim06.lzsa\"" >> intro_graphics.inc
+	echo "title_anim07_lzsa: .incbin \"title_anim07.lzsa\"" >> intro_graphics.inc
+	echo "title_anim08_lzsa: .incbin \"title_anim08.lzsa\"" >> intro_graphics.inc
+	echo "title_anim09_lzsa: .incbin \"title_anim09.lzsa\"" >> intro_graphics.inc
+	echo "title_anim10_lzsa: .incbin \"title_anim10.lzsa\"" >> intro_graphics.inc
+	echo "title_anim11_lzsa: .incbin \"title_anim11.lzsa\"" >> intro_graphics.inc
+	echo "title_anim12_lzsa: .incbin \"title_anim12.lzsa\"" >> intro_graphics.inc
+	echo "title_anim13_lzsa: .incbin \"title_anim13.lzsa\"" >> intro_graphics.inc
+	echo "title_anim14_lzsa: .incbin \"title_anim14.lzsa\"" >> intro_graphics.inc
+	echo "title_anim15_lzsa: .incbin \"title_anim15.lzsa\"" >> intro_graphics.inc
+	echo "title_anim16_lzsa: .incbin \"title_anim16.lzsa\"" >> intro_graphics.inc
+	echo "title_anim17_lzsa: .incbin \"title_anim17.lzsa\"" >> intro_graphics.inc
+	echo "title_anim18_lzsa: .incbin \"title_anim18.lzsa\"" >> intro_graphics.inc
+	echo "title_anim19_lzsa: .incbin \"title_anim19.lzsa\"" >> intro_graphics.inc
+	echo "title_anim20_lzsa: .incbin \"title_anim20.lzsa\"" >> intro_graphics.inc
+	echo "title_anim21_lzsa: .incbin \"title_anim21.lzsa\"" >> intro_graphics.inc
+	echo "title_anim22_lzsa: .incbin \"title_anim22.lzsa\"" >> intro_graphics.inc
+	echo "title_anim23_lzsa: .incbin \"title_anim23.lzsa\"" >> intro_graphics.inc
+	echo "title_anim24_lzsa: .incbin \"title_anim24.lzsa\"" >> intro_graphics.inc
+	echo "title_anim25_lzsa: .incbin \"title_anim25.lzsa\"" >> intro_graphics.inc
+	echo "title_anim26_lzsa: .incbin \"title_anim26.lzsa\"" >> intro_graphics.inc
+	echo "title_anim27_lzsa: .incbin \"title_anim27.lzsa\"" >> intro_graphics.inc
+	echo "title_anim28_lzsa: .incbin \"title_anim28.lzsa\"" >> intro_graphics.inc
+	echo "title_anim29_lzsa: .incbin \"title_anim29.lzsa\"" >> intro_graphics.inc
+	echo "title_anim30_lzsa: .incbin \"title_anim30.lzsa\"" >> intro_graphics.inc
+	echo "title_anim31_lzsa: .incbin \"title_anim31.lzsa\"" >> intro_graphics.inc
+	echo "title_anim32_lzsa: .incbin \"title_anim32.lzsa\"" >> intro_graphics.inc
+	echo "title_anim33_lzsa: .incbin \"title_anim33.lzsa\"" >> intro_graphics.inc
+	echo "title_anim34_lzsa: .incbin \"title_anim34.lzsa\"" >> intro_graphics.inc
+
+%.hgr:	%.png
+	$(PNG2HGR) $< > $@
+
+%.lzsa:	%.hgr
+	$(LZSA) -r -f2 $< $@
+
+###
+
+clean:	
+	rm -f *~ outline.inc *.lzsa *.gr *.hgr
+

games/peasant/intro.s

@@ -0,0 +1,57 @@
+; Videlectrix Intro
+
+; HGR is a pain
+
+; by Vince `deater` Weaver	vince@deater.net
+
+; with apologies to everyone
+
+.include "hardware.inc"
+
+NIBCOUNT	= $09
+GBASL		= $26
+GBASH		= $27
+CURSOR_X	= $62
+CURSOR_Y	= $63
+HGR_COLOR	= $E4
+P0      = $F1
+P1      = $F2
+P2      = $F3
+P3      = $F4
+P4      = $F5
+P5      = $F6
+
+INL		= $FC
+INH		= $FD
+OUTL		= $FE
+OUTH		= $FF
+
+
+
+hgr_display:
+	jsr	HGR2		; Hi-res graphics, no text at bottom
+				; Y=0, A=0 after this called
+
+	;************************
+	; Opening
+	;************************
+
+	lda	#<(videlectrix_lzsa)
+	sta	getsrc_smc+1
+	lda	#>(videlectrix_lzsa)
+	sta	getsrc_smc+2
+
+	lda	#$40
+
+	jsr	decompress_lzsa2_fast
+
+	jsr	wait_until_keypress
+
+forever:
+	jmp	forever
+
+
+.include "decompress_fast_v2.s"
+.include "wait_keypress.s"
+
+.include "graphics_intro/intro_graphics.inc"

games/peasant/peasant.s

@@ -30,21 +30,6 @@ hgr_display:
 	jsr	HGR2		; Hi-res graphics, no text at bottom
 				; Y=0, A=0 after this called
 
-	;************************
-	; Opening
-	;************************
-
-	lda	#<(videlectrix_lzsa)
-	sta	getsrc_smc+1
-	lda	#>(videlectrix_lzsa)
-	sta	getsrc_smc+2
-
-	lda	#$40
-
-	jsr	decompress_lzsa2_fast
-
-	jsr	wait_until_keypress
-
 	;************************
 	; Title
 	;************************
@@ -92,27 +77,11 @@ hgr_display:
 
 	jsr	river
 
-.if 0
-
-
-
-
 	;************************
 	; Knight
 	;************************
 
-	lda	#<(knight_lzsa)
-	sta	getsrc_smc+1
-	lda	#>(knight_lzsa)
-	sta	getsrc_smc+2
-
-	lda	#$40
-
-	jsr	decompress_lzsa2_fast
-
-	jsr	wait_until_keypress
-
-.endif
+	jsr knight
 
 forever:
 	jmp	forever
@@ -126,7 +95,7 @@ forever:
 .include "lake_w.s"
 .include "lake_e.s"
 .include "river.s"
-
+.include "knight.s"
 
 .include "hgr_font.s"