diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 594b7dcd..47ad1569 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -362,4 +362,6 @@ ARBOR_INSIDE_ELEV1 = 0 ARBOR_INSIDE_ELEV1_OPEN = 1 ARBOR_ARRIVAL_CLOSED = 2 ARBOR_ARRIVAL_OPEN = 3 - +ARBOR_BRIDGE1 = 4 +ARBOR_HUT1 = 5 +ARBOR_BRIDGE2 = 6 diff --git a/mist/graphics_arbor/Makefile b/mist/graphics_arbor/Makefile index a150a9b7..f1b91c70 100644 --- a/mist/graphics_arbor/Makefile +++ b/mist/graphics_arbor/Makefile @@ -10,12 +10,22 @@ all: arbor_graphics.inc arbor_graphics.inc: \ arrival_e.lzsa arrival_w.lzsa arrival_open_e.lzsa \ - inside_elevator1_closed_w.lzsa inside_elevator1_open_w.lzsa + inside_elevator1_closed_w.lzsa inside_elevator1_open_w.lzsa \ + bridge1_e.lzsa bridge1_w.lzsa \ + hut1_e.lzsa hut1_w.lzsa \ + bridge2_n.lzsa bridge2_s.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 echo "inside_elevator1_open_w_lzsa: .incbin \"inside_elevator1_open_w.lzsa\"" >> arbor_graphics.inc echo "inside_elevator1_closed_w_lzsa: .incbin \"inside_elevator1_closed_w.lzsa\"" >> arbor_graphics.inc + echo "bridge1_e_lzsa: .incbin \"bridge1_e.lzsa\"" >> arbor_graphics.inc + echo "bridge1_w_lzsa: .incbin \"bridge1_w.lzsa\"" >> arbor_graphics.inc + echo "hut1_e_lzsa: .incbin \"hut1_e.lzsa\"" >> arbor_graphics.inc + echo "hut1_w_lzsa: .incbin \"hut1_w.lzsa\"" >> arbor_graphics.inc + echo "bridge2_n_lzsa: .incbin \"bridge2_n.lzsa\"" >> arbor_graphics.inc + echo "bridge2_s_lzsa: .incbin \"bridge2_s.lzsa\"" >> arbor_graphics.inc + %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_arbor/bridge1_e.png b/mist/graphics_arbor/bridge1_e.png new file mode 100644 index 00000000..37279c15 Binary files /dev/null and b/mist/graphics_arbor/bridge1_e.png differ diff --git a/mist/graphics_arbor/bridge1_w.png b/mist/graphics_arbor/bridge1_w.png new file mode 100644 index 00000000..b574a62c Binary files /dev/null and b/mist/graphics_arbor/bridge1_w.png differ diff --git a/mist/graphics_arbor/bridge2_n.png b/mist/graphics_arbor/bridge2_n.png new file mode 100644 index 00000000..09971db1 Binary files /dev/null and b/mist/graphics_arbor/bridge2_n.png differ diff --git a/mist/graphics_arbor/bridge2_s.png b/mist/graphics_arbor/bridge2_s.png new file mode 100644 index 00000000..31b840b8 Binary files /dev/null and b/mist/graphics_arbor/bridge2_s.png differ diff --git a/mist/graphics_arbor/hut1_e.png b/mist/graphics_arbor/hut1_e.png new file mode 100644 index 00000000..22056a54 Binary files /dev/null and b/mist/graphics_arbor/hut1_e.png differ diff --git a/mist/graphics_arbor/hut1_w.png b/mist/graphics_arbor/hut1_w.png new file mode 100644 index 00000000..54feb0e0 Binary files /dev/null and b/mist/graphics_arbor/hut1_w.png differ diff --git a/mist/leveldata_arbor.inc b/mist/leveldata_arbor.inc index ac1230a1..935af1bf 100644 --- a/mist/leveldata_arbor.inc +++ b/mist/leveldata_arbor.inc @@ -4,6 +4,7 @@ locations: .word location0, location1, location2, location3 + .word location4, location5, location6 ; ARBOR_INSIDE_ELEV1 -- arrival in elevator1 location0: @@ -50,7 +51,7 @@ location2: .byte $ff ; north exit .byte $ff ; south exit .byte ARBOR_ARRIVAL_OPEN ; east exit - .byte $ff ; west exit + .byte ARBOR_BRIDGE1 ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir .byte DIRECTION_E ; east exit_dir @@ -67,7 +68,7 @@ location3: .byte $ff ; north exit .byte $ff ; south exit .byte ARBOR_INSIDE_ELEV1_OPEN ; east exit - .byte $ff ; west exit + .byte ARBOR_BRIDGE1 ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir .byte DIRECTION_W ; east exit_dir @@ -79,4 +80,53 @@ location3: .byte BG_WEST|BG_EAST .byte $ff +; ARBOR_BRIDGE1 -- first bridge +location4: + .byte $ff ; north exit + .byte $ff ; south exit + .byte ARBOR_ARRIVAL_CLOSED ; east exit + .byte ARBOR_HUT1 ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word bridge1_e_lzsa ; east bg + .word bridge1_w_lzsa ; west bg + .byte BG_WEST|BG_EAST + .byte $ff +; ARBOR_HUT1 -- first hut +location5: + .byte $ff ; north exit + .byte $ff ; south exit + .byte ARBOR_BRIDGE1 ; east exit + .byte ARBOR_BRIDGE2 ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte DIRECTION_N ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word hut1_e_lzsa ; east bg + .word hut1_w_lzsa ; west bg + .byte BG_WEST|BG_EAST + .byte $ff + +; ARBOR_BRIDGE2 -- second bridge +location6: + .byte $ff ; north exit + .byte ARBOR_HUT1 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte DIRECTION_E ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word bridge2_n_lzsa ; north bg + .word bridge2_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff