From f06b9467440b23cbe6cd4901bba833f56b260ce8 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 8 Jun 2020 00:45:38 -0400 Subject: [PATCH] mist: channelwood: closer to the windmill --- mist/common_defines.inc | 4 ++ mist/graphics_channel/Makefile | 17 +++++- mist/graphics_channel/steps_door_e.png | Bin 0 -> 989 bytes mist/graphics_channel/steps_door_w.png | Bin 0 -> 926 bytes mist/graphics_channel/steps_fork_n.png | Bin 0 -> 1012 bytes mist/graphics_channel/steps_fork_s.png | Bin 0 -> 1017 bytes mist/graphics_channel/steps_fork_w.png | Bin 0 -> 1044 bytes mist/graphics_channel/steps_path_e.png | Bin 0 -> 946 bytes mist/graphics_channel/steps_path_w.png | Bin 0 -> 1023 bytes mist/graphics_channel/wind_path_n.png | Bin 0 -> 956 bytes mist/graphics_channel/wind_path_s.png | Bin 0 -> 1063 bytes mist/leveldata_channel.inc | 75 ++++++++++++++++++++++++- 12 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 mist/graphics_channel/steps_door_e.png create mode 100644 mist/graphics_channel/steps_door_w.png create mode 100644 mist/graphics_channel/steps_fork_n.png create mode 100644 mist/graphics_channel/steps_fork_s.png create mode 100644 mist/graphics_channel/steps_fork_w.png create mode 100644 mist/graphics_channel/steps_path_e.png create mode 100644 mist/graphics_channel/steps_path_w.png create mode 100644 mist/graphics_channel/wind_path_n.png create mode 100644 mist/graphics_channel/wind_path_s.png diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 408dfbee..21b57d10 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -333,4 +333,8 @@ CHANNEL_FORK = 20 CHANNEL_BEFORE_ELEV1 = 21 CHANNEL_IN_ELEVATOR1 = 22 CHANNEL_PIPE_BRIDGE2 = 23 +CHANNEL_STEPS_FORK = 24 +CHANNEL_STEPS_PATH = 25 +CHANNEL_STEPS_DOOR = 26 +CHANNEL_WIND_PATH = 27 diff --git a/mist/graphics_channel/Makefile b/mist/graphics_channel/Makefile index 8e2f1b3b..631b7502 100644 --- a/mist/graphics_channel/Makefile +++ b/mist/graphics_channel/Makefile @@ -32,7 +32,11 @@ channel_graphics.inc: \ fork_n.lzsa fork_s.lzsa fork_w.lzsa \ before_elev1_e.lzsa before_elev1_w.lzsa \ pipe_bridge2_w.lzsa pipe_bridge2_e.lzsa \ - elevator1_open.lzsa + elevator1_open.lzsa \ + steps_fork_n.lzsa steps_fork_s.lzsa steps_fork_w.lzsa \ + steps_path_e.lzsa steps_path_w.lzsa \ + steps_door_e.lzsa steps_door_w.lzsa \ + wind_path_n.lzsa wind_path_s.lzsa echo "arrival_n_lzsa: .incbin \"arrival_n.lzsa\"" > channel_graphics.inc echo "arrival_s_lzsa: .incbin \"arrival_s.lzsa\"" >> channel_graphics.inc echo "clearing_e_lzsa: .incbin \"clearing_e.lzsa\"" >> channel_graphics.inc @@ -81,8 +85,15 @@ channel_graphics.inc: \ echo "pipe_bridge2_e_lzsa: .incbin \"pipe_bridge2_e.lzsa\"" >> channel_graphics.inc echo "pipe_bridge2_w_lzsa: .incbin \"pipe_bridge2_w.lzsa\"" >> channel_graphics.inc echo "elevator1_open_lzsa: .incbin \"elevator1_open.lzsa\"" >> channel_graphics.inc - - + echo "steps_fork_n_lzsa: .incbin \"steps_fork_n.lzsa\"" >> channel_graphics.inc + echo "steps_fork_s_lzsa: .incbin \"steps_fork_s.lzsa\"" >> channel_graphics.inc + echo "steps_fork_w_lzsa: .incbin \"steps_fork_w.lzsa\"" >> channel_graphics.inc + echo "steps_path_e_lzsa: .incbin \"steps_path_e.lzsa\"" >> channel_graphics.inc + echo "steps_path_w_lzsa: .incbin \"steps_path_w.lzsa\"" >> channel_graphics.inc + echo "steps_door_e_lzsa: .incbin \"steps_door_e.lzsa\"" >> channel_graphics.inc + echo "steps_door_w_lzsa: .incbin \"steps_door_w.lzsa\"" >> channel_graphics.inc + echo "wind_path_n_lzsa: .incbin \"wind_path_n.lzsa\"" >> channel_graphics.inc + echo "wind_path_s_lzsa: .incbin \"wind_path_s.lzsa\"" >> channel_graphics.inc %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_channel/steps_door_e.png b/mist/graphics_channel/steps_door_e.png new file mode 100644 index 0000000000000000000000000000000000000000..620fb55469d4a45c545c06b111e501ad418a4ed4 GIT binary patch literal 989 zcmV<310wv1P)EX>4Tx04R}tkv&MmKpe$iQ)@*k9jqYYkfAzR5EXUQDionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOihiQ z+u*!U9AQOSB|aw}G3kQDk6c$ge&bwlS>TxwGo6|vju4B57FJrA6-|wJf;g&bI^_!) zk5$fFoV8MgHSWn@7|Q9(OI)Wphy)g}2niw-RIq^(Y{Y2QNwJWk{dgPyfa{mYrI2d_ zj2!bQLxb%4!T;cQw^n|9%u5QzfxwI7d<+4>U7%idobO}Dsh`H!`LOu_?pV2pEf!t2m%^1aEnn+0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbOhey6R_L?XKR*-@$Q8Ij19ZbX?UzL;i205Q{3vr~4}&OZ$!qQJ63QYG@YciH7;ihCpE2FP*^t z>0f-3`v*_~%f_SJa#2c<&;{I%uxTPBmuhrDpP?SQJ+c8_OXkm8Fob3V{R-3;+JDx5oW+xV!)#x7TyW1SR{lOQIE7>RKQ#N-IXG!c>nMQ(%T zYbZx3h!zZh*0&Pm)ClYxU-A23TSq~5bQ-j?$9i}M2RF9mC}KV2vNXY{cX5U|BY9$1 zmP9jbkv>Cou>>#q`3$42<5!tr^G!w%?H%rc=UsRkv@Q~~trUY_omN50p7Rfx00000 LNkvXXu0mjfSt7s% literal 0 HcmV?d00001 diff --git a/mist/graphics_channel/steps_door_w.png b/mist/graphics_channel/steps_door_w.png new file mode 100644 index 0000000000000000000000000000000000000000..3437014bc709200774ce3b578c97ba0f5f5243e9 GIT binary patch literal 926 zcmV;P17ZA$P)EX>4Tx04R}tkv&MmKpe$iQ)@*k9jqYYkfAzR5EXUQDionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOihiQ z+u*!U9AQOSB|aw}G3kQDk6c$ge&bwlS>TxwGo6|vju4B57FJrA6-|wJf;g&bI^_!) zk5$fFoV8MgHSWn@7|Q9(OI)Wphy)g}2niw-RIq^(Y{Y2QNwJWk{dgPyfa{mYrI2d_ zj2!bQLxb%4!T;cQw^n|9%u5QzfxwI7d<+4>U7%idobO}Dsh`H!`LOu_?pV2pEf!t2Nww3k22z-I^{C$7dkl-vqrEkdJym)n(Lh z2FlaRAZo9SA-1ESv}%ISLo~>v-Bn=-42CRcV533-r&stTkd4B$`6wvlHE{V-c=u(H z+x-KG?L;uGaXM(0C@_6GIBf1l0LKFdRWN?+5wSRKcEUqpJfs6+BLx0kH7t>3JyO zb7!Eb=6(6d3Ak5t5zJ$4jHL-R4B`)^T@$13^dN}3c5tA=Y+a+96^?`Houp^EUM#P4 zIk~TI4C`Hfs8H=46ZMbbMX={BPp&XoZDxVU3p^N3*@M=JtpET307*qoM6N<$g5%es A!vFvP literal 0 HcmV?d00001 diff --git a/mist/graphics_channel/steps_fork_n.png b/mist/graphics_channel/steps_fork_n.png new file mode 100644 index 0000000000000000000000000000000000000000..803ccac74ad5419c9e9547b14e6694de3cf0f5a1 GIT binary patch literal 1012 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 literal 0 HcmV?d00001 diff --git a/mist/graphics_channel/wind_path_n.png b/mist/graphics_channel/wind_path_n.png new file mode 100644 index 0000000000000000000000000000000000000000..f1524939428a8cfa2f792b3ef076c83763dec3cc GIT binary patch literal 956 zcmV;t14I0YP)EX>4Tx04R}tkv&MmKpe$iQ)@*k9jqYYkfAzR5EXUQDionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOihiQ z+u*!U9AQOSB|aw}G3kQDk6c$ge&bwlS>TxwGo6|vju4B57FJrA6-|wJf;g&bI^_!) zk5$fFoV8MgHSWn@7|Q9(OI)Wphy)g}2niw-RIq^(Y{Y2QNwJWk{dgPyfa{mYrI2d_ zj2!bQLxb%4!T;cQw^n|9%u5QzfxwI7d<+4>U7%idobO}Dsh`H!`LOu_?pV2pEf!t2m>A=k(~0cs6j26;Zd zEd1wcs&P{;?Pgu(b!|Qh2o@cpW=F0!^z8{BmWB{xQC722N zIsw+wK{2Aut$vODqdhRSVkHcMWz2I4YxCf7ZHjtAK1J|2Z-ya|u5(U^;)n*8&tOla zEX>4Tx04R}tkv&MmKpe$iQ)@*k9jqYYkfAzR5EXUQDionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOihiQ z+u*!U9AQOSB|aw}G3kQDk6c$ge&bwlS>TxwGo6|vju4B57FJrA6-|wJf;g&bI^_!) zk5$fFoV8MgHSWn@7|Q9(OI)Wphy)g}2niw-RIq^(Y{Y2QNwJWk{dgPyfa{mYrI2d_ zj2!bQLxb%4!T;cQw^n|9%u5QzfxwI7d<+4>U7%idobO}Dsh`H!`LOu_?pV2pEf!t2m>%XXZ}z10000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbO(Md!>R7l6&mVs`AFbqVaNEu;Lwg3Oy;a-n(5?q?DRi#-f7#BY- zb`nU-Qp&Q_YUfhwX60tyGrMeNcl~UJ9Lut^#o^VOA|P&Pf#o{_;$Z_2A>u58YXTAT zKm$>Gs1P2Kh3$ceN#O~Q3R|G5p&?3zK@C}#7>Jm!A%}ce!!w19y%^Yb*?@L@qK1r( zz->b9(`y3AY3_mM+dtGd)fAi7y+Q!h<0&BgwkdxG0_i9A3xH7gkAd30*p^QMwUfLR zs4Z&*UM}wk=3Gk7wdTC80(xJ-)!8Xf2tfMOW6K$0?6?DYsURLPn&ER+#$BKf=Eg>7 zd&k4TubT;$HUrcn4}q-~0qy83X3!o9j}=c+(pE+>)tJ6P*Uol@N)p;XVl+di6m>t% z;s|YlNj8GcV5}EWzV6o{&*J==LZeuSYcXbF&?j{S($XBv<3?Bq^zC^BXY~((J``*1 zw~C{C(wKY<i2ISw1C;ruu3_)z4g`#lxRaQw84hPx|_+CYGC{#!c) zMstv<9IO<=4}kHsh9cAFl@VL(@u=>sWdU0leo>)PyfwTCsHNwDd<*x$5&00%x8ezf hdcX8QKlErG{sLzYU90iR4+{VQ002ovPDHLkV1jDe=8XUV literal 0 HcmV?d00001 diff --git a/mist/leveldata_channel.inc b/mist/leveldata_channel.inc index 8f028671..4638fc27 100644 --- a/mist/leveldata_channel.inc +++ b/mist/leveldata_channel.inc @@ -9,6 +9,8 @@ locations: .word location12,location13,location14,location15 .word location16,location17,location18,location19 .word location20,location21,location22,location23 + .word location24,location25,location26,location27 + ; CHANNEL_OUTSIDE_CABIN -- outside in clearing location0: @@ -333,11 +335,11 @@ location17: ; CHANNEL_PATH5 -- twisty maze of passages all alike location18: - .byte $ff ; north exit + .byte CHANNEL_STEPS_FORK ; north exit .byte CHANNEL_PATH6 ; south exit .byte CHANNEL_PATH4 ; east exit .byte $ff ; west exit - .byte $ff ; north exit_dir + .byte DIRECTION_N ; north exit_dir .byte DIRECTION_S ; south exit_dir .byte DIRECTION_E ; east exit_dir .byte $ff ; west exit_dir @@ -433,4 +435,73 @@ location23: .byte BG_EAST|BG_WEST .byte $ff +; CHANNEL_STEPS_FORK -- fork going to steps +location24: + .byte CHANNEL_WIND_PATH ; north exit + .byte CHANNEL_PATH5 ; south exit + .byte $ff ; east exit + .byte CHANNEL_STEPS_PATH ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word steps_fork_n_lzsa ; north bg + .word steps_fork_s_lzsa ; south bg + .word $0000 ; east bg + .word steps_fork_w_lzsa ; west bg + .byte BG_NORTH|BG_SOUTH|BG_WEST + .byte $ff + +; CHANNEL_STEPS_PATH -- path going to steps +location25: + .byte $ff ; north exit + .byte $ff ; south exit + .byte CHANNEL_STEPS_FORK ; east exit + .byte CHANNEL_STEPS_DOOR ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_N ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word steps_path_e_lzsa ; east bg + .word steps_path_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; CHANNEL_STEPS_DOOR -- door to the steps +location26: + .byte $ff ; north exit + .byte $ff ; south exit + .byte CHANNEL_STEPS_PATH ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte $ff ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word steps_door_e_lzsa ; east bg + .word steps_door_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; CHANNEL_WIND_PATH -- path to windmill +location27: + .byte $ff ; north exit + .byte CHANNEL_STEPS_FORK ; 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 wind_path_n_lzsa ; north bg + .word wind_path_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + +