From 70580ebe8cd6b6f991468b964964a82a4b5aee6a Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 30 Jul 2020 16:56:54 -0400 Subject: [PATCH] mist: selena: complete water path --- mist/common_defines.inc | 2 ++ mist/graphics_selena/Makefile | 6 ++++ mist/graphics_selena/water_path2_e.png | Bin 0 -> 1031 bytes mist/graphics_selena/water_path2_w.png | Bin 0 -> 1166 bytes mist/graphics_selena/water_path3_e.png | Bin 0 -> 940 bytes mist/graphics_selena/water_path3_w.png | Bin 0 -> 1013 bytes mist/leveldata_selena.inc | 48 +++++++++++++++++++++---- 7 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 mist/graphics_selena/water_path2_e.png create mode 100644 mist/graphics_selena/water_path2_w.png create mode 100644 mist/graphics_selena/water_path3_e.png create mode 100644 mist/graphics_selena/water_path3_w.png diff --git a/mist/common_defines.inc b/mist/common_defines.inc index b224a2eb..1df0ee3c 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -251,6 +251,8 @@ SELENA_ANTENNA_CLOSE = 39 SELENA_BUNKER_OPEN = 40 SELENA_BUNKER_KEYPAD = 41 SELENA_WALKWAY2 = 42 +SELENA_WATER_PATH2 = 43 +SELENA_WATER_PATH3 = 44 ; Submarine on Selena SUB_BUNKER_ENTRY = 0 diff --git a/mist/graphics_selena/Makefile b/mist/graphics_selena/Makefile index e83ae9c8..db2526c4 100644 --- a/mist/graphics_selena/Makefile +++ b/mist/graphics_selena/Makefile @@ -20,6 +20,8 @@ selena_graphics.inc: \ bunker_n.lzsa bunker_s.lzsa bunker_e.lzsa \ water_turn_n.lzsa water_turn_s.lzsa water_turn_w.lzsa \ water_path_e.lzsa water_path_w.lzsa \ + water_path2_e.lzsa water_path2_w.lzsa \ + water_path3_e.lzsa water_path3_w.lzsa \ water_note_n.lzsa water_note_e.lzsa water_note_w.lzsa water_note_s.lzsa \ tower_view_n.lzsa tower_view_s.lzsa tower_view_e.lzsa tower_view_w.lzsa \ chasm_path_e.lzsa chasm_path_w.lzsa \ @@ -67,6 +69,10 @@ selena_graphics.inc: \ echo "water_turn_w_lzsa: .incbin \"water_turn_w.lzsa\"" >> selena_graphics.inc echo "water_path_w_lzsa: .incbin \"water_path_w.lzsa\"" >> selena_graphics.inc echo "water_path_e_lzsa: .incbin \"water_path_e.lzsa\"" >> selena_graphics.inc + echo "water_path2_w_lzsa: .incbin \"water_path2_w.lzsa\"" >> selena_graphics.inc + echo "water_path2_e_lzsa: .incbin \"water_path2_e.lzsa\"" >> selena_graphics.inc + echo "water_path3_w_lzsa: .incbin \"water_path3_w.lzsa\"" >> selena_graphics.inc + echo "water_path3_e_lzsa: .incbin \"water_path3_e.lzsa\"" >> selena_graphics.inc echo "water_note_n_lzsa: .incbin \"water_note_n.lzsa\"" >> selena_graphics.inc echo "water_note_e_lzsa: .incbin \"water_note_e.lzsa\"" >> selena_graphics.inc echo "water_note_w_lzsa: .incbin \"water_note_w.lzsa\"" >> selena_graphics.inc diff --git a/mist/graphics_selena/water_path2_e.png b/mist/graphics_selena/water_path2_e.png new file mode 100644 index 0000000000000000000000000000000000000000..e164208221500c9ada52bdac31a2b81c26d087b6 GIT binary patch literal 1031 zcmV+i1o-=jP)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`2jmAH6aWD)&or_C000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H zM@dakSAh-}00059NklT-`AZ;;3xIhG1Wj)}a9z*(OB@95 zG7@ygW?d1)T}^}81c7qvGGNXlFgqdlK?f`aZv&EEb)VlaOn}pBdoYAQfqa<&GA=HZ3vOIY->GS0HUMoJPcVFfZ}B?egW1>9Ayk3KwPv>4nc(Y8bHbDfgXT8 zYDb7-T(rs1uA~NIq~Vq|_rDtys57-0+VwjHIY<7+WIs65pe7}#N9Pjsb3~9=5eKMm zi2_6La%7G`xsE+3{>|@(B?-i~jAqb)bd7Hb-=sl3i~S4+d!`b|q%68otuezK#{;2@ zwr%k?<_ppXX)Px~e8hs>n7-tf3zvQ7rg*Ce@dK8zTi4Q*yyO4?002ovPDHLkV1in? B!_@!) literal 0 HcmV?d00001 diff --git a/mist/graphics_selena/water_path2_w.png b/mist/graphics_selena/water_path2_w.png new file mode 100644 index 0000000000000000000000000000000000000000..adf4c9bc58a408a7ce82a4f6f6faf81c33b9086f GIT binary patch literal 1166 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 literal 0 HcmV?d00001 diff --git a/mist/leveldata_selena.inc b/mist/leveldata_selena.inc index c9d00126..cd8b35aa 100644 --- a/mist/leveldata_selena.inc +++ b/mist/leveldata_selena.inc @@ -14,7 +14,8 @@ locations: .word location28,location29,location30,location31 .word location32,location33,location34,location35 .word location36,location37,location38,location39 - .word location40,location41,location42 + .word location40,location41,location42,location43 + .word location44 ; SELENA_INSIDE_SHIP -- Inside Ship location0: @@ -151,7 +152,7 @@ location7: .byte SELENA_TOWER_VIEW ; north exit .byte SELENA_BUNKER ; south exit .byte $ff ; east exit - .byte SELENA_WATER_PATH ; west exit + .byte SELENA_WATER_PATH2 ; west exit .byte DIRECTION_N ; north exit_dir .byte DIRECTION_S ; south exit_dir .byte $ff ; east exit_dir @@ -167,11 +168,11 @@ location7: location8: .byte $ff ; north exit .byte $ff ; south exit - .byte SELENA_WATER_TURN ; east exit - .byte SELENA_WATER ; west exit + .byte SELENA_WATER_PATH2 ; east exit + .byte SELENA_WATER_PATH3 ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir - .byte DIRECTION_S ; east exit_dir + .byte DIRECTION_E ; east exit_dir .byte DIRECTION_W ; west exit_dir .word $0000 ; north bg .word $0000 ; south bg @@ -184,7 +185,7 @@ location8: location9: .byte $ff ; north exit .byte $ff ; south exit - .byte SELENA_WATER_PATH ; east exit + .byte SELENA_WATER_PATH3 ; east exit .byte $ff ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir @@ -801,3 +802,38 @@ location42: .word $0000 ; west bg .byte BG_NORTH|BG_SOUTH .byte $ff + +; SELENA_WATER_PATH2 -- more path to water +location43: + .byte $ff ; north exit + .byte $ff ; south exit + .byte SELENA_WATER_TURN ; east exit + .byte SELENA_WATER_PATH ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_S ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word water_path2_e_lzsa ; east bg + .word water_path2_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; SELENA_WATER_PATH3 -- more path to water +location44: + .byte $ff ; north exit + .byte $ff ; south exit + .byte SELENA_WATER_PATH ; east exit + .byte SELENA_WATER ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word water_path3_e_lzsa ; east bg + .word water_path3_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff +