diff --git a/mist/common_defines.inc b/mist/common_defines.inc index efb3a35f..c7b0a20f 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -82,7 +82,7 @@ MIST_GEAR_BASE = 16 MIST_CAT_LETTER = 17 MIST_SPACESHIP_SWITCH = 18 MIST_TREE_CORRIDOR_4 = 19 -MIST_UNUSED = 20 +MIST_TREE_CORRIDOR_1 = 20 MIST_CLOCK_PUZZLE = 21 MIST_CLOCK_ISLAND = 22 MIST_CLOCK_INSIDE = 23 diff --git a/mist/graphics_mist/Makefile b/mist/graphics_mist/Makefile index 0ad6bb5d..70f59a3e 100644 --- a/mist/graphics_mist/Makefile +++ b/mist/graphics_mist/Makefile @@ -24,7 +24,8 @@ mist_graphics.inc: \ 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_s.lzsa \ + tree1_n.lzsa tree1_s.lzsa \ + tree2_n.lzsa tree2_s.lzsa tree2_e.lzsa tree2_w.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 \ @@ -84,8 +85,12 @@ 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 echo "spaceship_far_e_lzsa: .incbin \"spaceship_far_e.lzsa\"" >> mist_graphics.inc + echo "tree1_n_lzsa: .incbin \"tree1_n.lzsa\"" >> mist_graphics.inc + echo "tree1_s_lzsa: .incbin \"tree1_s.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 "tree2_e_lzsa: .incbin \"tree2_e.lzsa\"" >> mist_graphics.inc + echo "tree2_w_lzsa: .incbin \"tree2_w.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 50dfaf52..678a9949 100644 --- a/mist/graphics_mist/mist_graphics.inc +++ b/mist/graphics_mist/mist_graphics.inc @@ -35,8 +35,12 @@ clock_e_lzsa: .incbin "clock_e.lzsa" 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" +tree1_n_lzsa: .incbin "tree1_n.lzsa" +tree1_s_lzsa: .incbin "tree1_s.lzsa" tree2_n_lzsa: .incbin "tree2_n.lzsa" tree2_s_lzsa: .incbin "tree2_s.lzsa" +tree2_e_lzsa: .incbin "tree2_e.lzsa" +tree2_w_lzsa: .incbin "tree2_w.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/pillar_cross.png b/mist/graphics_mist/pillar_cross.png new file mode 100644 index 00000000..e7ac3ecf Binary files /dev/null and b/mist/graphics_mist/pillar_cross.png differ diff --git a/mist/graphics_mist/pillar_emu.png b/mist/graphics_mist/pillar_emu.png new file mode 100644 index 00000000..fb5e560e Binary files /dev/null and b/mist/graphics_mist/pillar_emu.png differ diff --git a/mist/graphics_mist/pillar_eye.png b/mist/graphics_mist/pillar_eye.png new file mode 100644 index 00000000..40c3c569 Binary files /dev/null and b/mist/graphics_mist/pillar_eye.png differ diff --git a/mist/graphics_mist/pillar_snake.png b/mist/graphics_mist/pillar_snake.png new file mode 100644 index 00000000..d68a93c5 Binary files /dev/null and b/mist/graphics_mist/pillar_snake.png differ diff --git a/mist/graphics_mist/tree1_n.png b/mist/graphics_mist/tree1_n.png new file mode 100644 index 00000000..cb815db3 Binary files /dev/null and b/mist/graphics_mist/tree1_n.png differ diff --git a/mist/graphics_mist/tree1_s.png b/mist/graphics_mist/tree1_s.png new file mode 100644 index 00000000..45b7e645 Binary files /dev/null and b/mist/graphics_mist/tree1_s.png differ diff --git a/mist/graphics_mist/tree2_e.png b/mist/graphics_mist/tree2_e.png new file mode 100644 index 00000000..1a6a687e Binary files /dev/null and b/mist/graphics_mist/tree2_e.png differ diff --git a/mist/graphics_mist/tree2_w.png b/mist/graphics_mist/tree2_w.png new file mode 100644 index 00000000..4a97ac86 Binary files /dev/null and b/mist/graphics_mist/tree2_w.png differ diff --git a/mist/leveldata_mist.inc b/mist/leveldata_mist.inc index d62ff7cb..7cb1cacc 100644 --- a/mist/leveldata_mist.inc +++ b/mist/leveldata_mist.inc @@ -213,7 +213,7 @@ location9: ; MIST_POOL -- pool location10: .byte MIST_OUTSIDE_TEMPLE ; north exit - .byte MIST_TREE_CORRIDOR_2 ; south exit + .byte MIST_TREE_CORRIDOR_1 ; south exit .byte $ff ; east exit .byte $ff ; west exit .byte DIRECTION_N ; north exit_dir @@ -266,7 +266,7 @@ location12: ; MIST_TREE_CORRIDOR_2 -- tree corridor #2 location13: - .byte MIST_POOL ; north exit + .byte MIST_TREE_CORRIDOR_1 ; north exit .byte MIST_TREE_CORRIDOR_4 ; south exit .byte $ff ; east exit .byte $ff ; west exit @@ -276,9 +276,9 @@ location13: .byte $ff ; west exit_dir .word tree2_n_lzsa ; north bg .word tree2_s_lzsa ; south bg - .word $0000 ; east bg - .word $0000 ; west bg - .byte BG_NORTH|BG_SOUTH + .word tree2_e_lzsa ; east bg + .word tree2_w_lzsa ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST .byte DIRECTION_N ; special exit .byte 25,31 ; special x .byte 19,23 ; special y @@ -396,21 +396,21 @@ location19: .byte 0,46 ; special y .word green_house-1 ; special function -; UNUSED (was MIST_TREE_CABIN) +; MIST_TREE_CORRIDOR_1 location20: - .byte $ff ; north exit - .byte $ff ; south exit - .byte MIST_TREE_CORRIDOR_5 ; east exit + .byte MIST_POOL ; north exit + .byte MIST_TREE_CORRIDOR_2 ; south exit + .byte $ff ; east exit .byte $ff ; west exit - .byte $ff ; north exit_dir - .byte $ff ; south exit_dir - .byte DIRECTION_E ; east 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 $0000 ; south bg + .word tree1_n_lzsa ; north bg + .word tree1_s_lzsa ; south bg .word $0000 ; east bg .word $0000 ; west bg - .byte BG_EAST + .byte BG_NORTH|BG_SOUTH .byte $ff ; special exit ; MIST_CLOCK_PUZZLE -- clock puzzle