peasant: update graphics

hgr is evil

games/peasant/Makefile

@@ -25,7 +25,7 @@ PEASANT:	peasant.o
 	ld65 -o PEASANT peasant.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
 
 peasant.o:	peasant.s graphics/graphics.inc \
-		directions.s
+		directions.s cottage.s
 	ca65 -o peasant.o peasant.s -l peasant.lst
 
 ###

games/peasant/cottage.s

@@ -0,0 +1,31 @@
+; THATCHED ROOF COTTAGES
+
+cottage:
+
+	;************************
+	; Cottage
+	;************************
+
+	lda	#<(cottage_lzsa)
+	sta	getsrc_smc+1
+	lda	#>(cottage_lzsa)
+	sta	getsrc_smc+2
+
+	lda	#$40
+
+	jsr	decompress_lzsa2_fast
+
+	lda	#<peasant_text
+	sta	OUTL
+	lda	#>peasant_text
+	sta	OUTH
+
+	jsr	hgr_put_string
+
+
+	jsr	wait_until_keypress
+
+	rts
+
+peasant_text:
+	.byte 25,2,"Peasant's Quest",0

games/peasant/graphics/Makefile

@@ -21,10 +21,10 @@ graphics.inc:	\
 	echo "title_lzsa: .incbin \"peasant_title.lzsa\"" >> graphics.inc
 	echo "tips_lzsa: .incbin \"tips.lzsa\"" >> graphics.inc
 	echo "cottage_lzsa: .incbin \"cottage.lzsa\"" >> graphics.inc
-	echo "lake_e_lzsa: .incbin \"lake_e.lzsa\"" >> graphics.inc
 	echo "lake_w_lzsa: .incbin \"lake_w.lzsa\"" >> graphics.inc
-	echo "river_lzsa: .incbin \"river.lzsa\"" >> graphics.inc
+#	echo "lake_e_lzsa: .incbin \"lake_e.lzsa\"" >> graphics.inc
-	echo "knight_lzsa: .incbin \"knight.lzsa\"" >> graphics.inc
+#	echo "river_lzsa: .incbin \"river.lzsa\"" >> graphics.inc
+#	echo "knight_lzsa: .incbin \"knight.lzsa\"" >> graphics.inc
 
 
 ###

games/peasant/hello.bas

@@ -1,4 +1,4 @@
 5 HOME
-10 PRINT CHR$(4)"CATALOG"
+10 REM PRINT CHR$(4)"CATALOG"
-20 REM PRINT CHR$(4)"BRUN PEASANT"
+20 PRINT CHR$(4)"BRUN PEASANT"
 

games/peasant/peasant.s

@@ -71,19 +71,9 @@ hgr_display:
 	; Cottage
 	;************************
 
-	lda	#<(cottage_lzsa)
+	jsr	cottage
-	sta	getsrc_smc+1
-	lda	#>(cottage_lzsa)
-	sta	getsrc_smc+2
-
-	lda	#$40
-
-	jsr	decompress_lzsa2_fast
-
-	jsr	wait_until_keypress
 
 
-.if 0
 	;************************
 	; Lake West
 	;************************
@@ -100,6 +90,8 @@ hgr_display:
 	jsr	wait_until_keypress
 
 
+.if 0
+
 	;************************
 	; Lake East
 	;************************
@@ -156,6 +148,8 @@ forever:
 .include "wait_keypress.s"
 
 .include "directions.s"
+.include "cottage.s"
+
 .include "hgr_font.s"
 
 .include "graphics/graphics.inc"