From 20d3da4dc0168e1842f2286cbe2e3a41686dccc7 Mon Sep 17 00:00:00 2001
From: Michiel Sikma <michiel@sikma.org>
Date: Tue, 18 Feb 2020 20:20:57 +0100
Subject: [PATCH] Fix Meowstic sprite error - it was listed as 677 instead of
 678

---
 data/pokemon.json                        |  15 +++------------
 pokemon-gen8/regular/female/espurr.png   | Bin 806 -> 0 bytes
 pokemon-gen8/regular/female/meowstic.png | Bin 368 -> 806 bytes
 pokemon-gen8/regular/meowstic.png        | Bin 378 -> 792 bytes
 pokemon-gen8/shiny/female/espurr.png     | Bin 843 -> 0 bytes
 pokemon-gen8/shiny/female/meowstic.png   | Bin 368 -> 843 bytes
 pokemon-gen8/shiny/meowstic.png          | Bin 383 -> 876 bytes
 7 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 pokemon-gen8/regular/female/espurr.png
 delete mode 100644 pokemon-gen8/shiny/female/espurr.png

diff --git a/data/pokemon.json b/data/pokemon.json
index 19669a3d..e8351b6c 100644
--- a/data/pokemon.json
+++ b/data/pokemon.json
@@ -21154,8 +21154,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "has_female": true,
-          "is_prev_gen_icon": false
+          "is_prev_gen_icon": true
         }
       }
     }
@@ -21177,22 +21176,14 @@
         "$": {
           "has_female": true,
           "has_right": false
-        },
-        "male": {
-          "has_female": false,
-          "has_right": false,
-          "is_alias_of": "$"
         }
       }
     },
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
-        },
-        "male": {
-          "is_alias_of": "$",
-          "is_prev_gen_icon": true
+          "has_female": true,
+          "is_prev_gen_icon": false
         }
       }
     }
diff --git a/pokemon-gen8/regular/female/espurr.png b/pokemon-gen8/regular/female/espurr.png
deleted file mode 100644
index f484659e67bf1260cf7a1a38caca8699118cb7a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq002Y)001}$1^@s6MDtz<0008*Nkl<ZXx{Ca
zv5ONy6vnr(*wWI!K(Mel3rQfDOBx{vLf{I62o~B{Nw7GSTlaRc@N7=b#=`DIVqz!A
zkqIZq1*<D<g!>n^uvo<6Id8IWGCR8oYMSiuKKQuJC42CG_vXzv8_#30SS%Kc#bU8o
zEEbE!VzF2(7K_DVu^bgJ0s}_+8(;+};2ew<fUF90eSt(__&<fM3UobTloa(h1unX`
zx<G!(LeTMUtcn^PeV0Y~(A^f`FE0?pM1U9zbsznmDnrQ?f<VONE7Wh?g8s981>|bu
z9vGbh1sD^dyQBI*E_i@SGZ^hwTlx0(iE?YREul>HYrG~fX*!=d1Ohc24yz4h@NuBJ
zV%8lZ2Lu7wK$N>%3JAh5I|E_(zF++rB7~S(13ArnlKC`e>LfHR7n~z_zY{~%22#Is
zPyj-|!=EMyyjC#A!mS)aFsMlMby+<6=KZ(Oc|0w2MXCp}TQExV#F048Ee+KP88qq$
z+Lc^A13@w#LIU$4X<ILmY`Y~u?gEi8lA6C1$W9Ozy2f1~FJ}HWdH~7KIS9P|{PGe&
zP3D##9-I$6cpk>OOI&_zpnzcUCJ+Kt24n$@Md`MBK<GS!OT*qx&fa<O<--mHK~O$F
zWY9y~ORe%y^nA#66WmGAqfbJa-nY*-n0f)qXHQk3%;UK<o@LPH5XDT=xO<>%J|>`f
z67Gf&MbRwiWv5`2>Yl0sp+H85J2Hi{%hx(^(JzOgt||Fu9fqA#Ss)nAv3M+;Ks*Wd
zpx){hk}Q56!Sx>Y<ujD2nk{BGHJeQ*cA*>$>=J~LSWnf=Xur|uDBGdU2^iQRhwl$_
z=N3Dup35ybdNb6Y!F$YQV=o;iIwX$c!jmw1eWlh@Kpwq5(?HM~1kDpifapQ_bZ;aH
zB+w7`H4Mxr_#Vy&GkoQii}5(Yr6ddWtyjt$t)7BHOUQsxnodn1uEqM?fc=L!?nG=~
knoT_Z-nZ}{XRW*b0JrAC?DhuU^Z)<=07*qoM6N<$f_Bboi2wiq

diff --git a/pokemon-gen8/regular/female/meowstic.png b/pokemon-gen8/regular/female/meowstic.png
index 994835a28e808586f3e0d417bf132622d4fb1bb0..f484659e67bf1260cf7a1a38caca8699118cb7a6 100644
GIT binary patch
delta 784
zcmV+r1MmFs0;UF#BYy(zNkl<ZXx{Cav5ONy6vnr(*wWI!K(Mel3rQfDOBx{vLf{I6
z2o~B{Nw7GSTlaRc@N7=b#=`DIVqz!AkqIZq1*<D<g!>n^uvo<6Id8IWGCR8oYMSiu
zKKQuJC42CG_vXzv8_#30SS%Kc#bU8oEEbE!VzF2(7K_DVv40#DFaiTc`Ws*cDBv87
z6@aV?bA5qCVfa6VtqOEKVU!g0Hw7-bx4J-n$wJWaZmfzL9etNY`Ow`K;4d!_#6*A?
z3w0m;ohn1g6@oy-<SW!~+=BkIeFfxd;~p5D0tFZop}V8{KrVQIN;4SkR$KY@_K9+9
zvn`=a^=rH)Fn?(}pE(2qH5?AB4P@|fpt@q#9U=z=0oXv4yITqf!Z14nVfemZ{TU*J
zm{|ik&3uyiG-v80G%XjLBY3|PL)8XSzjIIkLchbGCJ4M%Fvh~I96~UtNc44CJo@JS
zx6pY!Ep$by2eDf)O7p~#IL<8%)d?9i>ImAETs;FpGJhUI0`nnhTQ8ApyCp#G0+BG1
zn!gmtP7oHl#$6yUX8tyM0Ljle2)zFM@)AHz=9V8GoDV#B9>%&$Tz+hzfMD?^5CT*N
zWC4st>9%@6=sbf<!`@BK-g)rl!wv*NP(D9o&_mlxt@2Rxe8_ea+)2=*PePgAx6d}1
zdI8F3Pk&XR%;UK<o@LPH5XDT=xO<>%J|>`f67Gf&MbRwiWv5`2>Yl0sp+H85J2Hi{
z%hx(^(JzOgt||Fu9fqA#Ss)nAv3M+;Ks*Wdpx){hk}Q56!Sx>Y<ujD2nk{BGHJeQ*
zcA*>$>=J~LSWnf=Xur|uDBGdU2^iQRhwl$_=YJMEsh-O%IC?YGpTT>~Wn(WLCpsjK
z<HD0LdVQtVQ$QZQKGQ(Z8U)P~M}X)-`E+k22_(=D_B9O5C-@%D2Qz%-mW%N?!KEY%
z^{rRR8?By#LQBYiQJPLoAg;yw+<^UuIPOGjUz$xk{@%CnA7`z*{s6b;!tC}2-t+(f
O00{s|MNUMnLSTX|v1-`>

delta 342
zcmZ3+_JL`Fay_HDr;B4q#=W;QHs&5S5O9sHQY$|tk!kD}c0o%sIE!`NBSDFpo5yQ{
zTe?at_p!^cFy{UE&|iM-DH8)4s9$2ot>U!ib(e^^l1JA`fqeP+uYW(=ZJiQ(WLvIp
z+q`L0tZvs9d$`*ye)FO9Lfp?54OzXE`jFb}RIyFo7h5DfFYeA#lkDH7d42k|LcvL*
znzMpBgijVKZuVKw-1GbUR!+;vJD1++t#wsdbZ_2DO@2*g$=}tQOGDK(^{2l$_jY^l
z6}`PZ69hJG@|5hmwIkwuN`=#<rANe#Lt~aqn^5*4H8Lu7N@2vMUz*B+%AAVoYkB5t
zIePeaJo$0=;eLPZrT(4W6DPz)rD>WjdGTSM#C>x&O|Q8^Q(JD>-+gHGjK{55PxEg1
l#Nf)!HK~t(YaRIioc-(lGo0W4@6ZN?gQu&X%Q~loCIA`amk<B|

diff --git a/pokemon-gen8/regular/meowstic.png b/pokemon-gen8/regular/meowstic.png
index 4aaf842a2010c78974ebc673879d92b3b84fbe71..e5719f703c671e43d992a7a36e43bce192c27f7b 100644
GIT binary patch
delta 769
zcmV+c1OEK_0+<GnBYy(lNkl<ZXx{Cav1=1?6vuDq=#a6ii<m{|a&izza|mKE2q#q%
zC`AP6QY3V!1w)JmO3_7-3Z;|aQpql%rv)*K&_(cH=-|+?gTwRQ%e`NJzhAFKp+oQS
zzVNstzhroyyx;qM-(3)>R4SE9rBbO>DwRs5QmIrbl}e>jsee>L1&Y9efl??Ij0*rF
z1}G%!6S%kjjpF~4ssP3XLA@L>{t-yg8m#p;;OGy?0m2~aOWP24ClI#Zxk=4ruV)Ik
zl><@&5GSFi784W%VnKo3PrG0%Zp2VjS^U2AK$bUBIL=CbG@ig*tw}I2X;iwGg0IGW
zOuyr+I3Nh)YJY17I!{(l0r7=^5Cp^Ufk-%IAj$xwUs4JLaVCs>{r016^BsmFp*jo@
zhG7HQ|GE!@R|BUq?Db}M3IOHx92v%pljYukVONH|j#qq-mBrO1(czke846X!UNH=g
zNLXb!K$?Tk6rA*E{0pM_yQYDnN5P}n-(F&Y#H|r@et#dBL=nbn@2#mC^eANB@^y*5
z!vS)b^^4Zi1p<SW!pG^#n-r=G*|B^yq2S&j9Y_#d4+scWi46o{pjQdD5(3iv@zDS&
znr*x&zbC;X)o!r(8G^Vm+=S@oNo9Eb!`ONDC(F-2WS`BJ9}1f<PMo($b#X{h&`fFF
zHfSgWvVSu^EVq^SPY^%){XPs|4jmXb+glW24u!pm6pvyO_l;T6af?aYKtju`2{LXK
zYN9;qqtMD9XV<8a7$+OH-G0J>10oNJp#UI|++U)whdlBn8H{HyUK=NCgRtS?Z3LX0
zd97Zrmlg>9o1CaU*G$L!@3aM0dhe-P;yWD*272*eag9RSoMZlRf3!y+7}eTi0s=Xd
z6VEX_wfhzfDTAM}>T&lpklMpdxHfm|Ec4|IfTC^*@I6+4%Ot%6s9Y&b)H#hr-V)%%
z5ClGMm_CC!H&HRR{k#O}iqBqhASw@z>N4sthCxUeD_M`O00000NkvXXu0mjfA<$&D

delta 352
zcmbQi_KRtPay_G?r;B4q#=W;Q_VONb;Bkv=4t=r7$tx_eb&cam4$YbEf=xA#tbfjF
zR<N4$eTlZvr5_LN?>=Ne2lks595`t(L8#@-=N^%h68il`aZY04Zo7p;Qg2AMEu7ZR
z5j5@1qAm_+qctTqafhTme|kMD*{5e)@6-1;%{_8UJ6lZakvAK@PqW;&=F({k`**4V
zsfW}hcMBBl={1eu4D4L7{*CLgtT$d>bF8E<tIb^!8X0jdLUZPvdwG-g_RNY)RPyOC
zI)1vty4z1pGj-DshUDhC%T}J``aidRx~8|6L*bJwp5G6ugVl3yM!0!&i5cl1vj6V4
ztu=D3rl@_H>dWA=l3%`E+>7$WR-_*Z%--vo68rM?T#q~M_gHSFcpUpZ<!Z;>h&{91
v=F}~{|Ks>-j^3wVwEv1bF59oe^rLv5Pt~mDLTeVQfI`L7)z4*}Q$iB}J$as}

diff --git a/pokemon-gen8/shiny/female/espurr.png b/pokemon-gen8/shiny/female/espurr.png
deleted file mode 100644
index 7fcb6c7893183ac4a5c6ee1be1c9f74abfd55ab5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 843
zcmV-R1GM~!P)<h;3K|Lk000e1NJLTq002Y)001}$1^@s6MDtz<0009LNkl<ZXx{Ca
zF^dyH6vyZAiY+bu3U=Dvffy685gP+GwxVC)8nL*zmqo<Z#>)DL$%&vKM<%GCh@zzk
zf_{V*6c#z;Id68~?AzJR5u(iuZ{g2wc4tE7m-qhjW>x`!64eq20z`la5CI}U1c(3;
zAOb{y2oM1xKm>>Y5g-CYAP5ivB0vO)01+U80_iw9Z~m_%G$2qM*_-P^ftY|;82<od
zrM^J|8K>zwP*wsO3J^D#jzO&gXIbBHf&4ZDL1lZH9n|dbvw4_6o-0Vqb8}W)AD)!L
zzIvfS&$aDG-?I!#2tXPGK_GhZ3bxN*hN8G_fjqe7qQuI4RwxH!p<Q%@4`dTh<zNuT
zpg*ue5U48`H{3Oez!XL8IRpZa>2w-4kjdkTjfyflbOXpT4To1P5QM=a17Rdd626CM
ztxK&4gdzz=>4H9j{i85dAISTIHUzqdXAT0dEsVL2s}3O;G)Mx2LSyBT!KYbDwb&}v
zRy}d3Up7+1MnVORB7$Zmnth@JlFz4*Lv512T#8iFEdh!bh`E_>CC38U9i^?Pi5JM-
zQtxIrApco|!0YGtPXTP1ZeJCAn<%)GW-dx%1>&IK;5iTi)CI(=UX`~7YM5=1KxjRK
zso~EipB^cAvA+wW(WvDg7KkbIP=2Zrln{Z~-|hUNnoV#fLCp@d6+QRYHdyrnbbC+9
zBgB+p#aREsz>1qF)+AJ)Fz;}FlJ2E29*@gHuUZ9L5}N@7p#dX|uCjgS`Uad#Y?~Gg
zdrg&Z6=4`T!2+QYov&%|-gbZ3s${ACwVOL;59O`(79LH#UawKb2JIm{Z4gH8?W*z8
z{_MF+R({dum-N9#$j7HA8tWErj<`nxe}2Hx_cM((4^JCEb)txnEX!IuVe}b21cChe
za=H;I4g~p03_!S1zIkYx6*;`#uNQt;pWrj}2VQ(N(uHj&1n(gTgrMNR{_I}4{Kq|3
zN+E(lZK*wp0}0(j8oTSh!SX@V&O6tV(p^OZgrE=%|24!hK%!aPt^M9MikID?>o0ec
V!?ip+7F7TM002ovPDHLkV1jZhZ(slb

diff --git a/pokemon-gen8/shiny/female/meowstic.png b/pokemon-gen8/shiny/female/meowstic.png
index 996e0f03e31d695a42e03afc9d939b9939f78423..7fcb6c7893183ac4a5c6ee1be1c9f74abfd55ab5 100644
GIT binary patch
delta 821
zcmV-51IqmH0?P)FBYy)DNkl<ZXx{CaF^dyH6vyZAiY+bu3U=Dvffy685gP+GwxVC)
z8nL*zmqo<Z#>)DL$%&vKM<%GCh@zzkf_{V*6c#z;Id68~?AzJR5u(iuZ{g2wc4tE7
zm-qhjW>x`!64eq20z`la5CI}U1c(3;AOb{y2oM1xKm>>Y5q}^8L?8$d0U|&IhyW2F
zfdc6`I&c23BQzjT9NC-eLV=ioSQ!5RWTn1A0vV_2I#5;u8VV3Mn2tfM0%uv@aDn_b
z13_hbnH|*Z@UwZCK%Of|%yV;ATpym4!oGT;LC>}AN8hsyN(ew213@5q@d~!jUxuQ%
zZGk+v<)XyOe1BFb2V<dKbc7FN6Hnz}5XPWCutE^1D;GE1HHp9!MeR8R0*~o*8a9y0
z<B5%mGCFhv$TAIwS1k~P!6O4<BuNs!hiI)!tq6o72}S9GK7#$DFjXJO`-3(Fx`$^D
z0<SHMxsIz2As94B0)s+h<&nXsSxU9oD%Dm!aj0K5Qh&onLIsT?f@UR}eWC-B&!><>
zZIZrRid54r0g4xhxtVVz#{$_MrLCxm7s%aG?`Ah3|5<~;>*x1R0c@FWUln|tD7cem
zE=pnr;-KK*IS>NW1;ndfmA3|Jm~D_iXg!0e;m;<Y9w~USzYC+$sO29Ph$-|?eyS0a
z5P{g=?SK5CnoV#fLCp@d6+QRYHdyrnbbC+9BgB+p#aREsz>1qF)+AJ)Fz;}FlJ2E2
z9*@gHuUZ9L5}N@7p#dX|uCjgS`Uad#Y?~Ggdrg&Z6=4`T!2+QYov&%|-gbZ3s${AC
zwVOL;59O`(79LH#UawKb2JIm{Z4gH8?W*z8{(tPbOICi-=9l!rM##sfCmQP(ZjQJ|
z0)KwM(f2crH4jf4KXsyrkSxnuJ7M%0Jp_UL`f|DvDGmhrNen=^QNDR-niV;`-me#a
zSfAiC^aoyiHPVG`Cj{>y2!x>Ezy9oAx%|gHR!Sj)L2ao$i317ULmIp5zQOWA)6P5B
zk}lF+MFWJO5Dfn{#4$jkS=_Dt-ZqMt-J$C*cay`lJUbRu00000NkvXXu0mjfZlZ7c

delta 342
zcmV-c0jd7W2JixqBYy!mNkl<ZXx{CZF>b>!5CmQNP3~0XX=(JGlxkD*3Hd^rAT5KH
zeaxC7RHVys1~>=;+;FhRJL_@*0000000000000000001hKT;nB5+T-gMT!d%B*kQi
zkN21Q{q;JvlwHKOZB2%rmXtc%eRD`hJfrOJb<ke<geV;@WPenBYh@O)OVNZGNzuD%
zCK>m(Dc7ggaS@UgDVkD<6UlKQvrM3ajL)}g6LPY+rQKaxi%3MhJyKKdQU)^i_fkr$
zOj4dM(Vg3G8>wA-86hELWs@=-wQ;eY$?$}vONlRLs<=okA?@JHvb4%5<FKUlQ%0gj
z5<*T|89r5lkWUcF@w>x+pH@nr5*H&Oy|m0yYDm%HJu$v-j8c?3B`OKAf4akE%o&X4
oTvEF4BB%0Z`O3!kRe=A`57HRxTB%d#g#Z8m07*qoM6N<$f||XWdjJ3c

diff --git a/pokemon-gen8/shiny/meowstic.png b/pokemon-gen8/shiny/meowstic.png
index 790e761f1e4ee28f037e59837a68710e3c411689..62adfbc4a32e028d606ab6102e2a73f81400df8b 100644
GIT binary patch
delta 854
zcmV-c1F8J~0_+BmBYy)kNkl<ZXx{DFziSjh6bJATVrP*ug@1sc2$lzdORfwN<iy4%
z#etnzq_`BGXEczAmA@NHMNCNS6vC}JkPE~E8$|@|0!pyBkmfj2Joh_$Z+CWX?~IV<
zt#9CEb2}VlK6yLyX4Vjq(MUoO6huK3L_ripK@>zm6huK3M1MgPL_ripK@>z06huK3
zL_ripL4<;2w9K2w)ue$CMK?)7`WVLmGV=Q(K!{rQvcGSr(}^Pb+gs+SVazxoT-0>G
ztPHUjM*-ms@b6V?%hWlf{D3gTmv@GKelzrOBRz047JeQx0|WLmD-R&?fOd8a6(&m-
z1t5%qSY2Bsw||wUOO%ya{8>CmuXm2RVal&>ZqtRy8H<5IqXmtC{5CyRvftxtu0Yyt
zV==08hOS<l9{}+ifB=EOcYTno`A6Iw@@T<O@IJ5sh@lw${_k4}7^4i!4v`>?;es@`
znzVR#F_jr^e-K33h4!#II1!5l;nji%%X0(5%?!8Sf`5dcky)HwqiPp%AdJETW)zzh
zjcg1Kfc&kH6AOX?x8Ed#Uf=vmg{j$iH9?JnrP+VHatqR03s;)opW=Z6W4`tv&KlGx
z2<~_5m0W`S3U6M#afMFYtk_IRD$rSKJP)xt+cwaL$Tf)l!_OECf-G@CfPq@YJS|(0
znfA*VB!6pf<A!Vy6aDA+_R<q9?g8Tb(mg7CejI0pJAW_$FU7d_dS}CX6C@VIU2RZ&
z@xb{J`S2<Ve==pr7_g7ByL&qPxe}j|h|Caw1@WU^uhY_<r4$CkAppX)iCd$H&kzjU
zFU+!*TX%Bha6!<Y6m9}R_ynwbm~8dYP|A11>wk;oq>^<J+$_Qd5y2(BXb{{gU!Jq!
zZu0OuFcxm#k1JUhf?<GwV+8D+xvy9($^_v#1cUPTHN4HoBXGU;%x252ilMhpk}Ubr
zH1v8U`*9IJhwudH2G=E(OU8mwA0??fCTzLyVu%NE_ceUR>Vp8QTuK*TKB$i&8iWVN
zXHTsDBXe+YlEzPE9t5RUBk`5$umSS&iq{R%JD8DY9|M^q^;PDmw{g+y3hZYhkpJS{
g?!VyV6GVFa0am!|EDd%C<p2Nx07*qoM6N<$g4*YfiU0rr

delta 357
zcmV-r0h<2o2LA$(BYy!#Nkl<ZXx{CZy=}ul3`Vtv$5G|pWfn@KRXl=9XN;_nCU7f*
zhkOSfb+Q6?rrratkgSH!{KE|c00000000000000000000yvTwAC&NHW5Him*QY7R4
z`&rJPkj0hJ;RIC~cE)k6<s*WWCA+91!jKFr9gml=At_(Ue1CtPmmVg^ezT)2Izj`k
zLSlB<d&?YOR_SGY{M<^Q%7kY!4k6@pz0_bOL?xoWaugY>u`4NY>g-ILbdpwOVOe9P
zWO91DN%k^odWDHFA<7&tBkn9ZnWU7-;scBgcABOpEBtr<U8XE40mYH4G3<lyO`Wu5
zV;LbSTFATz|6bfX*%r2@RQ%YLq-WXD={G4Zh`L#zo)Jf_^%jwJrLT7)aUa<Tw8@Z+
z_bICpyR&#TjX3>Ezw?h*5gN<sSNeYhnf|f};LUjePfg|wK}dd&00000NkvXXu0mjf
Dy-A=Q