From 2644d60974ebb2bb0aa7db3d6d8b94dc9fbadfdd Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Mon, 18 Oct 2021 00:41:50 -0400
Subject: [PATCH] peasant: actually call a room-specific look

---
 games/peasant/Makefile          | 13 ++++++++-----
 games/peasant/parse_input.s     | 10 ++++++++--
 games/peasant/peasant2.s        |  2 ++
 games/peasant/text/peasant2.inc |  1 +
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/games/peasant/Makefile b/games/peasant/Makefile
index c4014d16..61bd76c4 100644
--- a/games/peasant/Makefile
+++ b/games/peasant/Makefile
@@ -264,7 +264,7 @@ peasant1.o:	peasant1.s zp.inc inventory.inc \
 PEASANT2:	peasant2.o
 	ld65 -o PEASANT2 peasant2.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
 
-peasant2.o:	peasant2.s zp.inc inventory.inc \
+peasant2.o:	peasant2.s zp.inc inventory.inc dialog_peasant2.inc \
 		graphics_peasantry/graphics_peasant2.inc sprites/peasant_sprites.inc \
 		graphics_peasantry/priority_peasant2.inc \
 		sprites/inventory_sprites.inc \
@@ -400,6 +400,11 @@ dialog_peasant2.o:	dialog_peasant2.s
 
 ###
 
+dialog_peasant2.inc:	generate_common dialog_peasant2
+	./generate_common -a 0xe000 -s pass_look_message dialog_peasant2.lst > dialog_peasant2.inc
+
+####
+
 DIALOG_PEASANT3.LZSA:	dialog_peasant3
 	$(LZSA) -r -f2 dialog_peasant3 DIALOG_PEASANT3.LZSA
 
@@ -503,7 +508,5 @@ distclean:
 clean:	
 	rm -f *~ *.o *.lst HELLO VID_LOGO TITLE INTRO COPY_CHECK \
 			PEASANT1 PEASANT2 PEASANT3 PEASANT4 \
-			TROGDOR ENDING MUSIC GAME_OVER
-
-
-
+			TROGDOR ENDING MUSIC GAME_OVER \
+			dialog_peasant2
diff --git a/games/peasant/parse_input.s b/games/peasant/parse_input.s
index e5e58274..3f4d58be 100644
--- a/games/peasant/parse_input.s
+++ b/games/peasant/parse_input.s
@@ -308,9 +308,13 @@ parse_load:
 
 parse_look:
 
-	lda	#<look_irrelevant_message
+	lda	#<pass_look_message
 	sta	OUTL
-	lda	#>look_irrelevant_message
+	lda	#>pass_look_message
+
+;	lda	#<look_irrelevant_message
+;	sta	OUTL
+;	lda	#>look_irrelevant_message
 	jmp	finish_parse_message
 
 	;===================
@@ -732,3 +736,5 @@ verb_table:
 	.word	parse_why-1	; VERB_WHY	= 68
 	.word	parse_yet-1	; VERB_YES	= 69
 	.word	parse_help-1	; VERB_HELP	= 70
+
+.include "dialog_peasant2.inc"
diff --git a/games/peasant/peasant2.s b/games/peasant/peasant2.s
index 35f4f8ea..5630c411 100644
--- a/games/peasant/peasant2.s
+++ b/games/peasant/peasant2.s
@@ -246,3 +246,5 @@ map_priority_hi:
 
 ;peasant2_text_lzsa:
 ;.incbin "DIALOG_PEASANT2.LZSA"
+
+;.include "dialog_peasant2.inc"
diff --git a/games/peasant/text/peasant2.inc b/games/peasant/text/peasant2.inc
index a8f9b381..752128a7 100644
--- a/games/peasant/text/peasant2.inc
+++ b/games/peasant/text/peasant2.inc
@@ -219,6 +219,7 @@
 ;========================
 
 ; + look
+pass_look_message:
 .byte "You've reached the",13
 .byte "mountain pass that leads to",13
 .byte "Trogdor's lair. A royal",13