From efdc52167b84ed6e3bb460ee634bf4ec75a095dd Mon Sep 17 00:00:00 2001 From: Michiel Sikma Date: Sat, 13 Mar 2021 17:14:34 +0100 Subject: [PATCH] Fix Razz and Nanab berries - the original sprite is still current (3) --- data/item-legacy.json | 4 ++-- items-outline/berry/nanab-gen3.png | Bin 785 -> 0 bytes items-outline/berry/nanab-gen7.png | Bin 0 -> 822 bytes items-outline/berry/nanab.png | Bin 822 -> 785 bytes items-outline/berry/razz-gen3.png | Bin 798 -> 0 bytes items-outline/berry/razz-gen7.png | Bin 0 -> 763 bytes items-outline/berry/razz.png | Bin 763 -> 798 bytes items/berry/nanab-gen3.png | Bin 318 -> 0 bytes items/berry/nanab-gen7.png | Bin 0 -> 661 bytes items/berry/nanab.png | Bin 661 -> 318 bytes items/berry/razz-gen3.png | Bin 325 -> 0 bytes items/berry/razz-gen7.png | Bin 0 -> 643 bytes items/berry/razz.png | Bin 643 -> 325 bytes 13 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 items-outline/berry/nanab-gen3.png create mode 100755 items-outline/berry/nanab-gen7.png delete mode 100644 items-outline/berry/razz-gen3.png create mode 100755 items-outline/berry/razz-gen7.png delete mode 100644 items/berry/nanab-gen3.png create mode 100755 items/berry/nanab-gen7.png delete mode 100644 items/berry/razz-gen3.png create mode 100755 items/berry/razz-gen7.png diff --git a/data/item-legacy.json b/data/item-legacy.json index a79d3ec1..9cf028c5 100644 --- a/data/item-legacy.json +++ b/data/item-legacy.json @@ -6,10 +6,10 @@ "gen7": "key-item/tm-case" }, "item_0164": { - "gen3": "berry/razz-gen3" + "gen7": "berry/razz-gen7" }, "item_0166": { - "gen3": "berry/nanab-gen3" + "gen7": "berry/nanab-gen7" }, "item_0442": { "gen3": "key-item/town-map-gen3", diff --git a/items-outline/berry/nanab-gen3.png b/items-outline/berry/nanab-gen3.png deleted file mode 100644 index a269004df430815fbb708419c11932f9365a570a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 785 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh?!xdN1Q+aGJ{c&& zUgGKN%Kn5&kWZa^%G+z63=B-7o-U3d5r^MSUs(3oK)^Nr+ZX0dI;pZ6n{`hga+;nR z$@^Klt&Q7Te3wp|DNoLf!#XcEO}Sb>f%V*pAe~4rvvg-G4fly(?%k2}pL4Qq|8djD zw?nV)=V92f^Fi$KvnD_1vwUN4a8XdIJ$w71xUz#w#;T>ico=*yZxB@P^`7R?ns+2U z=@Wl(Lcs*%`m^;)LW`nz|39pjU|h(@sJiCr?$du1TwE&7R!b$T_^B?K z&pnaGwK*T1eKtGMu=S@g+&Vk@4NL z%FaK@i_JC&_U*YLAt`Sw$jp??=5yz@ocXKf8wWWSUt4LTmcMI7=$-6_jte&WjM7J= zPX9_a);Jlq?cA={4`;P3TP@`n=)H1QU-d!pbAe}WF4xZvd78IFu}Nw2nP(@ueZ$*s z#?0jCytrJUHd48|>V@|K6&+R2wBk9!W=vf5-@YtpS$%(ZpUac|AtB}K)Odga5pmRT zRZ;t*se2`3?_3n0|Gv4X_n%Jxv;`Td{trF2XqE5i&u34cb)fC5ltxtN(GZF3D&t#6 ze*TV6m2A16*`R(yNz6@BEI3h=ZOx0uhV6@_k1Jm7@JaHCI9})Vt)W^-D!D@R_yUd} zb>-Qjsfo+PXZ@YQnA+64=FyE^CzWJ$-Wew>EtGlAH9zUVf`_}Fha~o05TCS}wWjcE zy<0rnKc?$md?#nj5PASiGpZ%75hW>!C8<`)MX5lF!N|bKK-a)X*U&t~(8S8v!phV@ z+rYrez+kS(2Nx6#x%nxXX_Y_?hL*Yp7GMn)Rt7*lrVtHB9vZ3wH86O(`njxgN@xNA DUzaz| diff --git a/items-outline/berry/nanab-gen7.png b/items-outline/berry/nanab-gen7.png new file mode 100755 index 0000000000000000000000000000000000000000..c9d544b0694ee3fb8f7f2f71bdd91b7f7b836c81 GIT binary patch literal 822 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh?!xdN1Q+aGJ{c&& zUgGKN%Kn5&kWZb5tJC=v0|S$lr;B4q#No5kb*q~VL|Xm7p9u+bi}Q@t(w;bVwM*DL zeFgR3;%eG6U6iytrHza>ZJNaCA?4)MSX&Z4^}@3~md__$aE-lQkz#8b^4Ffh=KrBN zdCR)@mn>joP+}5nZKxAvaA{GBcAnPB`>~v1*AkI+#&PO(ObgnS1G>DKFYbD9-FLh_r+7ZoNHec0{G2 zFVv+a`P7Do+5&|hngJ==#rs9XkNozRxy)@=lbTehEz($i;oYmt-xwGI3i%k=mTZhv zxL5Dwb+cON4o3~cR_$k9zr2oGe$(HmTGISMx5j`;=}=}hL;9L>e~nbT*T1WLyb>QN zJhE6OZe9GoPvQ+@_#M$Wx8A$gS5@AN+}Nzuu&K9YMJH>3gqD88xpUj@h+QpR%hD1g zs~)kDnIYvwbi+d~H-*bQ9Z}+|-f4YV)f#l;n6+`5^E~baE_VD5{yV;OWF?-9P?j@f z-qEvT=d&Kg%HV}+d-xTmFn#Y~+`+m1oy3lg)@9ssCl^;QP|xY)Ub>;yw&L+D;e$-q z+^z`A3gy3!;#{+N`|fZ2ZUQ3PTNq1@zO`_>Q7`@==E;MpcW-WA_wDGy>^HC28Les` zWZNAV&E2~<@ou!O!5_N|mcn1I?Wwu>^~l>=Ma%u)`R43oU~_7g;K+9W)AvK7VV?9p zVMELP%m-3FYBI=jY@gF6t!pQGz@g>YETf6*R=#i9?9%q?;eTFvz7MRrH=Ms3_x#!d zOjxQVt`Q|Ei6yC4$wjF^iowXh$UxV?NY~Ij#L&db*uu)xK-<8;%D`Z*$Ojh`4Y~O# lnQ4`94F+Z*hL%yBK5DoGXtg1i_44$rjF6*2UngFyrK12Wj literal 0 HcmV?d00001 diff --git a/items-outline/berry/nanab.png b/items-outline/berry/nanab.png index c9d544b0694ee3fb8f7f2f71bdd91b7f7b836c81..a269004df430815fbb708419c11932f9365a570a 100755 GIT binary patch delta 605 zcmV-j0;2u429XAkeSZs-?bb;E00I?BL_t(o!|j)$cH=M*MPK&x1F|e-9VoLc%fdpJ zWmygL8-|7pOBcE-rN~aoXLK_$2H^I zRn@-?0Jyo}UB}Hd`JV*#06;__B7M!<;TI!7L};p|`V0U~(|@oLCyh&%K!t9^XJYaX zb6{|gGk?v0A`+royZ^%`U^8(J0VS-}yUY9_L_~Padm3XTP9>n4O-Bs?wUl^F-V}kY zZ1F=(v6U?VAkAtvVHgM{U}T-85t7AR2?IbR1hTXfWkCSQ(rENzAAtex=6Q+yW1}{( z5stjr7#SZu5q|>$V+Ksz>mE1igV@0cqt>ZBCU3f^RorWUh|oMQ0UO0y%lcz8D9Ki~ z&bsU2nuMmS8bMJ@shW;^!57X^%-N?eYgFZKxFLcflg#GGi%nOC*<6_jiP5JZeOV)W zdgx2QBrGLKW^41Xg)L|DZ!s&a>-mAx5V+|d`G z?}KuU{w$A{plD@J;YhS9cesyl2WOhVhV>dKT8YI}7;Abn+Qj+$Uu7AD-)Vp+*di82 z85UDv6$Y&6fq=K78^cw{|2RQ*2yJpaO+ zZl;UBbf5+RA_5VGfPNJKM1&$+LzamR@pk~aq!g|*UMGG6pnrxVP>M?f(YoNo(E(X} zV;?X-)B;jUb6sR>5OMQm+MGJyLED^jp90ft0B}qh-0Q{#VIX9gAp0mlL^i}EfR0r} zgk#FE;VTevNGVWcD|5dT7sUHd9McOnd}U&BD-?lu(C+Hf_5c7-aSi|mq_J5b-hV<$ z*?SV)2z&swD}UyS`bxz)_Ajv|bc66Md@uqc!fAT|XRLQmC}lqD`+7`DVd5a-IHngn zbMKBA>;YHY6<$V--Pfvl-dVAODuA+$gs6!HP#7vNfX>dg+!ob!tptQp9Vb|^0{~>m zTY%vTMj+D+h*}q_?ke=Eg;LnYJ2PfOo(rHvJ`X@oxPSDBYGKY;BOWmWxQw{D=8PeE zQ=ulj4IVTjec)?8#}#e8y zEj|^%K!oO+GLf#S?}W2NhU($}4Id8h1ufV^^)rn6w3DL(M<+5cEif`IFg8>%IXW;l cIxsaWFfckWFdtY2B>(^b07*qoM6N<$f>*^8;Q#;t diff --git a/items-outline/berry/razz-gen3.png b/items-outline/berry/razz-gen3.png deleted file mode 100644 index 1d333981f06d65843bb9b78399c66f89b7418bf5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 798 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh?!xdN1Q+aGJ{c&& zUgGKN%Kn5&kWZb5tJC=v0|S$ir;B4q#NoHob;}n!h_uar6KS~Pn4sl0J+YJi9c$L! zDeaAkl)QOgp!4>ri6?qj%W~=!_MGlYRC8csnsaw@SDf<>o;~v4&$){||2(t$*!JCv z>IHxBu5`4YIk9?$}*u32VxC0RnOPw_-X#$^Mu__Q${FAN4~jFP12KB=s=sUbR}!nd2YMJayCc3S|b3$d6ytX65uxx_fEyjai-*>-UVmYaQo*!TDD7(NiOESQi&P^b7kh+wXCiuPpw+(c=}95 z!cvF)()GV)^H~&3l9(BB`*A66$&Rq+Ys&LNDh(t48>(h7ujyrT7gGc`^sXiMz~CR6pL@P~ZMs{zlu9FH1ra87^h~> z#u*hm%r<-;U?r_1QvN^wgX@ELEdQ9!9#L?;&~WS~FafESxJHzuB$lLFB^RXvDF!10 zBLiInBV9xD5JM9yV+$)&18oBXD+7bMA|G5(H00)|WTsUDH5gjz8d!ieSXdbV^_W65 U9C>J{3e>>h>FVdQ&MBb@074Z`LI3~& diff --git a/items-outline/berry/razz-gen7.png b/items-outline/berry/razz-gen7.png new file mode 100755 index 0000000000000000000000000000000000000000..30d7ded96e5d12ec5d4743298d28ccecf3c0806e GIT binary patch literal 763 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh?!xdN1Q+aGJ{c&& zUgGKN%Kn5&kWZb5tJC=v0|VoKPZ!6Kh{JEg7Zx3I5Q(u8-DsgTKSy@r)QKLiGGbF+ zJA_@kx=pA%Tjf(q>L*V1gRVmEt`+6eAD@VA+h({&GVRd8J$JY7-s#Qu`>$N>wb1o1 z#F-e@{a>+Oa?QbdjSbuF6qLkgZWhVNO<`bSxHQMXWkS$4GhWpMe^!Q7mV%0Bzvi!= zu2r#0fQc){ZrN8a#fj5{1d|FB8*;-EO?nlM1oEegHHic~*!(h4)j5VC^T>g%LbrYV z&s}fh^%Ht1siD%aW+8)8Q^mChoBLNJI?fVqamW^H;(W5yCFVu;=A43kVoVdbZ%Q3$ ze6Dlh-+fiy2NfP&XOj3-JbCSAxpiH6SDoBsZTvv>!iV~)isDR#lU~@!T${IoE&aXo zfy259|GBqM`8dJgHp34Sv6t7R46`3YoetD;@yux9io7}J%DD#TPhkZM4hsu<=lP%cx?$qCD{%$$SsM}$U*|P-h|F3S zaB{a$#smw-8!xW2+DvIs`Y7E{)@sK;hqq)^RlVU(ffsWR@aw)ci_H385eiHlswJ)w zB`Jv|saDBFsX&Us$iT=z*T6{E&^*M@#LC#h%G5yHz`)ADV6Mmq7ZeS-`6-!cm2eFP fW+8@_Rt9EP2Br`V@)4}6Kn)C@u6{1-oD!M_s&Na=ku9+#<#noe-Zc$1it^n zZ-u&f@xKTJr;e1;|JGW&af2kL67axXFexR^e{4=E`@BJ-*ME)0gmvKD1lGIAUNb?O zA3gZ~r|~aTdC_zuNMeiwE!8@&32aYS1C_GZcq0HPS@HBHnr=)kK~Ob-+!(K3?j%Y< znHl1ZpvSk7uf-}&W15M#ol8vXE6oTiw0+W{#hDp~q&_xbw1Ny?U` zO)}IYlL!FF-2>z$@!GI|hvy&IhNSeQRAB(qvVH$k^yffZJex6_K}C6^4|{M^(|tudefBVrVn+ zE1^o3tq0EDE-1jOuKf5;{UAy92Kxn&gnt45Nklo1N6kIwLu{bK9Y#ou6kx1%jU1aM(R@T+F z5{qjj@?>T52`9lt5=TXNcbDVHU52(XycuS~!MxqKySYmS`~4n$)>W_Q7XkpT|ERAS ztigXMu(v)SA{Uvn6liT^00IEgoIpg7Qnoe?C16hl0IE3=A%D&FZ>yIoc&ZQr3S2&> z^-3X;mr@a8a3O$gR$(-aAjDA*XBL7KP~fxaVI@Oc0BOX)wG!J*PtMnd4Nel_87L%x ztf2rRf_T>8vyZ4@L7EeUKx-C)3FM_jTX!5 z!xIrpZcohhu#xuEUT~iUfMLVe4K+YnYOYYpyAo)SI04w`*9AP3fFki5fOdsG51b8j zs(ODhxeXBLoxl$*?KW9z|9DlCumVRXGB7PLGA%GRR53X^Fg7|cH7hVMIxsLFSOp~j O0000P) zu?@mN3`H|aR-t8tjF1&5Zv{$9Mz|FyDQPo8RygEH-#8Z=fzC+;I!hJ^MSkzT6OpE= zRqLOsZQDe>8$69+>Rm*nfE3wWg8FgmwvhlZj~o&ZahCv4#!WDp!1Z$EPii*_8bkvn z7$*f(%D4&esbk=wQUsj?i=PMv58>4@%tR1%z7ChTC)l8LoQvcuaf_Wn9|*{suQ&z3 zPu(Hi`(95$SqHwm2oQXBdM%B(Y&QWplu}TWPz30@VmN@5!XgO+Og)}^KLG|Cr?h@| z5#XCo8NMp~-5M;gjNV<~8?YN(NGST7;9YW-|I0g-a>d#=ipDEuy6CCU>0@tcQSyh+cNx24rGGE`xVY>wUB#CPf(5w%K z-O21RxC(*o?!6{)tU|OBqyO{{7{JJ-t!>D%nNvlw`xl#=jp`q*0Knz%=ZWxRZaP&6 z+rXI!Y_L`NZj%c}1-_r%2$=$wuWx)92rQo7D$sYq#@gZy+~nLASgGY@{zF3)i&q_u z2nu8XuY_`Y9~LTUv>-*G?dU=4IL*Hhd3s#<#TE&_-k!u-P?F(nqJ3@n?25wcwr^{I zT00mi|F2a+B8{wlfNByW&;d6PoB3+C1sV-+Y5&ufue*MfaB3(Fet`QkwXvKCfmLp7v6pbf;9 z5+fi490$e*%93TR;E;3#wJlDE%yOl~qx~mVlz@U@5eRFD2S%yDJvplw>jNc5V6@!) z(VGy)X#lg~z_k@W>vzGb5&EU(F#_JF18O^c;BJqK+^tt=$?{{6B+v^U025$tnWKd5 zKp!AU0-O9*X8YrvM>pw^tH4c$W{-V}!0{aP9X>;2bl{ZU4r;ianx`Hj^V4sFJvj vhmA`lbqHheE(Yrh_|g9f`(mE8_C??yBKZU3J`euN00000NkvXXu0mjf`B64E literal 0 HcmV?d00001 diff --git a/items/berry/nanab.png b/items/berry/nanab.png index 089c47328598e36196d55b7cf69c73893a262921..66e75bfabeda08440466e4b63ff5a66b5d314246 100755 GIT binary patch delta 292 zcmV+<0o(qS1-=51BYyz}Nklu?@mN3`H|aR-t8tjF1&5Zv{$9Mz|FyDQPo8 zRygEH-#8Z=fzC+;I!hJ^MSkzT6OpE=RqLOsZQDe>8$69+>Rm*nfE3wWg8FgmwvhlZ zj~o&ZahCv4#!WDp!1Z$EPii*_8bkvn7$*f(%D4&esbk=wQhx-U1B;&s1`pxYG0a2| zb-oUlxF^`4bexOiD{+gRK_3Xno3A(pz)#&F-TPioL0JdBy9f|`c6u$1xNJ88Ih0aR zlTZZcx?(thl)@qj157=hdp`jN8>h5>cM;&5PZ_={{M{NXu#Dba;2W?TTuMNMKo%6> q)&BeCIyMDsX&qQEA+>7#Y&`*ya`1but1{mJ0000=ipDEuy6CCU>0@tcQ zSyh+cNx24rGGE`xVY>wUB#CPf(5w%K-O21RxC(*o?!6{)tbanZ5~Kh04j915rLAqq zvYAswvildCn~mxptpLE~@8^l|V{STC2;0D!2yC!b`EHX7Mg_i~-3XZimalJo7ziw$ z-YU>{!N%I+4cz417Fem}W&T4$6pL3KjR*>40I!5{dmk1mX|y0kpzY{E>p0E75P5oB z_{A0pzuun2T7OWI;cTLPZTRep!t1tgYk*oi7%Bg+RY4++tbKrL5+l$7HxQfw9^cj{ z{O`WL@00vNidcfqO=`laSE0^X+s zYCC=4ZjXxGtygHt@?(%B&_6JTzcqlE21A0SBroBUN~`{SKQH|db8z)gl`k9~^3 z@f`FWK6XQ6bl{ZU4r;ianx`Hj^V4sFJvjhmA`lbqHheE(Yrh_|g9f`(mE8_C??y XBKZU3J`euN00000NkvXXu0mjfEtNGe diff --git a/items/berry/razz-gen3.png b/items/berry/razz-gen3.png deleted file mode 100644 index 9b4d8cf042b62851c24e489649604e4741482fec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmV-L0lNN)P) zF%H5o5CroSw<#$p{f&Hwk}vRtyor*Mk~U}!Yb_Tel$=fFlU61tC9}7&6^5Z#uU-`^ zgs@P5hhaV4V^W-BI}?O1^O$s<4vWIa>6leLjRd~MB!DRzz~lg9RG6Q-Fv}K4IsdTTLVmj*Hxld0}9r@eeaO&50?QzZS1)x`+?v~ z99K#0Hh~-UVJib-3}C8?0m8WfHTse%Yrr1U{byb#%(089($s3g6~B$x#%^JyM5?@h zKJZ)gHgfH|Pk}~kVZZur1Db>dl%R~f8hncZg*N#Lmf+Sz(?23QS@Vgvm>GKY>gB8_ XyKap1TkhEz00000NkvXXu0mjfmjRC2 diff --git a/items/berry/razz-gen7.png b/items/berry/razz-gen7.png new file mode 100755 index 0000000000000000000000000000000000000000..fb20fba60d648d910d42e285a719eb193d13460f GIT binary patch literal 643 zcmV-}0(||6P)sY>PT~Mpi+qq&rF1!rRsuwPYocLx&?`VpV088c-o2^Hx|RUSKnd3urG6w~ zCIHECYZ(04aN8JMeGiVUKZ47G@mr9(z1BD2!|hCdkm>h`S}h{n9QB8R)cfO9FeFg$ zw^^&z3YJ1RtA8({`rC}Aj+Fo!&*}I`V*3L}mrofufZv`!OyEGUm4It5^_MXa3l7xi z;QYb%mn+RzAL+zCiGO&+$8@{&(ZqD|MNjF=iBuoTwLj^~2V!*f| z6;S&E>l(XLRt00(t5}+ku6v}(FOHhxgV5DG1t487z$pxu5g70`dbrfavkH^Dor@g`MF= zlqTHG3KGi>(EQv3OKv4IZ!9eV4g*BW;JaHB#^8uqZ>{GsmN%i_t<4pK#@Cm~V0stg7tZ@JU002ovPDHLkV1nUFAt(R< literal 0 HcmV?d00001 diff --git a/items/berry/razz.png b/items/berry/razz.png index fb20fba60d648d910d42e285a719eb193d13460f..9b4d8cf042b62851c24e489649604e4741482fec 100755 GIT binary patch delta 299 zcmV+`0o4A31;ql8BYy!5NklF%H5o5CroSw<#$p{f&Hwk}vRtyor*Mk~U}! zYb_Tel$=fFlU61tC9}7&6^5Z#uU-`^gs@P5hhaV4V^W-BI}?O1^O$s<4vWIa>6leL zjRd~MB!DRzz~lg9VH|Ng57(;P7NTygj)kl zg4b1|R|5*xzJ2eI?hls%KyB=~C;NfmOB`28?KXiM^~iMN;;diCn%tS7r}jPzUX*%<%;002ovPDHLkV1ngIjCcS5 delta 619 zcmV-x0+jv50)qvRBYy%)Nklb$+Arxjb9y| zOq~!?@X?6qWjLdqPL<$W%t{~w?{<97AstSLlB&qeU{2xySBrd*RHbw|j8+0fd~2d% zcF-$8Oki~O1>U`>%DR>S%0LO%7o~nAVI}~{acda-*l^nzTzwCYtv`axg7I6By1mvn z;KS`qevs++h<{owBHSGHhk?}l<5VytQ1G`|tJMmYLO82`FQNL|jHZs202= z14oxn890F7oaTN7$>9pl<7Ae2y0jak5jo#924Cfv;m63Y(I{M-XeZY48sEG+>J14PQ; zyIT{+;ADtdZ>{GsmN%i_t<4pK#@Cm~V0stg7tZ@JU002ovPDHLk FV1fgPAOrva