diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 0e707bd1..0dddfacf 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -383,6 +383,15 @@ ARBOR_BRIDGE6 = 20 ARBOR_SHACK2 = 21 ARBOR_BRIDGE7 = 22 ARBOR_DOORS = 23 -ARBOR_DOORS_ELEV2_OPEN = 24 -ARBOR_INSIDE_ELEV2_OPEN = 25 -ARBOR_INSIDE_ELEV2_CLOSED= 26 +ARBOR_INSIDE_ELEV2_OPEN = 24 +ARBOR_INSIDE_ELEV2_CLOSED= 25 +ARBOR_IN_ELEV2_TOP_CLOSED= 26 +ARBOR_IN_ELEV2_TOP_OPEN= 27 +ARBOR_STEPS1 = 28 +ARBOR_STEPS2 = 29 +ARBOR_STEPS3 = 30 +ARBOR_STEPS4 = 31 +ARBOR_STEPS5 = 32 + + + diff --git a/mist/graphics_arbor/Makefile b/mist/graphics_arbor/Makefile index ef48988c..e8049703 100644 --- a/mist/graphics_arbor/Makefile +++ b/mist/graphics_arbor/Makefile @@ -30,7 +30,8 @@ arbor_graphics.inc: \ bridge6_n.lzsa bridge6_s.lzsa \ shack2_n.lzsa shack2_s.lzsa shack2_e.lzsa shack2_w.lzsa \ bridge7_e.lzsa bridge7_open_w.lzsa bridge7_closed_w.lzsa \ - doors_e.lzsa doors_closed_w.lzsa + doors_e.lzsa doors_closed_w.lzsa \ + inside_elevator2_open.lzsa inside_elevator2_closed.lzsa echo "arrival_e_lzsa: .incbin \"arrival_e.lzsa\"" > arbor_graphics.inc echo "arrival_open_e_lzsa: .incbin \"arrival_open_e.lzsa\"" >> arbor_graphics.inc echo "arrival_w_lzsa: .incbin \"arrival_w.lzsa\"" >> arbor_graphics.inc @@ -84,6 +85,8 @@ arbor_graphics.inc: \ echo "bridge7_open_w_lzsa: .incbin \"bridge7_open_w.lzsa\"" >> arbor_graphics.inc echo "doors_e_lzsa: .incbin \"doors_e.lzsa\"" >> arbor_graphics.inc echo "doors_closed_w_lzsa: .incbin \"doors_closed_w.lzsa\"" >> arbor_graphics.inc + echo "inside_elevator2_open_lzsa: .incbin \"inside_elevator2_open.lzsa\"" >> arbor_graphics.inc + echo "inside_elevator2_closed_lzsa: .incbin \"inside_elevator2_closed.lzsa\"" >> arbor_graphics.inc %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_arbor/doors_elev2_open_w.png b/mist/graphics_arbor/doors_elev2_open_w.png new file mode 100644 index 00000000..1da8de1e Binary files /dev/null and b/mist/graphics_arbor/doors_elev2_open_w.png differ diff --git a/mist/graphics_arbor/doors_open_elev2_closed_w.png b/mist/graphics_arbor/doors_open_elev2_closed_w.png new file mode 100644 index 00000000..0a1a95cf Binary files /dev/null and b/mist/graphics_arbor/doors_open_elev2_closed_w.png differ diff --git a/mist/graphics_arbor/doors_open_w.png b/mist/graphics_arbor/doors_open_w.png new file mode 100644 index 00000000..2db538a9 Binary files /dev/null and b/mist/graphics_arbor/doors_open_w.png differ diff --git a/mist/graphics_arbor/inside_elevator2_closed.png b/mist/graphics_arbor/inside_elevator2_closed.png new file mode 100644 index 00000000..6a5502cd Binary files /dev/null and b/mist/graphics_arbor/inside_elevator2_closed.png differ diff --git a/mist/graphics_arbor/inside_elevator2_open.png b/mist/graphics_arbor/inside_elevator2_open.png new file mode 100644 index 00000000..efda663d Binary files /dev/null and b/mist/graphics_arbor/inside_elevator2_open.png differ diff --git a/mist/leveldata_arbor.inc b/mist/leveldata_arbor.inc index 0c3ec241..cadcfc40 100644 --- a/mist/leveldata_arbor.inc +++ b/mist/leveldata_arbor.inc @@ -9,6 +9,7 @@ locations: .word location12,location13,location14,location15 .word location16,location17,location18,location19 .word location20,location21,location22,location23 + .word location24,location25 ; ARBOR_INSIDE_ELEV1 -- arrival in elevator1 location0: @@ -427,5 +428,41 @@ location23: .byte BG_EAST|BG_WEST .byte $ff +; ARBOR_INSIDE_ELEV2_OPEN -- inside elevator2, door open +location24: + .byte $ff ; north exit + .byte $ff ; south exit + .byte ARBOR_DOORS ; 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 inside_elevator2_open_lzsa ; east bg + .word $0000 ; west bg + .byte BG_EAST + .byte $ff + +; ARBOR_INSIDE_ELEV2_CLOSED -- inside elevator2, door closed +location25: + .byte $ff ; north exit + .byte $ff ; south exit + .byte ARBOR_INSIDE_ELEV2_OPEN ; 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 inside_elevator2_closed_lzsa ; east bg + .word $0000 ; west bg + .byte BG_EAST + .byte $ff + + +