From 2169b6e77af71aad1bea890d9cbcf09c3bcf9d79 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 23 Sep 2024 21:43:42 -0400 Subject: [PATCH] peasant: more moving files around --- games/peasant/Makefile | 42 ++++----------------- games/peasant/cliff_base/cliff_base.s | 12 ------ games/peasant/cliff_heights/Makefile | 13 +++---- games/peasant/cliff_heights/cliff_heights.s | 15 ++------ games/peasant/inn/dialog_inn.s | 4 +- games/peasant/inn/inn.s | 26 ++++++------- games/peasant/inn/inn_actions.s | 2 +- games/peasant/zp.inc | 3 +- 8 files changed, 35 insertions(+), 82 deletions(-) diff --git a/games/peasant/Makefile b/games/peasant/Makefile index 05ddf8ff..a08e9b14 100644 --- a/games/peasant/Makefile +++ b/games/peasant/Makefile @@ -45,7 +45,7 @@ peasant_disk2.dsk: QBOOT QLOAD \ $(DOS33_RAW) peasant_disk2.dsk 30 0 PEASANT4 0 0 peasant_disk3.dsk: ./trogdor/TROGDOR ./ending/ENDING \ - ./cliff_base/CLIFF_BASE ./game_over/GAME_OVER INSIDE INN \ + ./cliff_base/CLIFF_BASE ./game_over/GAME_OVER INSIDE ./inn/INN \ ./archery/ARCHERY ./map/MAP \ ./wrong_boot/WBOOT3 cp $(EMPTY_DISK)/empty.dsk peasant_disk3.dsk @@ -53,7 +53,7 @@ peasant_disk3.dsk: ./trogdor/TROGDOR ./ending/ENDING \ $(DOS33_RAW) peasant_disk3.dsk 4 0 ./map/MAP 0 0 $(DOS33_RAW) peasant_disk3.dsk 6 0 ./archery/ARCHERY 0 0 $(DOS33_RAW) peasant_disk3.dsk 9 0 INSIDE 0 0 - $(DOS33_RAW) peasant_disk3.dsk 14 0 INN 0 0 + $(DOS33_RAW) peasant_disk3.dsk 14 0 ./inn/INN 0 0 $(DOS33_RAW) peasant_disk3.dsk 19 0 ./trogdor/TROGDOR 0 0 $(DOS33_RAW) peasant_disk3.dsk 24 0 ./ending/ENDING 0 0 $(DOS33_RAW) peasant_disk3.dsk 29 0 ./cliff_base/CLIFF_BASE 0 0 @@ -87,7 +87,7 @@ peasant.2mg: dts_block PROBOOTHD QLOAD_HD \ $(PRODOS_RAW) peasant.2mg `./dts_block 3 4 0` ./map/MAP 0 0 $(PRODOS_RAW) peasant.2mg `./dts_block 3 6 0` ./archery/ARCHERY 0 0 $(PRODOS_RAW) peasant.2mg `./dts_block 3 9 0` INSIDE 0 0 - $(PRODOS_RAW) peasant.2mg `./dts_block 3 14 0` INN 0 0 + $(PRODOS_RAW) peasant.2mg `./dts_block 3 14 0` ./inn/INN 0 0 $(PRODOS_RAW) peasant.2mg `./dts_block 3 19 0` ./trogdor/TROGDOR 0 0 $(PRODOS_RAW) peasant.2mg `./dts_block 3 24 0` ./ending/ENDING 0 0 $(PRODOS_RAW) peasant.2mg `./dts_block 3 29 0` ./cliff_base/CLIFF_BASE 0 0 @@ -410,22 +410,8 @@ inside.o: inside.s zp.inc ./inventory/inventory.inc \ ### -INN: inn.o - ld65 -o INN inn.o -C $(LINKER_SCRIPTS)/apple2_6000.inc - -inn.o: inn.s zp.inc ./inventory/inventory.inc \ - parse_input.inc \ - inn_actions.s DIALOG_INN.ZX02 dialog_inn.inc \ - graphics_inn/graphics_inn.inc sprites/peasant_sprites.inc \ - graphics_inn/priority_inn.inc \ - draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \ - hgr_1x28_sprite_mask.s hgr_save_restore.s \ - wait_a_bit.s draw_peasant.s hgr_text_box.s \ - keyboard.s new_map_location.s \ - move_peasant.s score.s loadsave_menu.s - ca65 -o inn.o inn.s -l inn.lst - - +./inn/INN: + cd inn && make ### @@ -568,22 +554,6 @@ dialog_inside.inc: generate_all_symbols dialog_inside #### -DIALOG_INN.ZX02: dialog_inn - $(ZX02) -f dialog_inn DIALOG_INN.ZX02 - -dialog_inn: dialog_inn.o - ld65 -o dialog_inn dialog_inn.o -C ../../linker_scripts/apple2_d000.inc - -dialog_inn.o: dialog_inn.s text/inn.inc.lookup - ca65 -o dialog_inn.o dialog_inn.s -l dialog_inn.lst - -### - -dialog_inn.inc: generate_all_symbols dialog_inn - ./generate_all_symbols -a 0xd000 dialog_inn.lst > dialog_inn.inc - -#### - DIALOG_CLIFF.ZX02: dialog_cliff $(ZX02) -f dialog_cliff DIALOG_CLIFF.ZX02 @@ -673,6 +643,7 @@ distclean: cd copy && make distclean cd ending && make distclean cd game_over && make distclean + cd inn && make distclean cd intro && make distclean cd map && make distclean cd trogdor && make distclean @@ -691,6 +662,7 @@ clean: cd copy && make clean cd ending && make clean cd game_over && make clean + cd inn && make clean cd intro && make clean cd map && make clean cd music && make clean diff --git a/games/peasant/cliff_base/cliff_base.s b/games/peasant/cliff_base/cliff_base.s index 0bda579b..e6c56a15 100644 --- a/games/peasant/cliff_base/cliff_base.s +++ b/games/peasant/cliff_base/cliff_base.s @@ -307,33 +307,21 @@ exiting_cliff: map_backgrounds_low: .byte cliff_base_zx02 - .byte >cliff_heights_zx02 - .byte >outer_zx02 map_priority_low: .byte cliff_base_priority_zx02 - .byte >cliff_heights_priority_zx02 - .byte >outer_priority_zx02 verb_tables_low: .byte cliff_base_verb_table - .byte >cliff_heights_verb_table - .byte >cave_outer_verb_table diff --git a/games/peasant/cliff_heights/Makefile b/games/peasant/cliff_heights/Makefile index c35b55c8..4fda49f6 100644 --- a/games/peasant/cliff_heights/Makefile +++ b/games/peasant/cliff_heights/Makefile @@ -2,14 +2,14 @@ include ../../../Makefile.inc LINKER_SCRIPTS = ../../../linker_scripts -all: CLIFF_BASE +all: CLIFF_HEIGHTS #### -CLIFF_BASE: cliff_base.o - ld65 -o CLIFF_BASE cliff_base.o -C $(LINKER_SCRIPTS)/apple2_6000.inc +CLIFF_HEIGHTS: cliff_heights.o + ld65 -o CLIFF_HEIGHTS cliff_heights.o -C $(LINKER_SCRIPTS)/apple2_6000.inc -cliff_base.o: cliff_base.s \ +cliff_heights.o: cliff_heights.s \ ../zp.inc ../hardware.inc ../qload.inc ../version.inc \ ../inventory/inventory.inc \ ../parse_input.inc \ @@ -23,7 +23,7 @@ cliff_base.o: cliff_base.s \ ../new_map_location.s \ ../keyboard.s \ ../wait.s ../wait_a_bit.s - ca65 -o cliff_base.o cliff_base.s -l cliff_base.lst + ca65 -o cliff_heights.o cliff_heights.s -l cliff_heights.lst ### @@ -39,5 +39,4 @@ distclean: ### clean: - rm -f *~ *.o *.lst CLIFF_BASE - + rm -f *~ *.o *.lst CLIFF_HEIGHTS diff --git a/games/peasant/cliff_heights/cliff_heights.s b/games/peasant/cliff_heights/cliff_heights.s index 0bda579b..0d91682b 100644 --- a/games/peasant/cliff_heights/cliff_heights.s +++ b/games/peasant/cliff_heights/cliff_heights.s @@ -1,9 +1,8 @@ ; Peasant's Quest -; Cliff Base +; Cliff Heights -; just the cliff base -; we're going crazy with disk accesses now +; Top of the cliff and outer trogdor lair ; by Vince `deater` Weaver vince@deater.net @@ -17,9 +16,9 @@ collision_location = $bc00 -LOCATION_BASE = LOCATION_CLIFF_BASE ; (20) +LOCATION_BASE = LOCATION_CLIFF_HEIGHTS ; (21) -cliff_base: +cliff_heights: lda #0 sta LEVEL_OVER @@ -306,32 +305,26 @@ exiting_cliff: .include "graphics_cliff/priority_cliff.inc" map_backgrounds_low: - .byte cliff_base_zx02 .byte >cliff_heights_zx02 .byte >outer_zx02 map_priority_low: - .byte cliff_base_priority_zx02 .byte >cliff_heights_priority_zx02 .byte >outer_priority_zx02 verb_tables_low: - .byte cliff_base_verb_table .byte >cliff_heights_verb_table .byte >cave_outer_verb_table diff --git a/games/peasant/inn/dialog_inn.s b/games/peasant/inn/dialog_inn.s index d9ca866b..d4592b53 100644 --- a/games/peasant/inn/dialog_inn.s +++ b/games/peasant/inn/dialog_inn.s @@ -1,3 +1,3 @@ -.include "text/lookup.inc" -.include "text/inn.inc.lookup" +.include "../text/lookup.inc" +.include "../text/inn.inc.lookup" diff --git a/games/peasant/inn/inn.s b/games/peasant/inn/inn.s index 3ffe1a87..89ec5de0 100644 --- a/games/peasant/inn/inn.s +++ b/games/peasant/inn/inn.s @@ -8,12 +8,12 @@ ; with apologies to everyone -.include "hardware.inc" -.include "zp.inc" +.include "../hardware.inc" +.include "../zp.inc" -.include "qload.inc" -.include "./inventory/inventory.inc" -.include "parse_input.inc" +.include "../qload.inc" +.include "../inventory/inventory.inc" +.include "../parse_input.inc" LOCATION_BASE = LOCATION_INSIDE_INN ; index starts here (27) @@ -261,18 +261,18 @@ level_over: rts -.include "move_peasant.s" -.include "draw_peasant.s" +.include "../move_peasant.s" +.include "../draw_peasant.s" -.include "gr_copy.s" -.include "hgr_copy.s" +.include "../gr_copy.s" +.include "../hgr_copy.s" -.include "new_map_location.s" +.include "../new_map_location.s" -.include "keyboard.s" +.include "../keyboard.s" -.include "wait.s" -.include "wait_a_bit.s" +.include "../wait.s" +.include "../wait_a_bit.s" .include "graphics_inn/graphics_inn.inc" .include "graphics_inn/priority_inn.inc" diff --git a/games/peasant/inn/inn_actions.s b/games/peasant/inn/inn_actions.s index 54c7023d..6a35fc6a 100644 --- a/games/peasant/inn/inn_actions.s +++ b/games/peasant/inn/inn_actions.s @@ -1,4 +1,4 @@ -.include "tokens.inc" +.include "../tokens.inc" ;======================= ;======================= diff --git a/games/peasant/zp.inc b/games/peasant/zp.inc index 7e206e64..06fe650f 100644 --- a/games/peasant/zp.inc +++ b/games/peasant/zp.inc @@ -374,5 +374,6 @@ LOCATION_INSIDE_NN = 26 LOCATION_INSIDE_INN = 27 LOCATION_ARCHERY_GAME = 28 LOCATION_MAP = 29 +LOCATION_CLIMB = 30 -LOCATION_EMPTY = 30 +LOCATION_EMPTY = 31