diff --git a/mist/TODO b/mist/TODO index e78d2d01..2e26bad2 100644 --- a/mist/TODO +++ b/mist/TODO @@ -7,7 +7,7 @@ For release 1.0 + MIST -- open door to clock puzzle? -- only allow entering ship if it's up - -- maybe another location on dock to ship + -- another stop on path to spaceship. Out of room though :( -- MIST_ROCKET_PATH_PAD probably missing ship-raised background + OCTAGON diff --git a/mist/common_defines.inc b/mist/common_defines.inc index db9b9fe0..b224a2eb 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -103,6 +103,7 @@ MIST_PILLAR_ARROW = 35 MIST_PILLAR_LEAF = 36 MIST_PILLAR_CROSS = 37 MIST_PILLAR_EMU = 38 +MIST_SPACESHIP_PATH = 39 ; Mist Generator Building GEN_GREEN_SHACK = 0 diff --git a/mist/graphics_mist/Makefile b/mist/graphics_mist/Makefile index 38dbcfdf..f0603d05 100644 --- a/mist/graphics_mist/Makefile +++ b/mist/graphics_mist/Makefile @@ -41,6 +41,7 @@ mist_graphics.inc: \ gear_shipup_s.lzsa \ gear_base_n.lzsa \ spaceship_switch_s.lzsa spaceship_switch_n.lzsa \ + spaceship_path_w.lzsa \ tree4_n.lzsa tree4_s.lzsa tree4_w.lzsa tree4_e.lzsa \ clock_island_s.lzsa clock_island_n.lzsa \ clock_puzzle_s.lzsa clock_puzzle_bridge.lzsa \ @@ -118,6 +119,7 @@ mist_graphics.inc: \ echo "gear_base_n_lzsa: .incbin \"gear_base_n.lzsa\"" >> mist_graphics.inc echo "spaceship_switch_n_lzsa: .incbin \"spaceship_switch_n.lzsa\"" >> mist_graphics.inc echo "spaceship_switch_s_lzsa: .incbin \"spaceship_switch_s.lzsa\"" >> mist_graphics.inc + echo "spaceship_path_w_lzsa: .incbin \"spaceship_path_w.lzsa\"" >> mist_graphics.inc echo "tree4_n_lzsa: .incbin \"tree4_n.lzsa\"" >> mist_graphics.inc echo "tree4_s_lzsa: .incbin \"tree4_s.lzsa\"" >> mist_graphics.inc echo "tree4_w_lzsa: .incbin \"tree4_w.lzsa\"" >> mist_graphics.inc diff --git a/mist/graphics_mist/spaceship_path_w.png b/mist/graphics_mist/spaceship_path_w.png new file mode 100644 index 00000000..9eed5c00 Binary files /dev/null and b/mist/graphics_mist/spaceship_path_w.png differ diff --git a/mist/leveldata_mist.inc b/mist/leveldata_mist.inc index 62a93245..2a662d4a 100644 --- a/mist/leveldata_mist.inc +++ b/mist/leveldata_mist.inc @@ -13,7 +13,7 @@ locations: .word location24,location25,location26,location27 .word location28,location29,location30,location31 .word location32,location33,location34,location35 - .word location36,location37,location38 + .word location36,location37,location38,location39 ; MIST_ARRIVAL_DOCK -- dock location0: @@ -497,11 +497,11 @@ location24: ; MIST_ROCKET_PATH_PAD -- pad on way to rocket location25: - .byte MIST_SPACESHIP_FAR ; north exit + .byte MIST_SPACESHIP_PATH ; north exit .byte $ff ; south exit .byte MIST_OUTSIDE_TEMPLE ; east exit .byte $ff ; west exit - .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_W ; north exit_dir .byte $ff ; south exit_dir .byte DIRECTION_E ; east exit_dir .byte $ff ; west exit_dir @@ -772,11 +772,19 @@ location38: .byte 12,30 ; special y .word touch_pillar-1 ; special function - - - - - - - - +; MIST_SPACESHIP_PATH -- spaceship path +location39: + .byte $ff ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte MIST_SPACESHIP_FAR ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_N ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word $0000 ; east bg + .word spaceship_path_w_lzsa ; west bg + .byte BG_WEST + .byte $ff ; special exit