diff --git a/games/peasant/Makefile b/games/peasant/Makefile index 3cf2b0fd..9adff3fd 100644 --- a/games/peasant/Makefile +++ b/games/peasant/Makefile @@ -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 diff --git a/games/peasant/NOTES b/games/peasant/NOTES index a791bce2..80bce656 100644 --- a/games/peasant/NOTES +++ b/games/peasant/NOTES @@ -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 diff --git a/games/peasant/ending.s b/games/peasant/copy_check.s similarity index 89% rename from games/peasant/ending.s rename to games/peasant/copy_check.s index d87a359c..7e0ac136 100644 --- a/games/peasant/ending.s +++ b/games/peasant/copy_check.s @@ -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 diff --git a/games/peasant/graphics_end/Makefile b/games/peasant/graphics_copy/Makefile similarity index 70% rename from games/peasant/graphics_end/Makefile rename to games/peasant/graphics_copy/Makefile index f27fdbd6..01272808 100644 --- a/games/peasant/graphics_end/Makefile +++ b/games/peasant/graphics_copy/Makefile @@ -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 diff --git a/games/peasant/graphics_end/game_over.png b/games/peasant/graphics_copy/game_over.png similarity index 100% rename from games/peasant/graphics_end/game_over.png rename to games/peasant/graphics_copy/game_over.png diff --git a/games/peasant/graphics_end/trogdor.png b/games/peasant/graphics_copy/trogdor.png similarity index 100% rename from games/peasant/graphics_end/trogdor.png rename to games/peasant/graphics_copy/trogdor.png diff --git a/games/peasant/graphics_intro/Makefile b/games/peasant/graphics_intro/Makefile deleted file mode 100644 index ecf5dcd4..00000000 --- a/games/peasant/graphics_intro/Makefile +++ /dev/null @@ -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 - diff --git a/games/peasant/graphics_vid/Makefile b/games/peasant/graphics_vid/Makefile new file mode 100644 index 00000000..1ed7969d --- /dev/null +++ b/games/peasant/graphics_vid/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: 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 + diff --git a/games/peasant/graphics_intro/title_anim01.png b/games/peasant/graphics_vid/title_anim01.png similarity index 100% rename from games/peasant/graphics_intro/title_anim01.png rename to games/peasant/graphics_vid/title_anim01.png diff --git a/games/peasant/graphics_intro/title_anim02.png b/games/peasant/graphics_vid/title_anim02.png similarity index 100% rename from games/peasant/graphics_intro/title_anim02.png rename to games/peasant/graphics_vid/title_anim02.png diff --git a/games/peasant/graphics_intro/title_anim03.png b/games/peasant/graphics_vid/title_anim03.png similarity index 100% rename from games/peasant/graphics_intro/title_anim03.png rename to games/peasant/graphics_vid/title_anim03.png diff --git a/games/peasant/graphics_intro/title_anim04.png b/games/peasant/graphics_vid/title_anim04.png similarity index 100% rename from games/peasant/graphics_intro/title_anim04.png rename to games/peasant/graphics_vid/title_anim04.png diff --git a/games/peasant/graphics_intro/title_anim05.png b/games/peasant/graphics_vid/title_anim05.png similarity index 100% rename from games/peasant/graphics_intro/title_anim05.png rename to games/peasant/graphics_vid/title_anim05.png diff --git a/games/peasant/graphics_intro/title_anim06.png b/games/peasant/graphics_vid/title_anim06.png similarity index 100% rename from games/peasant/graphics_intro/title_anim06.png rename to games/peasant/graphics_vid/title_anim06.png diff --git a/games/peasant/graphics_intro/title_anim07.png b/games/peasant/graphics_vid/title_anim07.png similarity index 100% rename from games/peasant/graphics_intro/title_anim07.png rename to games/peasant/graphics_vid/title_anim07.png diff --git a/games/peasant/graphics_intro/title_anim08.png b/games/peasant/graphics_vid/title_anim08.png similarity index 100% rename from games/peasant/graphics_intro/title_anim08.png rename to games/peasant/graphics_vid/title_anim08.png diff --git a/games/peasant/graphics_intro/title_anim09.png b/games/peasant/graphics_vid/title_anim09.png similarity index 100% rename from games/peasant/graphics_intro/title_anim09.png rename to games/peasant/graphics_vid/title_anim09.png diff --git a/games/peasant/graphics_intro/title_anim10.png b/games/peasant/graphics_vid/title_anim10.png similarity index 100% rename from games/peasant/graphics_intro/title_anim10.png rename to games/peasant/graphics_vid/title_anim10.png diff --git a/games/peasant/graphics_intro/title_anim11.png b/games/peasant/graphics_vid/title_anim11.png similarity index 100% rename from games/peasant/graphics_intro/title_anim11.png rename to games/peasant/graphics_vid/title_anim11.png diff --git a/games/peasant/graphics_intro/title_anim12.png b/games/peasant/graphics_vid/title_anim12.png similarity index 100% rename from games/peasant/graphics_intro/title_anim12.png rename to games/peasant/graphics_vid/title_anim12.png diff --git a/games/peasant/graphics_intro/title_anim13.png b/games/peasant/graphics_vid/title_anim13.png similarity index 100% rename from games/peasant/graphics_intro/title_anim13.png rename to games/peasant/graphics_vid/title_anim13.png diff --git a/games/peasant/graphics_intro/title_anim14.png b/games/peasant/graphics_vid/title_anim14.png similarity index 100% rename from games/peasant/graphics_intro/title_anim14.png rename to games/peasant/graphics_vid/title_anim14.png diff --git a/games/peasant/graphics_intro/title_anim15.png b/games/peasant/graphics_vid/title_anim15.png similarity index 100% rename from games/peasant/graphics_intro/title_anim15.png rename to games/peasant/graphics_vid/title_anim15.png diff --git a/games/peasant/graphics_intro/title_anim16.png b/games/peasant/graphics_vid/title_anim16.png similarity index 100% rename from games/peasant/graphics_intro/title_anim16.png rename to games/peasant/graphics_vid/title_anim16.png diff --git a/games/peasant/graphics_intro/title_anim17.png b/games/peasant/graphics_vid/title_anim17.png similarity index 100% rename from games/peasant/graphics_intro/title_anim17.png rename to games/peasant/graphics_vid/title_anim17.png diff --git a/games/peasant/graphics_intro/title_anim18.png b/games/peasant/graphics_vid/title_anim18.png similarity index 100% rename from games/peasant/graphics_intro/title_anim18.png rename to games/peasant/graphics_vid/title_anim18.png diff --git a/games/peasant/graphics_intro/title_anim19.png b/games/peasant/graphics_vid/title_anim19.png similarity index 100% rename from games/peasant/graphics_intro/title_anim19.png rename to games/peasant/graphics_vid/title_anim19.png diff --git a/games/peasant/graphics_intro/title_anim20.png b/games/peasant/graphics_vid/title_anim20.png similarity index 100% rename from games/peasant/graphics_intro/title_anim20.png rename to games/peasant/graphics_vid/title_anim20.png diff --git a/games/peasant/graphics_intro/title_anim21.png b/games/peasant/graphics_vid/title_anim21.png similarity index 100% rename from games/peasant/graphics_intro/title_anim21.png rename to games/peasant/graphics_vid/title_anim21.png diff --git a/games/peasant/graphics_intro/title_anim22.png b/games/peasant/graphics_vid/title_anim22.png similarity index 100% rename from games/peasant/graphics_intro/title_anim22.png rename to games/peasant/graphics_vid/title_anim22.png diff --git a/games/peasant/graphics_intro/title_anim23.png b/games/peasant/graphics_vid/title_anim23.png similarity index 100% rename from games/peasant/graphics_intro/title_anim23.png rename to games/peasant/graphics_vid/title_anim23.png diff --git a/games/peasant/graphics_intro/title_anim24.png b/games/peasant/graphics_vid/title_anim24.png similarity index 100% rename from games/peasant/graphics_intro/title_anim24.png rename to games/peasant/graphics_vid/title_anim24.png diff --git a/games/peasant/graphics_intro/title_anim25.png b/games/peasant/graphics_vid/title_anim25.png similarity index 100% rename from games/peasant/graphics_intro/title_anim25.png rename to games/peasant/graphics_vid/title_anim25.png diff --git a/games/peasant/graphics_intro/title_anim26.png b/games/peasant/graphics_vid/title_anim26.png similarity index 100% rename from games/peasant/graphics_intro/title_anim26.png rename to games/peasant/graphics_vid/title_anim26.png diff --git a/games/peasant/graphics_intro/title_anim27.png b/games/peasant/graphics_vid/title_anim27.png similarity index 100% rename from games/peasant/graphics_intro/title_anim27.png rename to games/peasant/graphics_vid/title_anim27.png diff --git a/games/peasant/graphics_intro/title_anim28.png b/games/peasant/graphics_vid/title_anim28.png similarity index 100% rename from games/peasant/graphics_intro/title_anim28.png rename to games/peasant/graphics_vid/title_anim28.png diff --git a/games/peasant/graphics_intro/title_anim29.png b/games/peasant/graphics_vid/title_anim29.png similarity index 100% rename from games/peasant/graphics_intro/title_anim29.png rename to games/peasant/graphics_vid/title_anim29.png diff --git a/games/peasant/graphics_intro/title_anim30.png b/games/peasant/graphics_vid/title_anim30.png similarity index 100% rename from games/peasant/graphics_intro/title_anim30.png rename to games/peasant/graphics_vid/title_anim30.png diff --git a/games/peasant/graphics_intro/title_anim31.png b/games/peasant/graphics_vid/title_anim31.png similarity index 100% rename from games/peasant/graphics_intro/title_anim31.png rename to games/peasant/graphics_vid/title_anim31.png diff --git a/games/peasant/graphics_intro/title_anim32.png b/games/peasant/graphics_vid/title_anim32.png similarity index 100% rename from games/peasant/graphics_intro/title_anim32.png rename to games/peasant/graphics_vid/title_anim32.png diff --git a/games/peasant/graphics_intro/title_anim33.png b/games/peasant/graphics_vid/title_anim33.png similarity index 100% rename from games/peasant/graphics_intro/title_anim33.png rename to games/peasant/graphics_vid/title_anim33.png diff --git a/games/peasant/graphics_intro/title_anim34.png b/games/peasant/graphics_vid/title_anim34.png similarity index 100% rename from games/peasant/graphics_intro/title_anim34.png rename to games/peasant/graphics_vid/title_anim34.png diff --git a/games/peasant/graphics_intro/videlectrix.png b/games/peasant/graphics_vid/videlectrix.png similarity index 100% rename from games/peasant/graphics_intro/videlectrix.png rename to games/peasant/graphics_vid/videlectrix.png diff --git a/games/peasant/intro.s b/games/peasant/vid_logo.s similarity index 98% rename from games/peasant/intro.s rename to games/peasant/vid_logo.s index 3d25c9e9..04e552f5 100644 --- a/games/peasant/intro.s +++ b/games/peasant/vid_logo.s @@ -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"