peasant: rehook up early ending

games/peasant/Makefile

@@ -19,7 +19,7 @@ submit:	peasant_disk1.dsk peasant_disk2.dsk peasant_disk3.dsk
 peasant_disk1.dsk:	QBOOT QLOAD \
 	./vid_logo/VID_LOGO ./title/TITLE ./intro/INTRO \
 	./music/MUSIC ./copy/COPY_CHECK ./inventory/INVENTORY \
-	SAVE1 SAVE2 SAVE3 PARSE_INPUT.ZX02
+	SAVE1 SAVE2 SAVE3 PARSE_INPUT.ZX02 ./game_over/GAME_OVER
 	cp $(EMPTY_DISK)/empty.dsk peasant_disk1.dsk
 	$(DOS33_RAW) peasant_disk1.dsk  0  0 QBOOT      0   1
 	$(DOS33_RAW) peasant_disk1.dsk  0  2 QBOOT      1   1
@@ -34,7 +34,8 @@ peasant_disk1.dsk:	QBOOT QLOAD \
 	$(DOS33_RAW) peasant_disk1.dsk  9  0 ./intro/INTRO       0   0
 	$(DOS33_RAW) peasant_disk1.dsk  13 0 PARSE_INPUT.ZX02  0   0
 	$(DOS33_RAW) peasant_disk1.dsk  14 0 ./inventory/INVENTORY  0   0
-	$(DOS33_RAW) peasant_disk1.dsk 30  0 ./copy/COPY_CHECK   0   0
+	$(DOS33_RAW) peasant_disk1.dsk  15 0 ./game_over/GAME_OVER    0   0
+	$(DOS33_RAW) peasant_disk1.dsk  30 0 ./copy/COPY_CHECK   0   0
 
 peasant_disk2.dsk:	QBOOT QLOAD \
 	PEASANT1 PEASANT2 PEASANT3 PEASANT4 \
@@ -51,7 +52,6 @@ peasant_disk3.dsk:	WBOOT2 ./trogdor/TROGDOR ./ending/ENDING \
 	./archery/ARCHERY ./map/MAP
 	cp $(EMPTY_DISK)/empty.dsk peasant_disk3.dsk
 	$(DOS33_RAW) peasant_disk3.dsk   0 0  WBOOT2      0   1
