From c6e21d7b407474cc0b092f1504ed9130c6be89e4 Mon Sep 17 00:00:00 2001 From: Koji Ikarashi Date: Tue, 24 Nov 2015 22:09:50 -0800 Subject: [PATCH] Anime active sprites on weapon select --- game.c | 15 ++++++++++----- splatood.nes | Bin 40976 -> 40976 bytes 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/game.c b/game.c index 492ad03..8493b8b 100644 --- a/game.c +++ b/game.c @@ -550,6 +550,8 @@ void show_select_weapon(void) { ppu_on_all(); + anim_frame = 0; + while (1) { next: @@ -559,23 +561,26 @@ next: #define RIGHT 140 if (player_wpn[0] == WPN_ROLLER) { - oam_meta_spr(LEFT, A_HEIGHT, 0<<4, SprPlayers[0][WPN_ROLLER][0][0]); + oam_meta_spr(LEFT, A_HEIGHT, 0<<4, SprPlayers[0][WPN_ROLLER][0][anim_frame]); oam_meta_spr(RIGHT, A_HEIGHT, 1<<4, unselected_charger); } else { oam_meta_spr(LEFT, A_HEIGHT, 0<<4, unselected_roller); - oam_meta_spr(RIGHT, A_HEIGHT, 1<<4, SprPlayers[0][WPN_CHARGER][0][0]); + oam_meta_spr(RIGHT, A_HEIGHT, 1<<4, SprPlayers[0][WPN_CHARGER][0][anim_frame]); } if (player_wpn[1] == WPN_ROLLER) { - oam_meta_spr(LEFT, B_HEIGHT, 2<<4, SprPlayers[1][WPN_ROLLER][0][0]); + oam_meta_spr(LEFT, B_HEIGHT, 2<<4, SprPlayers[1][WPN_ROLLER][0][anim_frame]); oam_meta_spr(RIGHT, B_HEIGHT, 3<<4, unselected_charger); } else { oam_meta_spr(LEFT, B_HEIGHT, 2<<4, unselected_roller); - oam_meta_spr(RIGHT, B_HEIGHT, 3<<4, SprPlayers[1][WPN_CHARGER][0][0]); + oam_meta_spr(RIGHT, B_HEIGHT, 3<<4, SprPlayers[1][WPN_CHARGER][0][anim_frame]); } - while (1) { + i = 0; + anim_frame = 1 - anim_frame; + while (i < 10) { ppu_wait_frame(); + i++; for (player_id = 0; player_id < 2; player_id++) { j = pad_trigger(player_id); /* Start - Select weapon */ diff --git a/splatood.nes b/splatood.nes index 4907ed7ec7720eef755eab597a2b88aec885f7ec..5502bcc2b916c0c2cb53371de459107b7332cd09 100644 GIT binary patch delta 6448 zcmbU_30PBCx;G25s2E&ANC-J>%4XP=MJ=6Y3);(6t97aM6Rm!g&d|Zv?^$2<0|YKO z)CD+b)w;yUwOm>%G>I(Y(o|ar^C_b9kr<|(nGTG$PA6~LzNh2k*<=&VT;x-rB3;TKMf2b=2+2)THSy@C^FAO8-!I2`S$dM!679DKH0o5d2ts+nu*X zqWcC`{I)1~t&y8n6D#rw1d?XLO=AGkVETH4rd&K%tZDF!KXFJIu)6q!a5I z&k|?pX)`OfSzrM@#sPt$ioHgG;bMg`?sx%uY|u#w_Hwk;fR_Zy#hC`YCNON78n^(D zbQ3yj(248J!eYI2pJIo(R&)<(Ogc%Mxv6upl(XohZRThT0(4(M2QbA+^|w!S4B9~? zUJ8r|+G9k+27zg+Gxz4yO4t=f>*0U*;@TeIV*JLo}e)MEB7x?*VdHoB`W);-Mm#A&9XOm^;@8 z>gz;knn4FVKqMP;h-|ZYUz?fTgIi`S+^_-+D~Lct^iH|JAW0>tD7=XpD)b0$mvKU_ z{t6gCFNM1$mHHUxBm>6POVMghA1VBdU}fm-1d9=-0G1#{ZX!YK(j2{Xp8$aWa+FrSuj zU&N*HY5j;U;wwQ>8z->2Opd>yLa^%ZqUdsu{=&F^U_Rg!4LPPli+fca@*s9f~-qLpw zrie(t1=3pvo+6y0B)NtE=Mj(aapEV0kJGr>I)#TmM^0D}WegtyGiZAQAPe4TK#MDQ zEuyBJCNdxmE*^T-;isSHyVTz$i$pQU?AUfef!!h z5NUN5_6Gh${%rQ-WnyAjYj86Md94!m$XtW}oJ|B+qdRt1>|IAke($ z7<#D!DENivGDx=jNq@(6!3)KHMr;XwhJdLG3RuOzi6NiWDdgaKO^V#fxoXRCKJ#1_ zi9!cNaMgg%0Ql@Mo*jaw)g2>#NK_G0aH~wN^!PT-r(2E-QpGkcr)4{EaY)F5CzhYC zHTb8uNPHy(B|J&0GEt<43If245P@7~RTdj?98Xm$6}kG`ptGwoxH5teqqpP5%2blk zw?cFhd_baxyM`;3NIb`g&nXk6bBw|dxJemWN=00CBhp+(i1@gS;RJ4gj~|}zGf+Fv z5l!+$uQTGp!IPIbBhK#3CbzkC!N%TypHDb9|4;G#vDf4JDM6oyfSo`P1q6420ObJN zn;xu*Y_}0CZUKpdVj7-#BsfS2^XcankRXKJw5jN(ZmW_@)h1zD#&Bj{&2U!pb`)i7 zRRSrmrKEm9brk+6{NRX|U3Y?FLWnTKS>R>UT2&KK1@Sm;{R!c?oTyl@mQwe&p?@1TK&(UU@yc z5Z5=phw(^;mhLJ^a?k*i@MfTv&wjG;qdlH}wv(wdH@I2j(g=l&lx(qg$^IZBJ-e}y z#tksf28X815ioa8GF)OW0uN|tY)tITX1HYVTHoFvhlE|-h=U{5K1&V6D>EZCJ}=R$ zjgd=q_cAVKK`yY3-(Hf4q2JR>{cNnzz;XJxMWh_NON+1187{1N28SD z0uv62&MGJ{aVd@3&UYB-YM>`Gn_@-W5t#TT6ftC&D6+1Ct;hLz{&++<>g>y3H#S3kNrF$MxKjiB6&P4Yc#08^!X zh^NG5LG7Z}gU4SKZ{QLep)wuY!$5xw^$ThMU8ElKi&M}{=Qx7KmxLVfEJUZvyr;{? zr)A#Lq`P%uBd_T&+M7D(MUJW9jga-fJPq14YLAsMSe6hf&iM#Gj*B87JYGe>lK6b_ z$cMN%R*jqEadmt#%7|~xSCgden6CXRvB#|9%0So=MrOHzuAi-%9lbt<4 zia*^7puB@mB&s(-cTBhQ_k;A1VE*Cxf1b6W7o;7Q>#YE-o6=9<)k-3t*gL&e!q&Ax zuSoh+MUsXz-I+-d1Z;GIy-vV8L9Y}1#R-Cv=lK@266(kJnPj<&w6Mz|+tWJZ1JO%6 zVCZ9Ey*N1po@r{5!bpbQ}Tym`pX6 zr%6jhnp1hi6V>`^v z+gX)C&v5-!x6qG9bQ|wXf1#9In0R<6R{*avnU!X4pr>Y~xtSjTT;KOEtZ0wxSlF?s zuJolCoZWPZb}>e|q?x$E_=qAs%bR@d&XymAFW);B z{-AU6fAm4;BhK?3UE1|{3iGI9^yMxxZlL34I=)WFBG>wV(7WAq+)Kx5Iv(hHENxiM zi4H#3@LYYas1`5JS|mD*tFv-MU*Vpt7scoz4#^ImReW(Q$oU^FzIX*bqo;6wcA4MI z?lIZS?$HnMZ?n@EukH>HpBJB~O{>V*J37C6zxd?);=SUN?}^FBc|GQ{t6R)Dzhi#; zy50ZLVw}4uEV!+E%)hOB^mO-Wug~apyl2sB(ICFHXuUY@5>8kgDtZ?$Tg-+UFP(q% z=-o$;em(lvOMaI>x}0?R&gG?-?_GZNGIPbyws>=hG8fL{qYa^to)}>Y~UKcTAz4Z;NzctbN zvURuhtHDy7x-L@kuJr_753tQ@#-#uUt@kj$E^^waHPF^#y={GD)!6WzbrI5d+aeqO zJ6x=^ZLwjrK0@-gZ6AJaedMf@wvTQ3wzq7@Y*%cNw$E(U);`1T^&?_U?q~PzD(t@= z%Kd^sJe1o<;F+P^n*^T6Wv_8pQ?Fa(rMLH`GJMK4hR delta 6541 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