diff --git a/mist/graphics_mist/Makefile b/mist/graphics_mist/Makefile index ff408e6e..b0a5d7e1 100644 --- a/mist/graphics_mist/Makefile +++ b/mist/graphics_mist/Makefile @@ -22,7 +22,7 @@ mist_graphics.inc: \ step_land3_w.lzsa step_land3_e.lzsa \ step_top_e.lzsa step_top_w.lzsa step_top_n.lzsa step_top_s.lzsa \ pool_s.lzsa \ - clock_e.lzsa clock_s.lzsa clock_bridge.lzsa \ + clock_e.lzsa clock_n.lzsa clock_s.lzsa clock_bridge.lzsa \ spaceship_far_e.lzsa spaceship_far_n.lzsa \ tree2_n.lzsa \ tree5_n.lzsa tree5_e.lzsa tree5_s.lzsa \ @@ -76,6 +76,7 @@ mist_graphics.inc: \ echo "step_top_s_lzsa: .incbin \"step_top_s.lzsa\"" >> mist_graphics.inc echo "pool_s_lzsa: .incbin \"pool_s.lzsa\"" >> mist_graphics.inc echo "clock_s_lzsa: .incbin \"clock_s.lzsa\"" >> mist_graphics.inc + echo "clock_n_lzsa: .incbin \"clock_n.lzsa\"" >> mist_graphics.inc echo "clock_e_lzsa: .incbin \"clock_e.lzsa\"" >> mist_graphics.inc echo "clock_bridge_lzsa: .incbin \"clock_bridge.lzsa\"" >> mist_graphics.inc echo "spaceship_far_n_lzsa: .incbin \"spaceship_far_n.lzsa\"" >> mist_graphics.inc diff --git a/mist/graphics_mist/clock_n.png b/mist/graphics_mist/clock_n.png new file mode 100644 index 00000000..99393ed0 Binary files /dev/null and b/mist/graphics_mist/clock_n.png differ diff --git a/mist/graphics_mist/mist_graphics.inc b/mist/graphics_mist/mist_graphics.inc index 13bf9a24..670085a0 100644 --- a/mist/graphics_mist/mist_graphics.inc +++ b/mist/graphics_mist/mist_graphics.inc @@ -27,6 +27,7 @@ step_top_n_lzsa: .incbin "step_top_n.lzsa" step_top_s_lzsa: .incbin "step_top_s.lzsa" pool_s_lzsa: .incbin "pool_s.lzsa" clock_s_lzsa: .incbin "clock_s.lzsa" +clock_n_lzsa: .incbin "clock_n.lzsa" clock_e_lzsa: .incbin "clock_e.lzsa" clock_bridge_lzsa: .incbin "clock_bridge.lzsa" spaceship_far_n_lzsa: .incbin "spaceship_far_n.lzsa" diff --git a/mist/leveldata_mist.inc b/mist/leveldata_mist.inc index 174bb552..f015dc21 100644 --- a/mist/leveldata_mist.inc +++ b/mist/leveldata_mist.inc @@ -229,19 +229,19 @@ location10: ; MIST_CLOCK -- clock location11: - .byte $ff ; north exit + .byte MIST_TREE_CORRIDOR_5 ; north exit .byte MIST_CLOCK_PUZZLE ; south exit .byte $ff ; east exit .byte $ff ; west exit - .byte $ff ; north exit_dir + .byte DIRECTION_N ; north exit_dir .byte DIRECTION_S ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir - .word $0000 ; north bg + .word clock_n_lzsa ; north bg .word clock_s_lzsa ; south bg .word clock_e_lzsa ; east bg .word $0000 ; west bg - .byte BG_SOUTH|BG_EAST + .byte BG_SOUTH|BG_EAST|BG_NORTH .byte DIRECTION_E ; special exit .byte 5,30 ; special x .byte 2,46 ; special y @@ -415,7 +415,7 @@ location20: ; MIST_CLOCK_PUZZLE -- clock puzzle location21: - .byte MIST_TREE_CORRIDOR_4 ; north exit + .byte MIST_TREE_CORRIDOR_5 ; north exit .byte $ff ; south exit .byte $ff ; east exit .byte $ff ; west exit @@ -423,7 +423,7 @@ location21: .byte $ff ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir - .word tree5_n_lzsa ; north bg + .word clock_n_lzsa ; north bg .word clock_puzzle_s_lzsa ; south bg .word $0000 ; east bg .word $0000 ; west bg @@ -435,7 +435,7 @@ location21: ; MIST_CLOCK_ISLAND -- clock island location22: - .byte MIST_TREE_CORRIDOR_5 ; north exit + .byte MIST_CLOCK ; north exit .byte MIST_CLOCK_INSIDE ; south exit .byte $ff ; east exit .byte $ff ; west exit