peasant: re-arrange stuff in case I make this actually playable

This commit is contained in:
Vince Weaver 2021-08-14 14:04:46 -04:00
parent 80747fd82d
commit b6b89d4e44
44 changed files with 105 additions and 100 deletions

View File

@ -8,17 +8,17 @@ EMPTY_DISK = ../../empty_disk
all: peasant.dsk
peasant.dsk: QBOOT QLOAD INTRO TITLE PEASANT ENDING
peasant.dsk: QBOOT QLOAD VID_LOGO TITLE PEASANT COPY_CHECK
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 INTRO 0 0
$(DOS33_RAW) peasant.dsk 3 0 VID_LOGO 0 0
$(DOS33_RAW) peasant.dsk 10 0 TITLE 0 0
$(DOS33_RAW) peasant.dsk 17 0 PEASANT 0 0
$(DOS33_RAW) peasant.dsk 24 0 ENDING 0 0
$(DOS33_RAW) peasant.dsk 24 0 COPY_CHECK 0 0
###
@ -45,12 +45,12 @@ qload.o: qload.s qboot.inc
###
INTRO: intro.o
ld65 -o INTRO intro.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
VID_LOGO: intro.o
ld65 -o VID_LOGO intro.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
intro.o: intro.s decompress_fast_v2.s hgr_overlay.s \
graphics_intro/intro_graphics.inc
ca65 -o intro.o intro.s -l intro.lst
intro.o: vid_logo.s decompress_fast_v2.s hgr_overlay.s \
graphics_vid/vid_graphics.inc
ca65 -o intro.o vid_logo.s -l intro.lst
###
@ -73,20 +73,19 @@ peasant.o: peasant.s graphics/graphics.inc sprites/peasant_sprite.inc \
hgr_7x30_sprite.s hgr_1x5_sprite.s hgr_save_restore.s \
wait_a_bit.s draw_peasant.s \
title.s directions.s \
cottage.s lake_w.s lake_e.s river.s knight.s \
ending.s
cottage.s lake_w.s lake_e.s river.s knight.s
ca65 -o peasant.o peasant.s -l peasant.lst
###
ENDING: ending.o
ld65 -o ENDING ending.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
COPY_CHECK: copy_check.o
ld65 -o COPY_CHECK copy_check.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
ending.o: ending.s graphics_end/end_graphics.inc \
copy_check.o: copy_check.s graphics_copy/copy_graphics.inc \
hgr_input.s \
draw_box.s hgr_rectangle.s hgr_font.s \
ending.s
ca65 -o ending.o ending.s -l ending.lst
copy_check.s
ca65 -o copy_check.o copy_check.s -l copy_check.lst
###
@ -100,8 +99,8 @@ font_test.o: font_test.s hgr_font.s hgr_1x8_sprite.s
####
graphics_intro/intro_graphics.inc:
cd graphics_intro && make
graphics_vid/vid_graphics.inc:
cd graphics_vid && make
graphics_title/title_graphics.inc:
cd graphics_title && make
@ -110,12 +109,12 @@ graphics_title/title_graphics.inc:
graphics/graphics.inc:
cd graphics && make
graphics_end/end_graphics.inc:
cd graphics_end && make
graphics_copy/copy_graphics.inc:
cd graphics_copy && make
###
clean:
rm -f *~ *.o *.lst HELLO INTRO TITLE PEASANT ENDING
rm -f *~ *.o *.lst HELLO VID_LOGO TITLE PEASANT COPY_CHECK

View File

@ -21,7 +21,7 @@ Disk Map (disk has 35 tracks, each 4k in size)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
T 0 = Qboot
T 1 = QLOAD 4301 bytes 17S = 1T1S
T 3 = INTRO 10422 bytes 41S = 2T9S
T 3 = INTRO 6911 bytes 27S = 1T11S
T 10 = TITLE 9662 bytes 38S = 2T16S
T 17 = PEASANT 14265 bytes 56S = 3T8S
T 24 = ENDING 4642 bytes 18S = 1T2S

View File

@ -1,3 +1,10 @@
; Fake copy protection check
; As Strongbad Actual pointed out, this is anachronistic
; though if that's what you're worried about maybe you
; shouldn't be playing Peasant's Quest
; o/~ Bread is a good time for me o/~
; by Vince `deater` Weaver vince@deater.net
@ -10,7 +17,7 @@
; Ending
;************************
ending:
copy_check:
jsr hgr_make_tables
@ -110,7 +117,7 @@ forever:
.include "hgr_input.s"
.include "hgr_tables.s"
.include "graphics_end/end_graphics.inc"
.include "graphics_copy/copy_graphics.inc"
peasant_text:
.byte 25,2,"Peasant's Quest",0

View File

@ -5,14 +5,14 @@ PNG2HGR = ../../../utils/hgr-utils/png2hgr
LZSA = ~/research/lzsa/lzsa/lzsa
B2D = ../../../utils/bmp2dhr/b2d
all: end_graphics.inc
all: copy_graphics.inc
end_graphics.inc: \
copy_graphics.inc: \
trogdor.lzsa \
game_over.lzsa
echo "trogdor_lzsa: .incbin \"trogdor.lzsa\"" > end_graphics.inc
echo "game_over_lzsa: .incbin \"game_over.lzsa\"" >> end_graphics.inc
echo "trogdor_lzsa: .incbin \"trogdor.lzsa\"" > copy_graphics.inc
echo "game_over_lzsa: .incbin \"game_over.lzsa\"" >> copy_graphics.inc
###
@ -38,5 +38,5 @@ game_over.hgr: game_over.png
clean:
rm -f *~ end_graphics.inc *.lzsa *.gr *.hgr
rm -f *~ copy_graphics.inc *.lzsa *.gr *.hgr

View File

Before

Width:  |  Height:  |  Size: 957 B

After

Width:  |  Height:  |  Size: 957 B

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

@ -1,70 +0,0 @@
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

View File

@ -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: vid_graphics.inc
vid_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\"" > vid_graphics.inc
# echo "title_anim01_lzsa: .incbin \"title_anim01.lzsa\"" >> vid_graphics.inc
echo "title_anim02_lzsa: .incbin \"title_anim02.lzsa\"" >> vid_graphics.inc
echo "title_anim03_lzsa: .incbin \"title_anim03.lzsa\"" >> vid_graphics.inc
# echo "title_anim04_lzsa: .incbin \"title_anim04.lzsa\"" >> vid_graphics.inc
echo "title_anim05_lzsa: .incbin \"title_anim05.lzsa\"" >> vid_graphics.inc
# echo "title_anim06_lzsa: .incbin \"title_anim06.lzsa\"" >> vid_graphics.inc
echo "title_anim07_lzsa: .incbin \"title_anim07.lzsa\"" >> vid_graphics.inc
# echo "title_anim08_lzsa: .incbin \"title_anim08.lzsa\"" >> vid_graphics.inc
echo "title_anim09_lzsa: .incbin \"title_anim09.lzsa\"" >> vid_graphics.inc
# echo "title_anim10_lzsa: .incbin \"title_anim10.lzsa\"" >> vid_graphics.inc
echo "title_anim11_lzsa: .incbin \"title_anim11.lzsa\"" >> vid_graphics.inc
# echo "title_anim12_lzsa: .incbin \"title_anim12.lzsa\"" >> vid_graphics.inc
echo "title_anim13_lzsa: .incbin \"title_anim13.lzsa\"" >> vid_graphics.inc
# echo "title_anim14_lzsa: .incbin \"title_anim14.lzsa\"" >> vid_graphics.inc
echo "title_anim15_lzsa: .incbin \"title_anim15.lzsa\"" >> vid_graphics.inc
# echo "title_anim16_lzsa: .incbin \"title_anim16.lzsa\"" >> vid_graphics.inc
echo "title_anim17_lzsa: .incbin \"title_anim17.lzsa\"" >> vid_graphics.inc
# echo "title_anim18_lzsa: .incbin \"title_anim18.lzsa\"" >> vid_graphics.inc
echo "title_anim19_lzsa: .incbin \"title_anim19.lzsa\"" >> vid_graphics.inc
# echo "title_anim20_lzsa: .incbin \"title_anim20.lzsa\"" >> vid_graphics.inc
echo "title_anim21_lzsa: .incbin \"title_anim21.lzsa\"" >> vid_graphics.inc
# echo "title_anim22_lzsa: .incbin \"title_anim22.lzsa\"" >> vid_graphics.inc
echo "title_anim23_lzsa: .incbin \"title_anim23.lzsa\"" >> vid_graphics.inc
# echo "title_anim24_lzsa: .incbin \"title_anim24.lzsa\"" >> vid_graphics.inc
echo "title_anim25_lzsa: .incbin \"title_anim25.lzsa\"" >> vid_graphics.inc
# echo "title_anim26_lzsa: .incbin \"title_anim26.lzsa\"" >> vid_graphics.inc
echo "title_anim27_lzsa: .incbin \"title_anim27.lzsa\"" >> vid_graphics.inc
# echo "title_anim28_lzsa: .incbin \"title_anim28.lzsa\"" >> vid_graphics.inc
echo "title_anim29_lzsa: .incbin \"title_anim29.lzsa\"" >> vid_graphics.inc
echo "title_anim30_lzsa: .incbin \"title_anim30.lzsa\"" >> vid_graphics.inc
echo "title_anim31_lzsa: .incbin \"title_anim31.lzsa\"" >> vid_graphics.inc
echo "title_anim32_lzsa: .incbin \"title_anim32.lzsa\"" >> vid_graphics.inc
echo "title_anim33_lzsa: .incbin \"title_anim33.lzsa\"" >> vid_graphics.inc
echo "title_anim34_lzsa: .incbin \"title_anim34.lzsa\"" >> vid_graphics.inc
%.hgr: %.png
$(PNG2HGR) $< > $@
%.lzsa: %.hgr
$(LZSA) -r -f2 $< $@
###
clean:
rm -f *~ outline.inc *.lzsa *.gr *.hgr

View File

Before

Width:  |  Height:  |  Size: 659 B

After

Width:  |  Height:  |  Size: 659 B

View File

Before

Width:  |  Height:  |  Size: 695 B

After

Width:  |  Height:  |  Size: 695 B

View File

Before

Width:  |  Height:  |  Size: 780 B

After

Width:  |  Height:  |  Size: 780 B

View File

Before

Width:  |  Height:  |  Size: 776 B

After

Width:  |  Height:  |  Size: 776 B

View File

Before

Width:  |  Height:  |  Size: 804 B

After

Width:  |  Height:  |  Size: 804 B

View File

Before

Width:  |  Height:  |  Size: 818 B

After

Width:  |  Height:  |  Size: 818 B

View File

Before

Width:  |  Height:  |  Size: 813 B

After

Width:  |  Height:  |  Size: 813 B

View File

Before

Width:  |  Height:  |  Size: 826 B

After

Width:  |  Height:  |  Size: 826 B

View File

Before

Width:  |  Height:  |  Size: 792 B

After

Width:  |  Height:  |  Size: 792 B

View File

Before

Width:  |  Height:  |  Size: 802 B

After

Width:  |  Height:  |  Size: 802 B

View File

Before

Width:  |  Height:  |  Size: 785 B

After

Width:  |  Height:  |  Size: 785 B

View File

Before

Width:  |  Height:  |  Size: 791 B

After

Width:  |  Height:  |  Size: 791 B

View File

Before

Width:  |  Height:  |  Size: 775 B

After

Width:  |  Height:  |  Size: 775 B

View File

Before

Width:  |  Height:  |  Size: 773 B

After

Width:  |  Height:  |  Size: 773 B

View File

Before

Width:  |  Height:  |  Size: 839 B

After

Width:  |  Height:  |  Size: 839 B

View File

Before

Width:  |  Height:  |  Size: 830 B

After

Width:  |  Height:  |  Size: 830 B

View File

Before

Width:  |  Height:  |  Size: 876 B

After

Width:  |  Height:  |  Size: 876 B

View File

Before

Width:  |  Height:  |  Size: 879 B

After

Width:  |  Height:  |  Size: 879 B

View File

Before

Width:  |  Height:  |  Size: 857 B

After

Width:  |  Height:  |  Size: 857 B

View File

Before

Width:  |  Height:  |  Size: 851 B

After

Width:  |  Height:  |  Size: 851 B

View File

Before

Width:  |  Height:  |  Size: 837 B

After

Width:  |  Height:  |  Size: 837 B

View File

Before

Width:  |  Height:  |  Size: 835 B

After

Width:  |  Height:  |  Size: 835 B

View File

Before

Width:  |  Height:  |  Size: 799 B

After

Width:  |  Height:  |  Size: 799 B

View File

Before

Width:  |  Height:  |  Size: 803 B

After

Width:  |  Height:  |  Size: 803 B

View File

Before

Width:  |  Height:  |  Size: 790 B

After

Width:  |  Height:  |  Size: 790 B

View File

Before

Width:  |  Height:  |  Size: 788 B

After

Width:  |  Height:  |  Size: 788 B

View File

Before

Width:  |  Height:  |  Size: 767 B

After

Width:  |  Height:  |  Size: 767 B

View File

Before

Width:  |  Height:  |  Size: 768 B

After

Width:  |  Height:  |  Size: 768 B

View File

Before

Width:  |  Height:  |  Size: 834 B

After

Width:  |  Height:  |  Size: 834 B

View File

Before

Width:  |  Height:  |  Size: 889 B

After

Width:  |  Height:  |  Size: 889 B

View File

Before

Width:  |  Height:  |  Size: 834 B

After

Width:  |  Height:  |  Size: 834 B

View File

Before

Width:  |  Height:  |  Size: 825 B

After

Width:  |  Height:  |  Size: 825 B

View File

Before

Width:  |  Height:  |  Size: 737 B

After

Width:  |  Height:  |  Size: 737 B

View File

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 727 B

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -244,9 +244,8 @@ delays:
.include "decompress_fast_v2.s"
;.include "decompress_overlay.s"
.include "hgr_overlay.s"
;.include "wait_keypress.s"
.include "graphics_intro/intro_graphics.inc"
.include "graphics_vid/vid_graphics.inc"