diff --git a/mist/TODO b/mist/TODO index e0ba3e58..b34746e2 100644 --- a/mist/TODO +++ b/mist/TODO @@ -30,6 +30,7 @@ ending: MECHE age: + can poke around more stuff in their rooms ++ reduce size by using flipped-background attribute SELENA age: + optional mockingboard sound for keyboard? @@ -55,7 +56,7 @@ Stoneship age: + Implement spinning generator/battery level + Implement telescope + Enable linking back to Myst - ++ Implement book pages Ending: + Turning diff --git a/mist/common_defines.inc b/mist/common_defines.inc index a7a47f78..2273643c 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -244,10 +244,16 @@ STONEY_TELESCOPE_PATH2 = 29 STONEY_TELESCOPE_PATH3 = 30 STONEY_TELESCOPE = 31 STONEY_TELESCOPE_VIEW = 32 - - - - +STONEY_LEFT_TUNNEL1 = 33 +STONEY_LEFT_TUNNEL2 = 34 +STONEY_LEFT_AIRLOCK = 35 +STONEY_LEFT_AIRLOCK_OPEN= 36 +STONEY_RED_ROOM = 37 +STONEY_RED_ROOM_DRESSER = 38 +STONEY_RED_DRESSER_OPEN = 39 +STONEY_CRAWLWAY_LEFT = 40 +STONEY_COMPASS_ROOM = 41 +STONEY_COMPASS_ROSE = 42 ; Channely Wood CHANNEL_OUTSIDE_CABIN = 0 diff --git a/mist/graphics_stoney/Makefile b/mist/graphics_stoney/Makefile index 7320dada..cc864771 100644 --- a/mist/graphics_stoney/Makefile +++ b/mist/graphics_stoney/Makefile @@ -37,7 +37,15 @@ stoney_graphics.inc: \ telescope_path2_e.lzsa telescope_path2_w.lzsa \ telescope_path3_e.lzsa telescope_path3_w.lzsa \ telescope_e.lzsa telescope_w.lzsa \ - telescope_view.lzsa + telescope_view.lzsa \ + left_tunnel1_n.lzsa left_tunnel1_s.lzsa \ + left_tunnel2_n.lzsa left_tunnel2_s.lzsa left_tunnel2_w.lzsa \ + left_airlock_n.lzsa left_airlock_s.lzsa left_airlock_open_n.lzsa \ + 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_w.lzsa compass_room_e.lzsa \ + compass_rose_w.lzsa \ + crawlway_e.lzsa crawlway_w.lzsa echo "ship_entry_n_lzsa: .incbin \"ship_entry_n.lzsa\"" > stoney_graphics.inc echo "ship_entry_s_lzsa: .incbin \"ship_entry_s.lzsa\"" >> stoney_graphics.inc echo "ship_bow_s_lzsa: .incbin \"ship_bow_s.lzsa\"" >> stoney_graphics.inc @@ -98,6 +106,25 @@ stoney_graphics.inc: \ echo "telescope_e_lzsa: .incbin \"telescope_e.lzsa\"" >> stoney_graphics.inc echo "telescope_w_lzsa: .incbin \"telescope_w.lzsa\"" >> stoney_graphics.inc echo "telescope_view_lzsa: .incbin \"telescope_view.lzsa\"" >> stoney_graphics.inc + echo "left_tunnel1_n_lzsa: .incbin \"left_tunnel1_n.lzsa\"" >> stoney_graphics.inc + echo "left_tunnel1_s_lzsa: .incbin \"left_tunnel1_s.lzsa\"" >> stoney_graphics.inc + echo "left_tunnel2_n_lzsa: .incbin \"left_tunnel2_n.lzsa\"" >> stoney_graphics.inc + echo "left_tunnel2_s_lzsa: .incbin \"left_tunnel2_s.lzsa\"" >> stoney_graphics.inc + echo "left_tunnel2_w_lzsa: .incbin \"left_tunnel2_w.lzsa\"" >> stoney_graphics.inc + echo "left_airlock_n_lzsa: .incbin \"left_airlock_n.lzsa\"" >> stoney_graphics.inc + echo "left_airlock_s_lzsa: .incbin \"left_airlock_s.lzsa\"" >> stoney_graphics.inc + echo "left_airlock_open_n_lzsa: .incbin \"left_airlock_open_n.lzsa\"" >> stoney_graphics.inc + echo "red_room_n_lzsa: .incbin \"red_room_n.lzsa\"" >> stoney_graphics.inc + echo "red_room_s_lzsa: .incbin \"red_room_s.lzsa\"" >> stoney_graphics.inc + echo "red_room_e_lzsa: .incbin \"red_room_e.lzsa\"" >> stoney_graphics.inc + echo "red_room_w_lzsa: .incbin \"red_room_w.lzsa\"" >> stoney_graphics.inc + echo "dresser_e_lzsa: .incbin \"dresser_e.lzsa\"" >> stoney_graphics.inc + echo "dresser_open_e_lzsa: .incbin \"dresser_open_e.lzsa\"" >> stoney_graphics.inc + echo "compass_room_e_lzsa: .incbin \"compass_room_e.lzsa\"" >> stoney_graphics.inc + echo "compass_room_w_lzsa: .incbin \"compass_room_w.lzsa\"" >> stoney_graphics.inc + echo "compass_rose_w_lzsa: .incbin \"compass_rose_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 %.gr: %.png diff --git a/mist/graphics_stoney/compass_room_e.png b/mist/graphics_stoney/compass_room_e.png new file mode 100644 index 00000000..4b0566ce Binary files /dev/null and b/mist/graphics_stoney/compass_room_e.png differ diff --git a/mist/graphics_stoney/compass_room_w.png b/mist/graphics_stoney/compass_room_w.png new file mode 100644 index 00000000..7138e6b0 Binary files /dev/null and b/mist/graphics_stoney/compass_room_w.png differ diff --git a/mist/graphics_stoney/compass_rose_w.png b/mist/graphics_stoney/compass_rose_w.png new file mode 100644 index 00000000..415d033c Binary files /dev/null and b/mist/graphics_stoney/compass_rose_w.png differ diff --git a/mist/graphics_stoney/crawlway_e.png b/mist/graphics_stoney/crawlway_e.png new file mode 100644 index 00000000..fca6bbfd Binary files /dev/null and b/mist/graphics_stoney/crawlway_e.png differ diff --git a/mist/graphics_stoney/crawlway_w.png b/mist/graphics_stoney/crawlway_w.png new file mode 100644 index 00000000..0f6144ab Binary files /dev/null and b/mist/graphics_stoney/crawlway_w.png differ diff --git a/mist/graphics_stoney/dresser_e.png b/mist/graphics_stoney/dresser_e.png new file mode 100644 index 00000000..4ae4e703 Binary files /dev/null and b/mist/graphics_stoney/dresser_e.png differ diff --git a/mist/graphics_stoney/dresser_open_e.png b/mist/graphics_stoney/dresser_open_e.png new file mode 100644 index 00000000..87807ba3 Binary files /dev/null and b/mist/graphics_stoney/dresser_open_e.png differ diff --git a/mist/graphics_stoney/left_airlock_n.png b/mist/graphics_stoney/left_airlock_n.png new file mode 100644 index 00000000..6db04838 Binary files /dev/null and b/mist/graphics_stoney/left_airlock_n.png differ diff --git a/mist/graphics_stoney/left_airlock_open_n.png b/mist/graphics_stoney/left_airlock_open_n.png new file mode 100644 index 00000000..5ed5b7c1 Binary files /dev/null and b/mist/graphics_stoney/left_airlock_open_n.png differ diff --git a/mist/graphics_stoney/left_airlock_s.png b/mist/graphics_stoney/left_airlock_s.png new file mode 100644 index 00000000..9c408c2d Binary files /dev/null and b/mist/graphics_stoney/left_airlock_s.png differ diff --git a/mist/graphics_stoney/left_tunnel1_n.png b/mist/graphics_stoney/left_tunnel1_n.png new file mode 100644 index 00000000..240173e2 Binary files /dev/null and b/mist/graphics_stoney/left_tunnel1_n.png differ diff --git a/mist/graphics_stoney/left_tunnel1_s.png b/mist/graphics_stoney/left_tunnel1_s.png new file mode 100644 index 00000000..ed7b1fe8 Binary files /dev/null and b/mist/graphics_stoney/left_tunnel1_s.png differ diff --git a/mist/graphics_stoney/left_tunnel2_n.png b/mist/graphics_stoney/left_tunnel2_n.png new file mode 100644 index 00000000..cc95baec Binary files /dev/null and b/mist/graphics_stoney/left_tunnel2_n.png differ diff --git a/mist/graphics_stoney/left_tunnel2_s.png b/mist/graphics_stoney/left_tunnel2_s.png new file mode 100644 index 00000000..845923d9 Binary files /dev/null and b/mist/graphics_stoney/left_tunnel2_s.png differ diff --git a/mist/graphics_stoney/left_tunnel2_w.png b/mist/graphics_stoney/left_tunnel2_w.png new file mode 100644 index 00000000..70f3caee Binary files /dev/null and b/mist/graphics_stoney/left_tunnel2_w.png differ diff --git a/mist/graphics_stoney/red_room_e.png b/mist/graphics_stoney/red_room_e.png new file mode 100644 index 00000000..aeafc086 Binary files /dev/null and b/mist/graphics_stoney/red_room_e.png differ diff --git a/mist/graphics_stoney/red_room_n.png b/mist/graphics_stoney/red_room_n.png new file mode 100644 index 00000000..5360dc5e Binary files /dev/null and b/mist/graphics_stoney/red_room_n.png differ diff --git a/mist/graphics_stoney/red_room_s.png b/mist/graphics_stoney/red_room_s.png new file mode 100644 index 00000000..f132b530 Binary files /dev/null and b/mist/graphics_stoney/red_room_s.png differ diff --git a/mist/graphics_stoney/red_room_w.png b/mist/graphics_stoney/red_room_w.png new file mode 100644 index 00000000..a7d6ed9e Binary files /dev/null and b/mist/graphics_stoney/red_room_w.png differ diff --git a/mist/leveldata_stoney.inc b/mist/leveldata_stoney.inc index 28ae5d19..c166a896 100644 --- a/mist/leveldata_stoney.inc +++ b/mist/leveldata_stoney.inc @@ -12,7 +12,9 @@ locations: .word location20,location21,location22,location23 .word location24,location25,location26,location27 .word location28,location29,location30,location31 - .word location32 + .word location32,location33,location34,location35 + .word location36,location37,location38,location39 + .word location40,location41,location42 ; STONEY_SHIP_STERN -- back of the ship @@ -299,11 +301,11 @@ location15: ; STONEY_DOORWAY1 -- doorway1 location16: - .byte $ff ; north exit + .byte STONEY_LEFT_TUNNEL1 ; north exit .byte STONEY_ARRIVAL ; south exit .byte STONEY_BRIDGE ; east exit .byte STONEY_ARRIVAL ; west exit - .byte $ff ; north exit_dir + .byte DIRECTION_N ; north exit_dir .byte DIRECTION_S ; south exit_dir .byte DIRECTION_E ; east exit_dir .byte DIRECTION_W ; west exit_dir @@ -586,3 +588,173 @@ location32: .word $0000 ; west bg .byte BG_EAST .byte $ff + +; STONEY_LEFT_TUNNEL1 -- left tunnel to red room +location33: + .byte STONEY_LEFT_TUNNEL2 ; north exit + .byte STONEY_DOORWAY1 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .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 $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + +; STONEY_LEFT_TUNNEL2 -- left tunnel to red room, with side +location34: + .byte STONEY_LEFT_AIRLOCK ; north exit + .byte STONEY_LEFT_TUNNEL1 ; south exit + .byte $ff ; east exit + .byte STONEY_CRAWLWAY_LEFT ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word left_tunnel2_n_lzsa ; north bg + .word left_tunnel2_s_lzsa ; south bg + .word $0000 ; east bg + .word left_tunnel2_w_lzsa ; west bg + .byte BG_NORTH|BG_SOUTH|BG_WEST + .byte $ff + +; STONEY_LEFT_AIRLOCK -- airlock to red room +location35: + .byte STONEY_LEFT_AIRLOCK_OPEN ; north exit + .byte STONEY_LEFT_TUNNEL2 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .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 $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + +; STONEY_LEFT_AIRLOCK_OPEN -- airlock to red room, open +location36: + .byte STONEY_RED_ROOM ; north exit + .byte STONEY_LEFT_TUNNEL2 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word left_airlock_open_n_lzsa ; north bg + .word left_airlock_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + +; STONEY_RED_ROOM -- red room +location37: + .byte $ff ; north exit + .byte STONEY_LEFT_AIRLOCK ; south exit + .byte $ff ; east exit + .byte STONEY_RED_ROOM_DRESSER ; west exit + .byte $ff ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word red_room_n_lzsa ; north bg + .word red_room_s_lzsa ; south bg + .word red_room_e_lzsa ; east bg + .word red_room_w_lzsa ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST + .byte $ff + +; STONEY_RED_ROOM_DRESSER -- red room dresser +location38: + .byte $ff ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte STONEY_RED_DRESSER_OPEN ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word $0000 ; east bg + .word dresser_e_lzsa ; west bg + .byte BG_WEST + .byte $ff + +; STONEY_RED_DRESSER_OPEN -- red room dresser open +location39: + .byte $ff ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte STONEY_RED_ROOM ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word $0000 ; east bg + .word dresser_open_e_lzsa ; west bg + .byte BG_WEST + .byte $ff + +; STONEY_CRAWLWAY_LEFT -- left crawlway +location40: + .byte $ff ; north exit + .byte $ff ; south exit + .byte STONEY_LEFT_TUNNEL2 ; east exit + .byte STONEY_COMPASS_ROOM ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_N ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word crawlway_e_lzsa ; east bg + .word crawlway_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; STONEY_COMPASS_ROOM -- compass room +location41: + .byte $ff ; north exit + .byte $ff ; south exit + .byte STONEY_CRAWLWAY_LEFT ; east exit + .byte STONEY_COMPASS_ROSE ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word compass_room_e_lzsa ; east bg + .word compass_room_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; STONEY_COMPASS_ROSE -- compass rose +location42: + .byte $ff ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte STONEY_COMPASS_ROOM ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word $0000 ; east bg + .word compass_rose_w_lzsa ; west bg + .byte BG_WEST + .byte $ff diff --git a/mist/link_book_stoney.s b/mist/link_book_stoney.s index b4785673..384dfda6 100644 --- a/mist/link_book_stoney.s +++ b/mist/link_book_stoney.s @@ -16,6 +16,7 @@ stoney_link_book: ;==================================== ; load linking audio (12k) to $9000 +.if 0 lda #linking_filename @@ -32,6 +33,7 @@ stoney_link_book: sta BTC_H ldx #LINKING_NOISE_LENGTH ; 45 pages long??? jsr play_audio +.endif lda #STONEY_ARRIVAL sta LOCATION diff --git a/mist/stoney.s b/mist/stoney.s index 7edf78a0..7dede854 100644 --- a/mist/stoney.s +++ b/mist/stoney.s @@ -182,6 +182,7 @@ back_to_mist: ; linking books .include "link_book_stoney.s" + .include "link_book_mist.s" ; puzzles