diff --git a/mist/graphics_stoney/Makefile b/mist/graphics_stoney/Makefile index c2d6b917..413038d1 100644 --- a/mist/graphics_stoney/Makefile +++ b/mist/graphics_stoney/Makefile @@ -44,7 +44,7 @@ stoney_graphics.inc: \ red_room_n.lzsa red_room_s.lzsa red_room_e.lzsa red_room_w.lzsa \ dresser_e.lzsa dresser_open_e.lzsa \ compass_room_n.lzsa compass_room_w.lzsa compass_room_e.lzsa \ - compass_rose_w.lzsa \ + compass_rose_w.lzsa compass_rose_lit_w.lzsa \ crawlway_e.lzsa crawlway_w.lzsa \ blue_room_n.lzsa blue_room_s.lzsa blue_room_e.lzsa blue_room_w.lzsa \ map_case_open_e.lzsa map_case_closed_e.lzsa \ @@ -129,6 +129,7 @@ stoney_graphics.inc: \ echo "compass_room_w_lzsa: .incbin \"compass_room_w.lzsa\"" >> stoney_graphics.inc echo "compass_room_n_lzsa: .incbin \"compass_room_n.lzsa\"" >> stoney_graphics.inc echo "compass_rose_w_lzsa: .incbin \"compass_rose_w.lzsa\"" >> stoney_graphics.inc + echo "compass_rose_lit_w_lzsa: .incbin \"compass_rose_lit_w.lzsa\"" >> stoney_graphics.inc echo "crawlway_e_lzsa: .incbin \"crawlway_e.lzsa\"" >> stoney_graphics.inc echo "crawlway_w_lzsa: .incbin \"crawlway_w.lzsa\"" >> stoney_graphics.inc echo "blue_room_n_lzsa: .incbin \"blue_room_n.lzsa\"" >> stoney_graphics.inc diff --git a/mist/graphics_stoney/compass_rose_lit_w.png b/mist/graphics_stoney/compass_rose_lit_w.png new file mode 100644 index 00000000..d9bd74ac Binary files /dev/null and b/mist/graphics_stoney/compass_rose_lit_w.png differ diff --git a/mist/stoney_puzzles.s b/mist/stoney_puzzles.s index dfaa3b97..08ca87f9 100644 --- a/mist/stoney_puzzles.s +++ b/mist/stoney_puzzles.s @@ -146,7 +146,9 @@ right_knob: lda #1 sta COMPASS_STATE - jmp update_compass_state + jsr update_compass_state + + jmp change_direction wrong_knob: lda #0 @@ -224,16 +226,38 @@ compass_light_sprite: ; if COMPASS_STATE is 1: ; enable access to linking book update_compass_state: - ldy #LOCATION_NORTH_EXIT lda COMPASS_STATE bne enable_book_access disable_book_access: + ; regular compass rose + ldy #LOCATION_WEST_BG + lda #compass_rose_w_lzsa + sta location35+1,Y ; STONEY_COMPASS_ROSE_LEFT + sta location46+1,Y ; STONEY_COMPASS_ROSE_RIGHT + + ldy #LOCATION_NORTH_EXIT lda #$ff - bne update_book_access ; bra -enable_book_access: - lda #STONEY_BOOK_TABLE -update_book_access: sta location16,Y ; STONEY_BOOK_ROOM + + rts + +enable_book_access: + ; lit compass rose + ldy #LOCATION_WEST_BG + lda #compass_rose_lit_w_lzsa + sta location35+1,Y ; STONEY_COMPASS_ROSE_LEFT + sta location46+1,Y ; STONEY_COMPASS_ROSE_RIGHT + + ldy #LOCATION_NORTH_EXIT + lda #STONEY_BOOK_TABLE + sta location16,Y ; STONEY_BOOK_ROOM + rts ;===================================