Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-01-19 15:30:08 +00:00
Code Issues Projects Releases Wiki Activity

peasant: hook up some missing text in peasant4

Browse Source
This commit is contained in:
Vince Weaver 2021-12-05 13:52:17 -05:00
parent 1585b8f944
commit 4846cec0d2
3 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
games/peasant/peasant4_actions.s
View File

@ -437,6 +437,17 @@ ned_cottage_look_at_fence:
jmp finish_parse_message jmp finish_parse_message
ned_cottage_look_at_rock: ned_cottage_look_at_rock:
; check to see if it has been moved
lda GAME_STATE_2
and #COTTAGE_ROCK_MOVED
beq ned_cottage_look_at_rock_unmoved
ned_cottage_look_at_rock_moved:
ldx #<ned_cottage_look_rock_moved_message
ldy #>ned_cottage_look_rock_moved_message
jmp finish_parse_message
ned_cottage_look_at_rock_unmoved:
ldx #<ned_cottage_look_rock_message ldx #<ned_cottage_look_rock_message
ldy #>ned_cottage_look_rock_message ldy #>ned_cottage_look_rock_message
jmp finish_parse_message jmp finish_parse_message
@ -501,6 +512,10 @@ ned_tree_talk:
cmp #NOUN_TREE cmp #NOUN_TREE
beq ned_tree_talk_tree beq ned_tree_talk_tree
cmp #NOUN_NONE
beq ned_tree_talk_at
cmp #NOUN_NED
beq ned_tree_talk_ned
jmp parse_common_talk jmp parse_common_talk
@ -509,6 +524,41 @@ ned_tree_talk_tree:
ldy #>ned_tree_talk_tree_message ldy #>ned_tree_talk_tree_message
jmp finish_parse_message jmp finish_parse_message
ned_tree_talk_ned:
; only if he's out
lda NED_STATUS
bmi ned_tree_talk_ned_out
jmp parse_common_talk
ned_tree_talk_ned_out:
ldx #<ned_tree_talk_ned_message
ldy #>ned_tree_talk_ned_message
jmp finish_parse_message
ned_tree_talk_at:
; only if he's out
lda NED_STATUS
bmi ned_tree_talk_at_out
jmp parse_common_talk
ned_tree_talk_at_out:
; scare him away
lda #0
sta NED_STATUS
; FIXME: do we need to re-draw?
ldx #<ned_tree_talk_none_message
ldy #>ned_tree_talk_none_message
jmp finish_parse_message
;================= ;=================
; look ; look
;================= ;=================
@ -521,6 +571,15 @@ ned_tree_look:
beq ned_tree_look_at_tree beq ned_tree_look_at_tree
cmp #NOUN_NONE cmp #NOUN_NONE
beq ned_tree_look_at beq ned_tree_look_at
cmp #NOUN_DUDE
beq ned_tree_look_guy
cmp #NOUN_GUY
beq ned_tree_look_guy
cmp #NOUN_MAN
beq ned_tree_look_guy
cmp #NOUN_NED
beq ned_tree_look_guy
jmp parse_common_look jmp parse_common_look
@ -534,6 +593,19 @@ ned_tree_look_at_tree:
ldy #>ned_tree_look_at_tree_message ldy #>ned_tree_look_at_tree_message
jmp finish_parse_message jmp finish_parse_message
ned_tree_look_guy:
; only if he's visible
lda NED_STATUS
bmi ned_tree_look_ned_out
jmp parse_common_look
ned_tree_look_ned_out:
ldx #<ned_tree_look_ned_message
ldy #>ned_tree_look_ned_message
jmp finish_parse_message
;======================= ;=======================
;======================= ;=======================

4
games/peasant/text/peasant4.inc
View File

@ -95,6 +95,7 @@ ned_cottage_look_rock_message:
.byte "the cottage.",0 .byte "the cottage.",0
; + look rock (after removing it) ; + look rock (after removing it)
ned_cottage_look_rock_moved_message:
.byte "Some jerk removed a loose",13 .byte "Some jerk removed a loose",13
.byte "stone from the back of the",13 .byte "stone from the back of the",13
.byte "cottage.",0 .byte "cottage.",0
@ -207,6 +208,7 @@ ned_tree_look_at_message:
; + look guy ; + look guy
; + look man ; + look man
; + look ned (when Naked Ned is peeking out) ; + look ned (when Naked Ned is peeking out)
ned_tree_look_ned_message:
.byte "A fairly naked man is",13 .byte "A fairly naked man is",13
.byte "peering out from behind",13 .byte "peering out from behind",13
.byte "that tree.",0 .byte "that tree.",0
@ -220,11 +222,13 @@ ned_tree_climb_tree_message:
.byte "You don't climb wavy trees.",0 .byte "You don't climb wavy trees.",0
; + talk (with Naked Ned visible) (he disappears until you re-enter) ; + talk (with Naked Ned visible) (he disappears until you re-enter)
ned_tree_talk_none_message:
.byte "You startled him and he",13 .byte "You startled him and he",13
.byte "disappears!",0 .byte "disappears!",0
; + talk ned ; + talk ned
; + talk Naked Ned (with Naked Ned visible) ; + talk Naked Ned (with Naked Ned visible)
ned_tree_talk_ned_message:
.byte "'Never speak of this",13 .byte "'Never speak of this",13
.byte "meeting!' says the nudie",13 .byte "meeting!' says the nudie",13
.byte "and he disapperars.",0 .byte "and he disapperars.",0

4
games/peasant/zp.inc
View File

@ -153,6 +153,10 @@ GAME_STATE_2 = $99
GREASE_ON_HEAD =$80 GREASE_ON_HEAD =$80
NED_STATUS = $9A NED_STATUS = $9A
; 0 = hiding
; 1..127 = countdown to appearing
; negative = out
BUSH_STATUS = $9B ; status of bush search BUSH_STATUS = $9B ; status of bush search
BUSH_1_SEARCHED = $01 BUSH_1_SEARCHED = $01
BUSH_2_SEARCHED = $02 BUSH_2_SEARCHED = $02