From 52229459fd754e2a6fcc2ae2f6d2c0c3bc008d95 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 5 Dec 2021 15:01:46 -0500 Subject: [PATCH] peasant: hook up missing text in peasant1 --- games/peasant/peasant1_actions.s | 22 ++++++++++++++++++++-- games/peasant/text/peasant1.inc | 3 ++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/games/peasant/peasant1_actions.s b/games/peasant/peasant1_actions.s index 4e99c8a9..35fedc53 100644 --- a/games/peasant/peasant1_actions.s +++ b/games/peasant/peasant1_actions.s @@ -712,8 +712,26 @@ well_throw: jmp parse_common_unknown well_throw_baby: - ldx #well_throw_baby_message + ; first see if have baby + + lda INVENTORY_1 + and #INV1_BABY + beq well_throw_baby_none + + ; next see if still have baby + lda INVENTORY_1_GONE + and #INV1_BABY + bne well_throw_baby_none + +well_throw_baby_have: + + ldx #well_throw_baby_have_message + jmp finish_parse_message + +well_throw_baby_none: + ldx #well_throw_baby_none_message jmp finish_parse_message diff --git a/games/peasant/text/peasant1.inc b/games/peasant/text/peasant1.inc index be8782a9..72ab7e95 100644 --- a/games/peasant/text/peasant1.inc +++ b/games/peasant/text/peasant1.inc @@ -449,11 +449,12 @@ well_get_bucket_message: ; throw ; + throw baby (if you have it) +well_throw_baby_have_message: .byte "Throw it where?",0 ; + throw baby ; + put baby in bucket/well (before baby/after baby) -well_throw_baby_message: +well_throw_baby_none_message: well_put_baby_none_message: .byte "Hmmmm... A baby, eh? You",13 .byte "check your sundial.",13