From 436d5aee8771fd2603694661254eaec86315c4dd Mon Sep 17 00:00:00 2001 From: John Ward Date: Sun, 27 Dec 2020 14:40:20 +0000 Subject: [PATCH] fixes --- aticatac.dsk | Bin 194816 -> 194816 bytes boss.asm | 15 +++++++++------ chicken.asm | 6 ++++++ data/item_list.asm | 4 ++-- doors.asm | 4 ++++ food.asm | 22 +++++++++++++++++++++- macros.asm | 2 ++ room.asm | 1 + state_manager.asm | 10 +++------- utils/constants.asm | 2 ++ 10 files changed, 50 insertions(+), 16 deletions(-) diff --git a/aticatac.dsk b/aticatac.dsk index fd37d67eaad9e91939a5c7972dd5802c86868dd9..d4782610b5c12a551b6fffeb28aeaca37bfeda44 100644 GIT binary patch delta 7423 zcmb6;dwdktxikC9ZeBARlFe=cvoo_KncZx5H;25KZkAAy#Ro)G2o@x?YQeS|YHyna z!Y;@y&`L07R9^BFyRBD^1@9$Xt-rvAG|Msy_Scm9W2*V}CTcPCYHjOJ-O2sVY_fpm zpPS9jobP<+eCM3+eDB@-Y0lZg8bpwiU_uAz3%O4^>;ZnA^Iel3YqmyebAPVbN#l7mRYY+n&$WS6X9k4I}@= z&F!eP)=!P|TTpqxGSP}2F>(aKe^w-4&X+s<@+PnR;cWTGBoI+|4TN;)kn}=s73q_H zms`HP#$t&epJ~(;LC8Y-=C_p-?tAZdJ1omxt6f+43d@z%uH~*Ju7y|lGE0uKMtN9q zDG@@Q9F{L+O*Ms&&jN7QeW%aLJB+98A9>28=DeC{g(Vpb1)d%;Ah#tH_;+}FETJ{e zj95@5yni~9i@cTu_dwYCV3?eztDBs7RsN+}o@Y*w1OeS*r6oBJfBFM;qIaqt4E8q& zqFaL+PX%U)9<3QX)ld+Tcbip*kgXQ5WBBic$@B$j7&FvO_R>uLQOXe+y_gV>P+^5T zDtT#_{|MC+L{%1f%zWBvCKLyKJ|R;UWr-;{7k`w6#$*FND$SC{F|kUD&>UGM9j1#7 zM<~%Jy-t@l`Yg(uq+ldrx@Am$DqHTbjAm}!{yXJSLT<U zigrpftluDaO3l_q@Z4j4sDud5UwrE=%?ob*=50#|?N9eY9YGQ=)Jdej+yL$8r3D3z zp6z{NX9RK`yds+;hPbd+?h^?Gxb5BU2VwU_+ zYAvocO-ata;zc3Ei#5EeV{^Jxk~M9LvAX2zKwBO!vR_KRE+YPvkT1@Gry0hb5_HKg zHv-!JMl#A~iAN;XzKoodeqv`99khuDZK^7i22~Tj%7eD;uyfBLo5llvu1zKgal2+t zfRU+DW%T0c=}*2)B*bI&vEg_*Np?pkZWE75m+f3M)PW9A3DEDIm=C}WYz1~x3fK}Q zlC2VgUOp};+?g97B@GS7j|<{1?FKSeB6d@)$$6NQW8x2t>VRP65pCD=0op`t947^x z$sq2hu!e39i~A^UGv@rn$_Cm2CSx=`#WZnG9c?#E+*3otg&uG;L~CeIfVO8%tgNFw zi0=B&Vf!PnaI+{;Vc2!gmNbzmsrY|x;f5V}c2kZk|FR7|ElPMF_5ZSuIFko57-LN! zNr$LJBM4jk4>`UK+M%ZRvsW4_sbBVElH3V=2la|~lkwl##FpCFfOyfSR-NORgh~)A zY~8kITZe6(ZIkORX!iirthLjvbQ_OJ_k+QUNOzY8j5~_M;&y3!X?ZkKoD73pT}ZaT z^HQ=Ip2K1^-8mp`Ee2WACEpjfr5hiLKQC_XKs$=ZDM62ZR@^bpqMsKJpBm^$_CaqV zZBC}1^6_H%Lb3P~6C3Pg#GQ`Vfc&_LTT#pJujgL2@rP_76-5u)5`E|i2e-?i-6Tu8 z_#Q_jHf+jrUjC|>{vr|j8=%E*M^Ft4C8*ocmTW91tVbvgDY)S46oYlV=F-``kOiZLUD`jBCHJ`E*`+`LWUw8Px0>UZty7maWBLkr zUv!c7r`G>;(cx9%j^bv~PsfCuM&zf(rzp7UX4oWpl1eTeJVYn&8|QZ6&L6x; zCvO}43!VJ-;1gbXtrbsX^MHgjI@1Y!4UkVri=B7EbD#4k&JRkIh%U8OiRj1VR~(~Y z5o5!O%j=CFa9o+VBPIFSx1!?|C=0g739tjfaSB?hNzki#1B^L-!WA-uZHCo{R9Iiu zTR}y7D6rXy5HW?&eH}q#L^m}w2`5O;c#;BBpU})aMv&Jbq8KAS33da>zi90M`cG0r z`WwNl8$f(htuTD+4def%4<=pLmw<)wMZ+81otcz*;3J78QFm!ZxI#kS4?_tm9(Dc`TLylUPmT`APY!^6K=QC zM9N2`BfG=WYy54}F7~_91Fo6T15}7X2Z0R-sMv5Lw*Ojd#2f%`l7@z8wWC3ob`F5V z_Bt#cr22;g)*ws`hnSwA$_$f*%j_kMQynV9=E&vw;vp(_ep_yWeCZy|t7?Jal_3q7 zxZ`1?MN(Z0qFGFgMe@;E*PQ*}Ecq8RGodbsSaL0^Pqqz*`cM|b)iv43`1f357Sjme z07o?02>E+1`6?-&CrxDBQ!_QJ1$r~A;D$T+REf#LQOwv`h(~cKD)%~0kIr+s=&PLl z$ADG1uNdg_JZ!`v1c^PDymjVi*VU%A@Xl-qV&M>$G*B`nsp~Ck@-`GCJhF9DZ1{}< z&)e4D47@SWsI)0y7u@&*(U1b+5Dpjo;tuHtWh-)g7L!i))Iikql=ODltf;9FbRGFE z5JvkfK)2d5#$GDf#ggwA{=VQb#H3YjVRA?gdX&Y%T=2~yZh<**RW>u)jMCKRU2tJ!Zxl9Log6c$v zsSW5kUjj>5SYTmeYT>Xd2!@bgkLp5&$ihrtw3&(To0V)H#$$rhV|1Y)9x@d}nwhhV zSw7)9oq$1qm*?igYp4*8cw_Su=+Q=SYgR#Q8Y+U&RPM?Q=2)$_F#5Ib!&>)@bgxEZ z+MvI}oMHaR7@V}z?&O?)XV3`(^b&(!X2iRlL3FoM6$knN3I(7oE`_e8PPJ|Tz@<*H z8Ng;d0>EacxCFo@8dw^DhPW8u#Tu*yHGM!=;ck~M&z;@t*<2kKRQoSsf;C&G|$we$zFM33}qPwAbNX~2tLIp82B7AWm{PLUl5kxF}Z$OlWLxJ4eI*$M>hl~u+{XnCdED|gha^FT7NFtsMt z<`iEBf$Mbu3s8$w;qKM!VgL>U$AXi>*?}9FQ704p5wK& zLgD7}CKJT<5jckn9(w#RxFFk`5Wmf%T0Zm$s^hVzZpLG=mQN0!I)9SWasm5a89iw6 zG}c6Dc%i^XoI0-cTXX6dy5$DT=!4-2A6WWPZdrp2hvKa(l0@q;!Qx zE)v9#DuZeks|y*>N0qHWlw3x}FH5z)`slN6ez%+7>qftJ^T*x%Yi@Mj&C727Z8!SB z&41|T|Kh%ZIMALqWJLdQ)83(*_Kvy}I2+KYr%9*j;=pisQ5#vbd$5Eod}@7@bgzGX zbcg4F=S9y+&w0-uJy$(ndd!tYm3-w%55FPCnhj~re9#QJO)F$Mz;wuXfcv3Ig!oQ% zQmE;Gh5{B&HL|o=%Qpl6PO(O~tS;2?`-~xyPja4mUNg>ba~C(l#GvM7+>O?`d^$+H z0yE*_z{e)%!QFwK8ZrQ@Z%zU-pK4yVNk;-qIpXD&+^84+#$b!nZJf1D3iV^@Wvp|h zvA{!Qy>v%)E!iz?skV{3q&?LS&BjN@M>iHc;~|NrZ#CiXYfbs{@z+oQEL%6f7Zs6% zk_~a>xYU3ak$!0l8oGCnFE%Xh_hGB8C2~*u(uv$bpBD3qyM4+w{f!yUvoKoOro(Ag zI?%T8hkXiv)MwA)k3r)X(*8Lmp2NP0mAK1u3>v@iLE404Xt~KN!jc1aGYo}rea{-> zrQVt_^)CN0uky5uch$HSx>iWbYhEyqxU>?%h@`LO@<&{sM5i+Igg7Fh+Qrd~_g1(| zt)>U?B}a64iqftFZTS?Um}r+nUUxa^K)BtY@b8tyE6SQPH0N_X z4PkafX#@3xpi&n*-!&UY+b;S_V(hHg?L$~R5Bu;rv?GZJd@;cY5sfdwlJkOH*ZC;m*L>Siz5>)VL-rRPBW1Iz$9)4?q9Ihemd+zU^KsuO05`=FJj8icGq z`<#%$?hl#mmCy-2hR{qq8_KoM6!%G6>WUuR?+cDQ(S9FH4vWwFHp7yT-}++BaD7`~ z<>rhz#1_yF!zLD>y}s5BFmNL*a+b+~4W9;w+Hxvj0+-ry>H^G%LHm3gU_O%*?~%T! zdvxJJpR!PgS6Hho(PQFm%5p+kO(w;z$JZvmv1x1DbndP@f0u7Mb5FOYGZS%-^h&*N zHt5HYt`&^&5Gf_2f^K4gY6vuAeaVJigR&$mIk&f=X<%+V*-Gsn+=@ecm z(@dSrXXWBD=?4u#G9mq{Aq*A8Pa149 zy!3XEaFVAj%BFUg($&s+rINW18?Kbc&q&+nE;}lc(ew_@0dqRl+2gx7n&|g6Y@T+B z({I{u_7nckegEtG(D%OYk}u#F{H)*ZpMJ0Ruk)|*ukhdHU*vD{H~4ilN&L_1Lsj}5 zLT_k&qsm|+Ol7U_X>cRJ7{9vpP!xCQBIyB!L+Js!lNin?2*c|4w0Cgo{clt6m+(7_ zFucDC-Z1|wcw>UX{jgv@p<8r6%m@5q_iK2=E_h@7f2Z-pyMPCkQI`qPFjor+;W~Bs zx$J;?%emqJR|oJn`*238)MXQp^eK zY)4S#`?8w%22z~eWB&u!5YXCYk39*ufa{K~NP_!my0^h2zv36WP&5Y47;QkI9JCQ7 zxCQC?f+zlpKTWI;b)XdYxf?n>-oQt&n~ZN4J5dmIB2@=5Nhh+Bli10hsX`%(2k~#5 z`)=SjP!9w<&<=4X6*G>$W#V;EYjQ`#C;Y z0jmop+a#<{iU)XHur)CNF{C0rIIp~MFMoq00>AbB&~K-VqXMyV2MUhsfgb}YPzjRt z;`6d@*l2T#`=RvPc?+VjLvkx@Ej5R;RjBV5!GaV;SX9M!&wA zdi`qG9VD~v6pvYFhMAe;XzZLheV&Os+!kQg%ds`rsBJdWeFWXo12#?}Q{w;rBzon#|KU@)O-PnmcgU;9wuBPz0oj1k|Yx+BzVS%7+Z& zTZ_QXyC9$yY7^XGDK2Im!Nsg}UJ1pBcWm;n$$0Th?ulZIJf$HoXMxwf+9bc11;4Jq zPbGb5m*e=Yq^|Wz2dKzS2Lv_U4#pDiaa~^^)5?E9tq-z2NFpt4%Eo z6#SbeUezS2F5jD~qu2yjSc7+b7Vj8xayVz6d~M_Q+>9-kE&1^ka|m3IJQJwTB)np^ zC3fb;x~YnvTwN+w^WdnWjW}Q`=fppiftOU)ib|Q%c8yj=S=tAP?@yuMy9xTeYmP)S z1Sjfn9n^U~yYw0%OTIjin~^G6q~)OkjE$y$CtK>3|KyebQh7}ea9wV+OfIRAz2#bI z?iv8axod!O4Un^a@_0UWO@qs3XV#in`B~A16G9$7$Y(`b$kbuM8+4qXQz+^oZ9ICL zF4{Ku5POYRQ1f65aDjEL7P7X~ijNm3+XqZ~kT|H5YBHCQoAc!F=fR2LE~ zE2oOs{lemoAk^Pg18ZbRhy|b&O@29ve~_@(!5druY}NUt_Hd9J~qpuJI1H(u~8cG}pZ4nj-a~7Opn&w`!sZiZ57I z^rXBA$^R(gj@3tE>{svu1b0kI-7$K6apfU$o#g%4Nv_*^=f@}S{Fvg4(!@+<29 E0Ahbf&;S4c delta 9417 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