diff --git a/mist/graphics_stoney/Makefile b/mist/graphics_stoney/Makefile index 83009c8f..d0e04a1b 100644 --- a/mist/graphics_stoney/Makefile +++ b/mist/graphics_stoney/Makefile @@ -44,7 +44,9 @@ stoney_graphics.inc: \ 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 \ - right_airlock_open_n.lzsa \ + right_tunnel1_n.lzsa right_tunnel1_s.lzsa \ + right_tunnel2_n.lzsa right_tunnel2_s.lzsa right_tunnel2_w.lzsa \ + right_airlock_n.lzsa right_airlock_s.lzsa right_airlock_open_n.lzsa \ left_letter.lzsa echo "arrival_n_lzsa: .incbin \"arrival_n.lzsa\"" > stoney_graphics.inc echo "arrival_s_lzsa: .incbin \"arrival_s.lzsa\"" >> stoney_graphics.inc @@ -123,6 +125,13 @@ stoney_graphics.inc: \ echo "blue_room_w_lzsa: .incbin \"blue_room_w.lzsa\"" >> stoney_graphics.inc echo "map_case_open_e_lzsa: .incbin \"map_case_open_e.lzsa\"" >> stoney_graphics.inc echo "map_case_closed_e_lzsa: .incbin \"map_case_closed_e.lzsa\"" >> stoney_graphics.inc + echo "right_tunnel1_n_lzsa: .incbin \"right_tunnel1_n.lzsa\"" >> stoney_graphics.inc + echo "right_tunnel1_s_lzsa: .incbin \"right_tunnel1_s.lzsa\"" >> stoney_graphics.inc + echo "right_tunnel2_n_lzsa: .incbin \"right_tunnel2_n.lzsa\"" >> stoney_graphics.inc + echo "right_tunnel2_s_lzsa: .incbin \"right_tunnel2_s.lzsa\"" >> stoney_graphics.inc + echo "right_tunnel2_w_lzsa: .incbin \"right_tunnel2_w.lzsa\"" >> stoney_graphics.inc + echo "right_airlock_n_lzsa: .incbin \"right_airlock_n.lzsa\"" >> stoney_graphics.inc + echo "right_airlock_s_lzsa: .incbin \"right_airlock_s.lzsa\"" >> stoney_graphics.inc echo "right_airlock_open_n_lzsa: .incbin \"right_airlock_open_n.lzsa\"" >> stoney_graphics.inc echo "left_letter_lzsa: .incbin \"left_letter.lzsa\"" >> stoney_graphics.inc diff --git a/mist/graphics_stoney/right_tunnel1_n.png b/mist/graphics_stoney/right_tunnel1_n.png new file mode 100644 index 00000000..b6afe421 Binary files /dev/null and b/mist/graphics_stoney/right_tunnel1_n.png differ diff --git a/mist/graphics_stoney/right_tunnel1_s.png b/mist/graphics_stoney/right_tunnel1_s.png new file mode 100644 index 00000000..7e3ea665 Binary files /dev/null and b/mist/graphics_stoney/right_tunnel1_s.png differ diff --git a/mist/graphics_stoney/right_tunnel2_n.png b/mist/graphics_stoney/right_tunnel2_n.png new file mode 100644 index 00000000..9aa55bf4 Binary files /dev/null and b/mist/graphics_stoney/right_tunnel2_n.png differ diff --git a/mist/graphics_stoney/right_tunnel2_s.png b/mist/graphics_stoney/right_tunnel2_s.png new file mode 100644 index 00000000..fbecff86 Binary files /dev/null and b/mist/graphics_stoney/right_tunnel2_s.png differ diff --git a/mist/graphics_stoney/right_tunnel2_w.png b/mist/graphics_stoney/right_tunnel2_w.png new file mode 100644 index 00000000..0cd98322 Binary files /dev/null and b/mist/graphics_stoney/right_tunnel2_w.png differ diff --git a/mist/graphics_stoney/telescope_pieces.png b/mist/graphics_stoney/telescope_pieces.png new file mode 100644 index 00000000..6d6c44de Binary files /dev/null and b/mist/graphics_stoney/telescope_pieces.png differ diff --git a/mist/graphics_stoney/telescope_view.png b/mist/graphics_stoney/telescope_view.png index 69dc63e3..d246dbcb 100644 Binary files a/mist/graphics_stoney/telescope_view.png and b/mist/graphics_stoney/telescope_view.png differ diff --git a/mist/leveldata_stoney.inc b/mist/leveldata_stoney.inc index 43cb8edb..68e0ff38 100644 --- a/mist/leveldata_stoney.inc +++ b/mist/leveldata_stoney.inc @@ -441,7 +441,7 @@ location23: location24: .byte $ff ; north exit .byte $ff ; south exit - .byte STONEY_TELESCOPE_VIEW ; east exit + .byte $ff ; east exit .byte STONEY_TELESCOPE_PATH3 ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir @@ -452,7 +452,10 @@ location24: .word telescope_e_lzsa ; east bg .word telescope_w_lzsa ; west bg .byte BG_EAST|BG_WEST - .byte $ff + .byte DIRECTION_E ; special exit + .byte 16,25 ; special x + .byte 10,20 ; special y + .word goto_telescope-1 ; STONEY_TELESCOPE_VIEW -- telescope location25: @@ -657,8 +660,8 @@ location36: .byte DIRECTION_S ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir - .word left_tunnel1_n_lzsa ; north bg - .word left_tunnel1_s_lzsa ; south bg + .word right_tunnel1_n_lzsa ; north bg + .word right_tunnel1_s_lzsa ; south bg .word $0000 ; east bg .word $0000 ; west bg .byte BG_NORTH|BG_SOUTH @@ -674,9 +677,9 @@ location37: .byte DIRECTION_S ; south exit_dir .byte DIRECTION_E ; east exit_dir .byte DIRECTION_W ; west exit_dir - .word left_tunnel2_n_lzsa ; north bg - .word left_tunnel2_s_lzsa ; south bg - .word left_tunnel2_w_lzsa ; east bg + .word right_tunnel2_n_lzsa ; north bg + .word right_tunnel2_s_lzsa ; south bg + .word right_tunnel2_w_lzsa ; east bg .word $0000 ; west bg .byte BG_NORTH|BG_SOUTH|BG_EAST .byte $ff @@ -691,8 +694,8 @@ location38: .byte DIRECTION_S ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir - .word left_airlock_n_lzsa ; north bg - .word left_airlock_s_lzsa ; south bg + .word right_airlock_n_lzsa ; north bg + .word right_airlock_s_lzsa ; south bg .word $0000 ; east bg .word $0000 ; west bg .byte BG_NORTH|BG_SOUTH diff --git a/mist/stoney_puzzles.s b/mist/stoney_puzzles.s index 51aaaa6c..0b8c69e8 100644 --- a/mist/stoney_puzzles.s +++ b/mist/stoney_puzzles.s @@ -322,6 +322,20 @@ battery_sprite7: ; telescope ;====================================== +goto_telescope: + + ; reset to 0 each time + lda #71 + sta telescope_angle + + lda #STONEY_TELESCOPE_VIEW + sta LOCATION + + lda #DIRECTION_E|DIRECTION_SPLIT + sta DIRECTION + + jmp change_location + display_telescope: lda #16