diff --git a/mist/Makefile b/mist/Makefile index 67433f74..3399e69b 100644 --- a/mist/Makefile +++ b/mist/Makefile @@ -20,15 +20,16 @@ mist.dsk: HELLO LOADER MIST_TITLE MIST OCTAGON VIEWER \ $(DOS33) -y mist.dsk BSAVE -a 0x1400 MIST $(DOS33) -y mist.dsk BSAVE -a 0x1400 OCTAGON # $(DOS33) -y mist.dsk BSAVE -a 0x1400 MECHE - $(DOS33) -y mist.dsk BSAVE -a 0x1400 SELENA +# $(DOS33) -y mist.dsk BSAVE -a 0x1400 SELENA $(DOS33) -y mist.dsk BSAVE -a 0x1400 CHANNEL $(DOS33) -y mist.dsk BSAVE -a 0x1400 VIEWER $(DOS33) -y mist.dsk BSAVE -a 0x1400 STONEY $(DOS33) -y mist.dsk BSAVE -a 0x9000 ./audio/link_noise.btc LINK_NOISE.BTC -mist_side2.dsk: MECHE +mist_side2.dsk: MECHE SELENA cp empty.dsk mist_side2.dsk $(DOS33) -y mist_side2.dsk BSAVE -a 0x1400 MECHE + $(DOS33) -y mist_side2.dsk BSAVE -a 0x1400 SELENA $(DOS33) -y mist_side2.dsk BSAVE -a 0x9000 ./audio/link_noise.btc LINK_NOISE.BTC ### diff --git a/mist/common_defines.inc b/mist/common_defines.inc index ce96a733..c5b3723f 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -221,6 +221,12 @@ STONEY_SHIP_BOOK_OPEN = 6 STONEY_ARRIVAL = 7 STONEY_UMBRELLA_PATH = 8 STONEY_UMBRELLA = 9 +STONEY_LIGHTHOUSE_PATH = 10 +STONEY_LIGHTHOUSE_DOOR = 11 +STONEY_LIGHTHOUSE_INSIDE= 12 +STONEY_LIGHTHOUSE_UPSTAIRS= 13 +STONEY_LIGHTHOUSE_BATTERY= 14 +STONEY_LIGHTHOUSE_DOWNLADDER= 15 ; Channely Wood CHANNEL_OUTSIDE_CABIN = 0 diff --git a/mist/graphics_stoney/Makefile b/mist/graphics_stoney/Makefile index 16887fe9..c1a9cc18 100644 --- a/mist/graphics_stoney/Makefile +++ b/mist/graphics_stoney/Makefile @@ -16,7 +16,13 @@ stoney_graphics.inc: \ book_chair_open_s.lzsa book_chair_closed_s.lzsa \ arrival_n.lzsa arrival_s.lzsa arrival_e.lzsa arrival_w.lzsa \ umbrella_e.lzsa umbrella_w.lzsa \ - umbrella_path_e.lzsa umbrella_path_w.lzsa + umbrella_path_e.lzsa umbrella_path_w.lzsa \ + lighthouse_path_e.lzsa lighthouse_path_w.lzsa \ + lighthouse_door_e.lzsa lighthouse_door_w.lzsa \ + lighthouse_inside_e.lzsa lighthouse_inside_w.lzsa lighthouse_inside_n.lzsa \ + lighthouse_upstairs_e.lzsa lighthouse_upstairs_w.lzsa \ + lighthouse_battery_w.lzsa \ + lighthouse_downladder_e.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 @@ -35,8 +41,17 @@ stoney_graphics.inc: \ echo "umbrella_w_lzsa: .incbin \"umbrella_w.lzsa\"" >> stoney_graphics.inc echo "umbrella_path_e_lzsa: .incbin \"umbrella_path_e.lzsa\"" >> stoney_graphics.inc echo "umbrella_path_w_lzsa: .incbin \"umbrella_path_w.lzsa\"" >> stoney_graphics.inc - - + echo "lighthouse_path_e_lzsa: .incbin \"lighthouse_path_e.lzsa\"" >> stoney_graphics.inc + echo "lighthouse_path_w_lzsa: .incbin \"lighthouse_path_w.lzsa\"" >> stoney_graphics.inc + echo "lighthouse_door_e_lzsa: .incbin \"lighthouse_door_e.lzsa\"" >> stoney_graphics.inc + echo "lighthouse_door_w_lzsa: .incbin \"lighthouse_door_w.lzsa\"" >> stoney_graphics.inc + echo "lighthouse_inside_e_lzsa: .incbin \"lighthouse_inside_e.lzsa\"" >> stoney_graphics.inc + echo "lighthouse_inside_w_lzsa: .incbin \"lighthouse_inside_w.lzsa\"" >> stoney_graphics.inc + echo "lighthouse_inside_n_lzsa: .incbin \"lighthouse_inside_n.lzsa\"" >> stoney_graphics.inc + echo "lighthouse_upstairs_e_lzsa: .incbin \"lighthouse_upstairs_e.lzsa\"" >> stoney_graphics.inc + echo "lighthouse_upstairs_w_lzsa: .incbin \"lighthouse_upstairs_w.lzsa\"" >> stoney_graphics.inc + echo "lighthouse_battery_w_lzsa: .incbin \"lighthouse_battery_w.lzsa\"" >> stoney_graphics.inc + echo "lighthouse_downladder_e_lzsa: .incbin \"lighthouse_downladder_e.lzsa\"" >> stoney_graphics.inc %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_stoney/lighthouse_battery_w.png b/mist/graphics_stoney/lighthouse_battery_w.png new file mode 100644 index 00000000..62d57931 Binary files /dev/null and b/mist/graphics_stoney/lighthouse_battery_w.png differ diff --git a/mist/graphics_stoney/lighthouse_door_e.png b/mist/graphics_stoney/lighthouse_door_e.png new file mode 100644 index 00000000..8fd621aa Binary files /dev/null and b/mist/graphics_stoney/lighthouse_door_e.png differ diff --git a/mist/graphics_stoney/lighthouse_door_w.png b/mist/graphics_stoney/lighthouse_door_w.png new file mode 100644 index 00000000..61099ff5 Binary files /dev/null and b/mist/graphics_stoney/lighthouse_door_w.png differ diff --git a/mist/graphics_stoney/lighthouse_downladder_e.png b/mist/graphics_stoney/lighthouse_downladder_e.png new file mode 100644 index 00000000..e413c9e8 Binary files /dev/null and b/mist/graphics_stoney/lighthouse_downladder_e.png differ diff --git a/mist/graphics_stoney/lighthouse_inside_e.png b/mist/graphics_stoney/lighthouse_inside_e.png new file mode 100644 index 00000000..57c8ed02 Binary files /dev/null and b/mist/graphics_stoney/lighthouse_inside_e.png differ diff --git a/mist/graphics_stoney/lighthouse_inside_n.png b/mist/graphics_stoney/lighthouse_inside_n.png new file mode 100644 index 00000000..d40fcbc9 Binary files /dev/null and b/mist/graphics_stoney/lighthouse_inside_n.png differ diff --git a/mist/graphics_stoney/lighthouse_inside_w.png b/mist/graphics_stoney/lighthouse_inside_w.png new file mode 100644 index 00000000..a8cd44ee Binary files /dev/null and b/mist/graphics_stoney/lighthouse_inside_w.png differ diff --git a/mist/graphics_stoney/lighthouse_path_e.png b/mist/graphics_stoney/lighthouse_path_e.png new file mode 100644 index 00000000..ff0b523b Binary files /dev/null and b/mist/graphics_stoney/lighthouse_path_e.png differ diff --git a/mist/graphics_stoney/lighthouse_path_w.png b/mist/graphics_stoney/lighthouse_path_w.png new file mode 100644 index 00000000..afc8c5bf Binary files /dev/null and b/mist/graphics_stoney/lighthouse_path_w.png differ diff --git a/mist/graphics_stoney/lighthouse_upstairs_e.png b/mist/graphics_stoney/lighthouse_upstairs_e.png new file mode 100644 index 00000000..2d3ae1d2 Binary files /dev/null and b/mist/graphics_stoney/lighthouse_upstairs_e.png differ diff --git a/mist/graphics_stoney/lighthouse_upstairs_w.png b/mist/graphics_stoney/lighthouse_upstairs_w.png new file mode 100644 index 00000000..247a5084 Binary files /dev/null and b/mist/graphics_stoney/lighthouse_upstairs_w.png differ diff --git a/mist/leveldata_stoney.inc b/mist/leveldata_stoney.inc index 504d2659..5026c2df 100644 --- a/mist/leveldata_stoney.inc +++ b/mist/leveldata_stoney.inc @@ -6,7 +6,8 @@ locations: .word location0, location1, location2, location3 .word location4, location5, location6, location7 - .word location8, location9 + .word location8, location9, location10,location11 + .word location12,location13,location14,location15 ; STONEY_SHIP_STERN -- back of the ship location0: @@ -141,11 +142,11 @@ location6: location7: .byte $ff ; north exit .byte $ff ; south exit - .byte $ff ; east exit + .byte STONEY_LIGHTHOUSE_PATH ; east exit .byte STONEY_UMBRELLA_PATH ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir - .byte $ff ; east exit_dir + .byte DIRECTION_E ; east exit_dir .byte DIRECTION_W ; west exit_dir .word arrival_n_lzsa ; north bg .word arrival_s_lzsa ; south bg @@ -188,4 +189,113 @@ location9: .byte BG_EAST|BG_WEST .byte $ff +; STONEY_LIGHTHOUSE_PATH -- lighthouse path +location10: + .byte $ff ; north exit + .byte $ff ; south exit + .byte STONEY_LIGHTHOUSE_DOOR ; east exit + .byte STONEY_ARRIVAL ; 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 lighthouse_path_e_lzsa ; east bg + .word lighthouse_path_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; STONEY_LIGHTHOUSE_DOOR -- lighthouse door +location11: + .byte $ff ; north exit + .byte $ff ; south exit + .byte STONEY_LIGHTHOUSE_INSIDE; east exit + .byte STONEY_LIGHTHOUSE_PATH ; 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 lighthouse_door_e_lzsa ; east bg + .word lighthouse_door_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; STONEY_LIGHTHOUSE_INSIDE -- lighthouse inside +location12: + .byte $ff ; north exit + .byte $ff ; south exit + .byte STONEY_LIGHTHOUSE_UPSTAIRS; east exit + .byte STONEY_LIGHTHOUSE_DOOR ; 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 lighthouse_inside_n_lzsa ; north bg + .word $0000 ; south bg + .word lighthouse_inside_e_lzsa ; east bg + .word lighthouse_inside_w_lzsa ; west bg + .byte BG_EAST|BG_WEST|BG_NORTH + .byte $ff + +; STONEY_LIGHTHOUSE_UPSTAIRS -- lighthouse upstairs +location13: + .byte $ff ; north exit + .byte $ff ; south exit + .byte STONEY_LIGHTHOUSE_DOWNLADDER ; east exit + .byte STONEY_LIGHTHOUSE_BATTERY ; 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 lighthouse_upstairs_e_lzsa ; east bg + .word lighthouse_upstairs_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; STONEY_LIGHTHOUSE_BATTERY -- lighthouse battery +location14: + .byte $ff ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte STONEY_LIGHTHOUSE_UPSTAIRS ; 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 lighthouse_battery_w_lzsa ; west bg + .byte BG_WEST + .byte $ff + +; STONEY_LIGHTHOUSE_DOWNLADDER -- lighthouse down the ladder +location15: + .byte $ff ; north exit + .byte $ff ; south exit + .byte STONEY_LIGHTHOUSE_INSIDE ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte $ff ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word lighthouse_downladder_e_lzsa ; east bg + .word $0000 ; west bg + .byte BG_EAST + .byte $ff + + + + + + + +