Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-11-01 01:06:33 +00:00
Code Issues Projects Releases Wiki Activity

peasant: more moving files around

Browse Source
This commit is contained in:
Vince Weaver 2024-09-23 21:43:42 -04:00
parent 64d35d8984
commit 2169b6e77a
8 changed files with 35 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
games/peasant/Makefile
View File

@ -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

12
games/peasant/cliff_base/cliff_base.s
View File

@ -307,33 +307,21 @@ exiting_cliff:
map_backgrounds_low:
.byte <cliff_base_zx02
.byte <cliff_heights_zx02
.byte <outer_zx02
map_backgrounds_hi:
.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
map_priority_hi:
.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
verb_tables_hi:
.byte >cliff_base_verb_table
.byte >cliff_heights_verb_table
.byte >cave_outer_verb_table

13
games/peasant/cliff_heights/Makefile
View File

@ -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

15
games/peasant/cliff_heights/cliff_heights.s
View File

@ -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_backgrounds_hi:
.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
map_priority_hi:
.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
verb_tables_hi:
.byte >cliff_base_verb_table
.byte >cliff_heights_verb_table
.byte >cave_outer_verb_table

4
games/peasant/inn/dialog_inn.s
View File

@ -1,3 +1,3 @@
.include "text/lookup.inc"
.include "text/inn.inc.lookup"
.include "../text/lookup.inc"
.include "../text/inn.inc.lookup"

26
games/peasant/inn/inn.s
View File

@ -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"

2
games/peasant/inn/inn_actions.s
View File

@ -1,4 +1,4 @@
.include "tokens.inc"
.include "../tokens.inc"
;=======================
;=======================

3
games/peasant/zp.inc
View File

@ -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