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

mist: fix more breakage in tower rotation

Browse Source 
more issues because change_location was clearing animate status
This commit is contained in:
Vince Weaver 2020-07-20 01:03:49 -04:00
parent 561f5d7afd
commit 1e14451837
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
mist/octagon_bookshelf.s
View File

@ -557,11 +557,12 @@ elevator_goto_library_level:
lda #$ff lda #$ff
sta location18,Y sta location18,Y
jsr change_location
lda #(5|128) lda #(5|128)
sta ANIMATE_FRAME sta ANIMATE_FRAME
jmp change_location rts
;=================================== ;===================================
;=================================== ;===================================
@ -767,18 +768,16 @@ not_shelf:
lda #10 lda #10
done_shelf: done_shelf:
pha sta ANIMATE_FRAME
lda #OCTAGON_TEMPLE_CENTER lda #OCTAGON_TEMPLE_CENTER
sta LOCATION sta LOCATION
jsr change_location jsr change_location_save_animate
pla
; change location trashes animate frame ; change location trashes animate frame
sta ANIMATE_FRAME
shelf_swirl_no_inc: shelf_swirl_no_inc:
@ -934,16 +933,8 @@ finally_open_shelf:
all_done_open_shelf: all_done_open_shelf:
sta location1+1,Y sta location1+1,Y
lda ANIMATE_FRAME jmp change_location_save_animate
pha
; change location trashes ANIMATE_FRAME
jsr change_location
pla
sta ANIMATE_FRAME
rts
;=============================================== ;===============================================
;=============================================== ;===============================================
@ -958,6 +949,15 @@ animate_elevator_ride:
jmp elevator_going_down jmp elevator_going_down
change_location_save_animate:
lda ANIMATE_FRAME
pha
jsr change_location
pla
sta ANIMATE_FRAME
rts
;=============================================== ;===============================================
; elevator going up ; elevator going up
;=============================================== ;===============================================
@ -1000,7 +1000,7 @@ up_close_door:
lda #>elevator_door_closed_s_lzsa lda #>elevator_door_closed_s_lzsa
sta location18+1,Y sta location18+1,Y
jsr change_location jsr change_location_save_animate
jsr gr_copy_to_current jsr gr_copy_to_current
@ -1013,7 +1013,7 @@ up_light_off:
lda #>elevator_dark_s_lzsa lda #>elevator_dark_s_lzsa
sta location18+1,Y sta location18+1,Y
jsr change_location jsr change_location_save_animate
up_draw_lib: up_draw_lib:
jsr draw_elevator_window_lib jsr draw_elevator_window_lib
@ -1069,7 +1069,7 @@ up_light_on:
lda #>elevator_door_closed_s_lzsa lda #>elevator_door_closed_s_lzsa
sta location18+1,Y sta location18+1,Y
jsr change_location jsr change_location_save_animate
jsr draw_elevator_window_tower jsr draw_elevator_window_tower
@ -1150,7 +1150,7 @@ down_close_door:
lda #>elevator_door_closed_s_lzsa lda #>elevator_door_closed_s_lzsa
sta location18+1,Y sta location18+1,Y
jsr change_location jsr change_location_save_animate
jsr gr_copy_to_current jsr gr_copy_to_current
@ -1163,7 +1163,7 @@ down_light_off:
lda #>elevator_dark_s_lzsa lda #>elevator_dark_s_lzsa
sta location18+1,Y sta location18+1,Y
jsr change_location jsr change_location_save_animate
down_draw_tower: down_draw_tower:
jsr draw_elevator_window_tower jsr draw_elevator_window_tower
@ -1219,7 +1219,7 @@ down_light_on:
lda #>elevator_door_closed_s_lzsa lda #>elevator_door_closed_s_lzsa
sta location18+1,Y sta location18+1,Y
jsr change_location jsr change_location_save_animate
jsr draw_elevator_window_lib jsr draw_elevator_window_lib