diff --git a/mist/TODO b/mist/TODO index 997e3843..5349aed4 100644 --- a/mist/TODO +++ b/mist/TODO @@ -28,7 +28,9 @@ For release 1.0 + CHANNEL -- hook up water valves at least + -- show water in pipe (because no sound clue for water running?) -- hook up stairway + -- hook up pages and half letter + ARBOR -- finish level diff --git a/mist/graphics_arbor/Makefile b/mist/graphics_arbor/Makefile index 1d4f3dfd..ef48988c 100644 --- a/mist/graphics_arbor/Makefile +++ b/mist/graphics_arbor/Makefile @@ -28,7 +28,9 @@ arbor_graphics.inc: \ bridge5_n.lzsa bridge5_s.lzsa \ longshack3_n.lzsa longshack3_s.lzsa \ bridge6_n.lzsa bridge6_s.lzsa \ - shack2_n.lzsa shack2_s.lzsa shack2_e.lzsa shack2_w.lzsa + shack2_n.lzsa shack2_s.lzsa shack2_e.lzsa shack2_w.lzsa \ + bridge7_e.lzsa bridge7_open_w.lzsa bridge7_closed_w.lzsa \ + doors_e.lzsa doors_closed_w.lzsa echo "arrival_e_lzsa: .incbin \"arrival_e.lzsa\"" > arbor_graphics.inc echo "arrival_open_e_lzsa: .incbin \"arrival_open_e.lzsa\"" >> arbor_graphics.inc echo "arrival_w_lzsa: .incbin \"arrival_w.lzsa\"" >> arbor_graphics.inc @@ -77,7 +79,11 @@ arbor_graphics.inc: \ echo "shack2_s_lzsa: .incbin \"shack2_s.lzsa\"" >> arbor_graphics.inc echo "shack2_e_lzsa: .incbin \"shack2_e.lzsa\"" >> arbor_graphics.inc echo "shack2_w_lzsa: .incbin \"shack2_w.lzsa\"" >> arbor_graphics.inc - + echo "bridge7_e_lzsa: .incbin \"bridge7_e.lzsa\"" >> arbor_graphics.inc + echo "bridge7_closed_w_lzsa: .incbin \"bridge7_closed_w.lzsa\"" >> arbor_graphics.inc + echo "bridge7_open_w_lzsa: .incbin \"bridge7_open_w.lzsa\"" >> arbor_graphics.inc + echo "doors_e_lzsa: .incbin \"doors_e.lzsa\"" >> arbor_graphics.inc + echo "doors_closed_w_lzsa: .incbin \"doors_closed_w.lzsa\"" >> arbor_graphics.inc %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_arbor/bridge7_closed_w.png b/mist/graphics_arbor/bridge7_closed_w.png new file mode 100644 index 00000000..576770e7 Binary files /dev/null and b/mist/graphics_arbor/bridge7_closed_w.png differ diff --git a/mist/graphics_arbor/bridge7_e.png b/mist/graphics_arbor/bridge7_e.png new file mode 100644 index 00000000..c5fd3ed0 Binary files /dev/null and b/mist/graphics_arbor/bridge7_e.png differ diff --git a/mist/graphics_arbor/bridge7_open_w.png b/mist/graphics_arbor/bridge7_open_w.png new file mode 100644 index 00000000..289a19f3 Binary files /dev/null and b/mist/graphics_arbor/bridge7_open_w.png differ diff --git a/mist/graphics_arbor/doors_closed_w.png b/mist/graphics_arbor/doors_closed_w.png new file mode 100644 index 00000000..e4483d95 Binary files /dev/null and b/mist/graphics_arbor/doors_closed_w.png differ diff --git a/mist/graphics_arbor/doors_e.png b/mist/graphics_arbor/doors_e.png new file mode 100644 index 00000000..bdf1e6d0 Binary files /dev/null and b/mist/graphics_arbor/doors_e.png differ diff --git a/mist/leveldata_arbor.inc b/mist/leveldata_arbor.inc index da3e2521..0c3ec241 100644 --- a/mist/leveldata_arbor.inc +++ b/mist/leveldata_arbor.inc @@ -8,7 +8,7 @@ locations: .word location8, location9, location10,location11 .word location12,location13,location14,location15 .word location16,location17,location18,location19 - .word location20,location21 + .word location20,location21,location22,location23 ; ARBOR_INSIDE_ELEV1 -- arrival in elevator1 location0: @@ -381,7 +381,7 @@ location21: .byte ARBOR_LONGSHACK3 ; north exit .byte $ff ; south exit .byte $ff ; east exit - .byte $ff ; west exit + .byte ARBOR_BRIDGE7 ; west exit .byte DIRECTION_N ; north exit_dir .byte $ff ; south exit_dir .byte $ff ; east exit_dir @@ -393,3 +393,39 @@ location21: .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST .byte $ff +; ARBOR_BRIDGE7 -- the bridge before the doors +location22: + .byte $ff ; north exit + .byte $ff ; south exit + .byte ARBOR_SHACK2 ; east exit + .byte ARBOR_DOORS ; 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 bridge7_e_lzsa ; east bg + .word bridge7_closed_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; ARBOR_DOORS -- doors to the stair and elevator +location23: + .byte $ff ; north exit + .byte $ff ; south exit + .byte ARBOR_BRIDGE7 ; east exit + .byte $ff ; 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 doors_e_lzsa ; east bg + .word doors_closed_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + + +