From 60c409ab07d391928bb623017e686aab8018931d Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Mon, 18 Apr 2016 16:58:49 +1000 Subject: [PATCH] animated board item --- 028.game2/Makefile | 7 ++- 028.game2/assets/sprite_coin2.png | Bin 0 -> 1277 bytes 028.game2/assets/sprite_coin3.png | Bin 0 -> 1249 bytes 028.game2/assets/sprite_coin4.png | Bin 0 -> 1233 bytes 028.game2/assets/sprite_coin6.png | Bin 0 -> 1278 bytes 028.game2/assets/sprite_coin7.png | Bin 0 -> 1289 bytes 028.game2/foreground.tmx | 2 +- 028.game2/items.s | 97 +++++++++++++++++++++++++----- 8 files changed, 89 insertions(+), 17 deletions(-) create mode 100644 028.game2/assets/sprite_coin2.png create mode 100644 028.game2/assets/sprite_coin3.png create mode 100644 028.game2/assets/sprite_coin4.png create mode 100644 028.game2/assets/sprite_coin6.png create mode 100644 028.game2/assets/sprite_coin7.png diff --git a/028.game2/Makefile b/028.game2/Makefile index 9e3e03e..6496dde 100644 --- a/028.game2/Makefile +++ b/028.game2/Makefile @@ -22,7 +22,12 @@ IMAGES=foreground.png \ sprite_pig_up_jump.png \ sprite_pig_down_jump.png \ sprite_pig_right_jump.png \ - sprite_coin1.png + sprite_coin1.png \ + sprite_coin2.png \ + sprite_coin3.png \ + sprite_coin4.png \ + sprite_coin6.png \ + sprite_coin7.png IMAGEDATA=$(addprefix out/, $(IMAGES:.png=.bin)) diff --git a/028.game2/assets/sprite_coin2.png b/028.game2/assets/sprite_coin2.png new file mode 100644 index 0000000000000000000000000000000000000000..4e50698d26de9d698f55127303dba710d03c26b4 GIT binary patch literal 1277 zcmV4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q zt4TybR5%f}Qqc~BAPg+Jmks|`Kf~XhPt)!WWQYPLE;cE)UhmQz7!gtAb{q#?8>@R%}mCf9y&XY+B#3*_cxz9wb zDD61m>{u3~y1_hn6C?X5RuzcEdX=~v4cp&>P39o!dR{JzBp|ZB1OK}n8@z*eG83At n06~g`D3OU51p@i(`?rZ-|5$vbm!9LU00000NkvXXu0mjfky>o> literal 0 HcmV?d00001 diff --git a/028.game2/assets/sprite_coin3.png b/028.game2/assets/sprite_coin3.png new file mode 100644 index 0000000000000000000000000000000000000000..ac294d92250ae9f8a6e5aecb99fa84937047b8e7 GIT binary patch literal 1249 zcmV<71Rnc|P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q zk4Z#9R5%f>Qb`VgAPg+(#o%xC89o4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q ze@R3^R5%f}kwFfCFbD*}oA$Z-biHX1w2jgzo770cfx-?@n21EZ*}7(B7XAkiNo0-; zOfVxo0RYrL1Ip;zH0T=mNLJxo0kV$0YLogwaQUj4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q ztVu*cR5%f}Qqc~=APj7$FN%MwpW)}~o3q{lm7##i%$jtxyWXWaP!TcY>X=qDGjTfs zvmj;`bF}5Y1(G~po`8-KrjV+(MiY)Njf@GhJ`fy|0jNt~!Nb*jZ>}Sy$3Y4*NRk>RX`@Drv%|SBuyj&JlKqS9|^qXF&-m4jJ ongRqV;?W}$?+Q5i*ZH@JFS^`+rCiaFrvLx|07*qoM6N<$g1Int4gdfE literal 0 HcmV?d00001 diff --git a/028.game2/assets/sprite_coin7.png b/028.game2/assets/sprite_coin7.png new file mode 100644 index 0000000000000000000000000000000000000000..1be5a52e1dc64dd6cc609adcd8c1612c0efeb506 GIT binary patch literal 1289 zcmV+k1@`)hP)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q zw@E}nR5%f(Qd<&(FbIU&pEllBkKu9Ke$^t7hiOPs$7Tkz!tNR{2mr)!dRN;UAC^~uV=iu>f00000NkvXXu0mjfePDJq literal 0 HcmV?d00001 diff --git a/028.game2/foreground.tmx b/028.game2/foreground.tmx index ed2543e..41cded7 100644 --- a/028.game2/foreground.tmx +++ b/028.game2/foreground.tmx @@ -13,7 +13,7 @@ - eJxjYBgFo2AU4AKOjMTJgdjI2AmPvlEwMAA9vnCB0bgb3ABf3I2CUTAKRsEoGBoAABJBAtk= + eJxjYBgFo2AU4AKOjMTJgdjI2AmPvlFAW4Ar7NHji1T9o2BwAHxxNwpGwSgYBaNgaAAAFGIDHA== diff --git a/028.game2/items.s b/028.game2/items.s index 90e1853..e27e962 100644 --- a/028.game2/items.s +++ b/028.game2/items.s @@ -10,10 +10,21 @@ ScrollItemSprites: SetupItemSpriteData: move.l currentItemSprite,a0 + cmp.w #11<<3,itemIndex + ble .dontResetIndex + move.l #0,itemIndex +.dontResetIndex: cmp.l #deadSprite,a0 bne .setupSprite bra .c1 .setupSprite: + + move.l #0,d0 + move.w itemIndex,d0 + lsr.l #3,d0 + mulu.w #64+12,d0 + add.l d0,a0 + add.w #1,itemIndex move.w itemLagX,d0 move.w itemX,itemLagX add.w #32,d0 @@ -43,32 +54,88 @@ RenderItemSprite: cmpi.w #0,(a3) beq .dontAddSprite move.l #spriteCoin1,currentItemSprite - move.w #337,itemX + move.w #337,itemX mulu.w #16,d2 move.w #255-12,d3 sub.w d2,d3 move.w d3,itemY add.w #16,d3 move.w d3,itemYEnd + move.w #0,itemIndex .dontAddSprite: movem.l (sp)+,d2-d3 rts +currentItemSprite: + dc.l deadSprite +itemX: + dc.w 0 +itemLagX: + dc.w 0 +itemY: + dc.w 0 +itemYEnd: + dc.w 0 +itemIndex: + dc.w 4 + spriteCoin1: dc.w 0,0 dc.w 0,0 incbin "out/sprite_coin1.bin" - dc.l 0 - - -currentItemSprite: - dc.l deadSprite -itemX: - dc.w $E0 -itemLagX: - dc.w 0 -itemY: - dc.w $a4 -itemYEnd: - dc.w $b4 - \ No newline at end of file + dc.l 0 +spriteCoin2: + dc.w 0,0 + dc.w 0,0 + incbin "out/sprite_coin2.bin" + dc.l 0 +spriteCoin3: + dc.w 0,0 + dc.w 0,0 + incbin "out/sprite_coin3.bin" + dc.l 0 +spriteCoin4: + dc.w 0,0 + dc.w 0,0 + incbin "out/sprite_coin4.bin" + dc.l 0 +spriteCoin5: + dc.w 0,0 + dc.w 0,0 + incbin "out/sprite_coin3.bin" + dc.l 0 +spriteCoin6: + dc.w 0,0 + dc.w 0,0 + incbin "out/sprite_coin6.bin" + dc.l 0 +spriteCoin7: + dc.w 0,0 + dc.w 0,0 + incbin "out/sprite_coin7.bin" + dc.l 0 +spriteCoin8: + dc.w 0,0 + dc.w 0,0 + incbin "out/sprite_coin6.bin" + dc.l 0 +spriteCoin9: + dc.w 0,0 + dc.w 0,0 + incbin "out/sprite_coin3.bin" + dc.l 0 +spriteCoin10: + dc.w 0,0 + dc.w 0,0 + incbin "out/sprite_coin4.bin" + dc.l 0 +spriteCoin11: + dc.w 0,0 + dc.w 0,0 + incbin "out/sprite_coin3.bin" + dc.l 0 +spriteCoin12: + dc.w 0,0 + dc.w 0,0 + incbin "out/sprite_coin2.bin" + dc.l 0 \ No newline at end of file