peasant: spread the files on disk3 around a bit

This commit is contained in:
Vince Weaver
2024-09-24 13:07:56 -04:00
parent 5237d506af
commit 467b51644d
5 changed files with 105 additions and 70 deletions

View File

@@ -50,15 +50,15 @@ peasant_disk3.dsk: ./trogdor/TROGDOR ./ending/ENDING \
./wrong_boot/WBOOT3 ./wrong_boot/WBOOT3
cp $(EMPTY_DISK)/empty.dsk peasant_disk3.dsk cp $(EMPTY_DISK)/empty.dsk peasant_disk3.dsk
$(DOS33_RAW) peasant_disk3.dsk 0 0 ./wrong_boot/WBOOT3 0 1 $(DOS33_RAW) peasant_disk3.dsk 0 0 ./wrong_boot/WBOOT3 0 1
$(DOS33_RAW) peasant_disk3.dsk 4 0 ./map/MAP 0 0 $(DOS33_RAW) peasant_disk3.dsk 1 0 ./map/MAP 0 0
$(DOS33_RAW) peasant_disk3.dsk 6 0 ./archery/ARCHERY 0 0 $(DOS33_RAW) peasant_disk3.dsk 3 0 ./archery/ARCHERY 0 0
$(DOS33_RAW) peasant_disk3.dsk 9 0 ./inside/INSIDE 0 0 $(DOS33_RAW) peasant_disk3.dsk 7 0 ./inside/INSIDE 0 0
$(DOS33_RAW) peasant_disk3.dsk 14 0 ./inn/INN 0 0 $(DOS33_RAW) peasant_disk3.dsk 11 0 ./inn/INN 0 0
$(DOS33_RAW) peasant_disk3.dsk 19 0 ./trogdor/TROGDOR 0 0 $(DOS33_RAW) peasant_disk3.dsk 15 0 ./trogdor/TROGDOR 0 0
$(DOS33_RAW) peasant_disk3.dsk 24 0 ./ending/ENDING 0 0 $(DOS33_RAW) peasant_disk3.dsk 19 0 ./ending/ENDING 0 0
$(DOS33_RAW) peasant_disk3.dsk 29 0 ./cliff_base/CLIFF_BASE 0 0 $(DOS33_RAW) peasant_disk3.dsk 24 0 ./cliff_base/CLIFF_BASE 0 0
# $(DOS33_RAW) peasant_disk3.dsk 26 0 ./climb/CLIMB 0 0
# $(DOS33_RAW) peasant_disk3.dsk 30 0 ./cliff_heights/HEIGHTS 0 0
peasant.2mg: dts_block PROBOOTHD QLOAD_HD \ peasant.2mg: dts_block PROBOOTHD QLOAD_HD \
./vid_logo/VID_LOGO ./title/TITLE ./intro/INTRO \ ./vid_logo/VID_LOGO ./title/TITLE ./intro/INTRO \
@@ -84,13 +84,13 @@ peasant.2mg: dts_block PROBOOTHD QLOAD_HD \
$(PRODOS_RAW) peasant.2mg `./dts_block 2 25 0` PEASANT3 0 0 $(PRODOS_RAW) peasant.2mg `./dts_block 2 25 0` PEASANT3 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 2 30 0` PEASANT4 0 0 $(PRODOS_RAW) peasant.2mg `./dts_block 2 30 0` PEASANT4 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 3 0 0` ./wrong_boot/WBOOT3 0 1 $(PRODOS_RAW) peasant.2mg `./dts_block 3 0 0` ./wrong_boot/WBOOT3 0 1
$(PRODOS_RAW) peasant.2mg `./dts_block 3 4 0` ./map/MAP 0 0 $(PRODOS_RAW) peasant.2mg `./dts_block 3 1 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 3 0` ./archery/ARCHERY 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 3 9 0` ./inside/INSIDE 0 0 $(PRODOS_RAW) peasant.2mg `./dts_block 3 7 0` ./inside/INSIDE 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 3 14 0` ./inn/INN 0 0 $(PRODOS_RAW) peasant.2mg `./dts_block 3 11 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 15 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 19 0` ./ending/ENDING 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 3 29 0` ./cliff_base/CLIFF_BASE 0 0 $(PRODOS_RAW) peasant.2mg `./dts_block 3 24 0` ./cliff_base/CLIFF_BASE 0 0
### ###

View File

@@ -227,38 +227,42 @@ TROGDOR 15657 14774
ENDING 17642 17038 ENDING 17642 17038
CLIFF 13418 12648 CLIFF 13418 12648
Disk Maps, current
Disk Maps, Current Disk1 Map (disk has 35 tracks, each 4k in size)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
T 0 = Qboot / SAVES
T 1 = QLOAD 5037 bytes 2T (8192) 3k free
T 3 = MUSIC 4045 bytes 1T (4096) 0k free
T 4 = VID_LOGO 7343 bytes 2T (8192) 1k free
T 6 = TITLE 8500 bytes 3T (12288) 4k free
T 9 = INTRO 13628 bytes 4T (16384) 3k free
T 13 = PARSE_INP 3249 bytes 1T (4096) 1k free
T 14 = INVENTORY 3122 bytes 1T (4096) 1k free
T 15 = GAME_OVER 2074 bytes 1T (4096) 2k free
T 30 = COPY_CHECK 2834 bytes 1T (4096) 1k free
Disk1 Disk2 Map (disk has 35 tracks, each 4k in size)
QLOAD ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
SAVES T 0 = WBOOT2
MUSIC T 15 = PEASANT1 18205 bytes 5T (20480) 2k free
VID_LOGO T 20 = PEASANT2 17194 bytes 5T (20480) 3k free
TITLE T 25 = PEASANT3 17924 bytes 5T (20480) 3k free
INTRO T 30 = PEASANT4 16698 bytes 5T (20480) 3k free
PARSE_INPUT
INVENTORY
COPY_CHECK
GAME_OVER ; because need to restart/reload anyway
Disk2 Disk3 Map (disk has 35 tracks, each 4k in size)
PEASANT1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
PEASANT2 T 0 = WBOOT3
PEASANT3 T 1 = MAP 2556 bytes 2T (8192) 6k free
PEASANT4 T 3 = ARCHERY 2016 bytes 4T (16384) 14k free
MAP T 7 = INSIDE 13457 bytes 4T (16384) 3k free
INSIDE T 11 = INN 8935 bytes 4T (16384) 7k free
INN T 15 = TROGDOR 14771 bytes 4T (16384) 3k free
; variants with night backgrounds? T 19 = ENDING 17037 bytes 5T (20480) 3k free
; rain code? T 24 = CLIFF_BASE 6071 bytes 2T (8192) 2k free
T 26 = CLIMB 16384 bytes 4T (16483) 0k free
T 30 = HEIGHTS ???? bytes 3T (12288) 0k free
Disk3
ARCHERY
CLIFF/CLIMB
TROGDOR
SAM code?
ENDING
Disk Maps, Original Disk Maps, Original

View File

@@ -106,7 +106,11 @@ exits_north:
.byte LOCATION_EMPTY ; LOCATION_INSIDE_LADY = 25 .byte LOCATION_EMPTY ; LOCATION_INSIDE_LADY = 25
.byte LOCATION_EMPTY ; LOCATION_INSIDE_NN = 26 .byte LOCATION_EMPTY ; LOCATION_INSIDE_NN = 26
.byte LOCATION_EMPTY ; LOCATION_INSIDE_INN = 27 .byte LOCATION_EMPTY ; LOCATION_INSIDE_INN = 27
.byte LOCATION_EMPTY ; LOCATION_EMPTY = 28
.byte LOCATION_EMPTY ; LOCATION_ARCHERY = 28
.byte LOCATION_EMPTY ; LOCATION_MAP = 29
.byte LOCATION_EMPTY ; LOCATION_CLIMB = 30
.byte LOCATION_EMPTY ; LOCATION_EMPTY = 31
exits_south: exits_south:
.byte LOCATION_HAY_BALE ; LOCATION_POOR_GARY = 0 .byte LOCATION_HAY_BALE ; LOCATION_POOR_GARY = 0
@@ -142,7 +146,11 @@ exits_south:
.byte LOCATION_OUTSIDE_LADY ; LOCATION_INSIDE_LADY = 25 .byte LOCATION_OUTSIDE_LADY ; LOCATION_INSIDE_LADY = 25
.byte LOCATION_OUTSIDE_NN ; LOCATION_INSIDE_NN = 26 .byte LOCATION_OUTSIDE_NN ; LOCATION_INSIDE_NN = 26
.byte LOCATION_OUTSIDE_INN ; LOCATION_INSIDE_INN = 27 .byte LOCATION_OUTSIDE_INN ; LOCATION_INSIDE_INN = 27
.byte LOCATION_EMPTY ; LOCATION_EMPTY = 28
.byte LOCATION_EMPTY ; LOCATION_ARCHERY = 28
.byte LOCATION_EMPTY ; LOCATION_MAP = 29
.byte LOCATION_EMPTY ; LOCATION_CLIMB = 30
.byte LOCATION_EMPTY ; LOCATION_EMPTY = 31
exits_east: exits_east:
.byte LOCATION_KERREK_1 ; LOCATION_POOR_GARY = 0 .byte LOCATION_KERREK_1 ; LOCATION_POOR_GARY = 0
@@ -178,7 +186,13 @@ exits_east:
.byte LOCATION_EMPTY ; LOCATION_INSIDE_LADY = 25 .byte LOCATION_EMPTY ; LOCATION_INSIDE_LADY = 25
.byte LOCATION_EMPTY ; LOCATION_INSIDE_NN = 26 .byte LOCATION_EMPTY ; LOCATION_INSIDE_NN = 26
.byte LOCATION_EMPTY ; LOCATION_INSIDE_INN = 27 .byte LOCATION_EMPTY ; LOCATION_INSIDE_INN = 27
.byte LOCATION_EMPTY ; LOCATION_EMPTY = 28
.byte LOCATION_EMPTY ; LOCATION_ARCHERY = 28
.byte LOCATION_EMPTY ; LOCATION_MAP = 29
.byte LOCATION_EMPTY ; LOCATION_CLIMB = 30
.byte LOCATION_EMPTY ; LOCATION_EMPTY = 31
exits_west: exits_west:
.byte LOCATION_HIDDEN_GLEN ; LOCATION_POOR_GARY = 0 .byte LOCATION_HIDDEN_GLEN ; LOCATION_POOR_GARY = 0
@@ -214,7 +228,12 @@ exits_west:
.byte LOCATION_EMPTY ; LOCATION_INSIDE_LADY = 25 .byte LOCATION_EMPTY ; LOCATION_INSIDE_LADY = 25
.byte LOCATION_EMPTY ; LOCATION_INSIDE_NN = 26 .byte LOCATION_EMPTY ; LOCATION_INSIDE_NN = 26
.byte LOCATION_EMPTY ; LOCATION_INSIDE_INN = 27 .byte LOCATION_EMPTY ; LOCATION_INSIDE_INN = 27
.byte LOCATION_EMPTY ; LOCATION_EMPTY = 28
.byte LOCATION_EMPTY ; LOCATION_ARCHERY = 28
.byte LOCATION_EMPTY ; LOCATION_MAP = 29
.byte LOCATION_EMPTY ; LOCATION_CLIMB = 30
.byte LOCATION_EMPTY ; LOCATION_EMPTY = 31
location_to_file: location_to_file:
.byte LOAD_PEASANT1 ; LOCATION_POOR_GARY = 0 .byte LOAD_PEASANT1 ; LOCATION_POOR_GARY = 0
@@ -241,9 +260,9 @@ location_to_file:
.byte LOAD_PEASANT4 ; LOCATION_OUTSIDE_LADY = 18 .byte LOAD_PEASANT4 ; LOCATION_OUTSIDE_LADY = 18
.byte LOAD_PEASANT4 ; LOCATION_BURN_TREES = 19 .byte LOAD_PEASANT4 ; LOCATION_BURN_TREES = 19
.byte LOAD_CLIFF ; LOCATION_CLIFF_BASE = 20 .byte LOAD_CLIFF_BASE ; LOCATION_CLIFF_BASE = 20
.byte LOAD_CLIFF ; LOCATION_CLIFF_HEIGHTS= 21 .byte LOAD_HEIGHTS ; LOCATION_CLIFF_HEIGHTS= 21
.byte LOAD_CLIFF ; LOCATION_TROGDOR_OUTER= 22 .byte LOAD_HEIGHTS ; LOCATION_TROGDOR_OUTER= 22
.byte LOAD_TROGDOR ; LOCATION_TROGDOR_LAIR = 23 .byte LOAD_TROGDOR ; LOCATION_TROGDOR_LAIR = 23
.byte LOAD_INSIDE ; LOCATION_HIDDEN_GLEN = 24 .byte LOAD_INSIDE ; LOCATION_HIDDEN_GLEN = 24
@@ -253,6 +272,6 @@ location_to_file:
.byte LOAD_ARCHERY ; LOCATION_ARCHERY_GAME = 28 .byte LOAD_ARCHERY ; LOCATION_ARCHERY_GAME = 28
.byte LOAD_MAP ; LOCATION_MAP = 29 .byte LOAD_MAP ; LOCATION_MAP = 29
.byte LOAD_CLIMB ; LOCATION_CLIMB = 30
.byte LOCATION_EMPTY ; LOCATION_EMPTY = 30 .byte LOCATION_EMPTY ; LOCATION_EMPTY = 31

View File

@@ -29,9 +29,11 @@ qload_start:
which_disk_array: which_disk_array:
.byte 1,1,1,1 ; VID_LOGO, TITLE, INTRO. COPY_CHECK .byte 1,1,1,1 ; VID_LOGO, TITLE, INTRO. COPY_CHECK
.byte 2,2,2,2 ; PEASANT1, PEASANT2, PEASANT3, PEASANT4 .byte 2,2,2,2 ; PEASANT1, PEASANT2, PEASANT3, PEASANT4
.byte 3,3,1,3 ; TROGDOR, ENDING, MUSIC, CLIFF .byte 3,3,1,3 ; TROGDOR, ENDING, MUSIC, CLIFF_BASE
.byte 1,1,1,3 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN .byte 1,1,1,3 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN
.byte 3,3,3 ; INSIDE, ARCHERY, MAP .byte 3,3,3,3 ; INSIDE, ARCHERY, MAP, CLIMB
.byte 3 ; HEIGHTS
.byte 1,1,1 ; SAVE1, SAVE2, SAVE3 .byte 1,1,1 ; SAVE1, SAVE2, SAVE3
.byte $f ; disk detect .byte $f ; disk detect
@@ -40,34 +42,42 @@ load_address_array:
.byte $60,$60,$60,$60 ; PEASANT1, PEASANT2, PEASANT3, PEASANT4 .byte $60,$60,$60,$60 ; PEASANT1, PEASANT2, PEASANT3, PEASANT4
.byte $60,$60,$D0,$60 ; TROGDOR, ENDING, MUSIC, CLIFF .byte $60,$60,$D0,$60 ; TROGDOR, ENDING, MUSIC, CLIFF
.byte $60,$D0,$20,$60 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN .byte $60,$D0,$20,$60 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN
.byte $60,$60,$60 ; INSIDE, ARCHERY, MAP .byte $60,$60,$60,$60 ; INSIDE, ARCHERY, MAP, CLIMB
.byte $60 ; HEIGHTS
.byte $BC,$BC,$BC ; SAVE1, SAVE2, SAVE3 .byte $BC,$BC,$BC ; SAVE1, SAVE2, SAVE3
.byte $BC ; disk detect .byte $BC ; disk detect
track_array: track_array:
.byte 4, 6, 9,1 ; VID_LOGO, TITLE, INTRO, COPY_CHECK .byte 4, 6, 9,1 ; VID_LOGO, TITLE, INTRO, COPY_CHECK
.byte 15,20,25,30 ; PEASANT1, PEASANT2, PEASANT3, PEASANT4 .byte 15,20,25,30 ; PEASANT1, PEASANT2, PEASANT3, PEASANT4
.byte 19,24, 3,29 ; TROGDOR, ENDING, MUSIC, CLIFF .byte 15,19, 3,24 ; TROGDOR, ENDING, MUSIC, CLIFF_BASE
.byte 15,14,13,14 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN .byte 15,14,13,11 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN
.byte 9,6,4 ; INSIDE, ARCHERY, MAP .byte 7,3,1,26 ; INSIDE, ARCHERY, MAP, CLIMB
.byte 30 ; HEIGHTS
.byte 0, 0, 0 ; SAVE1, SAVE2, SAVE3 .byte 0, 0, 0 ; SAVE1, SAVE2, SAVE3
.byte 0 ; disk detect .byte 0 ; disk detect
sector_array: sector_array:
.byte 0, 0, 0, 0 ; VID_LOGO, TITLE, INTRO, COPY_CHECK .byte 0, 0, 0, 0 ; VID_LOGO, TITLE, INTRO, COPY_CHECK
.byte 0, 0, 0, 0 ; PEASANT1, PEASANT2, PEASANT3, PEASANT4 .byte 0, 0, 0, 0 ; PEASANT1, PEASANT2, PEASANT3, PEASANT4
.byte 0, 0, 0, 0 ; TROGDOR, ENDING, MUSIC, CLIFF .byte 0, 0, 0, 0 ; TROGDOR, ENDING, MUSIC, CLIFF_BASE
.byte 0, 0, 0, 0 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN .byte 0, 0, 0, 0 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN
.byte 0, 0, 0 ; INSIDE, ARCHERY, MAP .byte 0, 0, 0, 0 ; INSIDE, ARCHERY, MAP, CLIMB
.byte 0 ; HEIGHTS
.byte 11,12,13 ; SAVE1, SAVE2, SAVE3 .byte 11,12,13 ; SAVE1, SAVE2, SAVE3
.byte 0 ; disk detect .byte 0 ; disk detect
length_array: length_array:
.byte 32, 50, 60, 20 ; VID_LOGO, TITLE, INTRO, COPY_CHECK .byte 32, 50, 60, 20 ; VID_LOGO, TITLE, INTRO, COPY_CHECK
.byte 80, 88, 88, 80 ; PEASANT1, PEASANT2, PEASANT3, PEASANT4 .byte 80, 88, 88, 80 ; PEASANT1, PEASANT2, PEASANT3, PEASANT4
.byte 80, 80, 16, 80 ; TROGDOR, ENDING, MUSIC, CLIFF .byte 64, 80, 16, 32 ; TROGDOR, ENDING, MUSIC, CLIFF_BASE
.byte 16, 16, 16, 80 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN .byte 16, 16, 16, 64 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN
.byte 80, 64, 16 ; INSIDE, ARCHERY, MAP .byte 64, 64, 32, 64 ; INSIDE, ARCHERY, MAP, CLIMB
.byte 48 ; HEIGHTS
.byte 1,1,1 ; SAVE1, SAVE2, SAVE3 .byte 1,1,1 ; SAVE1, SAVE2, SAVE3
.byte 1 ; disk detect .byte 1 ; disk detect

View File

@@ -320,7 +320,7 @@ LOAD_PEASANT4 = 7
LOAD_TROGDOR = 8 LOAD_TROGDOR = 8
LOAD_ENDING = 9 LOAD_ENDING = 9
LOAD_MUSIC = 10 LOAD_MUSIC = 10
LOAD_CLIFF = 11 LOAD_CLIFF_BASE = 11
LOAD_GAME_OVER = 12 LOAD_GAME_OVER = 12
LOAD_INVENTORY = 13 LOAD_INVENTORY = 13
LOAD_PARSE_INPUT= 14 LOAD_PARSE_INPUT= 14
@@ -328,10 +328,12 @@ LOAD_INN = 15
LOAD_INSIDE = 16 LOAD_INSIDE = 16
LOAD_ARCHERY = 17 LOAD_ARCHERY = 17
LOAD_MAP = 18 LOAD_MAP = 18
LOAD_CLIMB = 19
LOAD_HEIGHTS = 20
LOAD_SAVE1 = 19 LOAD_SAVE1 = 21
LOAD_SAVE2 = 20 LOAD_SAVE2 = 22
LOAD_SAVE3 = 21 LOAD_SAVE3 = 23
VGI_RCOLOR = P0 VGI_RCOLOR = P0