From c392b7411abd8bf5da0959b18eb4cea9d9f740a5 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 27 Aug 2020 20:42:25 -0400 Subject: [PATCH] mist: meche: another stop on north hint --- mist/common_defines.inc | 2 +- mist/default_save.s | 4 ++-- mist/graphics_meche/Makefile | 5 ++++- mist/graphics_meche/north_close_n.png | Bin 0 -> 840 bytes mist/graphics_meche/north_close_s.png | Bin 0 -> 962 bytes mist/graphics_meche/north_top_s.png | Bin 962 -> 1055 bytes mist/leveldata_meche.inc | 25 +++++++++++++++++++++---- 7 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 mist/graphics_meche/north_close_n.png create mode 100644 mist/graphics_meche/north_close_s.png 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 0000000000000000000000000000000000000000..ecc38478d544d84dd08e8e8764d6f2c0ecfd2724 GIT binary patch literal 840 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 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