diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 408dfbee..21b57d10 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -333,4 +333,8 @@ CHANNEL_FORK = 20 CHANNEL_BEFORE_ELEV1 = 21 CHANNEL_IN_ELEVATOR1 = 22 CHANNEL_PIPE_BRIDGE2 = 23 +CHANNEL_STEPS_FORK = 24 +CHANNEL_STEPS_PATH = 25 +CHANNEL_STEPS_DOOR = 26 +CHANNEL_WIND_PATH = 27 diff --git a/mist/graphics_channel/Makefile b/mist/graphics_channel/Makefile index 8e2f1b3b..631b7502 100644 --- a/mist/graphics_channel/Makefile +++ b/mist/graphics_channel/Makefile @@ -32,7 +32,11 @@ channel_graphics.inc: \ fork_n.lzsa fork_s.lzsa fork_w.lzsa \ before_elev1_e.lzsa before_elev1_w.lzsa \ pipe_bridge2_w.lzsa pipe_bridge2_e.lzsa \ - elevator1_open.lzsa + elevator1_open.lzsa \ + 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 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 @@ -81,8 +85,15 @@ channel_graphics.inc: \ echo "pipe_bridge2_e_lzsa: .incbin \"pipe_bridge2_e.lzsa\"" >> channel_graphics.inc echo "pipe_bridge2_w_lzsa: .incbin \"pipe_bridge2_w.lzsa\"" >> channel_graphics.inc echo "elevator1_open_lzsa: .incbin \"elevator1_open.lzsa\"" >> channel_graphics.inc - - + echo "steps_fork_n_lzsa: .incbin \"steps_fork_n.lzsa\"" >> channel_graphics.inc + echo "steps_fork_s_lzsa: .incbin \"steps_fork_s.lzsa\"" >> channel_graphics.inc + echo "steps_fork_w_lzsa: .incbin \"steps_fork_w.lzsa\"" >> channel_graphics.inc + echo "steps_path_e_lzsa: .incbin \"steps_path_e.lzsa\"" >> channel_graphics.inc + echo "steps_path_w_lzsa: .incbin \"steps_path_w.lzsa\"" >> channel_graphics.inc + echo "steps_door_e_lzsa: .incbin \"steps_door_e.lzsa\"" >> 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 %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_channel/steps_door_e.png b/mist/graphics_channel/steps_door_e.png new file mode 100644 index 00000000..620fb554 Binary files /dev/null and b/mist/graphics_channel/steps_door_e.png differ diff --git a/mist/graphics_channel/steps_door_w.png b/mist/graphics_channel/steps_door_w.png new file mode 100644 index 00000000..3437014b Binary files /dev/null and b/mist/graphics_channel/steps_door_w.png differ diff --git a/mist/graphics_channel/steps_fork_n.png b/mist/graphics_channel/steps_fork_n.png new file mode 100644 index 00000000..803ccac7 Binary files /dev/null and b/mist/graphics_channel/steps_fork_n.png differ diff --git a/mist/graphics_channel/steps_fork_s.png b/mist/graphics_channel/steps_fork_s.png new file mode 100644 index 00000000..4db0feab Binary files /dev/null and b/mist/graphics_channel/steps_fork_s.png differ diff --git a/mist/graphics_channel/steps_fork_w.png b/mist/graphics_channel/steps_fork_w.png new file mode 100644 index 00000000..5cb1ba9b Binary files /dev/null and b/mist/graphics_channel/steps_fork_w.png differ diff --git a/mist/graphics_channel/steps_path_e.png b/mist/graphics_channel/steps_path_e.png new file mode 100644 index 00000000..ae147f96 Binary files /dev/null and b/mist/graphics_channel/steps_path_e.png differ diff --git a/mist/graphics_channel/steps_path_w.png b/mist/graphics_channel/steps_path_w.png new file mode 100644 index 00000000..a6940c36 Binary files /dev/null and b/mist/graphics_channel/steps_path_w.png differ diff --git a/mist/graphics_channel/wind_path_n.png b/mist/graphics_channel/wind_path_n.png new file mode 100644 index 00000000..f1524939 Binary files /dev/null and b/mist/graphics_channel/wind_path_n.png differ diff --git a/mist/graphics_channel/wind_path_s.png b/mist/graphics_channel/wind_path_s.png new file mode 100644 index 00000000..8446364d Binary files /dev/null and b/mist/graphics_channel/wind_path_s.png differ diff --git a/mist/leveldata_channel.inc b/mist/leveldata_channel.inc index 8f028671..4638fc27 100644 --- a/mist/leveldata_channel.inc +++ b/mist/leveldata_channel.inc @@ -9,6 +9,8 @@ locations: .word location12,location13,location14,location15 .word location16,location17,location18,location19 .word location20,location21,location22,location23 + .word location24,location25,location26,location27 + ; CHANNEL_OUTSIDE_CABIN -- outside in clearing location0: @@ -333,11 +335,11 @@ location17: ; CHANNEL_PATH5 -- twisty maze of passages all alike location18: - .byte $ff ; north exit + .byte CHANNEL_STEPS_FORK ; north exit .byte CHANNEL_PATH6 ; south exit .byte CHANNEL_PATH4 ; east exit .byte $ff ; west exit - .byte $ff ; north exit_dir + .byte DIRECTION_N ; north exit_dir .byte DIRECTION_S ; south exit_dir .byte DIRECTION_E ; east exit_dir .byte $ff ; west exit_dir @@ -433,4 +435,73 @@ location23: .byte BG_EAST|BG_WEST .byte $ff +; CHANNEL_STEPS_FORK -- fork going to steps +location24: + .byte CHANNEL_WIND_PATH ; north exit + .byte CHANNEL_PATH5 ; south exit + .byte $ff ; east exit + .byte CHANNEL_STEPS_PATH ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word steps_fork_n_lzsa ; north bg + .word steps_fork_s_lzsa ; south bg + .word $0000 ; east bg + .word steps_fork_w_lzsa ; west bg + .byte BG_NORTH|BG_SOUTH|BG_WEST + .byte $ff + +; CHANNEL_STEPS_PATH -- path going to steps +location25: + .byte $ff ; north exit + .byte $ff ; south exit + .byte CHANNEL_STEPS_FORK ; east exit + .byte CHANNEL_STEPS_DOOR ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_N ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word steps_path_e_lzsa ; east bg + .word steps_path_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; CHANNEL_STEPS_DOOR -- door to the steps +location26: + .byte $ff ; north exit + .byte $ff ; south exit + .byte CHANNEL_STEPS_PATH ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte $ff ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word steps_door_e_lzsa ; east bg + .word steps_door_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; CHANNEL_WIND_PATH -- path to windmill +location27: + .byte $ff ; north exit + .byte CHANNEL_STEPS_FORK ; 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_path_n_lzsa ; north bg + .word wind_path_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + +