From b9504b88e85ad80a824a883c4f3f66d5a1c399c7 Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Thu, 5 May 2016 16:28:15 +1000 Subject: [PATCH] arrow items --- 028.bs/assets/items.png | Bin 3802 -> 4147 bytes 028.bs/foreground.tmx | 2 +- 028.bs/items.s | 11 +++++++++++ 028.bs/player.s | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/028.bs/assets/items.png b/028.bs/assets/items.png index c9bf30e32fef63646e46a8531f4ebf7d372809d7..cbf1f42f9f488bec4cc07e63461d3ca9fa9d1ab7 100644 GIT binary patch delta 1842 zcmV-22hI4}9kU>?JOqCW;Ymb6RCodH+)a|?Mil_yYCIAAm|!LduUK#hR@{Rtz=AdA z5`=%##_uGGooC&=8#qSTFeE#Q2 zZLMz7pxCLkt<@DFlg(P&THPe5*r~Ox)fFL=&05=9-6W{kskN=u6(Ke|1@4jnA0IzH zoY%);d)r;oIX3zcztykvXQC_o?VtXBkpydXOM}$f*6PGB38>#9aEs>$lk67B>$^|? zdohQPKKthI@UVYAocKP!3;6Yl^^ibjRNro7}p_rJ%0PU9}X8RACK!#UVr~F)^q)MDR^q1aam@&j4R7y zzx(5l^Jt5Yd6Z-4yoMLDIQMuB^SH8)E%UGS(-NPK(Kdg#qnz)T$A<0RWir;#+2fFK z#&x(IJ{_yoMcdk1Yg?ssP7Cd-Ivjn9~zdz8l||8uzh`eU4VA1(3255RaH%5kG^zMt)ia@g!z zt|qace|dj?y_v+yx?yDT6@!{pt*-0L2|nEA8DQK3fA#BqU4Q-d)g<<(UtHc!ubsEN z1<%;8-~MMU>zzxw09$1#@5)d}3V!8d>X%SDg1 zx{F3n6}7gtI`K;a>aPjBx_0n($9}xIt4v-Q7>R!|6I<3@E6eyuKoP&TWXxsqYoC8P z&v@<`ON<|h?XutH8RcBY7GJc@KYPpMx3r)2_bP`gm9cBj0iWkN=)KPChuH6WR=D}A zUQZ^IH~%pHGI@yYS|e64P2{94;uo%kgI^;-n?-KVaM@X=@cyUkm`7$TBDnFv;f z9S=wRJb|^uMVlBa5?!q2xaZ`z-c!%`>%F(Ph~yVbmhF-IThVjj7Yi(-0pw< z8JL{^#xXU!oj~vTyWLD)U{ANeyLbac5}PkeS5EVGu`j;QuV#9suJ>o);{0D3%c0u~ z^q#-l&*%m9cndslfERSaD^upX=~f1>?6eW!qX=i*Jd`zRLJ5aT#Bh$9bQ>im5!-x*dJo zx@}9J@!HFA=lkWcVcSB0K!-pz`Nf+q*Ou?2nM`$OWK z9A4X>G``VJetXMOd81);Lx8{_P)&d-6W?cd{7$>=Noa3ej(slUIo|dqlIWI1p2@DY z+&-iBh)jMNG2hR6B>@6`0#_4Ye4pLrciOcj!@Y5rFQ;w1dEEI5uq}T+Kj>&J=i}XD zf4Kdy)?=TCp5uB?xCOKaI~OI-F>#>d0|*w15I%N&1eT-koh_^oYQ+r>P>pq$Ub z_E2phKwyu+#oq!CZ_t10v$MFOnqLvs2As#Y#${g_zcnu7vy6UXX_<4zlx4=Z^wHY3 zwOu)nhV6a7=-AM)CImiofr|tfFSvZ8Ccu_NQpRtIn~%LUHs@OQ)7wXDe7xp)+t#{r z-aED>z#V8p2!ud20ix*_==o1zpF delta 1495 zcmV;|1t|KnAlevZ#mGi|!{tpdK6!{bfCo?5y&zTfgkr4`GBm3Ow8~x6}mgD)7x+vrA5Z z0D(ISD1djwmzn^9`wBeXBK>~4zq5Y#{_7$Am(Pz~QGBzTDuNmR^v$(A79-WML;3629KR(# z^JN<`t??O?`J?TZ^qHQ2Jw{7>nv{9tSiPV9iniOd5O|paH~A7IZh=4jv~1|O+A3p* zt_G+6sPYy(W50akA)rUV0DIFO~=>yBla|h z>G&jz&pm%Hm$vvd^Us{!?eE!Vfq7g@fIu&>>^^luFTVtt=r(vdZvo?E6oIl33G1hPprv*9AtxyD1NbIyTOo#AV6S1;P|CPeo>Gg;@54Q z@8U<-IA6z<`z`VDp??{Z+i|=#KKhk&iS0S@nX`XvpCZ1tjhywdf&K1~g}}=cX#dyA z<38~wJ1$+ZsQw*be=4pDA0B=`_8Z#}zs_&W^~&)reg>`#?-YUOE3m~6|5*Wyml{Q^ zURsJ@#)x0%myV6?7C!@xsdOXoyacxR;lC(=&+8?c&4j=fKLZmfoF?!*1#a>s$n$)u zW<`I10D*IX_}kwV+_}kSdvPm2=hlB=Vpnhr;e-)z1$d*Mf&3gZ+Z&}ZECB*51Qfs( zc-KPn$}ih%eVrpf;64I_1u(8!PV4^g6qPyC>tpA~MUFD>oSb#v9H%}$XFtYhU55G& z6~Cc=tvU1~Kww*ei(iF{H)uXgpii~*d47NM;>wp5`Cok~k1XAehp{gEh%5_Lv_plg zoKb7v)_&#Kwh0iptw4MUa#*`J=js%9UnT@+P9@&{Tm$hewDx5wGbe%RA8|9#hWhImgmvM8$0@E+iyo?9=~3UPW^wf zf40}-x)*&>q++boc=O|j#(b({X&!CltoH}z(H*i7Ah1MW@H4>kTi_+bu8TQ;m_pmr zQ|gTUZS>&FtGgceyP|pAj*Y4Pv(6jsNr1qA0)qwc{1)`-t>#?0jm>WE6<~~$#V^O4 z+RuKsXtVfbdy5>#BtW3}5}~{OJARQ7+vOS`#>ajKHo6YQx5VX`W&E7Dj4yxNoO^j} z?)KE{Eyru^+uAS24udks$aZ(wLV&;$fs5Y-?%tq-pPj`OReeP?l(3F(jmxnzer{aG zXB*?h(lY0aDcg*18KbptYrk?H4cp89p<~0qx)Auk3tSYyc){fxH38-nk}`fyT%CJv zY|gbDXYClR@$s7LzOBc~c`q#3Rsa{E2_X;yg9Q-HdVw{63Czr{0L}!{oj?i - eJxjYBgFgxk4MTIwODLiV0NIHpuZ1FQ33IEjgThwZkRVS475ziMkrKmRpmBhTExYI8edC4l2k6p+pANXRsJxg56XCOUtbHZQGwzlcg7kdmQMAujhSUz9AVPjRkZYkKOHmoCU+BsscU1qPeFORfXk1FGjYBTQAgAAcsgLSg== + eJxjYBgFgxk4MRJW40iEGlLNRFbnRaL5ww2AwhdfGDszoqolx3xnEvR5D+H4IDbt4QOwMIbRPnjMRI47FxLtJlY9PvtHEnBlxIwbdICel7wJ5C1sdhACvjQqDwcjALkdGYMAqWUQcpy4kREWhPT40Th8SYm/wRLXpMaROxXV+w+SMBgFowAA+ysMrA== diff --git a/028.bs/items.s b/028.bs/items.s index 3726f25..5ce5298 100644 --- a/028.bs/items.s +++ b/028.bs/items.s @@ -117,6 +117,7 @@ ClearItemSpriteData: SetupItemSpriteData: ;; d0 - item slot move.l d0,-(sp) + move.l d0,d4 ; save item slot lsl.w #ITEM_STRUCT_MULU_SHIFT,d0 ; multiply by 16 (item control structure size) lea item1,a1 @@ -162,10 +163,20 @@ SetupItemSpriteData: .c1: sub.l d2,a0 ;#1*ITEM_SPRITE_VERTICAL_BYTES,a0 + cmp.b #8,d4 + bge .arrowSprite move.l a0,SPR2PTH(a6) bra .done +.arrowSprite: + move.l a0,SPR4PTH(a6) + bra .done .dontEnable: + cmp.b #8,d4 + bge .dontEnableArrowSprite move.l #deadSprite,SPR2PTH(a6) + bra .done +.dontEnableArrowSprite: + move.l #deadSprite,SPR4PTH(a6) .done: add.w #1,ITEM_INDEX(a1) diff --git a/028.bs/player.s b/028.bs/player.s index bc33121..07a8d58 100644 --- a/028.bs/player.s +++ b/028.bs/player.s @@ -213,7 +213,7 @@ SetupSpriteData: move.l #deadSprite,SPR1PTH(a6) move.l #deadSprite,SPR3PTH(a6) - move.l #deadSprite,SPR4PTH(a6) + ;; move.l #deadSprite,SPR4PTH(a6) move.l #deadSprite,SPR5PTH(a6) move.l #deadSprite,SPR6PTH(a6) move.l #deadSprite,SPR7PTH(a6)