mirror of
https://github.com/deater/dos33fsprogs.git
synced 2024-12-28 09:30:41 +00:00
mist: fix issue where bookshelf passage not opening
broke whenever we modified change_location() to clear ANIMATE_FRAME
This commit is contained in:
parent
e3a05e070a
commit
7bd447ee1c
@ -1,10 +1,5 @@
|
|||||||
For release 1.0
|
For release 1.0
|
||||||
|
|
||||||
+ real harware
|
|
||||||
- down button doesn't work?
|
|
||||||
- myst title doesn't display long enough
|
|
||||||
- can't access right-hand rooms in octagon?
|
|
||||||
|
|
||||||
+ LOADER
|
+ LOADER
|
||||||
-- save game
|
-- save game
|
||||||
-- joystick support
|
-- joystick support
|
||||||
|
@ -578,6 +578,9 @@ open_bookshelf:
|
|||||||
cmp #OCTAGON_BOOKSHELF_CLOSE
|
cmp #OCTAGON_BOOKSHELF_CLOSE
|
||||||
beq actually_open_shelf
|
beq actually_open_shelf
|
||||||
|
|
||||||
|
|
||||||
|
; already open, so beep in protest
|
||||||
|
|
||||||
jsr short_beep
|
jsr short_beep
|
||||||
|
|
||||||
rts
|
rts
|
||||||
@ -589,48 +592,48 @@ actually_open_shelf:
|
|||||||
|
|
||||||
ldy #LOCATION_SPECIAL_EXIT
|
ldy #LOCATION_SPECIAL_EXIT
|
||||||
lda #$ff
|
lda #$ff
|
||||||
sta location1,Y
|
sta location1,Y ; OCTAGON_TEMPLE_CENTER
|
||||||
|
|
||||||
; change background of bookshelf N
|
; change background of bookshelf N
|
||||||
|
|
||||||
ldy #LOCATION_NORTH_BG
|
ldy #LOCATION_NORTH_BG
|
||||||
lda #<bookshelf_open_n_lzsa
|
lda #<bookshelf_open_n_lzsa
|
||||||
sta location8,Y
|
sta location8,Y ; OCTAGON_BOOKSHELF
|
||||||
lda #>bookshelf_open_n_lzsa
|
lda #>bookshelf_open_n_lzsa
|
||||||
sta location8+1,Y
|
sta location8+1,Y ; OCTAGON_BOOKSHELF
|
||||||
|
|
||||||
; change background of door N
|
; change background of door N
|
||||||
|
|
||||||
lda #<temple_door_closed_n_lzsa
|
lda #<temple_door_closed_n_lzsa
|
||||||
sta location0,Y
|
sta location0,Y ; OCTAGON_TEMPLE_DOORWAY
|
||||||
lda #>temple_door_closed_n_lzsa
|
lda #>temple_door_closed_n_lzsa
|
||||||
sta location0+1,Y
|
sta location0+1,Y ; OCTAGON_TEMPLE_DOORWAY
|
||||||
|
|
||||||
; change background of center room S
|
; change background of center room S
|
||||||
|
|
||||||
ldy #LOCATION_SOUTH_BG
|
ldy #LOCATION_SOUTH_BG
|
||||||
lda #<temple_center_closed_s_lzsa
|
lda #<temple_center_closed_s_lzsa
|
||||||
sta location1,Y
|
sta location1,Y ; OCTAGON_TEMPLE_CENTER
|
||||||
lda #>temple_center_closed_s_lzsa
|
lda #>temple_center_closed_s_lzsa
|
||||||
sta location1+1,Y
|
sta location1+1,Y ; OCTAGON_TEMPLE_CENTER
|
||||||
|
|
||||||
; change background of door S
|
; change background of door S
|
||||||
|
|
||||||
lda #<temple_door_closed_s_lzsa
|
lda #<temple_door_closed_s_lzsa
|
||||||
sta location0,Y
|
sta location0,Y ; OCTAGON_TEMPLE_DOORWAY
|
||||||
lda #>temple_door_closed_s_lzsa
|
lda #>temple_door_closed_s_lzsa
|
||||||
sta location0+1,Y
|
sta location0+1,Y ; OCTAGON_TEMPLE_DOORWAY
|
||||||
|
|
||||||
; disable exit to S
|
; disable exit to S
|
||||||
ldy #LOCATION_SPECIAL_EXIT
|
ldy #LOCATION_SPECIAL_EXIT
|
||||||
lda #$ff
|
lda #$ff
|
||||||
sta location0,Y
|
sta location0,Y ; OCTAGON_TEMPLE_DOORWAY
|
||||||
|
|
||||||
; enable exit to N
|
; enable exit to N
|
||||||
|
|
||||||
ldy #LOCATION_NORTH_EXIT
|
ldy #LOCATION_NORTH_EXIT
|
||||||
lda #OCTAGON_TOWER_HALL1
|
lda #OCTAGON_TOWER_HALL1
|
||||||
sta location8,Y
|
sta location8,Y ; OCTAGON_BOOKSHELF
|
||||||
|
|
||||||
; start animation
|
; start animation
|
||||||
|
|
||||||
@ -764,13 +767,19 @@ not_shelf:
|
|||||||
lda #10
|
lda #10
|
||||||
done_shelf:
|
done_shelf:
|
||||||
|
|
||||||
sta ANIMATE_FRAME
|
pha
|
||||||
|
|
||||||
lda #OCTAGON_TEMPLE_CENTER
|
lda #OCTAGON_TEMPLE_CENTER
|
||||||
sta LOCATION
|
sta LOCATION
|
||||||
|
|
||||||
jsr change_location
|
jsr change_location
|
||||||
|
|
||||||
|
pla
|
||||||
|
|
||||||
|
; change location trashes animate frame
|
||||||
|
|
||||||
|
sta ANIMATE_FRAME
|
||||||
|
|
||||||
shelf_swirl_no_inc:
|
shelf_swirl_no_inc:
|
||||||
|
|
||||||
|
|
||||||
@ -802,7 +811,7 @@ animate_shelf_open:
|
|||||||
|
|
||||||
lda ANIMATE_FRAME
|
lda ANIMATE_FRAME
|
||||||
cmp #5
|
cmp #5
|
||||||
bcs animate_shelf_close
|
bcs animate_shelf_close ; bge
|
||||||
|
|
||||||
asl
|
asl
|
||||||
tay
|
tay
|
||||||
@ -836,7 +845,7 @@ advance_shelf_open:
|
|||||||
bne shelf_open_no_inc
|
bne shelf_open_no_inc
|
||||||
|
|
||||||
; reset animation/bg
|
; reset animation/bg
|
||||||
|
disable_shelf_animate:
|
||||||
lda #0
|
lda #0
|
||||||
sta ANIMATE_FRAME
|
sta ANIMATE_FRAME
|
||||||
|
|
||||||
@ -844,7 +853,7 @@ advance_shelf_open:
|
|||||||
|
|
||||||
ldy #LOCATION_SPECIAL_EXIT
|
ldy #LOCATION_SPECIAL_EXIT
|
||||||
lda #DIRECTION_ANY
|
lda #DIRECTION_ANY
|
||||||
sta location1,Y
|
sta location1,Y ; OCTAGON_TEMPLE_CENTER
|
||||||
|
|
||||||
shelf_open_no_inc:
|
shelf_open_no_inc:
|
||||||
|
|
||||||
@ -906,26 +915,34 @@ shelf_close_no_dec:
|
|||||||
update_final_shelf_bg:
|
update_final_shelf_bg:
|
||||||
|
|
||||||
ldy #LOCATION_NORTH_EXIT
|
ldy #LOCATION_NORTH_EXIT
|
||||||
lda location8,Y
|
lda location8,Y ; OCTAGON_BOOKSHELF
|
||||||
cmp #OCTAGON_BOOKSHELF_CLOSE
|
cmp #OCTAGON_BOOKSHELF_CLOSE
|
||||||
bne finally_open_shelf
|
bne finally_open_shelf
|
||||||
|
|
||||||
ldy #LOCATION_NORTH_BG
|
ldy #LOCATION_NORTH_BG
|
||||||
lda #<temple_center_n_lzsa
|
lda #<temple_center_n_lzsa
|
||||||
sta location1,Y
|
sta location1,Y ; OCTAGON_CENTER
|
||||||
lda #>temple_center_n_lzsa
|
lda #>temple_center_n_lzsa
|
||||||
jmp all_done_open_shelf
|
jmp all_done_open_shelf
|
||||||
|
|
||||||
finally_open_shelf:
|
finally_open_shelf:
|
||||||
ldy #LOCATION_NORTH_BG
|
ldy #LOCATION_NORTH_BG
|
||||||
lda #<temple_center_open_n_lzsa
|
lda #<temple_center_open_n_lzsa
|
||||||
sta location1,Y
|
sta location1,Y ; OCTAGON_CENTER
|
||||||
lda #>temple_center_open_n_lzsa
|
lda #>temple_center_open_n_lzsa
|
||||||
|
|
||||||
all_done_open_shelf:
|
all_done_open_shelf:
|
||||||
sta location1+1,Y
|
sta location1+1,Y
|
||||||
|
|
||||||
|
lda ANIMATE_FRAME
|
||||||
|
pha
|
||||||
|
|
||||||
|
; change location trashes ANIMATE_FRAME
|
||||||
jsr change_location
|
jsr change_location
|
||||||
|
|
||||||
|
pla
|
||||||
|
sta ANIMATE_FRAME
|
||||||
|
|
||||||
rts
|
rts
|
||||||
|
|
||||||
;===============================================
|
;===============================================
|
||||||
|
Loading…
Reference in New Issue
Block a user