diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 21b57d10..f9534bcc 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -337,4 +337,8 @@ CHANNEL_STEPS_FORK = 24 CHANNEL_STEPS_PATH = 25 CHANNEL_STEPS_DOOR = 26 CHANNEL_WIND_PATH = 27 +CHANNEL_WIND_PATH2 = 28 +CHANNEL_ISLAND1 = 29 +CHANNEL_ISLAND2 = 30 +CHANNEL_ISLAND3 = 31 diff --git a/mist/graphics_channel/Makefile b/mist/graphics_channel/Makefile index 631b7502..757595da 100644 --- a/mist/graphics_channel/Makefile +++ b/mist/graphics_channel/Makefile @@ -36,7 +36,11 @@ channel_graphics.inc: \ steps_fork_n.lzsa steps_fork_s.lzsa steps_fork_w.lzsa \ steps_path_e.lzsa steps_path_w.lzsa \ steps_door_e.lzsa steps_door_w.lzsa \ - wind_path_n.lzsa wind_path_s.lzsa + wind_path_n.lzsa wind_path_s.lzsa \ + wind_path2_n.lzsa wind_path2_s.lzsa \ + island1_n.lzsa island1_s.lzsa \ + island2_n.lzsa island2_s.lzsa \ + island3_n.lzsa island3_s.lzsa echo "arrival_n_lzsa: .incbin \"arrival_n.lzsa\"" > channel_graphics.inc echo "arrival_s_lzsa: .incbin \"arrival_s.lzsa\"" >> channel_graphics.inc echo "clearing_e_lzsa: .incbin \"clearing_e.lzsa\"" >> channel_graphics.inc @@ -94,6 +98,15 @@ channel_graphics.inc: \ echo "steps_door_w_lzsa: .incbin \"steps_door_w.lzsa\"" >> channel_graphics.inc echo "wind_path_n_lzsa: .incbin \"wind_path_n.lzsa\"" >> channel_graphics.inc echo "wind_path_s_lzsa: .incbin \"wind_path_s.lzsa\"" >> channel_graphics.inc + echo "wind_path2_n_lzsa: .incbin \"wind_path2_n.lzsa\"" >> channel_graphics.inc + echo "wind_path2_s_lzsa: .incbin \"wind_path2_s.lzsa\"" >> channel_graphics.inc + echo "island1_n_lzsa: .incbin \"island1_n.lzsa\"" >> channel_graphics.inc + echo "island1_s_lzsa: .incbin \"island1_s.lzsa\"" >> channel_graphics.inc + echo "island2_n_lzsa: .incbin \"island2_n.lzsa\"" >> channel_graphics.inc + echo "island2_s_lzsa: .incbin \"island2_s.lzsa\"" >> channel_graphics.inc + echo "island3_n_lzsa: .incbin \"island3_n.lzsa\"" >> channel_graphics.inc + echo "island3_s_lzsa: .incbin \"island3_s.lzsa\"" >> channel_graphics.inc + %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_channel/island1_n.png b/mist/graphics_channel/island1_n.png new file mode 100644 index 00000000..13ab30b4 Binary files /dev/null and b/mist/graphics_channel/island1_n.png differ diff --git a/mist/graphics_channel/island1_s.png b/mist/graphics_channel/island1_s.png new file mode 100644 index 00000000..5cf0f4a3 Binary files /dev/null and b/mist/graphics_channel/island1_s.png differ diff --git a/mist/graphics_channel/island2_n.png b/mist/graphics_channel/island2_n.png new file mode 100644 index 00000000..74e3d994 Binary files /dev/null and b/mist/graphics_channel/island2_n.png differ diff --git a/mist/graphics_channel/island2_s.png b/mist/graphics_channel/island2_s.png new file mode 100644 index 00000000..c114f65a Binary files /dev/null and b/mist/graphics_channel/island2_s.png differ diff --git a/mist/graphics_channel/island3_n.png b/mist/graphics_channel/island3_n.png new file mode 100644 index 00000000..6487b28a Binary files /dev/null and b/mist/graphics_channel/island3_n.png differ diff --git a/mist/graphics_channel/island3_s.png b/mist/graphics_channel/island3_s.png new file mode 100644 index 00000000..15485173 Binary files /dev/null and b/mist/graphics_channel/island3_s.png differ diff --git a/mist/graphics_channel/wind_path2_n.png b/mist/graphics_channel/wind_path2_n.png new file mode 100644 index 00000000..070cdb46 Binary files /dev/null and b/mist/graphics_channel/wind_path2_n.png differ diff --git a/mist/graphics_channel/wind_path2_s.png b/mist/graphics_channel/wind_path2_s.png new file mode 100644 index 00000000..2705eac3 Binary files /dev/null and b/mist/graphics_channel/wind_path2_s.png differ diff --git a/mist/leveldata_channel.inc b/mist/leveldata_channel.inc index 4638fc27..f7e369b9 100644 --- a/mist/leveldata_channel.inc +++ b/mist/leveldata_channel.inc @@ -10,6 +10,7 @@ locations: .word location16,location17,location18,location19 .word location20,location21,location22,location23 .word location24,location25,location26,location27 + .word location28,location29,location30,location31 ; CHANNEL_OUTSIDE_CABIN -- outside in clearing @@ -488,7 +489,7 @@ location26: ; CHANNEL_WIND_PATH -- path to windmill location27: - .byte $ff ; north exit + .byte CHANNEL_WIND_PATH2 ; north exit .byte CHANNEL_STEPS_FORK ; south exit .byte $ff ; east exit .byte $ff ; west exit @@ -503,5 +504,73 @@ location27: .byte BG_NORTH|BG_SOUTH .byte $ff +; CHANNEL_WIND_PATH2 -- path to windmill too +location28: + .byte CHANNEL_ISLAND1 ; north exit + .byte CHANNEL_WIND_PATH ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word wind_path2_n_lzsa ; north bg + .word wind_path2_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + +; CHANNEL_ISLAND1 -- island part1 +location29: + .byte CHANNEL_ISLAND2 ; north exit + .byte CHANNEL_WIND_PATH2 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word island1_n_lzsa ; north bg + .word island1_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + +; CHANNEL_ISLAND2 -- island part2 +location30: + .byte CHANNEL_ISLAND3 ; north exit + .byte CHANNEL_ISLAND1 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word island2_n_lzsa ; north bg + .word island2_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + +; CHANNEL_ISLAND3 -- island part3 +location31: + .byte $ff ; north exit + .byte CHANNEL_ISLAND2 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word island3_n_lzsa ; north bg + .word island3_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff +