From 30ad89d4c5f5b8e67af8e0e2b99eaf3db3c97c88 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 30 Jul 2020 12:35:06 -0400 Subject: [PATCH] mist: selena: add another walkway location --- mist/common_defines.inc | 3 +- mist/graphics_selena/Makefile | 9 +++-- mist/graphics_selena/walkway2_n.png | Bin 0 -> 963 bytes mist/graphics_selena/walkway2_s.png | Bin 0 -> 942 bytes .../{spaceship_path_n.png => walkway3_n.png} | Bin .../{spaceship_path_s.png => walkway3_s.png} | Bin mist/leveldata_selena.inc | 35 +++++++++++++----- 7 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 mist/graphics_selena/walkway2_n.png create mode 100644 mist/graphics_selena/walkway2_s.png rename mist/graphics_selena/{spaceship_path_n.png => walkway3_n.png} (100%) rename mist/graphics_selena/{spaceship_path_s.png => walkway3_s.png} (100%) diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 1ed911a6..db9b9fe0 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -229,7 +229,7 @@ SELENA_CRYSTAL_STEPS = 18 SELENA_CRYSTAL_PATH = 19 SELENA_CRYSTALS = 20 SELENA_CRYSTAL_CLOSE = 21 -SELENA_SPACESHIP_PATH = 22 +SELENA_WALKWAY3 = 22 SELENA_BEFORE_CRYSTALS = 23 SELENA_TUNNEL_STEPS = 24 SELENA_TUNNEL_PATH = 25 @@ -249,6 +249,7 @@ SELENA_ANTENNA_OPEN = 38 SELENA_ANTENNA_CLOSE = 39 SELENA_BUNKER_OPEN = 40 SELENA_BUNKER_KEYPAD = 41 +SELENA_WALKWAY2 = 42 ; Submarine on Selena SUB_BUNKER_ENTRY = 0 diff --git a/mist/graphics_selena/Makefile b/mist/graphics_selena/Makefile index 80c6ffb5..e83ae9c8 100644 --- a/mist/graphics_selena/Makefile +++ b/mist/graphics_selena/Makefile @@ -33,7 +33,8 @@ selena_graphics.inc: \ crystal_path_n.lzsa \ crystals_s.lzsa crystals_n.lzsa \ crystals_note_e.lzsa \ - spaceship_path_n.lzsa spaceship_path_s.lzsa \ + walkway3_n.lzsa walkway3_s.lzsa \ + walkway2_n.lzsa walkway2_s.lzsa \ before_crystals_w.lzsa before_crystals_e.lzsa \ tunnel_steps_e.lzsa tunnel_steps_w.lzsa \ tunnel_path_s.lzsa tunnel_path_n.lzsa tunnel_path_w.lzsa \ @@ -98,8 +99,10 @@ selena_graphics.inc: \ echo "crystals_s_lzsa: .incbin \"crystals_s.lzsa\"" >> selena_graphics.inc echo "crystals_n_lzsa: .incbin \"crystals_n.lzsa\"" >> selena_graphics.inc echo "crystals_note_e_lzsa: .incbin \"crystals_note_e.lzsa\"" >> selena_graphics.inc - echo "spaceship_path_n_lzsa: .incbin \"spaceship_path_n.lzsa\"" >> selena_graphics.inc - echo "spaceship_path_s_lzsa: .incbin \"spaceship_path_s.lzsa\"" >> selena_graphics.inc + echo "walkway3_n_lzsa: .incbin \"walkway3_n.lzsa\"" >> selena_graphics.inc + echo "walkway3_s_lzsa: .incbin \"walkway3_s.lzsa\"" >> selena_graphics.inc + echo "walkway2_n_lzsa: .incbin \"walkway2_n.lzsa\"" >> selena_graphics.inc + echo "walkway2_s_lzsa: .incbin \"walkway2_s.lzsa\"" >> selena_graphics.inc echo "before_crystals_w_lzsa: .incbin \"before_crystals_w.lzsa\"" >> selena_graphics.inc echo "before_crystals_e_lzsa: .incbin \"before_crystals_e.lzsa\"" >> selena_graphics.inc echo "tunnel_steps_e_lzsa: .incbin \"tunnel_steps_e.lzsa\"" >> selena_graphics.inc diff --git a/mist/graphics_selena/walkway2_n.png b/mist/graphics_selena/walkway2_n.png new file mode 100644 index 0000000000000000000000000000000000000000..4aba94bda2b2dc702f27b78ffc127023262fd2d4 GIT binary patch literal 963 zcmV;!13dhRP)EX>4Tx04R}tkv&MmKpe$iQ>7vm1v`i+M5s;{#ELj-6^c-y)C#RSm|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jfa&%I3krMxx6k5c1aNLh~_a1le0HI!Hs@X9CsG4P@ z;xRFkT@?eb2w)g}h+;%yraqTUCg3@~?&0I>U4&K9P8q>4rtTK|H-_ z>74h8L#!w%#OK8023?T&k?XR{Z=4Gb3p_Jqq*L?6A!4!6#&R38qM;H`5r-93qkJLb zvch?bvs$jQ<~{ifgE?(wnd>x%5XT~xkc0>sRg_SMg$S)0DJD|1AM@}JI{qZNWO9|j z$gzM5R7j2={11M2Yv!YqZc;D?biUa3$0!ik1sXNm{yw(t#tGnm2ClT0zfuQgK1r{& zwD1woyA51iw={VVxZD8-o^;8O9LY~p$mfCgGy0}1(0>bbuerT7_i_3Fq^YaK4RCM> zj1?$*-Q(R|?Y;ebrrF;Qz7ulA^${4!0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X zmRIYN00007bV*G`2jmAH5EnRdK#=eN000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H zM@dakSAh-}0004QNklLI#6+2j>G*!vjI@2Y}ws4<_;f7^4Oe?MQBe@k$PQ ze*=`AiYnX2mHh?sA7dN>>P2TRj&d8cOC-zz@Gug%nLr)0p!WduPQUcLAK~vgSAfE) zB|sFjL;<{xloTa|21pQ&V?%RJ)HdB1Y1h`+nKCz=gIps(*=m~mt)Zm0TcGT0 z2c&v-lRnryhum@vqtfGr|LPB`g&kOe*mSv{cB3Fd9Z)s@u l^Q5|xJof!rb(W-^e*<{NYW}RDumk`A002ovPDHLkV1lNWqdNcq literal 0 HcmV?d00001 diff --git a/mist/graphics_selena/walkway2_s.png b/mist/graphics_selena/walkway2_s.png new file mode 100644 index 0000000000000000000000000000000000000000..c06d951a6f49aee9f24a6add697bac55350db208 GIT binary patch literal 942 zcmV;f15x~mP)EX>4Tx04R}tkv&MmKpe$iQ>7vm1v`i+M5s;{#ELj-6^c-y)C#RSm|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jfa&%I3krMxx6k5c1aNLh~_a1le0HI!Hs@X9CsG4P@ z;xRFkT@?eb2w)g}h+;%yraqTUCg3@~?&0I>U4&K9P8q>4rtTK|H-_ z>74h8L#!w%#OK8023?T&k?XR{Z=4Gb3p_Jqq*L?6A!4!6#&R38qM;H`5r-93qkJLb zvch?bvs$jQ<~{ifgE?(wnd>x%5XT~xkc0>sRg_SMg$S)0DJD|1AM@}JI{qZNWO9|j z$gzM5R7j2={11M2Yv!YqZc;D?biUa3$0!ik1sXNm{yw(t#tGnm2ClT0zfuQgK1r{& zwD1woyA51iw={VVxZD8-o^;8O9LY~p$mfCgGy0}1(0>bbuerT7_i_3Fq^YaK4RCM> zj1?$*-Q(R|?Y;ebrrF;Qz7ulA^${4!0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X zmRIYN00007bV*G`2jmAH5C|_k$s4Hv000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H zM@dakSAh-}00045Nkl`cZ^)fJoT`B-V`6Cb|ql0jWE*>m-SriCI76`|+E`OSIh)@Qy8=$1@TKTHP zOaUbjK=o&Vz)d)mFiyyT5;p+an|vGrHLmvA4d8uYe@7~Q QL;wH)07*qoM6N<$f@Ce4UjP6A literal 0 HcmV?d00001 diff --git a/mist/graphics_selena/spaceship_path_n.png b/mist/graphics_selena/walkway3_n.png similarity index 100% rename from mist/graphics_selena/spaceship_path_n.png rename to mist/graphics_selena/walkway3_n.png diff --git a/mist/graphics_selena/spaceship_path_s.png b/mist/graphics_selena/walkway3_s.png similarity index 100% rename from mist/graphics_selena/spaceship_path_s.png rename to mist/graphics_selena/walkway3_s.png diff --git a/mist/leveldata_selena.inc b/mist/leveldata_selena.inc index fc28f186..c9d00126 100644 --- a/mist/leveldata_selena.inc +++ b/mist/leveldata_selena.inc @@ -14,7 +14,7 @@ locations: .word location28,location29,location30,location31 .word location32,location33,location34,location35 .word location36,location37,location38,location39 - .word location40,location41 + .word location40,location41,location42 ; SELENA_INSIDE_SHIP -- Inside Ship location0: @@ -80,7 +80,7 @@ location2: ; SELENA_WALKWAY1 -- walkway1 location3: - .byte SELENA_SPACESHIP_PATH ; north exit + .byte SELENA_WALKWAY2 ; north exit .byte SELENA_SPACESHIP_DOOR ; south exit .byte $ff ; east exit .byte $ff ; west exit @@ -115,7 +115,7 @@ location4: ; SELENA_WALKWAY4 -- walkway4 location5: .byte SELENA_BUNKER ; north exit - .byte SELENA_SPACESHIP_PATH ; south exit + .byte SELENA_WALKWAY3 ; south exit .byte $ff ; east exit .byte $ff ; west exit .byte DIRECTION_N ; north exit_dir @@ -415,20 +415,20 @@ location21: .word selena_take_red_page-1 ; special function -; SELENA_SPACESHIP_PATH -- spaceship path/ walkway3? +; SELENA_WALKWAY3 -- spaceship path/ walkway3 location22: .byte SELENA_WALKWAY4 ; north exit - .byte SELENA_WALKWAY1 ; south exit + .byte SELENA_WALKWAY2 ; 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 spaceship_path_n_lzsa ; north bg - .word spaceship_path_s_lzsa ; south bg - .word $0000 ; east bg - .word $0000 ; west bg + .word walkway3_n_lzsa ; north bg + .word walkway3_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg .byte BG_NORTH|BG_SOUTH .byte $ff @@ -784,3 +784,20 @@ location41: .byte 12,28 ; special x .byte 10,32 ; special y .word keypad_press-1 ; special function + +; SELENA_WALKWAY2 -- walkway2 +location42: + .byte SELENA_WALKWAY3 ; north exit + .byte SELENA_WALKWAY1 ; 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 walkway2_n_lzsa ; north bg + .word walkway2_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff