From 7d20d8082f94edf20ee87dd2227255763961bb0a Mon Sep 17 00:00:00 2001 From: Papa Cancer Date: Tue, 9 Apr 2019 23:42:44 +0100 Subject: [PATCH] Gen 7 animations Includes 2-frame images for Tapus and Marshadow Custom animations made for Yveltal, Shiinotic, and Toxapex/Poipole --- graphics/pokemon/marshadow/back.png | Bin 566 -> 523 bytes graphics/pokemon/marshadow/front.png | Bin 570 -> 1026 bytes graphics/pokemon/marshadow/normal.pal | 30 +- graphics/pokemon/marshadow/shiny.pal | 30 +- graphics/pokemon/tapu_bulu/front.png | Bin 875 -> 1325 bytes graphics/pokemon/tapu_fini/front.png | Bin 885 -> 1274 bytes graphics/pokemon/tapu_koko/front.png | Bin 1040 -> 1445 bytes graphics/pokemon/tapu_lele/front.png | Bin 784 -> 1245 bytes include/constants/rgb.h | 1 + src/data/pokemon_graphics/front_pic_anims.h | 16 + src/data/text/species_names.h | 772 ++++++++++---------- src/pokemon.c | 101 ++- src/pokemon_animation.c | 77 +- 13 files changed, 601 insertions(+), 426 deletions(-) diff --git a/graphics/pokemon/marshadow/back.png b/graphics/pokemon/marshadow/back.png index 6ad3500ea182816a910c0356ab37d271f3d2b063..7e53e86b2d217b2444112cd99d6daf4cdc790981 100644 GIT binary patch delta 497 zcmV`Z!N>Wn)_muxa0KLU) zoQz6)T0&AWW2I8Hb3%ma{)LVJ000SaNLh0L01m_e01m_fl`9S#0004jNkly zO>)98428{%**DM=q`d$&2S^8Jyk&v$1;D<5jjmrQ;nz~=bbnVgz=HQ#dUB*F^@7nf z&-G>7u0&xro}9H9Zz7==baFw!r<`0PA|@ zgnPL#psx~m=AnNCSQl917a%+W%!7u%0(Fgl0n}}>fv7Huk5qNlY#!1{8=fW5 zxL0>X;bZTP-d_npSK8q?=bjL69e>zo;u4YdFcO!Mj%x8B07~0&b10-57}nupkZh$A zbXVC$`bfJ?fxD5h1MB!bj|t$qJhBB3`Fu~pv!n#>4jA8Pm4g7ga|JRZIe^R1^pXo* nZa{`2*zBQPfdEeK^i|^ra#|BfXLFi)00000NkvXXu0mjfwxi$J delta 541 zcmV+&0^6V#h=_;)00000000005l#E<00009 za7bBm000id000id0mpBsWB>pGk4Z#9R7l6wl(BNcFbsyxoqySz(yd$Cty5|qAU&M( z%7B}N5$vU7jNYqjW|;C&l|!Il%i+2e9c1}GOTQAy>>eY_#`Rg-7Njsao}9E84=UVrvZ3e=~23RrJ@V9rv&bT9GnVuQKXG|<_m)H}P>U3ZX_ht2|O)~ykM zl1OmyIzHW}v9O9gc6QhG0Js{U33YC)`|^N=K3rIX1JpZX%%DSLLV<&;h=KZ2b`eko z33TM4x(1>yu*MCbhH;Y|{t7hz5eVCi214CvlLfCjntz9|Mpyw?N!DWtIPTR2;o`AZ zTdmIop);-w_Fj2JOBH|YfjEUJY2q}}#%vfxNI&<-plV=9g^S^3NncaEZj|vqNuT$- z(O?HsxkLguFAr@&Lo>W5;#>Lz>H;|4Xn}(oRzn4EhH?O>p{Xbr-2DO#IKpNH?hMqR f5;yu?1{PyK#3LzSfI@6*00000NkvXXu0mjf2dd~p diff --git a/graphics/pokemon/marshadow/front.png b/graphics/pokemon/marshadow/front.png index 927049d8edc32c8f7a3abedad908f32ecce58334..866348de4bebf35ff4031fbc681e4a6f227ed3f3 100644 GIT binary patch delta 1017 zcmVMBi2pHW z=KrEE)TR^HYqeW*$lc(8g<7pPCuSBy4!DEBO>v#o#a%3Mdwz-UAz1V=1rT=^bvNHw=1fz78Jpj2}e0Dqn#Kuiy&`q z;~X}7X+i@+B|QW>ZDuPl1rE}0hha}`p#4^u$Z)4t8zf>+0XeC_{)w2L0|Kqc;#SI# zYeK3_0)B8k;zGfPp$n9&NKn^I2N*il;O_=~pzvyGQ_g|ASwhj~?sVd?+g)r>8?#{Bk5vcZECK-yb@6?k-5+95XnFfE&`luvC$8BNA91e)pmqyf`ap z;PUfJ5Bz*SDnbefieds3bOI4Lx$(=n@rHC`5*Us<2#nQ6ukKDrKy^@3(CK9y0KNPx zKz|1qpsr$oZvZg@+aJ3ht$J?n2J4 z6M*-!QYyfAWB7vxZ0Rp@$YTmn9=PX$Tym5CAV_Q~b&3w9&G>^4_?PVKcne^t8rNKZ z0${QH3zgz8Xp?Tn(+yn^yKtj$xR4kx% nP{8_!KzetwGR>k~1slHsimb~`z5CoY00000NkvXXu0mjfdPKyO delta 558 zcmV+}0@3|~2)YE27k@wm0{{R3SVwH_00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^ z1poj5Fi=cXMVQc_C_pG+fM`%)P!JFhC@?T^aCk^iQ26kW_&@;gpiqFAc!-FI00000 z000000Eo*>IsgCw32;bRa{vGi!vFvd!vV){sAK>D0h38YL4Q<8$L*BOZNo4Og%v=# z=cfzQ-Js3@Mx#nsA7ZM$Ths!UiB3>tfFMOS$d;wm9z}P6_Q9|Z?}J1?ic)`4tL-oT zu39GcRrR!C?m+@}RaI@&s%|9Ug@H%47kzc)EuOarxdvU&S^(6sHnm*Ayu?8nBf4D% z^0zE#Gq4WQ0)H4K{(BH|^?IHor^=BgbWT2d+4*hw;$N-G02&DebIe*-)(U$?`{FQaLQlhxktRT*&2G2gA2tWjy zXJZijHH4glG+7ET1DvNYoG=X;m|~D>9Jmu?AxHp?e4^;pOWjm%q-6X^BA^Y8Of6he w?5do!cqdEo05i~uK5x>Tj9I!T|5cV!Une`D1mvt+Z2$lO07*qoM6N<$g7hxxga7~l diff --git a/graphics/pokemon/marshadow/normal.pal b/graphics/pokemon/marshadow/normal.pal index b234dfcdcc..c2b49fecae 100644 --- a/graphics/pokemon/marshadow/normal.pal +++ b/graphics/pokemon/marshadow/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -40 64 40 -96 128 104 -80 96 80 +156 214 165 +41 66 41 +99 132 107 +82 99 82 16 16 16 -40 48 48 -112 112 120 -72 80 80 -248 240 144 -248 64 0 -240 160 80 -128 152 120 -136 136 136 -0 0 0 -0 0 0 -0 0 0 +41 49 49 +115 115 123 +74 82 82 +255 247 148 +239 99 25 +189 197 107 +156 140 74 +123 90 66 +16 74 74 +8 173 132 +16 123 99 diff --git a/graphics/pokemon/marshadow/shiny.pal b/graphics/pokemon/marshadow/shiny.pal index 2ebd257404..d77f9f3f08 100644 --- a/graphics/pokemon/marshadow/shiny.pal +++ b/graphics/pokemon/marshadow/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -48 32 64 -128 96 136 -88 64 104 +156 214 165 +49 33 66 +132 99 140 +90 66 107 16 16 16 -40 48 48 -112 112 120 -72 80 80 -248 240 144 -248 64 0 -240 160 80 -136 120 152 -136 136 136 -0 0 0 -0 0 0 -0 0 0 +41 49 49 +115 115 123 +74 82 82 +255 247 148 +255 66 0 +189 197 107 +156 140 74 +123 90 66 +82 49 99 +165 82 181 +115 66 132 diff --git a/graphics/pokemon/tapu_bulu/front.png b/graphics/pokemon/tapu_bulu/front.png index 7b6c8b6a5be765eb57cd807164f363bb076e58ea..e5f6355bbce9c8d25a169dbcf5ae870333b12140 100644 GIT binary patch delta 1210 zcmV;r1V#Jn2CWK^7Ycv`0{{R3Nw0EQks)w@1cpgOK~z}7<(9E;+eQ?JNpR5O!E$ON zXeOWIb1W~4&QeUnT^hip)K{M-YetOoevz%Z7dYk*~c z2~c$ilg7ZoJwVY>hFC7b`OE9yseyHP#udcg5Cvi)lr`~&%XvG|@BV}VaGSj2g3Y;8 zuIRr-SyynkCBWto`EB0?suMJX@HrRm>*?_0pGl|_Vm|)&{o+*k?hW8~IfpgFCdKYVv)3rGvU?;a+~m6n8DbV5j+sl@6b#T zlIiQP2nhl^PL3y!`1->n_MH(jjvzIV?767WkzWCH_sPH^>UfNUPgmWzpDh6w!-iNp{-DL#+Mh- zK>7y?Ahm=hwnmbG)(xY2RKeewX^T^Tgh2#mb@86f<;q-I6QY2@%_LBpOGOSp0O>E8v>kEs za%BdvY6#nXURa3%ezG)s9~MKSt0r$hjREPO1AeR=K($(hLsHmVky>X|7V^cR>~U6} z9_0T3V77Fv?J9MO@a5iUR0LqYa<}tWO!mJ8TCG$WJDj^MEB~BGAWy4*w3Ofn&wf@` zL7qC-PU5?j-;a;ob{vveE{0W!=YZvql96oVxC^A>=thb$q_m_3M$X95%^ZtTTG0Yk zNR$?+(25o?hQr~tR%E_Z)B~1YBiP~zwXf?e|CkvGcE8x;BfF2ib16VXIn=x~Igz(#pp(3r^ zDzGZ7{u#hYfiY()p~SI22Y9>Se3o!x`+R&;ux3es&vuz-ut2SUzxbV&*Z@CPbURjHB=Aw-=O_Uxm2Ile*m7b^0V)r??k15)J^{sg=*8pbYzyPyoHm zc@$##xI7sUwXQC(0TTLvMxq#;#@j2hA}4 Y26e?QoJ?fe;Q#;t07*qoM6N<$f?yI*!vFvP delta 756 zcmVnu~K~zY`m6g43+CUh_ZF$I&AteP> z&2}^w)hvX=D4=v{OqMbgPF+|6)lsSr{g7f9BL<(x5D9!89jR5#mXT~t*y!57r|+4N zAp8;al_ij$pP%>f-D_L<&w8S$TS>Z_mB%9h$|nF%>xz;-N&wOlpz#(e4S@P1K-G+Y zwMbW?e|qwfN%+%I^+*D)?j2M0ooZK``dS=|ne5YHM0 z4@JnrL1rM)dr1h92>h_vaR8Cj{0VEv0g7hs*UF6HSc^h&=g+IoR}^be$-eo2@wYcd zaSxX|MU`KUD^T3SrGCGjPF}jhSRj@2{VRlWeq4{|SJR2qCo#ZA3N0&3qJaJ#kVD84 z5h*mWBjsz~M=(5tD4=qU(bR_sJ;#jz%Dm#kpg>IAch9!Nz=61!VjXT1cUA`eq13Xt zKo~+`))D6{v{q^=D?|x{%p}l%3N1weZ$tDGChI_)on+Pkt%Y!T%uAU7;Ag4z{m>Yi z-}LxkKLDg20zNhBFs)jtO-hFunRP8?$*9icJ5Dob-S`c_`sixKCN-;Y@^C({0uY|u zqH)9I`)`vr8%@UAq21DqBO(EVHfb$F2jw^~r@)}*tr_`j8OK4}qG^&}$Z=7$M(`cb zOj1*#YvH>|8fMZbMVV1rO9bZT+)VoBXq3`MBG80|N(36Tkq9WW+3Yqkq*1FT16p!M msKc9lGN84UM{3nTQT_pkc^*b&uOi9-0000wK~z}7?U&Dw+C~(|ZOM^1)~vK? z)e{5w53qri+#CoyhB#7Btdo}AOIb3_9;>Y6C8v#)2v$8+0m1Yb6GfV&hlrl=UaIb) zTJab3ujw0`pTpQyrK;*7?*zQheBYb#_`Qen-NrFPf=; zZ!Jei1e$0aM9m^Z$aVdx;3=xQyX(5khzt zNG^eSA_zjDc0ndVNC$fsn29W_Dg|7Biao|yrEN1Q(4k`sdtqoAcKE9tcy;d@ABQHg z!-))V>5tde$O!`gBuQw*9XF>3qrou%%#;9+8WC{e1SoGM0k>~ze+>AcTO~;njq#BE z@^$ITfwMR`mjM?;#{Mkz1}zrI0IkubEyn6kyG}T@CHqt!_;lEM3&7xbDn0CfjIVz& zY}P;bsWUST8Sn!txQF*qkK&d|B!Kb)p^mlRP5}(k`j9nxwC+@-K&Do_{SECs9*|B` zmZWm0R=oa*_R0X9{4N2!CML%>q+@%8I5&b*hdawkO8p4{n0cNEs0glFsj9qm7{>IF zF;6HEDt6ceqF%vSyY%Hl#>AU{uNL2eKSLv6Twq67NK$p+Rmk*)0S9Qmc9iQ2S*nG8 zzvmBaJ8bRw4Dl$oIR$p98xD!1>*s8qtHo;&%t%!e(gnaV!uTSD^LBEGW5t zWMYgAtiq)C+NyUN;2w+HfEeePL;&H0xL#2(2LDt4SsB-#9N~tfkST|MP+S__vQ_ee zj)to;02xOBlurWLWq_KGP;ml)H%|syy{=VmG1*HI1K;@1EH99~m~je4)_Com1kww; z09+3;=qQOmU_lj=rw9O)zcR0bSngLe%kmx(LX!M&*l^w9PAkafQh_<{7~ z@p6AL1tnd59idcW5!oUQG}%c!c*s{@o;5 zfY^M>IZugThn05TuO_94AjH%-O#?u}w4av}BSaGKQUPSo4#Zl2xe4S^p4sAfpzHen zYCY7;Q?dm_W>JteTtR(n$Y)Qf*!4Bh$}k4d?;Rc z`JWU%q_1Nvy3B?IG$zd*i8F+@>8~oB5K0N&^uq#7sZc3!9Hp}q-tBN2{?zyWzosaE Y0shs^jQw>B)c^nh07*qoM6N<$g6WPibpQYW delta 766 zcmV#THjMfAd*vmLRpqMwwHZ01Fs%j&|cp?rNoCVrLz zU@%eO;k13eJ{k7_P>uoEYR!OwpW^#u8F2Ns`E{H(owx=Qt!bj(KX#9O=*9Y>2^b_w zeRtz=SEVMP&>G6FQo-KP&(1x=J<+C+N%stZaqryN?4l^$OWMI*A^lH|Z33Qu<7&9^ z5XX{s9c}>7ON=9Or~e1Q=G}K?JC=dJW(11O+SO;gvOVTe+hh{mYSu13;FUT6J6{X{ zYg694|kD=G0JbI** zKKWMd4Dv-e1Ey8gp_)m{ho?|~jFU764bu@}a;(2K(C!)FfP~Sq<=0u2L z@+S3M01j7g?1&f^ix`fd!e!*_<5VLGxq=L~RqBRf7J7{$oT5BFAwkrF^i;nF)HtMk z2JoEF&m%-B0!<-)Ku$)?WD$m{RxB&97Jd-kP_HpW{Uv8`m5)Akec(T wKnUC7oG;5mvtis}rqS|%zk@c=zYTnxbF#rGn diff --git a/graphics/pokemon/tapu_koko/front.png b/graphics/pokemon/tapu_koko/front.png index 7f9a3f80b539cf2e905d3bf26654b243504b6080..f98c83b47155113f99204f37f3083e040c7c3c70 100644 GIT binary patch delta 1331 zcmV-31`|j zBs=a8+GCseSKb6w)h^Q>4#>_Y-{*PXSFu0LM_2lR&l4-31|$~Q{9J&QSZO}6Apo#{ z`|TWHO=5P{nJEdxu1UM<0W$~4r_@kDVlfV&gHkwvjR7n|+9$oeC{~U@c0~(JbO2BfZVT=z9Dr49lEu*Ahrv~X^t%8Q zkpj_@w;hNT+W>s6s)JVR#7VGC!GvM4yX~BU1abU(7w1dmJ^+1~!Pb$Ig0?sL12I>;xn+&Iw3tcJZ@e*&zK(H=zPO;n}3TNL`MKrP$T$>eAaLi^1qgT zG*1%{fb2Nn&Vc38>r*BT0iy1IvrhKE(yWN5C3fM?`6tfH{_1u@7bPe=py3#|)bpa=~=$cK=LOJHLVWD z`QLg{0!~wG>vja_a=2d40Pqfg+8aSMdPN)tFjvqWVCU%d)`D@E!*(|UFd6Pb?_haL zJyO*dWAy|VIh?~$px2QZ=Vzgw-Kd8i5PA|N3j-T2Cjfbi>A)WRG_{MH@Beav$P@F) zt=$1mE4@56ZU(~+0Qty&v+n%X0)W|e05WU=AV;5t7q?dcq+Y29$Ht(g%d*Tw>uhx8 z%kBwGKq5-GSK`Q~!q6PRs*#RUf;B?SR2O0n}1z2!_YN-l9 zvq}S;T>wCW7EMi>1xS0+wsy8f0~qJt4*UTC7&E()T9rvX1kA60?N0`h4*`tK{M+@v zKg9eY?hYOh@&}dzg#97v4)<|ke_*2k@7;9#;YHXTg68g(;}0(*?hpV@L}C^EA?gmH z@!^=+)&0YmJNU%`0iKYJyThcCkO*&hu^D%V0D$7)y)=xuLm1%U8UKD9bBFLA^2jFd zmRecE1vS*+N)tN)2sveM< p2}sFP@P{fMGshpK|E51M%s=t>bKBc*>dycG002ovPDHLkV1i-6ZOH%t delta 923 zcmV;M17!TA3y=tq7YaZG0{{R3SVwH_ks)w@18GS_K~zY`rPQ%++eQ=z;3EV98YO}# z;%+>%M$PGL%2DIAgQ!cPaw?FB>1?CN7#)R}LW&NKGsvnJOKo6MoG3Oixdt#GAGc17 zGUgBJBb7v?E6WIS8U&s`{ocDf@X%+E+AY5e>t6AFTkbGRp-B)$0K7oB06o8W1tI3IX^!&=so?kb&Ihi+jpEpwjJ z>GzSew=oZRKK}(bv%kriUOVrT^4^b(brI@g43jlXG5J(T+U&bGSpo5Tq@OnTEVlpW4bqb6H*j7L&INXH@lUX)d^A#K@ z{sO?atgGW)+UXoxy<>s90B{7;O16p=h1FMz+T#7oXx437tY*pO*U zO9M)jHWjRn0(w8OJU%_k5)Pn-_TgML4L}Gb?#0$@iqFy>Ua}$f7w5jFsAB+k8`kK6 zp7E&n(8iR&_~BIJp` znFIIvPq2#i_P5;Q+cM`v*e|@PehZUjFtj1BDy&yQ^>l&NhGTd6#iA0njSkb$?!606>it z@WcV274O2+t8)P5r)~y45YgNfIx|nO>P3@F=^N*JIeq{=N`fb x05Ej(DA`?9z74D%jV}hJ+W^wg=M04Y1H;pCMpGY}`~Uy|07*p#PDHLkV1mEos6YS! diff --git a/graphics/pokemon/tapu_lele/front.png b/graphics/pokemon/tapu_lele/front.png index 78910fd68a02fa20767752d94954df965c02f806..93a7038799d761e4e9da0810eef67c66f37e0c63 100644 GIT binary patch delta 1129 zcmV-v1eW`d2Hgpe7Ycv`0{{R3Nw0EQks)w@1U5-TK~z}7?Uui9+eQ?}j~fAZuvDmZ z&@MTNfPi??$&M_vi%HrRI$7bN9J&NfsSX`oDMJTZmK;(|hQJzlQkOy<#3Ks09fFAJ zR4v{;_Mhpa?4d9p>A64NB0=xN?|Vnx-S?4yVknyrp)KJO?b;{e>HHx}(vQM?+Oo7U-1FOhxqGa|Ucsr{J^~20%5Q1_R?L zjwTC%0E=iDdLr=LI2uLEI7nBR%7A$8z+Ft$kqlj=1rL7wfPEH6MD;wZh2-O!eG32< zYe3n&cD`SKD{Q6#czMO`#$Xl8_oP7Y|Kq9*;la}CVsIVHcOK>3O#^fCDf8HWXd?aR z90Q^`SvA-i_*zQ?6S)l3*Q3jVFXcsBE8PdkND8-Dl|Rv{42P7K?E9>Nb=Bz{Y^B zDGYPfWEC2>)4m3VA}3B$wzgY(3*TI2B;1;~J}qtzM<+!@td zzyOI1>m1$@MyB^v4sEYc0wU9URnIu|N}Oj~pK2T$UMa`=65ue;8rQ&4K5+T~VB`a2 v01^)XM!vtR4*|q8aw{anLleZmF9`VyFJ!y`9!LZ^00000NkvXXu0mjfv5q0c delta 665 zcmV;K0%rZ)36KVm7YaZG0{{R3SVwH_ks)w@0%=J^K~zY`-IK9z(?Ar)FPo(@G(iR` zv2bamNbSVAZHQp0ovIld`9ubm3UC-0Az@%JZIU{s9javTB`l~*{Z2@Q0pSZ1Ub1)O zpW)iEzB4nt#g^aC-}lb`9{Lxnu>6;P=|Mhld%Kb=QSdCB3*33Jjq^MTJ2u979wxDW zD9-UHly@vlTY8U@?LFVdl|8M%>ZT`8p&!C*^kmVNZV2OP*So5>w5kERofTlkyI$v= z#^Pv202lFTx96*YuY7I(Z7qhP23Ufhm!$lg0}Ipwg7c8nKXOR?rMXgI{^f)`IT0d> z1Y9TtW=o$g3As!JX9CU@0vCcE5z-ZZ31>5r1*EE&MSW*i@M*#nK*Hy7z@oqxJmhl` zWgTV^p}_C^$;=2L_7x)p^5HG=Sa4(nfog=S%YwX?fU2&6!t%mii5SU-8!e?BCc!06lzIlofV;|OkjZW7Wj2&XUmjMhG71G*pKdp@-V&Qf+ zbb&8{ZYQl(!#Z)4!Iwa%o7QZogH=(*)~FtO-m3!wk780$<<`LVrd(bE= z*TQ6aHeOW&Eo{r}uaogZR|z10v*nUTs}7{$(tE079N@CFXvPx>D3@=5uZDEk#BtlI zJ~G^`Ue9t_v*~C6YWLo3xD(c#X!d{LZrRjzSkut}QeuNj!r4VgCn3Wo310^ogJ%s% zw2`)qW2ZseKFT5Fe&_Wi;pF#aw9x-o2>k&pL-XSTB=jKw0000data[2] > 128) { - BlendPalette(sprite->data[7], 0x10, 0, RGB(24, 0, 24)); + BlendPalette(sprite->data[7], 0x10, 0, RGB_PURPLE); sprite->callback = SpriteCB_SetDummyOnAnimEnd; } else { sprite->data[6] = Sin(sprite->data[2], 12); - BlendPalette(sprite->data[7], 0x10, sprite->data[6], RGB(24, 0, 24)); + BlendPalette(sprite->data[7], 0x10, sprite->data[6], RGB_PURPLE); } sprite->data[2] += 2; @@ -5399,7 +5405,7 @@ static void BackAnimBlend(struct Sprite *sprite) { static const u16 sColors[] = { - RGB_RED, RGB_GREEN, RGB_BLUE, RGB_BLACK + RGB_RED, RGB_GREEN, RGB_BLUE, RGB_BLACK, RGB_WHITE, RGB_PURPLE }; if (sprite->data[2] > 127) @@ -5626,6 +5632,69 @@ static void pokemonanimfunc_96(struct Sprite *sprite) sprite->data[2]++; } +static void pokemonanimfunc_97(struct Sprite *sprite) +{ + if (sprite->data[2] == 0) + { + sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[0] = 80; + sprite->data[5] = 0; + sprite->data[4] = 1; + sprite->data[3] = 0; + sprite->data[1] = 3; + } + + if (sprite->data[2] % 2 == 0) + BackAnimBlend(sprite); + + if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2) + sub_8184934(sprite); + + sprite->data[2]++; +} + +static void pokemonanimfunc_98(struct Sprite *sprite) +{ + if (sprite->data[2] == 0) + { + sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[0] = 80; + sprite->data[5] = 0; + sprite->data[4] = 1; + sprite->data[3] = 0; + sprite->data[1] = 4; + } + + if (sprite->data[2] % 2 == 0) + BackAnimBlend(sprite); + + if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2) + sub_8184934(sprite); + + sprite->data[2]++; +} + +static void pokemonanimfunc_99(struct Sprite *sprite) +{ + if (sprite->data[2] == 0) + { + sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[0] = 80; + sprite->data[5] = 0; + sprite->data[4] = 1; + sprite->data[3] = 0; + sprite->data[1] = 5; + } + + if (sprite->data[2] % 2 == 0) + BackAnimBlend(sprite); + + if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2) + sub_8184934(sprite); + + sprite->data[2]++; +} + static void SpriteCB_SetDummyOnAnimEnd(struct Sprite *sprite) { if (sprite->animEnded)