peasant: more background work

games/peasant/NOTES

@@ -26,22 +26,26 @@ $40-$5f HGR Page 2
 $60-$?? Programs	(roughly 22k available?)
 $B8-$BB Hi-res lookup tables
 $BC     temp area for load/save files
-$BD-$BF ???
+$BD-$BE temp area when saving game
+$BF	 ???
 $C0-$CF	I/O
-$D0-$DF (BANK2)	Mockingboard music/PT3-routines
+$D0-$DF (Language Card BANK1) ?????
+$D0-$DF (Language Card BANK2)	Mockingboard music/PT3-routines
+$E0-$FF (Language Card) ?????
 
 Disk1 Map (disk has 35 tracks, each 4k in size)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 T	  0 = Qboot
 T	  1 = QLOAD	 4813 bytes	19S = 1T3S
-T	  3 = VID_LOGO	 6911 bytes	27S = 1T11S
-T	  5 = TITLE      9662 bytes	38S = 2T6S
-T	  8 = INTRO	16040 bytes	63S = 3T15S
-T	 12 = COPY_CHECK 4922 bytes	20S = 1T4S
-T	 14 = PEASANT1  22501 bytes	79S = 4T15S	; 88 is max?
-T	 19 = PEASANT2					; 79 = 20224
-T        24 = PEASANT3
-T	 29 = PEASANT4
+T	  3 = MUSIC	 4045 bytes	16S = 1T0S
+T	  4 = VID_LOGO	 6911 bytes	27S = 1T11S
+T	  6 = TITLE      9662 bytes	38S = 2T6S
+T	  9 = INTRO	16040 bytes	63S = 3T15S
+T	 13 = COPY_CHECK 4922 bytes	20S = 1T4S
+T	 15 = PEASANT1  22501 bytes	79S = 4T15S	; 88 is max?
+T	 20 = PEASANT2					; 79 = 20224
+T        25 = PEASANT3
+T	 30 = PEASANT4
 
 Disk2 Map (disk has 35 tracks, each 4k in size)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

games/peasant/graphics/Makefile

@@ -72,7 +72,7 @@ graphics_peasant3.inc:	\
 	echo "cottage_lzsa: .incbin \"cottage.lzsa\"" >> graphics_peasant3.inc
 	echo "lake_w_lzsa: .incbin \"lake_w.lzsa\"" >> graphics_peasant3.inc
 	echo "lake_e_lzsa: .incbin \"lake_e.lzsa\"" >> graphics_peasant3.inc
-	echo "lake_e_boat_lzsa: .incbin \"lake_e_boat.lzsa\"" >> graphics_peasant3.inc
+#	echo "lake_e_boat_lzsa: .incbin \"lake_e_boat.lzsa\"" >> graphics_peasant3.inc
 	echo "inn_lzsa: .incbin \"inn.lzsa\"" >> graphics_peasant3.inc
 
 ###

games/peasant/parse_input.s

@@ -51,27 +51,34 @@ parse_look:
 
 parse_talk:
 	cmp	#'T'
-        bne     parse_show
+        bne     parse_s
 
         lda     #<fake_error2
         sta     OUTL
         lda     #>fake_error2
 	jmp	finish_parse_message
 
-parse_show:
+parse_s:
 	cmp	#'S'
         bne     parse_version
 
-;	bit	LORES
-;	bit	PAGE1
+	lda	input_buffer+2
+	and	#$DF			; make uppercase 0110 0001 -> 0100 0001
+	cmp	#'A'
+	beq	parse_save
+parse_show:
 
-;	jsr	wait_until_keypress
+	bit	LORES
+	bit	PAGE1
 
-;	bit	PAGE2
-;	bit	HIRES
+	jsr	wait_until_keypress
 
-;	jmp	done_parse_message
+	bit	PAGE2
+	bit	HIRES
 
+	jmp	done_parse_message
+
+parse_save:
 	jsr	save_menu
 
 	jmp	restore_parse_message

games/peasant/peasant1.s

@@ -1,10 +1,10 @@
 ; Peasant's Quest
 
 ; Peasantry Part 1 (top line of map)
+; 	Gary, Kerrek 1, Well, Yellow Tree, Waterfall
 
 WHICH_PEASANTRY = 0
 
-
 ; by Vince `deater` Weaver	vince@deater.net
 
 ; with apologies to everyone
@@ -182,8 +182,6 @@ peasant_text:
 .include "wait.s"
 .include "wait_a_bit.s"
 
-.include "graphics/graphics_peasant1.inc"
-.include "graphics/priority_peasant1.inc"
 
 .include "version.inc"
 .include "loadsave_menu.s"
@@ -204,7 +202,7 @@ fake_error2:
 .byte	     "]",127,0
 
 
-
+.include "graphics/graphics_peasant1.inc"
 
 map_backgrounds_low:
 	.byte	<gary_lzsa		; 0	-- gary the horse
@@ -212,21 +210,6 @@ map_backgrounds_low:
 	.byte	<wishing_well_lzsa	; 2	-- wishing well
 	.byte	<leaning_tree_lzsa	; 3	-- leaning tree
 	.byte	<waterfall_lzsa		; 4	-- waterfall
-;	.byte	<todo_lzsa		; 5
-;	.byte	<todo_lzsa		; 6
-;	.byte	<todo_lzsa		; 7
-;	.byte	<river_lzsa		; 8	-- river
-;	.byte	<knight_lzsa		; 9	-- knight
-;	.byte	<todo_lzsa		; 10
-;	.byte	<cottage_lzsa		; 11	-- cottage
-;	.byte	<lake_w_lzsa		; 12	-- lake west
-;	.byte	<lake_e_lzsa		; 13	-- lake east
-;	.byte	<inn_lzsa		; 14	-- inn
-;	.byte	<todo_lzsa		; 15
-;	.byte	<todo_lzsa		; 16
-;	.byte	<todo_lzsa		; 17
-;	.byte	<lady_cottage_lzsa	; 18	-- cottage lady
-;	.byte	<crooked_tree_lzsa	; 19	-- crooked tree
 
 map_backgrounds_hi:
 	.byte	>gary_lzsa		; 0	-- gary the horse
@@ -234,23 +217,9 @@ map_backgrounds_hi:
 	.byte	>wishing_well_lzsa	; 2	-- wishing well
 	.byte	>leaning_tree_lzsa	; 3	-- leaning tree
 	.byte	>waterfall_lzsa		; 4	-- waterfall
-;	.byte	>todo_lzsa		; 5
-;	.byte	>todo_lzsa		; 6
-;	.byte	>todo_lzsa		; 7
-;	.byte	>river_lzsa		; 8	-- river
-;	.byte	>knight_lzsa		; 9	-- knight
-;	.byte	>todo_lzsa		; 10
-;	.byte	>cottage_lzsa		; 11	-- cottage
-;	.byte	>lake_w_lzsa		; 12	-- lake west
-;	.byte	>lake_e_lzsa		; 13	-- lake east
-;	.byte	>inn_lzsa		; 14	-- inn
-;	.byte	>todo_lzsa		; 15
-;	.byte	>todo_lzsa		; 16
-;	.byte	>todo_lzsa		; 17
-;	.byte	>lady_cottage_lzsa	; 18	-- cottage lady
-;	.byte	>crooked_tree_lzsa	; 19	-- crooked tree
 
 
+.include "graphics/priority_peasant1.inc"
 
 map_priority_low:
 	.byte	<gary_priority_lzsa		; 0	-- gary the horse

games/peasant/peasant3.s

@@ -181,9 +181,6 @@ peasant_text:
 .include "wait.s"
 .include "wait_a_bit.s"
 
-.include "graphics/graphics_peasant3.inc"
-.include "graphics/priority_peasant3.inc"
-
 .include "version.inc"
 .include "loadsave_menu.s"
 
@@ -203,51 +200,25 @@ fake_error2:
 .byte	     "]",127,0
 
 
+.include "graphics/graphics_peasant3.inc"
+
+.include "sprites/boat_sprites.inc"
 
 map_backgrounds_low:
-;	.byte	<todo_lzsa		; 0
-;	.byte	<todo_lzsa		; 1
-;	.byte	<todo_lzsa		; 2
-;	.byte	<waterfall_lzsa		; 3	-- temp intentional bug
-;	.byte	<waterfall_lzsa		; 4	-- waterfall
-;	.byte	<todo_lzsa		; 5
-;	.byte	<todo_lzsa		; 6
-;	.byte	<todo_lzsa		; 7
-;	.byte	<river_lzsa		; 8	-- river
-;	.byte	<knight_lzsa		; 9	-- knight
 	.byte	<jhonka_lzsa		; 10	-- jhonka
 	.byte	<cottage_lzsa		; 11	-- cottage
 	.byte	<lake_w_lzsa		; 12	-- lake west
-	.byte	<lake_e_boat_lzsa		; 13	-- lake east
+	.byte	<lake_e_lzsa		; 13	-- lake east
 	.byte	<inn_lzsa		; 14	-- inn
-;	.byte	<todo_lzsa		; 15
-;	.byte	<todo_lzsa		; 16
-;	.byte	<todo_lzsa		; 17
-;	.byte	<lady_cottage_lzsa	; 18	-- cottage lady
-;	.byte	<crooked_tree_lzsa	; 19	-- crooked tree
 
 map_backgrounds_hi:
-;	.byte	>todo_lzsa		; 0
-;	.byte	>todo_lzsa		; 1
-;	.byte	>todo_lzsa		; 2
-;	.byte	>todo_lzsa		; 3
-;	.byte	>waterfall_lzsa		; 4	-- waterfall
-;	.byte	>todo_lzsa		; 5
-;	.byte	>todo_lzsa		; 6
-;	.byte	>todo_lzsa		; 7
-;	.byte	>river_lzsa		; 8	-- river
-;	.byte	>knight_lzsa		; 9	-- knight
 	.byte	>jhonka_lzsa		; 10	-- jhonka
 	.byte	>cottage_lzsa		; 11	-- cottage
 	.byte	>lake_w_lzsa		; 12	-- lake west
-	.byte	>lake_e_boat_lzsa		; 13	-- lake east
+	.byte	>lake_e_lzsa		; 13	-- lake east
 	.byte	>inn_lzsa		; 14	-- inn
-;	.byte	>todo_lzsa		; 15
-;	.byte	>todo_lzsa		; 16
-;	.byte	>todo_lzsa		; 17
-;	.byte	>lady_cottage_lzsa	; 18	-- cottage lady
-;	.byte	>crooked_tree_lzsa	; 19	-- crooked tree
 
+.include "graphics/priority_peasant3.inc"
 
 map_priority_low:
 	.byte	<jhonka_priority_lzsa		; 10	-- jhonka

games/peasant/sprites/Makefile

@@ -1,6 +1,18 @@
 HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite
 
-all:	inventory_sprites.inc ending_sprites.inc trogdor_sprites.inc
+all:	inventory_sprites.inc ending_sprites.inc trogdor_sprites.inc \
+	boat_sprites.inc
+
+boat_sprites.inc:	boat_sprites.png
+	$(HGR_SPRITE) -s -l boat0 boat_sprites.png  7   1 81   45 > boat_sprites.inc
+	$(HGR_SPRITE) -s -l boat1 boat_sprites.png  7  47 81   91 >> boat_sprites.inc
+	$(HGR_SPRITE) -s -l boat2 boat_sprites.png  7  93 81  137 >> boat_sprites.inc
+	$(HGR_SPRITE) -s -l boat3 boat_sprites.png  7 139 81  183 >> boat_sprites.inc
+	$(HGR_SPRITE) -s -l boat4 boat_sprites.png 91   1 165  45 >> boat_sprites.inc
+	$(HGR_SPRITE) -s -l boat5 boat_sprites.png 91  47 165  91 >> boat_sprites.inc
+	$(HGR_SPRITE) -s -l boat6 boat_sprites.png 91  93 165 137 >> boat_sprites.inc
+	$(HGR_SPRITE) -s -l boat7 boat_sprites.png 91 139 165 183 >> boat_sprites.inc
+
 
 inventory_sprites.inc:	inventory.png
 	$(HGR_SPRITE) -l arrow_sprite inventory.png 14 3 27 19 > inventory_sprites.inc
@@ -23,7 +35,7 @@ inventory_sprites.inc:	inventory.png
 	$(HGR_SPRITE) -l tshirt_sprite inventory.png 42 139 55 155 >> inventory_sprites.inc
 
 
-ending_sprites.inc:	end_sprites.png boat_sprites.png
+ending_sprites.inc:	end_sprites.png end_boat_sprites.png
 	$(HGR_SPRITE) -l baby0_sprite end_sprites.png 14 3 27 17 > ending_sprites.inc
 	$(HGR_SPRITE) -l baby0_mask end_sprites.png 42 3 55 17 >> ending_sprites.inc
 	$(HGR_SPRITE) -l baby1_sprite end_sprites.png 14 20 27 34 >> ending_sprites.inc
@@ -48,14 +60,14 @@ ending_sprites.inc:	end_sprites.png boat_sprites.png
 	$(HGR_SPRITE) -l baby10_mask end_sprites.png 42 173 55 187 >> ending_sprites.inc
 	$(HGR_SPRITE) -s -l jhonka1 end_sprites.png 105 84 145 115 >> ending_sprites.inc
 	$(HGR_SPRITE) -s -l jhonka2 end_sprites.png 105 121 145 152 >> ending_sprites.inc
-	$(HGR_SPRITE) -s -l boat0 boat_sprites.png  7   1 81   45 >> ending_sprites.inc
-	$(HGR_SPRITE) -s -l boat1 boat_sprites.png  7  47 81   91 >> ending_sprites.inc
-	$(HGR_SPRITE) -s -l boat2 boat_sprites.png  7  93 81  137 >> ending_sprites.inc
-	$(HGR_SPRITE) -s -l boat3 boat_sprites.png  7 139 81  183 >> ending_sprites.inc
-	$(HGR_SPRITE) -s -l boat4 boat_sprites.png 91   1 165  45 >> ending_sprites.inc
-	$(HGR_SPRITE) -s -l boat5 boat_sprites.png 91  47 165  91 >> ending_sprites.inc
-	$(HGR_SPRITE) -s -l boat6 boat_sprites.png 91  93 165 137 >> ending_sprites.inc
-	$(HGR_SPRITE) -s -l boat7 boat_sprites.png 91 139 165 183 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat0 end_boat_sprites.png  7   1 81   45 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat1 end_boat_sprites.png  7  47 81   91 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat2 end_boat_sprites.png  7  93 81  137 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat3 end_boat_sprites.png  7 139 81  183 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat4 end_boat_sprites.png 91   1 165  45 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat5 end_boat_sprites.png 91  47 165  91 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat6 end_boat_sprites.png 91  93 165 137 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat7 end_boat_sprites.png 91 139 165 183 >> ending_sprites.inc
 	$(HGR_SPRITE) -s -l foam0 end_sprites.png 155  38 165 85 >> ending_sprites.inc
 	$(HGR_SPRITE) -s -l foam1 end_sprites.png 183  38 195 85 >> ending_sprites.inc