From a1378405c89cf91b032afde761bb9491ec205f82 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 19 Jun 2020 15:04:38 -0400 Subject: [PATCH] mist: arbor: some more stops --- mist/common_defines.inc | 4 ++ mist/graphics_arbor/Makefile | 19 ++++++- mist/graphics_arbor/bridge3_e.png | Bin 0 -> 1142 bytes mist/graphics_arbor/bridge3_w.png | Bin 0 -> 1087 bytes mist/graphics_arbor/longshack1_e.png | Bin 0 -> 1064 bytes mist/graphics_arbor/longshack1_w.png | Bin 0 -> 1169 bytes mist/graphics_arbor/longshack2_e.png | Bin 0 -> 1181 bytes mist/graphics_arbor/longshack2_n.png | Bin 0 -> 1104 bytes mist/graphics_arbor/longshack2_s.png | Bin 0 -> 986 bytes mist/graphics_arbor/longshack2_w.png | Bin 0 -> 1204 bytes mist/graphics_arbor/shack1_e.png | Bin 0 -> 1151 bytes mist/graphics_arbor/shack1_n.png | Bin 0 -> 1002 bytes mist/graphics_arbor/shack1_s.png | Bin 0 -> 972 bytes mist/graphics_arbor/shack1_w.png | Bin 0 -> 1117 bytes mist/leveldata_arbor.inc | 77 +++++++++++++++++++++++++-- 15 files changed, 95 insertions(+), 5 deletions(-) create mode 100644 mist/graphics_arbor/bridge3_e.png create mode 100644 mist/graphics_arbor/bridge3_w.png create mode 100644 mist/graphics_arbor/longshack1_e.png create mode 100644 mist/graphics_arbor/longshack1_w.png create mode 100644 mist/graphics_arbor/longshack2_e.png create mode 100644 mist/graphics_arbor/longshack2_n.png create mode 100644 mist/graphics_arbor/longshack2_s.png create mode 100644 mist/graphics_arbor/longshack2_w.png create mode 100644 mist/graphics_arbor/shack1_e.png create mode 100644 mist/graphics_arbor/shack1_n.png create mode 100644 mist/graphics_arbor/shack1_s.png create mode 100644 mist/graphics_arbor/shack1_w.png diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 47ad1569..ab281221 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -365,3 +365,7 @@ ARBOR_ARRIVAL_OPEN = 3 ARBOR_BRIDGE1 = 4 ARBOR_HUT1 = 5 ARBOR_BRIDGE2 = 6 +ARBOR_SHACK1 = 7 +ARBOR_BRIDGE3 = 8 +ARBOR_LONGSHACK1 = 9 +ARBOR_LONGSHACK2 = 10 diff --git a/mist/graphics_arbor/Makefile b/mist/graphics_arbor/Makefile index f1b91c70..773deadd 100644 --- a/mist/graphics_arbor/Makefile +++ b/mist/graphics_arbor/Makefile @@ -13,7 +13,11 @@ arbor_graphics.inc: \ inside_elevator1_closed_w.lzsa inside_elevator1_open_w.lzsa \ bridge1_e.lzsa bridge1_w.lzsa \ hut1_e.lzsa hut1_w.lzsa \ - bridge2_n.lzsa bridge2_s.lzsa + bridge2_n.lzsa bridge2_s.lzsa \ + shack1_n.lzsa shack1_s.lzsa shack1_e.lzsa shack1_w.lzsa \ + bridge3_e.lzsa bridge3_w.lzsa \ + longshack1_e.lzsa longshack1_w.lzsa \ + longshack2_e.lzsa longshack2_w.lzsa longshack2_n.lzsa longshack2_s.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 @@ -25,7 +29,18 @@ arbor_graphics.inc: \ echo "hut1_w_lzsa: .incbin \"hut1_w.lzsa\"" >> arbor_graphics.inc echo "bridge2_n_lzsa: .incbin \"bridge2_n.lzsa\"" >> arbor_graphics.inc echo "bridge2_s_lzsa: .incbin \"bridge2_s.lzsa\"" >> arbor_graphics.inc - + echo "shack1_n_lzsa: .incbin \"shack1_n.lzsa\"" >> arbor_graphics.inc + echo "shack1_s_lzsa: .incbin \"shack1_s.lzsa\"" >> arbor_graphics.inc + echo "shack1_e_lzsa: .incbin \"shack1_e.lzsa\"" >> arbor_graphics.inc + echo "shack1_w_lzsa: .incbin \"shack1_w.lzsa\"" >> arbor_graphics.inc + echo "bridge3_e_lzsa: .incbin \"bridge3_e.lzsa\"" >> arbor_graphics.inc + echo "bridge3_w_lzsa: .incbin \"bridge3_w.lzsa\"" >> arbor_graphics.inc + echo "longshack1_e_lzsa: .incbin \"longshack1_e.lzsa\"" >> arbor_graphics.inc + echo "longshack1_w_lzsa: .incbin \"longshack1_w.lzsa\"" >> arbor_graphics.inc + echo "longshack2_e_lzsa: .incbin \"longshack2_e.lzsa\"" >> arbor_graphics.inc + echo "longshack2_w_lzsa: .incbin \"longshack2_w.lzsa\"" >> arbor_graphics.inc + echo "longshack2_n_lzsa: .incbin \"longshack2_n.lzsa\"" >> arbor_graphics.inc + echo "longshack2_s_lzsa: .incbin \"longshack2_s.lzsa\"" >> arbor_graphics.inc %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_arbor/bridge3_e.png b/mist/graphics_arbor/bridge3_e.png new file mode 100644 index 0000000000000000000000000000000000000000..24c53e6214692d1ba96f7525bcd8672f41b6fdba GIT binary patch literal 1142 zcmV-+1d02JP)EX>4Tx04R}tkv&MmKpe$iTeTv!3U&~2$WWauh>CR7DionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi%KKJM7Rq`eSd;;+d(+!Jwop^fF z(mC%FM_5Txh|h_~47wokBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;Ut5)&yUC3DXO0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbPAW1|)R7l6I*6Xr^APfXxepJ-X@cyrRT-QAb7%JLkruL$ICfsbA zre%wDkEx2Z1>ct=Qkv&wnP)p^fiugpoe_9u&mhQQ5KxV>k>^PIn}s0DV2%u;X^&-T zLEfed&ND%hs|(LDd&}_*mLnX9zInZHv_2$(-SA(mthhhVRN)B@?mk+0N)Pyc=d<6b54adDL7O0#%@ROcib1q~lwlwIL5A-zLwq+A0Y%)Gip69E12ow3A`G-`H9f*lrA1`?&RKbLfEzQV|FeFSXyU>47SX6z<)E z91wOC+wTvKv62aLRagjQj>k?KfjLi8&Nw2EoYxiKaMarHTbV%80Z7U~PAFtZP>)i6 zW}yWC`!Hvm%K7~U1dha6^S0H)mp>9DWFT_51`XS5x&p<0%FvcY1%hlr z^r3;cE(UqyCc_v+Nn;?cyaBSe*sDFzWvE^hs7rl@$dSk`P&2U)_DdcD{ciFj5DjhO zd|k2)35TUODExE@wi~E+?JvOk4;%L#4{DRR0cIBhxf{0N-oH;W)FbLP$mQ-q-ol=G z7a+=DLtmf|13hyKZ2vEX>4Tx04R}tkv&MmKpe$iTeTv!3U&~2$WWauh>CR7DionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi%KKJM7Rq`eSd;;+d(+!Jwop^fF z(mC%FM_5Txh|h_~47wokBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;Ut6Am*U{}8(>0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbO=}AOER7l6Img|m$APj~5gWx8<|Lg9aIo3iiisLphGZFgPD|A^> zX>EBR?U3ajSnE76S=>G%%ca=W{PQDn6S=Zb*JCT)mUc?4Xn}p~ZelnCBm&`St=88- z0%`@Yl-n%Nxy*L}{*-?PmV03N2nt6t-PggFKuE1bi-jYWz#}Q!AQ2ES0uiMVB=`;( z^+<%5yhaWuE?YV*Wc=_zSnktF@xZ9HUISs7WceCsV%Qx1De$mxyO6Jd=IEKWaQyU3 zU{35@0oSwqd?nJkAPBxg3N&HYJhgY$Og`rKo12F^+aVHZP$-Waf9ui0G zMha3}GTD1kpu>Ix#QPCxr!MExb0D-5ARB%L$h`^#@)sF9JjL|_qt^fc002ovPDHLk FV1m9;>@ffU literal 0 HcmV?d00001 diff --git a/mist/graphics_arbor/longshack1_e.png b/mist/graphics_arbor/longshack1_e.png new file mode 100644 index 0000000000000000000000000000000000000000..9aee689de687b0b79f1df9085f54d81414547473 GIT binary patch literal 1064 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 literal 0 HcmV?d00001 diff --git a/mist/graphics_arbor/longshack2_n.png b/mist/graphics_arbor/longshack2_n.png new file mode 100644 index 0000000000000000000000000000000000000000..e148ebf1239065d70e7e555600e848d8e932273e GIT binary patch literal 1104 zcmV-W1h4yvP)EX>4Tx04R}tkv&MmKpe$iTeTv!3U&~2$WWauh>CR7DionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi%KKJM7Rq`eSd;;+d(+!Jwop^fF z(mC%FM_5Txh|h_~47wokBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;Ut6A~3Pg-)AV0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbO`bk7VR7l6om)ml~APhu#032t?|Nm~YUQ|hdZIbd(&6u3~Oz9go|-^c1U5uTRrJ*`)==&8r%16O9>Z7Rh*Bl zYEanoW&z&sfLC=Hf7^TiA8@#j?|@fz`!GUXqzH8Ri&=A2T_ z7+;5tpD~SWh(Zlt#w_re#Jlgf`~l&BnAD>ua2jQ~^9xtg+MGWzzPuG0eG>O1(>tPVKIRi0fAp58a-@ll?c>b zf`s79xd$R{o3cv0>QI4NMGw?lQ4Nx^ZK(M*<|Fil&N=>?1=^a?%j4y6AO-*qFEQgcmbn)WiM3*>!*F|4Xp(<;PicWO?_fWB WJ!j$h36vlJ00004P)EX>4Tx04R}tkv&MmKpe$iTeTv!3U&~2$WWauh>CR7DionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi%KKJM7Rq`eSd;;+d(+!Jwop^fF z(mC%FM_5Txh|h_~47wokBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;Ut6A%YGZh<0p0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbOgh@m}R7l6|m)mZ`APk0cLx?8v{;%74o`cVrHoKdpM5u(%#{O~A z<9gVRf8gi9$L$a3*VP(c4{aGEYps79+*|u<+A03tJB)kBC#8u9?egmG9GnMy#~|uQ zfsBI#xKH#uI$HpTYxG3wjAPcoI8FyBwTac96@<~omMu`?u!dO{ixJ*pxFd{^n-SuO z3h1w460wsI8C_luy)|s0rvVs8=p!8+?nLOVQ3L6H9idLwy;EPDip2uPb8at0hC%h9>kjtqW}N^07*qo IM6N<$g2TeaasU7T literal 0 HcmV?d00001 diff --git a/mist/graphics_arbor/longshack2_w.png b/mist/graphics_arbor/longshack2_w.png new file mode 100644 index 0000000000000000000000000000000000000000..fd52435f1f05f9707ee432d3e9c9dedc399fb37b GIT binary patch literal 1204 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 Y|5X}Z<`QN?9smFU07*qoM6N<$f?1cp=>Px# literal 0 HcmV?d00001 diff --git a/mist/graphics_arbor/shack1_s.png b/mist/graphics_arbor/shack1_s.png new file mode 100644 index 0000000000000000000000000000000000000000..e37b36ad16b0119b32bb8d7dd88e04971747451a GIT binary patch literal 972 zcmV;-12g=IP)EX>4Tx04R}tkv&MmKpe$iTeTv!3U&~2$WWauh>CR7DionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi%KKJM7Rq`eSd;;+d(+!Jwop^fF z(mC%FM_5Txh|h_~47wokBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;Ut5(O0k>ml4z0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbOc1c7*R7l6|m(7C1AP9s#Y&0Hx|JU8lB1)=&Nxg07(ELSg6yIU* zsQ@K%&7tbE$6+KnM0eYv;#1xrBwaI5N-OLO@)`k1p2ITHLamIz^F&9?VM;mkka2D; zy+(PTgPcpj9R}hW>lkQzEmzK%d>{b)8+RfgoG(8dMj$!d2Bevck>9ZZqD_pCfj|Nn zU+VdlKy_cEE}-xP*tSahfOT(kA4o+ad#ZJK16=)P{1c5845e11=f{YyK7- za$E`Q4~N^pqU!2j8S*F#$Vaub7dOwXO9zh4@ADe))<)X>5;2nLc3z*SNf6p&&$7Dq uUYP`Y0o7u$fQEIi0_R9$B8nsLz5ELy5I1M4MOBjk0000EX>4Tx04R}tkv&MmKpe$iTeTv!3U&~2$WWauh>CR7DionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi%KKJM7Rq`eSd;;+d(+!Jwop^fF z(mC%FM_5Txh|h_~47wokBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;Ut6B7XjV)b{p0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbP2T4RhR7l6YmP?X@FbqV!A;ziV{@0y|j?mwjnyK+35R4uz(~@Zo zWA~%?F}Cl(S?}_{_twThC?65`Ib=k_X#fNJcZ`waPGE+lfNirt9*oo~FWe>6A+^37 z*cw3tuBAwe1CStAAvD@}TyaR;8Wma~9Z8|Y;xVlSoph0d?tmP{ny<9|I%L2Wh87|4 zWZDjuMgUq^5}#eHfgY9$(o0NoY2XAXrn;%+8kqaQub&0RPIOv=l;KG4n*-1zvrS;)L$*!k zu2^!Me%YyYs(DJsvG2z*F?Iybzit4eZ?lC4`vhoJE(2dLI-_5lF_4ZL`9L9qtU|g@ z4oyEeSAc?LAYDs<`itNxkbDWZnti!$L3zrEV59-so%qQou?7Np%AI|EtpXW&E@*x; jr%1hK1qkFXfidO>I-ER_h$`FZ00000NkvXXu0mjfwZHnG literal 0 HcmV?d00001 diff --git a/mist/leveldata_arbor.inc b/mist/leveldata_arbor.inc index 935af1bf..c817e7e1 100644 --- a/mist/leveldata_arbor.inc +++ b/mist/leveldata_arbor.inc @@ -4,7 +4,9 @@ locations: .word location0, location1, location2, location3 - .word location4, location5, location6 + .word location4, location5, location6, location7 + .word location8, location9, location10 + ; ARBOR_INSIDE_ELEV1 -- arrival in elevator1 location0: @@ -116,11 +118,11 @@ location5: ; ARBOR_BRIDGE2 -- second bridge location6: - .byte $ff ; north exit + .byte ARBOR_SHACK1 ; north exit .byte ARBOR_HUT1 ; south exit .byte $ff ; east exit .byte $ff ; west exit - .byte $ff ; north exit_dir + .byte DIRECTION_N ; north exit_dir .byte DIRECTION_E ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir @@ -130,3 +132,72 @@ location6: .word $0000 ; west bg .byte BG_NORTH|BG_SOUTH .byte $ff + +; ARBOR_SHACK1 -- first shack +location7: + .byte $ff ; north exit + .byte ARBOR_BRIDGE2 ; south exit + .byte ARBOR_BRIDGE3 ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte $ff ; west exit_dir + .word shack1_n_lzsa ; north bg + .word shack1_s_lzsa ; south bg + .word shack1_e_lzsa ; east bg + .word shack1_w_lzsa ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST + .byte $ff + +; ARBOR_BRIDGE3 -- third bridge +location8: + .byte $ff ; north exit + .byte $ff ; south exit + .byte ARBOR_LONGSHACK1 ; east exit + .byte ARBOR_SHACK1 ; 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 bridge3_e_lzsa ; east bg + .word bridge3_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; ARBOR_LONGSHACK1 -- extra long shack +location9: + .byte $ff ; north exit + .byte $ff ; south exit + .byte ARBOR_LONGSHACK2 ; east exit + .byte ARBOR_BRIDGE3 ; 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 longshack1_e_lzsa ; east bg + .word longshack1_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; ARBOR_LONGSHACK2 -- extra long shack part 2 +location10: + .byte $ff ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte ARBOR_LONGSHACK1 ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word longshack2_n_lzsa ; north bg + .word longshack2_s_lzsa ; south bg + .word longshack2_e_lzsa ; east bg + .word longshack2_w_lzsa ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST + .byte $ff +