peasant: properly hook up "climb cliff" message

games/peasant/parse_input.s

@@ -133,8 +133,6 @@ parse_common_cheat:
 parse_common_climb:
 
 	lda	CURRENT_NOUN
-	cmp	#NOUN_CLIFF
-	beq	climb_cliff
 	cmp	#NOUN_TREE
 	beq	climb_tree
 
@@ -155,13 +153,6 @@ climb_tree_day:
 	ldy	#>climb_tree_message
 	jmp	finish_parse_message
 
-climb_cliff:
-	; FIXME: only on certain locations
-	ldx	#<climb_cliff_message
-	ldy	#>climb_cliff_message
-	jmp	finish_parse_message
-
-
 	;=================
 	; copy
 	;=================
@@ -219,6 +210,11 @@ ditch_baby:
 	and	#INV1_BABY
 	beq	no_baby
 
+	lda	INVENTORY_1_GONE
+	and	#INV1_BABY
+	bne	no_baby
+
+
 	ldx	#<ditch_baby_message
 	ldy	#>ditch_baby_message
 	jmp	finish_parse_message
@@ -258,6 +254,10 @@ throw_baby:
 	and	#INV1_BABY
 	beq	throw_baby_no_baby
 
+	lda	INVENTORY_1_GONE
+	and	#INV1_BABY
+	bne	throw_baby_no_baby
+
 throw_baby_yes_baby:
 	ldx	#<throw_baby_yes_message
 	ldy	#>throw_baby_yes_message

games/peasant/peasant1_actions.s

@@ -1142,12 +1142,33 @@ yellow_tree_look_tree:
 	;=======================
 
 waterfall_verb_table:
+	.byte VERB_CLIMB
+	.word waterfall_climb-1
 	.byte VERB_LOOK
 	.word waterfall_look-1
 	.byte VERB_SWIM
 	.word waterfall_swim-1
 	.byte 0
 
+	;=================
+	; climb
+	;=================
+
+waterfall_climb:
+
+	lda	CURRENT_NOUN
+
+	cmp	#NOUN_CLIFF
+	beq	waterfall_climb_cliff
+
+	jmp	parse_common_unknown
+
+waterfall_climb_cliff:
+	ldx	#<waterfall_climb_cliff_message
+	ldy	#>waterfall_climb_cliff_message
+	jmp	finish_parse_message
+
+
 	;=================
 	; look
 	;=================

games/peasant/peasant4_actions.s

@@ -923,6 +923,8 @@ bush_count_lookup:
 	;=======================
 
 crooked_tree_verb_table:
+        .byte VERB_CLIMB
+        .word crooked_tree_climb-1
         .byte VERB_GET
         .word crooked_tree_get-1
         .byte VERB_LIGHT
@@ -931,6 +933,22 @@ crooked_tree_verb_table:
         .word crooked_tree_look-1
 	.byte 0
 
+	;================
+	; climb
+	;================
+crooked_tree_climb:
+	lda	CURRENT_NOUN
+
+	cmp	#NOUN_CLIFF
+	beq	crooked_climb_cliff
+
+	jmp	parse_common_unknown
+
+crooked_climb_cliff:
+	ldx	#<crooked_tree_climb_cliff_message
+	ldy	#>crooked_tree_climb_cliff_message
+	jmp	finish_parse_message
+
 
 	;================
 	; get

games/peasant/text/common.inc

@@ -177,13 +177,6 @@ no_baby_message:
 .byte "You don't even have two",13
 .byte "babies to rub together.",0
 
-; + climb cliff (screens where cliff is there [pass doesn't count?])
-climb_cliff_message:
-.byte "There aren't enough",13
-.byte "footholds and you don't",13
-.byte "have any carabeaners on",13
-.byte "you.",0
-
 ; + climb tree (day)
 climb_tree_message:
 .byte "But then your hands would",13

games/peasant/text/peasant1.inc

@@ -527,6 +527,13 @@ waterfall_swim_message:
 .byte "of those weight-gain",13
 .byte "protein smoothies.",0
 
+; + climb cliff
+waterfall_climb_cliff_message:
+.byte "There aren't enough",13
+.byte "footholds and you don't",13
+.byte "have any carabeaners on",13
+.byte "you.",0
+
 peasant1_dialog_end:
 
 .assert (>peasant1_dialog_end - >peasant1_dialog_start) < $1E , error, "peasant1 dialog too big"

games/peasant/text/peasant4.inc

@@ -447,6 +447,13 @@ crooked_tree_get_plaque_message:
 .byte "your browning, rotten",13
 .byte "peasant teeth already.",0
 
+; + climb cliff
+crooked_tree_climb_cliff_message:
+.byte "There aren't enough",13
+.byte "footholds and you don't",13
+.byte "have any carabeaners on",13
+.byte "you.",0
+
 peasant4_dialog_end:
 
 .assert (>peasant4_dialog_end - >peasant4_dialog_start) < $1E , error, "peasant4 dialog too big"