From 6341bd2e723561b14d00cc5756549287f7bb6b24 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 18 Jun 2020 00:51:35 -0400 Subject: [PATCH] mist: arbor: can go slightly further --- mist/common_defines.inc | 4 ++- mist/graphics_arbor/Makefile | 12 ++++++- mist/graphics_arbor/bridge1_e.png | Bin 0 -> 1174 bytes mist/graphics_arbor/bridge1_w.png | Bin 0 -> 1106 bytes mist/graphics_arbor/bridge2_n.png | Bin 0 -> 1016 bytes mist/graphics_arbor/bridge2_s.png | Bin 0 -> 1050 bytes mist/graphics_arbor/hut1_e.png | Bin 0 -> 1127 bytes mist/graphics_arbor/hut1_w.png | Bin 0 -> 1114 bytes mist/leveldata_arbor.inc | 54 ++++++++++++++++++++++++++++-- 9 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 mist/graphics_arbor/bridge1_e.png create mode 100644 mist/graphics_arbor/bridge1_w.png create mode 100644 mist/graphics_arbor/bridge2_n.png create mode 100644 mist/graphics_arbor/bridge2_s.png create mode 100644 mist/graphics_arbor/hut1_e.png create mode 100644 mist/graphics_arbor/hut1_w.png diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 594b7dcd..47ad1569 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -362,4 +362,6 @@ ARBOR_INSIDE_ELEV1 = 0 ARBOR_INSIDE_ELEV1_OPEN = 1 ARBOR_ARRIVAL_CLOSED = 2 ARBOR_ARRIVAL_OPEN = 3 - +ARBOR_BRIDGE1 = 4 +ARBOR_HUT1 = 5 +ARBOR_BRIDGE2 = 6 diff --git a/mist/graphics_arbor/Makefile b/mist/graphics_arbor/Makefile index a150a9b7..f1b91c70 100644 --- a/mist/graphics_arbor/Makefile +++ b/mist/graphics_arbor/Makefile @@ -10,12 +10,22 @@ all: arbor_graphics.inc arbor_graphics.inc: \ arrival_e.lzsa arrival_w.lzsa arrival_open_e.lzsa \ - inside_elevator1_closed_w.lzsa inside_elevator1_open_w.lzsa + 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 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 echo "inside_elevator1_open_w_lzsa: .incbin \"inside_elevator1_open_w.lzsa\"" >> arbor_graphics.inc echo "inside_elevator1_closed_w_lzsa: .incbin \"inside_elevator1_closed_w.lzsa\"" >> arbor_graphics.inc + echo "bridge1_e_lzsa: .incbin \"bridge1_e.lzsa\"" >> arbor_graphics.inc + echo "bridge1_w_lzsa: .incbin \"bridge1_w.lzsa\"" >> arbor_graphics.inc + echo "hut1_e_lzsa: .incbin \"hut1_e.lzsa\"" >> 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 + %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_arbor/bridge1_e.png b/mist/graphics_arbor/bridge1_e.png new file mode 100644 index 0000000000000000000000000000000000000000..37279c1559e7b50a0ff4950370669005b7ceca08 GIT binary patch literal 1174 zcmV;H1Zn$;P)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(F7D7l`>%0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbPKuJVFR7l6I*4c7~APfcIT*#s`zW?ji<1vOMD7DQ@t3Tpr2)IbN zBj=PtNJ)+eRpcwsE|L=WMRE>dS=a~X;+M>TB!S@%`|R}!a_fO?vkVo?xdc=C1d42- zA2PY)Lfl0hhqpJ75rS7k2jmuAvDJ1D>}$vhUf_0~y6^8G_x%hD@c6kiWq~031v%uS5AP8E=?w;OU2E{{JPR79!>d8$ zC&K^rvf+hn$R~(hCF_N)U|EbBM5_b#8MYvf0cEX>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;Ut5fUO4gf7!90000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbO{7FPXR7l6om%(zwAPhvg#3={;|L=zNMo0*3gPlV)<92GK$07-E z(`&bPwOs74nEoDF&h6;SSyG^gcZ(q-pcK=;MFNl-H2`q99RuT=PGJi?3OfTL9zT=M z;2j{B4+cp!hkedg6z1Fj0eiM&3Ie47S)p@aN_>uiT&YO1`T*EwXBNl`)FmsOlGlNV z3_$LXSnC;}HVccgdlD$}cD4=#lKUokln%iWVVu(g@tz(WqcWeUgdORDnnz?t0lh-J z0}}oNpdwLrE_qg=mcjvX6cE|&=~;z{@inir>H&05p;Sw4W8PC3fDCGP%+C~BA3j!S zefTql9{ArBvKQ|tv@(XB;(?rbP9c%vEZOa<2hds$^#af-k{v@`G>)$r`Y)1FWP=nc+#WJVyrD>w$AKZwf}z+2y=6f>i+zgvb YAGjTUh0|h($ literal 0 HcmV?d00001 diff --git a/mist/graphics_arbor/bridge2_n.png b/mist/graphics_arbor/bridge2_n.png new file mode 100644 index 0000000000000000000000000000000000000000..09971db1710bb8ea45f0c30921fef53539b02d36 GIT binary patch literal 1016 zcmVEX>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;Ut5fue2bEeNz0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbOqDe$SR7l6wmEE$!FbITulhmG>y#MPSak~OZO4Ha2WyV-3`CK4B zOM2P*vd3=gno=qBS`)vFDM=h6NLZHT>044#WDT@P#sP@fi@+oE!1T5X$RGrs0X1cn z(*PB@t|hb<=u);t9|H=8nRHTaflT zSRi~q0kp^-(AN#107yp!L@#dy;++D+l)nzh*_VL+n?SU43MjvvUcV{5o$`ao(ZbM@A@=CyC{G4Ped=C=>Eh{0000 literal 0 HcmV?d00001 diff --git a/mist/graphics_arbor/bridge2_s.png b/mist/graphics_arbor/bridge2_s.png new file mode 100644 index 0000000000000000000000000000000000000000..31b840b8f1bbeefb75ac94f42bae07abac9fa62d GIT binary patch literal 1050 zcmV+#1m*jQP)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;Ut5fva6#88*K0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbO#7RU!R7l6omeH<+APhwJ1;m^5|9^L_Wo!#|1LDJNqO#x|hZb=^ zsm8W_mI54YEQbSb+nU3a8i%XEZp!ZfPf9uBjSO-)TdO$~{c&cirN)}KI%U4B=P&?D z_k1?3)&May>y;I!?(ZrJ-V=e%zJdUXDFZ|fFy%We`gPo@Z-8>Mwp85XxFsM~(-9_f zHivvf1;Uu3;VdPh3iJ+9lre|Uin|afWf^to)unVf)H;tlwCdw+(;XYP}bnNrP2&!+3x+@p_6~hI^if0>D3lQBWpRG_Ok|M;h{<~7 zzTY{N5f3E#0Td+5Vu$O8I0HPk>(E0r3i=!ZA{TIS&9CdB0>H0dpP!<}Mb2tv>;N0le)_ U^4q+2R{#J207*qoM6N<$f)!fP#sB~S literal 0 HcmV?d00001 diff --git a/mist/graphics_arbor/hut1_e.png b/mist/graphics_arbor/hut1_e.png new file mode 100644 index 0000000000000000000000000000000000000000..22056a541a2f185d51426149ff6ce19c859fd844 GIT binary patch literal 1127 zcmV-t1ep7YP)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(EJ>3-|P>0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbP5lKWrR7l6I*4uK!APfXhUck6B{{P=?wmZs7n46n0L0&{OMrJgEK(uzz-;EH}7W6?I zI19M}`A8snA2LDI;s|v;20;qMGK<%H$8kxlKn5((7xr)?6o@gXnJs878-mu=!nGj` z!26bKbJ*r@F+!VV)cZN?fniemIYf8Av+p7M93sODP(kmF@DX^u%D+SQ!FZ549fv#w zjkKLQ2JOC_6ref({59j|zk_xyKrI`~CBa&G07q~mWWTVv^#uMahwV-w*8>+J``2jv z_VXmjWqk(+%cckFOy=Q$`z++{i=H{-d8eQ_^Q#dCFy@e8%;hZPaMlpyZ-)rpU!w-z z-^v@H-wWKqScj#cR!U0#3didh#Is$n6yCca=b6uV5iG@nu}nZaz*gXLgm?f9-30P; zJV6&86184eO8(jcl}CV=D=nzMAAqrJfwo`10%~P_afEEZAIbvR*4J(FHbFaqu4xfF z%^|{P?I7Iwd%^oETf6lEaXx=w>d&~7l@7w*>k<+ t(*cPYXdFX|TpRLWmOU7`cA3m3EX>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(6PRe1z+W0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbP1W80eR7l6I*4=XJAPfXxZpzPvC-48Zsj}Iuz{nK0e{?zl9*5#dXG~`$@6khJgAS#0>hB=iui}8B-pU9zhH@XbEH$`!!a|{m z8K5Fu1ar2*_(WIxm!N(3lfs7`g2ZwLFb7q`*)hKZ_h$-0){xgKJ(9~jh)~h>5$25R zob@K?m-i{iIo)1OV0w>W&jS!!yB#>zu#pl(Q_6nY0x%_jpwMCv(Jz2o*CG%#^|zm& zK%6X>!0|VD1$C`GEkN^Mx literal 0 HcmV?d00001 diff --git a/mist/leveldata_arbor.inc b/mist/leveldata_arbor.inc index ac1230a1..935af1bf 100644 --- a/mist/leveldata_arbor.inc +++ b/mist/leveldata_arbor.inc @@ -4,6 +4,7 @@ locations: .word location0, location1, location2, location3 + .word location4, location5, location6 ; ARBOR_INSIDE_ELEV1 -- arrival in elevator1 location0: @@ -50,7 +51,7 @@ location2: .byte $ff ; north exit .byte $ff ; south exit .byte ARBOR_ARRIVAL_OPEN ; east exit - .byte $ff ; west exit + .byte ARBOR_BRIDGE1 ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir .byte DIRECTION_E ; east exit_dir @@ -67,7 +68,7 @@ location3: .byte $ff ; north exit .byte $ff ; south exit .byte ARBOR_INSIDE_ELEV1_OPEN ; east exit - .byte $ff ; west exit + .byte ARBOR_BRIDGE1 ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir .byte DIRECTION_W ; east exit_dir @@ -79,4 +80,53 @@ location3: .byte BG_WEST|BG_EAST .byte $ff +; ARBOR_BRIDGE1 -- first bridge +location4: + .byte $ff ; north exit + .byte $ff ; south exit + .byte ARBOR_ARRIVAL_CLOSED ; east exit + .byte ARBOR_HUT1 ; 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 bridge1_e_lzsa ; east bg + .word bridge1_w_lzsa ; west bg + .byte BG_WEST|BG_EAST + .byte $ff +; ARBOR_HUT1 -- first hut +location5: + .byte $ff ; north exit + .byte $ff ; south exit + .byte ARBOR_BRIDGE1 ; east exit + .byte ARBOR_BRIDGE2 ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte DIRECTION_N ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word hut1_e_lzsa ; east bg + .word hut1_w_lzsa ; west bg + .byte BG_WEST|BG_EAST + .byte $ff + +; ARBOR_BRIDGE2 -- second bridge +location6: + .byte $ff ; north exit + .byte ARBOR_HUT1 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte DIRECTION_E ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word bridge2_n_lzsa ; north bg + .word bridge2_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff