diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 34b02a57..22b21f02 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -122,6 +122,8 @@ MECHE_OPEN_BOOK = 2 MECHE_ARRIVAL = 3 MECHE_ENTRANCE = 4 MECHE_FORT_VIEW = 5 +MECHE_BRIDGE2 = 6 +MECHE_FORT_DOOR = 7 ; Selena Age diff --git a/mist/graphics_meche/Makefile b/mist/graphics_meche/Makefile index c41c4267..26dde756 100644 --- a/mist/graphics_meche/Makefile +++ b/mist/graphics_meche/Makefile @@ -14,7 +14,9 @@ meche_graphics.inc: \ arrival_w.lzsa \ entrance_e.lzsa entrance_s.lzsa entrance_n.lzsa entrance_w.lzsa \ meche_book_closed.lzsa meche_book_open.lzsa \ - fort_view_n.lzsa fort_view_s.lzsa + fort_view_n.lzsa fort_view_s.lzsa \ + bridge2_n.lzsa bridge2_s.lzsa bridge2_e.lzsa bridge2_w.lzsa \ + fort_door_n.lzsa echo "departure_e_lzsa: .incbin \"departure_e.lzsa\"" > meche_graphics.inc echo "arrival_w_lzsa: .incbin \"arrival_w.lzsa\"" >> meche_graphics.inc echo "entrance_e_lzsa: .incbin \"entrance_e.lzsa\"" >> meche_graphics.inc @@ -25,6 +27,12 @@ meche_graphics.inc: \ echo "meche_book_open_lzsa: .incbin \"meche_book_open.lzsa\"" >> meche_graphics.inc echo "fort_view_n_lzsa: .incbin \"fort_view_n.lzsa\"" >> meche_graphics.inc echo "fort_view_s_lzsa: .incbin \"fort_view_s.lzsa\"" >> meche_graphics.inc + echo "bridge2_n_lzsa: .incbin \"bridge2_n.lzsa\"" >> meche_graphics.inc + echo "bridge2_s_lzsa: .incbin \"bridge2_s.lzsa\"" >> meche_graphics.inc + echo "bridge2_e_lzsa: .incbin \"bridge2_e.lzsa\"" >> meche_graphics.inc + echo "bridge2_w_lzsa: .incbin \"bridge2_w.lzsa\"" >> meche_graphics.inc + echo "fort_door_n_lzsa: .incbin \"fort_door_n.lzsa\"" >> meche_graphics.inc + %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_meche/bridge2_e.png b/mist/graphics_meche/bridge2_e.png new file mode 100644 index 00000000..da9f76bf Binary files /dev/null and b/mist/graphics_meche/bridge2_e.png differ diff --git a/mist/graphics_meche/bridge2_n.png b/mist/graphics_meche/bridge2_n.png new file mode 100644 index 00000000..5859e003 Binary files /dev/null and b/mist/graphics_meche/bridge2_n.png differ diff --git a/mist/graphics_meche/bridge2_s.png b/mist/graphics_meche/bridge2_s.png new file mode 100644 index 00000000..80dba508 Binary files /dev/null and b/mist/graphics_meche/bridge2_s.png differ diff --git a/mist/graphics_meche/bridge2_w.png b/mist/graphics_meche/bridge2_w.png new file mode 100644 index 00000000..2cddcb91 Binary files /dev/null and b/mist/graphics_meche/bridge2_w.png differ diff --git a/mist/graphics_meche/fort_door_n.png b/mist/graphics_meche/fort_door_n.png new file mode 100644 index 00000000..f66f43a7 Binary files /dev/null and b/mist/graphics_meche/fort_door_n.png differ diff --git a/mist/graphics_meche/meche_graphics.inc b/mist/graphics_meche/meche_graphics.inc index 58fa551d..d75b8490 100644 --- a/mist/graphics_meche/meche_graphics.inc +++ b/mist/graphics_meche/meche_graphics.inc @@ -8,3 +8,8 @@ meche_book_closed_lzsa: .incbin "meche_book_closed.lzsa" meche_book_open_lzsa: .incbin "meche_book_open.lzsa" fort_view_n_lzsa: .incbin "fort_view_n.lzsa" fort_view_s_lzsa: .incbin "fort_view_s.lzsa" +bridge2_n_lzsa: .incbin "bridge2_n.lzsa" +bridge2_s_lzsa: .incbin "bridge2_s.lzsa" +bridge2_e_lzsa: .incbin "bridge2_e.lzsa" +bridge2_w_lzsa: .incbin "bridge2_w.lzsa" +fort_door_n_lzsa: .incbin "fort_door_n.lzsa" diff --git a/mist/leveldata_meche.inc b/mist/leveldata_meche.inc index 0971600f..9acb0715 100644 --- a/mist/leveldata_meche.inc +++ b/mist/leveldata_meche.inc @@ -5,7 +5,7 @@ locations: .word location0, location1, location2, location3 - .word location4, location5 + .word location4, location5, location6, location7 ; MECHE_INSIDE_GEAR -- Inside gear on Mist location0: @@ -99,11 +99,11 @@ location4: ; MECHE_FORT_VIEW -- fort view location5: - .byte MECHE_FORT_VIEW ; north exit + .byte MECHE_BRIDGE2 ; north exit .byte MECHE_ENTRANCE ; south exit .byte $ff ; east exit .byte $ff ; west exit - .byte DIRECTION_S ; north exit_dir + .byte DIRECTION_N ; north exit_dir .byte DIRECTION_S ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir @@ -114,3 +114,38 @@ location5: .byte BG_NORTH|BG_SOUTH .byte $ff ; special exit +; MECHE_BRIDGE2 -- bridge2 +location6: + .byte MECHE_FORT_DOOR ; north exit + .byte MECHE_FORT_VIEW ; 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 bridge2_n_lzsa ; north bg + .word bridge2_s_lzsa ; south bg + .word bridge2_e_lzsa ; east bg + .word bridge2_w_lzsa ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST + .byte $ff ; special exit + + +; MECHE_FORT_DOOR -- fort door +location7: + .byte $ff ; north exit + .byte MECHE_BRIDGE2 ; 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 fort_door_n_lzsa ; north bg + .word $0000 ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH + .byte $ff ; special exit +