diff --git a/games/peasant/peasant3_actions.s b/games/peasant/peasant3_actions.s index 09cc0412..547a5176 100644 --- a/games/peasant/peasant3_actions.s +++ b/games/peasant/peasant3_actions.s @@ -717,7 +717,11 @@ lake_west_get_pebbles: bne lake_west_yes_pebbles lake_west_no_pebbles: - ; TODO: only if standing on them + ; only if standing vaguely near them + + lda PEASANT_Y + cmp #$70 + bcs pebbles_too_far ; bge ; pick up pebbles lda INVENTORY_1 @@ -734,6 +738,13 @@ lake_west_no_pebbles: ldy #>lake_west_get_pebbles_message jmp finish_parse_message +pebbles_too_far: + ldx #lake_west_pebbles_too_far_message + jmp finish_parse_message + + + lake_west_yes_pebbles: jmp parse_common_get diff --git a/games/peasant/text/common.inc b/games/peasant/text/common.inc index 22d372cf..70b7a81d 100644 --- a/games/peasant/text/common.inc +++ b/games/peasant/text/common.inc @@ -2,6 +2,16 @@ ; Anywhere ;================== +; TODO +; After jumping in the haystack, go to any screen except Jhonka +; both hay and mud go away +.byte "Drat. The winds are heavy",13 +.byte "on all but a couple of key",13 +.byte "screens... looks like",13 +.byte "you're no longer in stealth",13 +.byte "mode.",0 + + ; + get/wear belt (after getting it) wear_belt_message: .byte "You're already wearing it.",13 diff --git a/games/peasant/text/peasant2.inc b/games/peasant/text/peasant2.inc index 4e43de4d..ed0da0a4 100644 --- a/games/peasant/text/peasant2.inc +++ b/games/peasant/text/peasant2.inc @@ -4,15 +4,6 @@ peasant2_dialog_start: ; That Hay Bale ;=============== -; TODO -; After jumping in the haystack, go to any screen except Jhonka -; both hay and mud go away -.byte "Drat. The winds are heavy",13 -.byte "on all but a couple of key",13 -.byte "screens... looks like",13 -.byte "you're no longer in stealth",13 -.byte "mode.",0 - ; + look hay_look_message: .byte "Well, there's that big bale",13 @@ -89,8 +80,7 @@ hay_get_hay_message: ; Mud Puddle ;============= -; note, puddle goes dry after you get riches? - +; note, puddle goes dry after you get riches ; +2 POINTS ; + (walk into puddle when raining) diff --git a/games/peasant/text/peasant3.inc b/games/peasant/text/peasant3.inc index 25176053..fcd3db72 100644 --- a/games/peasant/text/peasant3.inc +++ b/games/peasant/text/peasant3.inc @@ -373,8 +373,8 @@ lake_west_skip_stones_message: .byte "You decide to save yourself",13 .byte "the embarrassment.",0 -; TODO ; + get pebbles/rocks (from too far) +lake_west_pebbles_too_far_message: .byte "You do your best Mr.",13 .byte "Fantastic impression,",13 .byte "but you can't reach from",13