diff --git a/mist/graphics_mist/Makefile b/mist/graphics_mist/Makefile index b0a5d7e1..0ad6bb5d 100644 --- a/mist/graphics_mist/Makefile +++ b/mist/graphics_mist/Makefile @@ -21,10 +21,10 @@ mist_graphics.inc: \ step_dentist_n.lzsa step_dentist_e.lzsa step_dentist_w.lzsa \ 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 \ + pool_n.lzsa pool_s.lzsa pool_e.lzsa pool_w.lzsa \ clock_e.lzsa clock_n.lzsa clock_s.lzsa clock_bridge.lzsa \ spaceship_far_e.lzsa spaceship_far_n.lzsa \ - tree2_n.lzsa \ + tree2_n.lzsa tree2_s.lzsa \ tree5_n.lzsa tree5_e.lzsa tree5_s.lzsa \ gear_n.lzsa gear_w.lzsa gear_s.lzsa gear_open_n.lzsa\ gear_base_n.lzsa \ @@ -74,7 +74,10 @@ mist_graphics.inc: \ echo "step_top_w_lzsa: .incbin \"step_top_w.lzsa\"" >> mist_graphics.inc echo "step_top_n_lzsa: .incbin \"step_top_n.lzsa\"" >> mist_graphics.inc echo "step_top_s_lzsa: .incbin \"step_top_s.lzsa\"" >> mist_graphics.inc + echo "pool_n_lzsa: .incbin \"pool_n.lzsa\"" >> mist_graphics.inc echo "pool_s_lzsa: .incbin \"pool_s.lzsa\"" >> mist_graphics.inc + echo "pool_e_lzsa: .incbin \"pool_e.lzsa\"" >> mist_graphics.inc + echo "pool_w_lzsa: .incbin \"pool_w.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 @@ -82,6 +85,7 @@ mist_graphics.inc: \ echo "spaceship_far_n_lzsa: .incbin \"spaceship_far_n.lzsa\"" >> mist_graphics.inc echo "spaceship_far_e_lzsa: .incbin \"spaceship_far_e.lzsa\"" >> mist_graphics.inc echo "tree2_n_lzsa: .incbin \"tree2_n.lzsa\"" >> mist_graphics.inc + echo "tree2_s_lzsa: .incbin \"tree2_s.lzsa\"" >> mist_graphics.inc echo "tree5_n_lzsa: .incbin \"tree5_n.lzsa\"" >> mist_graphics.inc echo "tree5_s_lzsa: .incbin \"tree5_s.lzsa\"" >> mist_graphics.inc echo "tree5_e_lzsa: .incbin \"tree5_e.lzsa\"" >> mist_graphics.inc diff --git a/mist/graphics_mist/mist_graphics.inc b/mist/graphics_mist/mist_graphics.inc index 670085a0..50dfaf52 100644 --- a/mist/graphics_mist/mist_graphics.inc +++ b/mist/graphics_mist/mist_graphics.inc @@ -25,7 +25,10 @@ step_top_e_lzsa: .incbin "step_top_e.lzsa" step_top_w_lzsa: .incbin "step_top_w.lzsa" step_top_n_lzsa: .incbin "step_top_n.lzsa" step_top_s_lzsa: .incbin "step_top_s.lzsa" +pool_n_lzsa: .incbin "pool_n.lzsa" pool_s_lzsa: .incbin "pool_s.lzsa" +pool_e_lzsa: .incbin "pool_e.lzsa" +pool_w_lzsa: .incbin "pool_w.lzsa" clock_s_lzsa: .incbin "clock_s.lzsa" clock_n_lzsa: .incbin "clock_n.lzsa" clock_e_lzsa: .incbin "clock_e.lzsa" @@ -33,6 +36,7 @@ clock_bridge_lzsa: .incbin "clock_bridge.lzsa" spaceship_far_n_lzsa: .incbin "spaceship_far_n.lzsa" spaceship_far_e_lzsa: .incbin "spaceship_far_e.lzsa" tree2_n_lzsa: .incbin "tree2_n.lzsa" +tree2_s_lzsa: .incbin "tree2_s.lzsa" tree5_n_lzsa: .incbin "tree5_n.lzsa" tree5_s_lzsa: .incbin "tree5_s.lzsa" tree5_e_lzsa: .incbin "tree5_e.lzsa" diff --git a/mist/graphics_mist/pool_e.png b/mist/graphics_mist/pool_e.png new file mode 100644 index 00000000..a8826dfc Binary files /dev/null and b/mist/graphics_mist/pool_e.png differ diff --git a/mist/graphics_mist/pool_n.png b/mist/graphics_mist/pool_n.png new file mode 100644 index 00000000..622d2731 Binary files /dev/null and b/mist/graphics_mist/pool_n.png differ diff --git a/mist/graphics_mist/pool_s.png b/mist/graphics_mist/pool_s.png index c902fdda..c76e0903 100644 Binary files a/mist/graphics_mist/pool_s.png and b/mist/graphics_mist/pool_s.png differ diff --git a/mist/graphics_mist/pool_w.png b/mist/graphics_mist/pool_w.png new file mode 100644 index 00000000..b3889fe8 Binary files /dev/null and b/mist/graphics_mist/pool_w.png differ diff --git a/mist/graphics_mist/tree2_s.png b/mist/graphics_mist/tree2_s.png new file mode 100644 index 00000000..147d00af Binary files /dev/null and b/mist/graphics_mist/tree2_s.png differ diff --git a/mist/leveldata_mist.inc b/mist/leveldata_mist.inc index f015dc21..d62ff7cb 100644 --- a/mist/leveldata_mist.inc +++ b/mist/leveldata_mist.inc @@ -212,19 +212,19 @@ location9: ; MIST_POOL -- pool location10: - .byte $ff ; north exit - .byte MIST_TREE_CORRIDOR_4 ; south exit + .byte MIST_OUTSIDE_TEMPLE ; north exit + .byte MIST_TREE_CORRIDOR_2 ; 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 pool_n_lzsa ; north bg .word pool_s_lzsa ; south bg - .word $0000 ; east bg - .word $0000 ; west bg - .byte BG_SOUTH + .word pool_e_lzsa ; east bg + .word pool_w_lzsa ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST .byte $ff ; special exit ; MIST_CLOCK -- clock @@ -266,19 +266,19 @@ location12: ; MIST_TREE_CORRIDOR_2 -- tree corridor #2 location13: - .byte MIST_OUTSIDE_TEMPLE ; north exit - .byte $ff ; south exit + .byte MIST_POOL ; north exit + .byte MIST_TREE_CORRIDOR_4 ; south exit .byte $ff ; east exit .byte $ff ; west exit .byte DIRECTION_N|DIRECTION_ONLY_POINT ; north exit_dir - .byte $ff ; south exit_dir + .byte DIRECTION_S ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir .word tree2_n_lzsa ; north bg - .word $0000 ; south bg + .word tree2_s_lzsa ; south bg .word $0000 ; east bg .word $0000 ; west bg - .byte BG_NORTH + .byte BG_NORTH|BG_SOUTH .byte DIRECTION_N ; special exit .byte 25,31 ; special x .byte 19,23 ; special y