diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 982d7341..fa1d5828 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -208,7 +208,7 @@ MECHE_ACHENAR_LETTER = 43 MECHE_EAST_PATH = 44 MECHE_EAST_STEPS = 45 MECHE_EAST_LANDING = 46 - +MECHE_NORTH_CLOSE = 47 ; Selena Age diff --git a/mist/default_save.s b/mist/default_save.s index 516d0ec7..0860eab8 100644 --- a/mist/default_save.s +++ b/mist/default_save.s @@ -26,8 +26,8 @@ .if 1 ; MECHE .byte LOAD_MECHE ; WHICH_LOAD = $80 -.byte DIRECTION_E ; DIRECTION = $81 -.byte MECHE_EAST_PLATFORM ; LOCATION = $82 +.byte DIRECTION_N ; DIRECTION = $81 +.byte MECHE_NORTH_PLATFORM ; LOCATION = $82 .endif diff --git a/mist/graphics_meche/Makefile b/mist/graphics_meche/Makefile index 0ece2728..6bc69762 100644 --- a/mist/graphics_meche/Makefile +++ b/mist/graphics_meche/Makefile @@ -63,7 +63,8 @@ meche_graphics.inc: \ achenar_letter.lzsa \ east_path_e.lzsa east_path_w.lzsa \ east_steps_s.lzsa east_steps_n.lzsa \ - east_landing_e.lzsa east_landing_w.lzsa + east_landing_e.lzsa east_landing_w.lzsa \ + north_close_n.lzsa north_close_s.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 @@ -173,6 +174,8 @@ meche_graphics.inc: \ echo "east_steps_n_lzsa: .incbin \"east_steps_n.lzsa\"" >> meche_graphics.inc echo "east_landing_e_lzsa: .incbin \"east_landing_e.lzsa\"" >> meche_graphics.inc echo "east_landing_w_lzsa: .incbin \"east_landing_w.lzsa\"" >> meche_graphics.inc + echo "north_close_s_lzsa: .incbin \"north_close_s.lzsa\"" >> meche_graphics.inc + echo "north_close_n_lzsa: .incbin \"north_close_n.lzsa\"" >> meche_graphics.inc %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_meche/north_close_n.png b/mist/graphics_meche/north_close_n.png new file mode 100644 index 00000000..ecc38478 Binary files /dev/null and b/mist/graphics_meche/north_close_n.png differ diff --git a/mist/graphics_meche/north_close_s.png b/mist/graphics_meche/north_close_s.png new file mode 100644 index 00000000..be6aeb78 Binary files /dev/null and b/mist/graphics_meche/north_close_s.png differ diff --git a/mist/graphics_meche/north_top_s.png b/mist/graphics_meche/north_top_s.png index be6aeb78..c2aecf39 100644 Binary files a/mist/graphics_meche/north_top_s.png and b/mist/graphics_meche/north_top_s.png differ diff --git a/mist/leveldata_meche.inc b/mist/leveldata_meche.inc index 496bceb1..dff3713e 100644 --- a/mist/leveldata_meche.inc +++ b/mist/leveldata_meche.inc @@ -15,7 +15,7 @@ locations: .word location32,location33,location34,location35 .word location36,location37,location38,location39 .word location40,location41,location42,location43 - .word location44,location45,location46 + .word location44,location45,location46,location47 ; MECHE_INSIDE_GEAR -- Inside gear on Mist location0: @@ -217,11 +217,11 @@ location10: ; MECHE_NORTH_HINT -- hint plate location11: - .byte MECHE_NORTH_TOP ; north exit + .byte MECHE_NORTH_CLOSE ; north exit .byte $ff ; south exit .byte $ff ; east exit .byte $ff ; west exit - .byte DIRECTION_S ; north exit_dir + .byte DIRECTION_N ; north exit_dir .byte $ff ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir @@ -234,7 +234,7 @@ location11: ; MECHE_NORTH_TOP -- north top location12: - .byte MECHE_NORTH_HINT ; north exit + .byte MECHE_NORTH_CLOSE ; north exit .byte MECHE_NORTH_DIP ; south exit .byte $ff ; east exit .byte $ff ; west exit @@ -863,3 +863,20 @@ location46: .word east_landing_w_lzsa ; west bg .byte BG_EAST|BG_WEST .byte $ff ; special exit + +; MECHE_NORTH_CLOSE -- north close +location47: + .byte MECHE_NORTH_HINT ; north exit + .byte MECHE_NORTH_TOP ; 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 north_close_n_lzsa ; north bg + .word north_close_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff ; special exit