From c0cf1ce1de4f7c109b55a85be5788e9b225923d8 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 19 Sep 2024 13:02:33 -0400 Subject: [PATCH] peasant: move some more files around --- games/peasant/Makefile | 59 ++++-------------- games/peasant/TODO | 6 ++ games/peasant/{ => music}/duet.s | 0 .../pt3_lib_mockingboard_patch.s | 0 .../{ => ssi263}/ssi263_simple_speech.s | 0 games/peasant/{ => title}/directions.s | 0 .../{ => title}/graphics_title/Makefile | 0 .../{ => title}/graphics_title/altfire.inc | 0 .../graphics_title/peasant_title.png | Bin .../graphics_title/peasant_title_altfire.png | Bin .../graphics_title/peasant_title_trogfree.png | Bin .../{ => title}/graphics_title/tips.png | Bin games/peasant/{ => title}/title.s | 24 +++---- games/peasant/trogdor.s | 2 +- 14 files changed, 28 insertions(+), 63 deletions(-) rename games/peasant/{ => music}/duet.s (100%) rename games/peasant/{ => pt3_lib}/pt3_lib_mockingboard_patch.s (100%) rename games/peasant/{ => ssi263}/ssi263_simple_speech.s (100%) rename games/peasant/{ => title}/directions.s (100%) rename games/peasant/{ => title}/graphics_title/Makefile (100%) rename games/peasant/{ => title}/graphics_title/altfire.inc (100%) rename games/peasant/{ => title}/graphics_title/peasant_title.png (100%) rename games/peasant/{ => title}/graphics_title/peasant_title_altfire.png (100%) rename games/peasant/{ => title}/graphics_title/peasant_title_trogfree.png (100%) rename games/peasant/{ => title}/graphics_title/tips.png (100%) rename games/peasant/{ => title}/title.s (93%) diff --git a/games/peasant/Makefile b/games/peasant/Makefile index 68cf1276..52dff84b 100644 --- a/games/peasant/Makefile +++ b/games/peasant/Makefile @@ -16,7 +16,8 @@ all: peasant_disk1.dsk peasant_disk2.dsk peasant_disk3.dsk submit: peasant_disk1.dsk peasant_disk2.dsk peasant_disk3.dsk zip peasant.zip peasant_disk1.dsk peasant_disk2.dsk peasant_disk3.dsk -peasant_disk1.dsk: QBOOT QLOAD ./vid_logo/VID_LOGO TITLE ./intro/INTRO \ +peasant_disk1.dsk: QBOOT QLOAD ./vid_logo/VID_LOGO ./title/TITLE \ + ./intro/INTRO \ SAVE1 SAVE2 SAVE3 ./music/MUSIC COPY_CHECK cp $(EMPTY_DISK)/empty.dsk peasant_disk1.dsk $(DOS33_RAW) peasant_disk1.dsk 0 0 QBOOT 0 1 @@ -28,11 +29,11 @@ peasant_disk1.dsk: QBOOT QLOAD ./vid_logo/VID_LOGO TITLE ./intro/INTRO \ $(DOS33_RAW) peasant_disk1.dsk 1 0 QLOAD 0 0 $(DOS33_RAW) peasant_disk1.dsk 3 0 ./music/MUSIC 0 0 $(DOS33_RAW) peasant_disk1.dsk 4 0 ./vid_logo/VID_LOGO 0 0 - $(DOS33_RAW) peasant_disk1.dsk 6 0 TITLE 0 0 + $(DOS33_RAW) peasant_disk1.dsk 6 0 ./title/TITLE 0 0 $(DOS33_RAW) peasant_disk1.dsk 9 0 ./intro/INTRO 0 0 $(DOS33_RAW) peasant_disk1.dsk 30 0 COPY_CHECK 0 0 -peasant_disk2.dsk: QBOOT QLOAD TITLE ./intro/INTRO \ +peasant_disk2.dsk: QBOOT QLOAD \ PEASANT1 PEASANT2 PEASANT3 PEASANT4 \ SAVE1 SAVE2 SAVE3 INVENTORY PARSE_INPUT.ZX02 cp $(EMPTY_DISK)/empty.dsk peasant_disk2.dsk @@ -43,8 +44,6 @@ peasant_disk2.dsk: QBOOT QLOAD TITLE ./intro/INTRO \ $(DOS33_RAW) peasant_disk2.dsk 0 12 SAVE2 0 1 $(DOS33_RAW) peasant_disk2.dsk 0 13 SAVE3 0 1 $(DOS33_RAW) peasant_disk2.dsk 1 0 QLOAD 0 0 - $(DOS33_RAW) peasant_disk2.dsk 6 0 TITLE 0 0 - $(DOS33_RAW) peasant_disk2.dsk 9 0 ./intro/INTRO 0 0 $(DOS33_RAW) peasant_disk2.dsk 13 0 PARSE_INPUT.ZX02 0 0 $(DOS33_RAW) peasant_disk2.dsk 14 0 INVENTORY 0 0 $(DOS33_RAW) peasant_disk2.dsk 15 0 PEASANT1 0 0 @@ -217,41 +216,16 @@ inventory.o: inventory.s \ ./vi_logo/VID_LOGO: cd vid_logo && make -### - -TITLE: title.o - ld65 -o TITLE title.o -C $(LINKER_SCRIPTS)/apple2_6000.inc - -title.o: title.s qload.inc ./music/music.inc \ - graphics_title/title_graphics.inc \ - graphics_title/altfire.inc \ - directions.s \ - pt3_lib_mockingboard_patch.s duet.s - ca65 -o title.o title.s -l title.lst - -### +./title/TITLE: + cd title && make ./intro/INTRO: cd intro && make -### +./music/MUSIC: + cd music && make -MUSIC: music.o - ld65 -o MUSIC music.o -C $(LINKER_SCRIPTS)/apple2_d000.inc - -music.o: music.s zp.inc \ - music/peasant.pt3 \ - pt3_lib_core.s \ - pt3_lib_mockingboard_detect.s \ - pt3_lib_detect_model.s \ - pt3_lib_mockingboard.inc \ - pt3_lib_init.s \ - pt3_lib_mockingboard_setup.s \ - pt3_lib_irq_handler.s - ca65 -o music.o music.s -l music.lst - - -### +#### CLIFF: cliff.o ld65 -o CLIFF cliff.o -C $(LINKER_SCRIPTS)/apple2_6000.inc @@ -409,7 +383,7 @@ trogdor.o: trogdor.s zp.inc \ graphics_trogdor/trogdor_graphics.inc sprites/trogdor_sprites.inc \ sprites/inventory_sprites.inc \ DIALOG_TROGDOR.ZX02 dialog_trogdor.inc \ - ssi263_simple_speech.s \ + ssi263/ssi263_simple_speech.s \ draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \ hgr_save_restore.s \ wait_a_bit.s draw_peasant.s hgr_text_box.s \ @@ -715,15 +689,9 @@ graphics_peasantry/graphics_intro.inc: graphics_peasantry/graphics_peasant1.inc: cd graphics_peasantry && make -graphics_title/title_graphics.inc: - cd graphics_title && make - graphics_trogdor/trogdor_graphics.inc: cd graphics_trogdor && make -graphics_vid/vid_graphics.inc: - cd graphics_vid && make - #### sprites/inventory_sprites.inc: @@ -755,9 +723,7 @@ distclean: cd graphics_map && make clean cd graphics_over && make clean cd graphics_peasantry && make clean - cd graphics_title && make clean cd graphics_trogdor && make clean - cd graphics_vid && make clean cd text && make clean cd intro && make distclean cd vid_logo && make distclean @@ -765,11 +731,12 @@ distclean: ### clean: - rm -f *~ *.o *.lst VID_LOGO TITLE COPY_CHECK \ + rm -f *~ *.o *.lst COPY_CHECK \ PEASANT1 PEASANT2 PEASANT3 PEASANT4 \ TROGDOR ENDING MUSIC GAME_OVER \ *.ZX02 dialog_peasant2 \ generate_common generate_all_symbols cd intro && make clean - cd music && make_cean + cd music && make_clean + cd title && make clean cd vid_logo && make clean diff --git a/games/peasant/TODO b/games/peasant/TODO index bff7b855..437c1e9e 100644 --- a/games/peasant/TODO +++ b/games/peasant/TODO @@ -1,6 +1,12 @@ New: ~~~~ use updated speaker_beeps.s from music/redbook_sound +use updates ssi263 code from wargames +check if newer pt3_lib needed +updated qload code +add hard-disk image support +change keyboard to use ;,/ for up/down on II+ +remove need to type enter QUESTIONS FOR VIDELECTRIX: diff --git a/games/peasant/duet.s b/games/peasant/music/duet.s similarity index 100% rename from games/peasant/duet.s rename to games/peasant/music/duet.s diff --git a/games/peasant/pt3_lib_mockingboard_patch.s b/games/peasant/pt3_lib/pt3_lib_mockingboard_patch.s similarity index 100% rename from games/peasant/pt3_lib_mockingboard_patch.s rename to games/peasant/pt3_lib/pt3_lib_mockingboard_patch.s diff --git a/games/peasant/ssi263_simple_speech.s b/games/peasant/ssi263/ssi263_simple_speech.s similarity index 100% rename from games/peasant/ssi263_simple_speech.s rename to games/peasant/ssi263/ssi263_simple_speech.s diff --git a/games/peasant/directions.s b/games/peasant/title/directions.s similarity index 100% rename from games/peasant/directions.s rename to games/peasant/title/directions.s diff --git a/games/peasant/graphics_title/Makefile b/games/peasant/title/graphics_title/Makefile similarity index 100% rename from games/peasant/graphics_title/Makefile rename to games/peasant/title/graphics_title/Makefile diff --git a/games/peasant/graphics_title/altfire.inc b/games/peasant/title/graphics_title/altfire.inc similarity index 100% rename from games/peasant/graphics_title/altfire.inc rename to games/peasant/title/graphics_title/altfire.inc diff --git a/games/peasant/graphics_title/peasant_title.png b/games/peasant/title/graphics_title/peasant_title.png similarity index 100% rename from games/peasant/graphics_title/peasant_title.png rename to games/peasant/title/graphics_title/peasant_title.png diff --git a/games/peasant/graphics_title/peasant_title_altfire.png b/games/peasant/title/graphics_title/peasant_title_altfire.png similarity index 100% rename from games/peasant/graphics_title/peasant_title_altfire.png rename to games/peasant/title/graphics_title/peasant_title_altfire.png diff --git a/games/peasant/graphics_title/peasant_title_trogfree.png b/games/peasant/title/graphics_title/peasant_title_trogfree.png similarity index 100% rename from games/peasant/graphics_title/peasant_title_trogfree.png rename to games/peasant/title/graphics_title/peasant_title_trogfree.png diff --git a/games/peasant/graphics_title/tips.png b/games/peasant/title/graphics_title/tips.png similarity index 100% rename from games/peasant/graphics_title/tips.png rename to games/peasant/title/graphics_title/tips.png diff --git a/games/peasant/title.s b/games/peasant/title/title.s similarity index 93% rename from games/peasant/title.s rename to games/peasant/title/title.s index 2cb4a04a..d8ba8d1e 100644 --- a/games/peasant/title.s +++ b/games/peasant/title/title.s @@ -2,11 +2,11 @@ ; by Vince `deater` Weaver vince@deater.net -.include "hardware.inc" -.include "zp.inc" +.include "../hardware.inc" +.include "../zp.inc" -.include "qload.inc" -.include "music.inc" +.include "../qload.inc" +.include "../music/music.inc" title: jsr hgr2 ; clear screen, HGR page 2 @@ -301,25 +301,17 @@ duet_finished: rts - - -;.include "decompress_fast_v2.s" -;.include "wait_keypress.s" - .include "directions.s" -;.include "hgr_font.s" -;.include "hgr_tables.s" -;.include "hgr_hgr2.s" - -.include "duet.s" +.include "../music/duet.s" peasant_ed: -.incbin "music/peasant.ed" +.incbin "../music/peasant.ed" -.include "pt3_lib_mockingboard_patch.s" +.include "../pt3_lib/pt3_lib_mockingboard_patch.s" .include "graphics_title/title_graphics.inc" altfire: .include "graphics_title/altfire.inc" + diff --git a/games/peasant/trogdor.s b/games/peasant/trogdor.s index d4d5ed34..3c005d2c 100644 --- a/games/peasant/trogdor.s +++ b/games/peasant/trogdor.s @@ -314,7 +314,7 @@ draw_sprite_h: .include "hgr_sprite.s" -.include "ssi263_simple_speech.s" +.include "ssi263/ssi263_simple_speech.s" .include "trogdor_speech.s" .include "graphics_trogdor/trogdor_graphics.inc"