From febc0039af8e5ec609f723f718b84e79e2285394 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 25 Aug 2020 00:55:45 -0400 Subject: [PATCH] mist: arbor: add in missing shack --- mist/common_defines.inc | 1 + mist/graphics_arbor/Makefile | 7 ++++++- mist/graphics_arbor/inlongshack3_e.png | Bin 0 -> 1140 bytes mist/graphics_arbor/inlongshack3_n.png | Bin 0 -> 1241 bytes mist/graphics_arbor/inlongshack3_s.png | Bin 0 -> 1074 bytes mist/graphics_arbor/inlongshack3_w.png | Bin 0 -> 1033 bytes mist/leveldata_arbor.inc | 25 +++++++++++++++++++++---- 7 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 mist/graphics_arbor/inlongshack3_e.png create mode 100644 mist/graphics_arbor/inlongshack3_n.png create mode 100644 mist/graphics_arbor/inlongshack3_s.png create mode 100644 mist/graphics_arbor/inlongshack3_w.png diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 86b3062f..18949186 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -449,6 +449,7 @@ ARBOR_STEPS2 = 28 ARBOR_STEPS1 = 29 ARBOR_STEPS_BOTTOM = 30 ARBOR_ARRIVAL_NOELEV = 31 +ARBOR_IN_LONGSHACK3 = 32 ; NIBEL, up in the clouds NIBEL_IN_ELEV2_TOP_CLOSED= 0 diff --git a/mist/graphics_arbor/Makefile b/mist/graphics_arbor/Makefile index feea1388..c70d49a5 100644 --- a/mist/graphics_arbor/Makefile +++ b/mist/graphics_arbor/Makefile @@ -37,7 +37,8 @@ arbor_graphics.inc: \ steps_top_e.lzsa steps_top_w.lzsa \ steps1_e.lzsa steps1_w.lzsa \ steps2_e.lzsa steps2_w.lzsa \ - steps_bottom_e.lzsa steps_bottom_open_w.lzsa steps_bottom_closed_w.lzsa + steps_bottom_e.lzsa steps_bottom_open_w.lzsa steps_bottom_closed_w.lzsa \ + inlongshack3_n.lzsa inlongshack3_s.lzsa inlongshack3_e.lzsa inlongshack3_w.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 @@ -107,6 +108,10 @@ arbor_graphics.inc: \ echo "steps_bottom_e_lzsa: .incbin \"steps_bottom_e.lzsa\"" >> arbor_graphics.inc echo "steps_bottom_open_w_lzsa: .incbin \"steps_bottom_open_w.lzsa\"" >> arbor_graphics.inc echo "steps_bottom_closed_w_lzsa: .incbin \"steps_bottom_closed_w.lzsa\"" >> arbor_graphics.inc + echo "inlongshack3_n_lzsa: .incbin \"inlongshack3_n.lzsa\"" >> arbor_graphics.inc + echo "inlongshack3_s_lzsa: .incbin \"inlongshack3_s.lzsa\"" >> arbor_graphics.inc + echo "inlongshack3_e_lzsa: .incbin \"inlongshack3_e.lzsa\"" >> arbor_graphics.inc + echo "inlongshack3_w_lzsa: .incbin \"inlongshack3_w.lzsa\"" >> arbor_graphics.inc %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_arbor/inlongshack3_e.png b/mist/graphics_arbor/inlongshack3_e.png new file mode 100644 index 0000000000000000000000000000000000000000..12f2618b068817d0a083b370e18e831a97cf30b1 GIT binary patch literal 1140 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 DxO>EI literal 0 HcmV?d00001 diff --git a/mist/leveldata_arbor.inc b/mist/leveldata_arbor.inc index 32e76e8f..fe0eea4d 100644 --- a/mist/leveldata_arbor.inc +++ b/mist/leveldata_arbor.inc @@ -11,7 +11,7 @@ locations: .word location20,location21,location22,location23 .word location24,location25,location26,location27 .word location28,location29,location30,location31 - + .word location32 ; ARBOR_INSIDE_ELEV1 -- arrival in elevator1 location0: @@ -348,7 +348,7 @@ location18: ; ARBOR_LONGSHACK3 -- next longshack location19: .byte ARBOR_BRIDGE5 ; north exit - .byte ARBOR_BRIDGE6 ; south exit + .byte ARBOR_IN_LONGSHACK3 ; south exit .byte $ff ; east exit .byte $ff ; west exit .byte DIRECTION_N ; north exit_dir @@ -364,7 +364,7 @@ location19: ; ARBOR_BRIDGE6 -- the next bridge location20: - .byte ARBOR_LONGSHACK3 ; north exit + .byte ARBOR_IN_LONGSHACK3 ; north exit .byte ARBOR_SHACK2 ; south exit .byte $ff ; east exit .byte $ff ; west exit @@ -381,7 +381,7 @@ location20: ; ARBOR_SHACK2 -- the shack before the elevator location21: - .byte ARBOR_LONGSHACK3 ; north exit + .byte ARBOR_BRIDGE6 ; north exit .byte $ff ; south exit .byte $ff ; east exit .byte ARBOR_BRIDGE7 ; west exit @@ -584,3 +584,20 @@ location31: .word $ff ; west bg .byte BG_EAST .byte $ff + +; ARBOR_IN_LONGSHACK3 -- inside longshack3 +location32: + .byte ARBOR_LONGSHACK3 ; north exit + .byte ARBOR_BRIDGE6 ; 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 inlongshack3_n_lzsa ; north bg + .word inlongshack3_s_lzsa ; south bg + .word inlongshack3_e_lzsa ; east bg + .word inlongshack3_w_lzsa ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST + .byte $ff