-	$(DOS33_RAW) peasant_disk3.dsk   3 0 ./game_over/GAME_OVER    0   0
 	$(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

games/peasant/NOTES

@@ -94,33 +94,6 @@ $D0-$ED (bank1) per-levelstrings
 $D0-$DF (bank2) inventory		(3122 bytes)
 $EE-$FF common parser code  (4.5k = 4608 bytes [4332 currently])
 
-Disk1 Map (disk has 35 tracks, each 4k in size)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-T	  0 = Qboot
-T	  1 = QLOAD	 5286 bytes	21S = 1T5S
-T	  3 = MUSIC	 4045 bytes	16S = 1T0S
-T	  4 = VID_LOGO	 7574 bytes	30S = 1T14S
-T	  6 = TITLE      8950 bytes	35S = 2T3S
-T	  9 = INTRO	13467 bytes	52S = 3T4S
-T	 14 = INVENTORY  3121 bytes     13S = 0T13S
-T	 15 = PEASANT1  17007 bytes	67S = 4T3S	; 80 is max
-T	 20 = PEASANT2  17941 bytes	71S = 4T7S	; 79 = 20224
-T        25 = PEASANT3  18154 bytes	71S = 4T7S
-T	 30 = PEASANT4	15806 bytes	62S = 3T14S
-
-Disk2 Map (disk has 35 tracks, each 4k in size)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-T	  0 = WBOOT
-T	  1 = COPY_CHECK 2942 bytes	12S = 0T12S
-T         3 = GAME_OVER	 2111 bytes	 9S = 0T9S
-T	  4 = MAP        2703 bytes     11S = 0T11S
-T         6 = ARCHERY	 2112 bytes     11S = 0T11S
-T         9 = INSIDE	14178 bytes     56s = 3T8S
-T        14 = INN	 6906 bytes     27S = 1T11S
-T	 19 = TROGDOR	11468 bytes     45S = 2T13S	
-T        24 = ENDING	17619 bytes	69S = 4T5S
-T	 29 = CLIFF     13024 bytes     51S = 3T3S
-
 
 238, to 280 (6)
 50 to 135 (85)   6*85=510
@@ -254,3 +227,67 @@ TROGDOR		15657	14774
 ENDING		17642	17038
 CLIFF		13418	12648
 
+
+Disk Maps, Current
+
+	Disk1
+		QLOAD
+		SAVES
+		MUSIC
+		VID_LOGO
+		TITLE
+		INTRO
+		PARSE_INPUT
+		INVENTORY
+		COPY_CHECK
+		GAME_OVER	; because need to restart/reload anyway
+		
+	Disk2
+		PEASANT1
+		PEASANT2
+		PEASANT3
+		PEASANT4
+		MAP
+		INSIDE
+		INN
+		; variants with night backgrounds?
+		; rain code?
+
+	Disk3
+		ARCHERY
+		CLIFF/CLIMB
+		TROGDOR
+		SAM code?
+		ENDING		
+	
+
+Disk Maps, Original
+
+
+Disk1 Map (disk has 35 tracks, each 4k in size)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+T	  0 = Qboot
+T	  1 = QLOAD	 5286 bytes	21S = 1T5S
+T	  3 = MUSIC	 4045 bytes	16S = 1T0S
+T	  4 = VID_LOGO	 7574 bytes	30S = 1T14S
+T	  6 = TITLE      8950 bytes	35S = 2T3S
+T	  9 = INTRO	13467 bytes	52S = 3T4S
+T	 14 = INVENTORY  3121 bytes     13S = 0T13S
+T	 15 = PEASANT1  17007 bytes	67S = 4T3S	; 80 is max
+T	 20 = PEASANT2  17941 bytes	71S = 4T7S	; 79 = 20224
+T        25 = PEASANT3  18154 bytes	71S = 4T7S
+T	 30 = PEASANT4	15806 bytes	62S = 3T14S
+
+Disk2 Map (disk has 35 tracks, each 4k in size)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+T	  0 = WBOOT
+T	  1 = COPY_CHECK 2942 bytes	12S = 0T12S
+T         3 = GAME_OVER	 2111 bytes	 9S = 0T9S
+T	  4 = MAP        2703 bytes     11S = 0T11S
+T         6 = ARCHERY	 2112 bytes     11S = 0T11S
+T         9 = INSIDE	14178 bytes     56s = 3T8S
+T        14 = INN	 6906 bytes     27S = 1T11S
+T	 19 = TROGDOR	11468 bytes     45S = 2T13S	
+T        24 = ENDING	17619 bytes	69S = 4T5S
+T	 29 = CLIFF     13024 bytes     51S = 3T3S
+

games/peasant/qload.s

@@ -251,7 +251,7 @@ which_disk_array:
 	.byte 1,1,1,1		; VID_LOGO, TITLE, INTRO. COPY_CHECK
 	.byte 2,2,2,2		; PEASANT1, PEASANT2, PEASANT3, PEASANT4
 	.byte 2,2,1,2		; TROGDOR, ENDING, MUSIC, CLIFF
-	.byte 2,1,1,2		; GAME_OVER, INVENTORY, PARSE_INPUT, INN
+	.byte 1,1,1,2		; GAME_OVER, INVENTORY, PARSE_INPUT, INN
 	.byte 2,2,2		; INSIDE, ARCHERY, MAP
 	.byte 1,1,1		; SAVE1, SAVE2, SAVE3
 	.byte $f		; disk detect
@@ -269,7 +269,7 @@ track_array:
         .byte  4, 6, 9,1	; VID_LOGO, TITLE, INTRO, COPY_CHECK
 	.byte 15,20,25,30	; PEASANT1, PEASANT2, PEASANT3, PEASANT4
 	.byte 19,24, 3,29	; TROGDOR, ENDING, MUSIC, CLIFF
-	.byte  3,14,13,14	; GAME_OVER, INVENTORY, PARSE_INPUT, INN
+	.byte 15,14,13,14	; GAME_OVER, INVENTORY, PARSE_INPUT, INN
 	.byte  9,6,4		; INSIDE, ARCHERY, MAP
 	.byte  0, 0, 0		; SAVE1, SAVE2, SAVE3
 	.byte  0		; disk detect