Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-11-01 01:06:33 +00:00
Code Issues Projects Releases Wiki Activity

peasant: fix up keeper conversation

Browse Source
This commit is contained in:
Vince Weaver 2024-10-15 23:46:17 -04:00
parent 33aa298843
commit f7258fa407
5 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
games/peasant/cliff_heights/cliff_heights.s
View File

@ -190,11 +190,7 @@ col_copy_loop:
ldx #<cliff_heights_top_message
ldy #>cliff_heights_top_message
stx OUTL
sty OUTH
jsr print_text_message
jsr wait_until_keypress
jsr finish_parse_message
jsr restore_parse_message
@ -237,10 +233,10 @@ no_lightning:
lda MAP_LOCATION
cmp #LOCATION_TROGDOR_OUTER
bne no_keeper
bne done_check_keeper
lda IN_QUIZ
bne no_keeper
bne done_check_keeper
check_keeper1:
lda INVENTORY_2
@ -255,9 +251,28 @@ check_keeper1:
check_keeper2:
no_keeper:
done_check_keeper:
;=================================
; draw keeper if we need refresh
lda REFRESH_SCREEN
beq no_draw_keeper
lda #0
sta REFRESH_SCREEN
lda IN_QUIZ ; need to draw keeper if quizzing
beq no_draw_keeper
jsr draw_standing_keeper
no_draw_keeper:
;=====================
; always draw peasant
@ -610,6 +625,7 @@ done_ron_peasant:
lda #200
jsr wait
jsr wait_vblank
jmp ron1_loop
@ -751,6 +767,7 @@ keeper1_loop:
lda #200
jsr wait
jsr wait_vblank
jmp keeper1_loop
@ -845,8 +862,14 @@ check_keyboard_answer:
lda KEYPRESS
bpl no_answer
bit KEYRESET
pha
jsr restore_parse_message
lda #0
sta REFRESH_SCREEN ; don't refresh or we draw keeper on top
pla
and #$7f ; strip high bit
@ -874,24 +897,23 @@ invalid_answer:
bit KEYRESET ; clear the keyboard buffer
lda WHICH_QUIZ
cmp #3
cmp #2 ; off by 1
beq resay_quiz3
cmp #2
cmp #1
beq resay_quiz2
resay_quiz1:
ldx #<cave_outer_quiz1_1again
ldy #>cave_outer_quiz1_1again
jmp print_text_message
jmp finish_parse_message_nowait
resay_quiz2:
ldx #<cave_outer_quiz1_2again
ldy #>cave_outer_quiz1_2again
jmp print_text_message
jmp finish_parse_message_nowait
resay_quiz3:
ldx #<cave_outer_quiz1_3again
ldy #>cave_outer_quiz1_3again
jmp print_text_message
jmp finish_parse_message_nowait
;======================

4
games/peasant/cliff_heights/heights_actions.s
View File

@ -260,9 +260,7 @@ keeper1_quiz3:
ldy #>cave_outer_quiz1_3
keeper1_quiz_common:
sta WHICH_QUIZ
stx OUTL
sty OUTH
jmp print_text_message
jmp finish_parse_message_nowait
;=============================

3
games/peasant/parse_input.s
View File

@ -717,6 +717,9 @@ finish_parse_message:
restore_parse_message:
lda #1
sta REFRESH_SCREEN ; might need to re-draw bg things
lda #0
ldx #39

2
games/peasant/vblank.s
View File

@ -12,7 +12,7 @@ VBLANK = $C019 ;
; positive? during vblank
wait_vblank:
lda APPLE_II_MODEL
lda APPLEII_MODEL
cmp #'E'
bne no_vblank

1
games/peasant/zp.inc
View File

@ -272,6 +272,7 @@ CURRENT_NOUN = $B1
WORD_MATCH = $B2
MAX_HEIGHT = $B3
WAIT_LOOP = $B4
REFRESH_SCREEN = $B5
INPUT_X = $C0
BOX_X1L = $C1