From 5477033a19ee77ac5917e4db38c906fdbfebabfa Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Mon, 9 Dec 2024 05:51:18 -0600 Subject: [PATCH] Updated Ogerpon, Enamorus and Sinistcha sprites (#5793) --- graphics/pokemon/enamorus/back.png | Bin 841 -> 734 bytes graphics/pokemon/enamorus/front.png | Bin 832 -> 785 bytes graphics/pokemon/enamorus/normal.pal | 20 +-- graphics/pokemon/enamorus/shiny.pal | 24 +-- graphics/pokemon/enamorus/therian/back.png | Bin 710 -> 891 bytes graphics/pokemon/enamorus/therian/front.png | Bin 821 -> 867 bytes graphics/pokemon/enamorus/therian/normal.pal | 28 ++-- graphics/pokemon/enamorus/therian/shiny.pal | 28 ++-- graphics/pokemon/ogerpon/back.png | Bin 447 -> 515 bytes graphics/pokemon/ogerpon/cornerstone/back.png | Bin 537 -> 540 bytes .../pokemon/ogerpon/cornerstone/front.png | Bin 962 -> 947 bytes .../pokemon/ogerpon/cornerstone/normal.pal | 33 ++-- .../pokemon/ogerpon/cornerstone/shiny.pal | 33 ++-- graphics/pokemon/ogerpon/front.png | Bin 1043 -> 1007 bytes graphics/pokemon/ogerpon/hearthflame/back.png | Bin 533 -> 534 bytes .../pokemon/ogerpon/hearthflame/front.png | Bin 958 -> 947 bytes .../pokemon/ogerpon/hearthflame/normal.pal | 32 ++-- .../pokemon/ogerpon/hearthflame/shiny.pal | 32 ++-- graphics/pokemon/ogerpon/normal.pal | 33 ++-- graphics/pokemon/ogerpon/shiny.pal | 33 ++-- graphics/pokemon/ogerpon/wellspring/back.png | Bin 472 -> 534 bytes graphics/pokemon/ogerpon/wellspring/front.png | Bin 960 -> 909 bytes .../pokemon/ogerpon/wellspring/normal.pal | 32 ++-- graphics/pokemon/ogerpon/wellspring/shiny.pal | 32 ++-- graphics/pokemon/sinistcha/back.png | Bin 583 -> 591 bytes graphics/pokemon/sinistcha/front.png | Bin 646 -> 654 bytes graphics/pokemon/sinistcha/normal.pal | 23 +-- graphics/pokemon/sinistcha/shiny.pal | 25 +-- .../pokemon/species_info/gen_8_families.h | 4 +- .../pokemon/species_info/gen_9_families.h | 146 +++++++++--------- 30 files changed, 282 insertions(+), 276 deletions(-) diff --git a/graphics/pokemon/enamorus/back.png b/graphics/pokemon/enamorus/back.png index 1b2b00e218f9f00d05f649ab21fd56845f8afffc..2e7af720cfc05968495d84e24b5616d3bdbab889 100755 GIT binary patch delta 722 zcmV;@0xkW?2Hpjb7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-snbM?nJW)zY zN{t~Qz)v#tTobcqwWwEZ|HVA%hv(0Op0u>R5D*aj{QLj_00000T(YcO00079NklG|hZqrPn$3uzNW zS`XE2gzo>z-``bCTjvnulm&}W{jmc0qpo60D=Au=o1HzNeFqp-8n;V7eHRW zfK`}hgCPsR!X{2&Ha$@aq54IfAg~y)p33T%g{36@M0+=WJ{bTN)^a(d7nM*yB?8z3 z5P;N^A)69v34euQ04`!tHQWvPs$$guseZgee-!kPwn{_;8Si>;?mMTi#yw>s{X2s)u7@lwZA9s&f`>rA|K zLZ*^f=7FG_2cbf!_p^-E3XDo-a^NG0hhkMjwh9NJ)sq=641iwUc#>WSrM=J9;Xvc% zrnwo1fq$h00WfEGf>Iz~+52dBfChU3m`hNN=bnS_zN*EF06Kb#jkV`{gd0ssI207*qoM6N<$ Eg5C5tq5uE@ delta 830 zcmV-E1Ht^>1<3}G7=Hu<00013M{Ml?000McNliru=K>ZG2`{b^|JeWl02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1poj5Fi=cXMVZs3N=iz!w7vZN{16Zjb}~AXA%7m=be!`pF0M*f$1W-J zRFAtpUjM~B@8qxm0052siG%^3p!LMeSoHyF@vN&frW4IVDB0G0ScK7DR}525QO_43Iyb#1qBMe50!T(xg^%R zJmX0}|L?t%e1G!1vA{Rqx#y}`BIYw8uASh!5Lbl|!WA(~;zBG^KZ#v{&lwLgFK_|I zGYg9J9T4a5f-iZSq~4GqGPg6v3Moz^rd${D^9T z?aW4)?X+D?Bg)+thK(?D5TM$jsK#$Bo4Nt!a&|vP`i0+uJeor161b@9Zf-YMhDR4R`bkLDNw;mh7`stbM z;gk)a?GDtRvyr-m5s+t4!{n(QR_HPkcueZG4QQv=%}!=)JA$47*d>%BXnRH;5G4#t zfRwUyG+_YnP_{%D27Cb4nUf51;`M2|y+T0Q#Un0=cO4#Q*>R07*qo IM6N<$f}06olmGw# diff --git a/graphics/pokemon/enamorus/front.png b/graphics/pokemon/enamorus/front.png index c679b07e571f202cbeaeaf1bbe6459f76043c961..67493a1e6b1deef6ed020f2cbb38e7acd05cb54b 100755 GIT binary patch delta 773 zcmV+g1N!{H29XAk7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-snbM?oGCE31 zN|PZT$1W-JE-t%1Uam@4|HVA>RFB|voV2vP5D*aj{QLj_00000+%&-iJiBBci) z2o&+8W|jj4L1zgm_32V_iZK5ka?h6{$7K||g)g_8z%u%6v%YOiLxfM{4$Ba>vKbGH z1cv;6KN5tklz*K^<5HS>5EgTR*>2GCXm$aRl2w3LX_ujfhQ5>ppl;jNcmzOo>Q@0E zVE!#)(72AERT5V9+6C&yqc+q-6^E^dfPmWgY4zkBD$*y%`UJ3e1S;QK#ZROAP=qe+L6U7a(}pE{Dd9^Kb$q(Yn4Mpi|(0q za2rK~g$zB{VJXEkdIz8=8-TI~?*{=1eE>qqD*?J(g43jw`%{lblI%vp)*(^-oXHX1 zWDp*UU&4;(MAiv@Q1tL$$K8?1qv#V5dZ=@SKROe%* zgkG|85(XgjC<00DR)+&+0^q@8o3Logtj!2C2gAA1SluUabJX3t4gl_(kNxtR58T*A zL+x6cdOTRh-)noVDISFWW{Uvp-O{0yhCMh6qmp00N^)L_t(Y$F0>dPuoBg0Ds_fv3J{-Dq*Y7bgQb` zM>dL*U_>EQ3R0|y(1{_k%9H_J8MB?@i7Kc~=PraUg@BNbP7RaYq3W3b(BIHIKrL$C z4VC(2Ig#F%_b%u29YX&z49C8^Y4Sb|)GgErOdV|Fz>y3tAQN*zU?aS!12!_kXX;A@ z1SYi~DDX%NLVtVC4@2L^8h~oHDTf&#S2G4w^H7A$ia{1Mz$A{GCBr4!nW_=j4_s2! zPqiD;kT}SS8!+hj9qKP4tHt(VknASAKCQGEJAg|h{iJ_J%S^@qNL!8MBsn=%pzA=u zycR0_HO5Lk5agY`&YtkA#V((R0NPB_q%ZJd@37Q^o_~f>zDO_9%w1|m)p;0XS#~u& zU20fEu!He>USI@u80w0dS1z{{Vr(a%XPa5sv5C%W%XJ5rtJlHsf zJD|dV(xvO8t==*GBn&?PmgI5k4PS)|RCzCsog#bBD>~q?E-$jff@VEgTsm-qfhx{GlzkdUvG>?qkJ;hoWSpH9^ZiV=FS*y@j^6H-p^M>su_bRCh27= zb}l2`+r2swB0U#P?dxw!Aa=&XEzJ&MzN%kJAb*;~gGC{)%OQ-<$04{&88(gr32=Rd zhR}wN14?P>a~+rEC-H!dSVcf@0|Gw%6CnUFz6S`IolBSAD-n7gu!$1?UW?h?R)V`E zC9;JMgg1ad!1PoLBCE^#WFbN`b5$dEp#bq_kG9|7He^3%2Ds{{w|Sqg{9VGVkw{*| zQ!dOU1#{-)G9z`>NR`N}JXACbPnszDrxX7d?+)P|ss9?Y00000NkvXXu0mjft*>;| diff --git a/graphics/pokemon/enamorus/normal.pal b/graphics/pokemon/enamorus/normal.pal index 08f6e5ebf1..43c4eb7a07 100755 --- a/graphics/pokemon/enamorus/normal.pal +++ b/graphics/pokemon/enamorus/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 211 165 -74 74 74 -180 180 189 -252 252 252 -16 16 16 +153 210 164 118 50 58 +74 74 74 147 33 30 -224 116 156 -243 46 46 -174 74 87 199 46 41 -243 84 143 +243 46 46 187 62 94 +174 74 87 255 197 60 -239 228 176 +243 84 143 +224 116 156 +180 180 189 +16 16 16 +252 252 252 +0 0 0 0 0 0 diff --git a/graphics/pokemon/enamorus/shiny.pal b/graphics/pokemon/enamorus/shiny.pal index 180ae687e5..edbd1c73cb 100644 --- a/graphics/pokemon/enamorus/shiny.pal +++ b/graphics/pokemon/enamorus/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 +153 210 164 +117 60 81 74 74 74 +141 33 33 +192 79 50 +244 92 19 +179 102 181 +168 87 109 +255 197 60 +233 135 231 +207 131 158 180 180 189 -255 255 255 -0 0 0 -131 57 82 -164 24 24 -230 131 164 -255 90 0 -189 82 106 -222 74 41 -255 139 238 -205 98 189 -255 197 32 +16 16 16 +252 252 252 0 0 0 0 0 0 diff --git a/graphics/pokemon/enamorus/therian/back.png b/graphics/pokemon/enamorus/therian/back.png index a563156e4d1f0bfbd1794b70c0f5efd6268142ba..04a5286fc159cb9de072a6516241cbcac97adb7a 100644 GIT binary patch delta 880 zcmV-$1CRX11^Wh&7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!hbI8aDP zNQfXHz(_FgSP-yau&7XI_`o>mfZ)i0n6R+85D*af`1k+-00000sz1Q)0008{Nkl-XtQ3KBZ>@Ord}5rTha~pVCth8i35g@`Rsv8UlE7 zflmn(kOn}y2jJ%bNdSI4zXRZW$zl7LUjmwhmw+*gAfgk>9Uvh+0SJF$4KVt099T9fo=a@u6GO>K+{VI!Ggf$Vwq|{Ov5G2YT-40Y@vP44wMln1B(WIf!)$skgRxw3mY04}X^)GzV111)*)_r)x?u`z0U~ zq6cXCMI}8*TQs(P4?Q5)F?Ke(2$UXF3* zEePLKPUGr59}xQ-GypcDyZOuF1$6T7_sbvJ_bF3!NuWay=HqC9pRgcZuq)U_4sn=$ z)Rgf3e1Gh>t}m=zAg8VXYOmdJEL|Wk7Xp!ceg9rTch692S!Y+=V^?s7{7A#eef=S=1w65Y*6z-l{I{&tk0>M?)7-Jub?Y^z8fe4IQ12vE~NV1H3wj$gD#*JNQ=N+sEj#?a>|&N zTWKsS!19aB=f7Ok3WC|yH95j~OJb)F#Vi|f0Z3C85O@NV%T`PPx2nhKjlk;|N;P9|H0hJOuKoiZ?nGE-e40i80000rH delta 698 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 delta 433 zcmV;i0Z#sd1iu527=H)@0001;w}I>c0004VQb$4nuFf3k0000jP)t-sl+mF80RSp2 zDHWav8%7U3aWxTYL{o)YN=!+w*q{6T`io;Z0Hm3CQ77A-TxYv*Bme*bKuJVFR9J=W zl*x}?r696Ow&It~<3!vFv5g0Z=FxZQ5T)+kcUf}r&fzcEafS)D=kjqG({0;_W+=R|q zD1i00o1_w0Rw!%Bd-C(5b!QfBzWSJfE53k zzX;~|I0Jq$$A8}=%n;0F<=<-a-HW|D??ri()w~8){qt00E~-L_t(|obA#-OT$1I2JnLj zg=|?fUZF##wx`h1A#KG$m)<83E|95UAzh?`(A?&zqm5AEmVb^Seg!wbg0qW*Zs*8m;kbqp#C+6 zP73^81F#c7*w%Xn?4g{SaFc<^VT?hi2CQ^P1l5!)A_0;LA8LVPSr#jS(hd_!5Q{dT zgch&_$b+^6JAaGfDNQ>CvO)tkIk0uWv~nOSY8PQ{tbeEth+F`1lhqw5kckfT8bG$A zo8*RkO5RHj;);tVAa=-#UKK!uikI0V{Q{7c$o)ha@FB?n7%0$PoV|SvQa~6#a+6zswL0%@fTtB^Sh R%>V!Z00>D%PDHLkV1j<|;?Dp8 delta 524 zcmV+n0`vWx1epYo7=H)@0001;w}I>c0004VQb$4nuFf3k0000jP)t-sl+mF8001g1 zDHWavN=!*TaWxqm7;R&0g^Pi}06Yu=14}~PGAKeh0R$|l8wR4lnIIhk7Fi%S1Pj?UT|i<64%a3@aUmf$ zh(Krt=4&x1!VncApT!+iGR7blK_S%!!>{zfG@clIvzp6owopD8=*L&9175COdGxm#BiO(k>HEp z2%HxV&+EL;Aa8;3!q3;h(BbzH>@W-kUH&8RqXoV%=<}Z*d@K1i6!iFJj5yLGLE%pX zh{-qkc8XixhGHw6(2*ckLD|L1FS%5L&k?^l&3;So`F~tx%hR`=Xhd-}L8AQ)BO@#me O002ovP6b4+LSTXqzvD{) diff --git a/graphics/pokemon/ogerpon/cornerstone/front.png b/graphics/pokemon/ogerpon/cornerstone/front.png index 8e96be70e7c8b2c23299a744da89feb1e71aaae0..9b7f2792387428bc1e2c71509de805da7ee5df96 100644 GIT binary patch delta 937 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 Ef_Ik83;+NC diff --git a/graphics/pokemon/ogerpon/hearthflame/back.png b/graphics/pokemon/ogerpon/hearthflame/back.png index d6d927f19d5a051631c1ef4b2bc6b6f425aa1f6f..73f95efbf2cafea2a6d0e259646f71ac17f71f51 100644 GIT binary patch delta 521 zcmV+k0`~ot1eOGl7=Hu<00013M{Ml?001yhOjJeg=Cn#mO4Xbg|K34Cb1_=1F%S?C zDJd!LIVqeF5K;&T|NsA_%@})XF#y&7i()zbplFN$00E&%L_t(|obA%RYJ*S|2k;b% zf}2ZxkP9I=WiT|9LYKHFq`lBCX&}_0gIl@y209glw%#RMpMRiZUM7oOljBSVIvf_AIoIxdq5~lCAX9-y*PZ(SL+pE9z`X}Z zb;vA{qXcsVezs8pU87S04zMwm05_*{MrNA65**B{2ltlmHfo?}9+;^+V*y8yDpp8M z&!^KFV~ks%0)MbHhc?ANV_$d-1xU@+x9qb3fVRaND9Hia0eG#?v4)jhfB;2n4Glq* z1IBmwqWq&No=H-I*yfxQy9o@EgvE@Q$ZAH!2=a)4D1jY@A#Z@j41)-86n#JnCEz&_ zi}r)4dW-s&MpOV1p#Vt*A{8*g3SdO*5JnQleE|Ci@PCr0GYTL&DlqN<<&06@*Thre zE)_UNymtYdAtJ`7fKXaL=9n#NKtxh!PfHLGR)WEk1f%U8`F$z?c0004VQb$4nuFf3k0000mP)t-sl+vUC001d0 zDG;3i<~%VuaWOH4tb-gF)#mp9#!9SdAe@=3F}~)cG%-p{O1+6%1%%aT0004#Nkl8vu4ejHS2$hxO4$} zNE$%?{r0j#d@N9c-dw!E_xscUCg=rA!2Cl2Ab*n;@ZOW~PX*baSOx1I=!Oc!1`W;z zVm_k^h**0=zy^&D<8z51IDfw*AWIwSLdp&q4Nh>qZl-;FUN_O4^$F9iCY zITdvI;}n;3Tn&XUuImXx6ByqPqI`wE0K5F^X>P!VFMmI}OF=!x);~`8fgr%Ob36!! zd=bbVeO0ao-}p2P5GpT%^#NiRK>F(i2q;@N{}ZqYAg>I6qHrw$?}>eZ@t@D$pdExd zrQIWF*ONDt{#1Z|0GF-=+=9oEPZm;FM}r6!!=4Z2A!rxEz(2*&ClLpC)rkNA002ov KPDHLkU;%>3gy2a4 diff --git a/graphics/pokemon/ogerpon/hearthflame/front.png b/graphics/pokemon/ogerpon/hearthflame/front.png index d8b9cb7b2346a9b49c50b60e3484b0c8dc3e03c4..098041cf76ae5b047a5e9c617c8c5c1ae8d5e481 100644 GIT binary patch delta 937 zcmV;a16KUL2eSu|7=Hu<00013M{Ml?001yhOjJeg=Cn#mO4Xbg|K34Cb1_=1F%S?C zDJd!LIVqeF5K;&T|NsB)oB(@jF#y&7i()ydz4YY(00TZrL_t(|oR!tVOWRN!2k;am z1y8;z73UE43Pq3hL8;qigH#XmGRW(>arU)!J1mz5yvRK0OMh-t2zh!L2-;*I$mYiE zQSqdw{RO*v=+X0juW7e7O_e=p3i*Bd{k{H@Hj46JYvPf5;@Kl2ky(^)V=v=sokNbu zh@u_?QWGJ7h%rjbF<=qIc>`I-V26niY?GYl?UPKNvHSp#7a)-@KtKTZeHShL1&*wX zgYGuga2*0%qXoU(Tk?Gfyd`;77w+85CusHl<{IV@1%<;jtG0tLGXT&vVncxMpUtAv z_UsP;SATMn5m4ZE>+DGzp-myyi-w76egp{57N@`4?K|NXOBRa&l`LS)Kep!X0$;ea z)TpsRu!b>a^L%y=X606BwE>gw)O&+c*Kk&;^OLrJ%qp~G)c}MEy-TXHvZ8uUAdCj3 zB@@8W^Zq@CNS-m$lwKNX00i0zw;w2VIK$R8?SC@g0R%RD++QDe>rj8KYpYkR1IY7W z;O8?gT(-O3I@dJqIs_y?&|zFO`KCJ--0D}@c!!x&njVBTmk|8w1#N~uCCdi=-b zs(&_^N=L+ZT3FV-!mRQGU<5d9}sx(}Kp z>Vnu!By~m89t2dQx&+!Xn$qHWREoN}1)!*-*vD2fy<#B=REUbZ8Y(i;v>YTvmEyjq zii~L)ps48;GjY00000 LNkvXXu0mjf+Ge!n delta 948 zcmV;l155m~2fhc87=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sl+vUC001d0 zDG;3i<~%VuaWOH4tb-gF)#mp9#!9SdAe@=3F}~)cG%-p{O1+6%1%%aT0009#Nklq@7xre7RjdIms#p)YQ|Q=Kxhf?ttL(TY4Q=_54TzP`T-^49LJ` zNvQ!?Ke+zFfC3iQ=LSfLD5Yfj>lq-@*Z?V0DU@&N8Ia!qh{6EX-vNM-M*}RS*kZc= z8Zc(o|2e>t(SHDx(-mOMe}6roH~ zH6TyZw9fqUyk<$HZixzD!YN>yUauDjst3Y0l>h=foB^iS%nn|Ytq{tw*lq|d5vKrz z5JX=*XsrNF=^l{U6yRWfO{&*!fblm5ICch7TSOk49ZX1cLIp@qdA2pAz5urR4MFr- zDhSez{(nH;^n;96_fj%|KqLn;{(b?gK4|l>GIj&cW`LGuN64LC34*}P#SzWW%b|)F zdIC09r?&=Vy}0?01{jw@bw71-*DJxZ?-8TaAop7-DxYQAc7_V*5epWN0WsJ{vRR_r z^^Ii%s0a+jgg|^iH-JrZ-_({qJRb`IFwdmTB!Bx-Ujd+(w!;h04S|DVb_>f9;C&M0 zz1ay-%P`k-`;1`vN|-STBf!IlBQn%l;44Ym0`!*Ugp&g@fKlWo*aN}?cO~6z>GXgd z>P51iPi#2gAMd4r^xwQ_;&NlV%0D1I-p=m`dqgu#a=>2QGTsqez4nB|BDfO*;Qsh4 zL4PlrXs|yLg6QR>{E6TOhF=M8VEBW{UO_Lwv-?y-Z-NM_|1VN%(}%io@P~pojGc2#>1{ zNH+D|Qm`+3VU1RZVnG1+8iRgYU27o=!7X;g9ldk`(pJz}rrWJe-sAyquGtCZY{-A@ W8$}4~HHMb}0000WlPuCx7J!FJNzQ z`F;F;e;jDq|GDntdCT6p&-uPjm>f=wj;vexyOw}s5jT!KTx#Z)cSSrojvX&mgNJSb zz_|}$MIMJ}hXnQ>R)~E7VH@aV;Mg2i@S_l2!si4!U=&3VvmYaXKRS2R^%dYPV0xVI zoDmCX2hbyLO@9U>#u$Ya5TH$>O-5kO*eeRmO*DH`a~9xWOGFNsi#>(8on-|GT)xvV zkmP_-ccW?axhcNHyabDkQYx|*NQ;hzP^THO0FXxn0tH!`rnCVX9fpwLEc$>FD4;oz zi}r)0dW!m%Mp6J7fq;1h5)2q=1t6kz5ym`S^Z}RyfPb63>?nYoVBpvR%8o-m*X6(D zy;R^F@!18SLq;4gfgq%QnMXFR0U1fG6DdI;SP8VL0*BSZ&-b(djIyGk4b&T@^rZy4 z0+W?>vfgt5A1xi%K_b{Bw5;Lp`Kytq3XmO8E5U~XYF-Ptg7XJ&k&ItQlUySJ0000< LMNUMnLIPldrc>k{ delta 458 zcmV;*0X6=X1lR+R7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sl+mF8001g1 zDHWav3qW~2aWzUzNe^180Dk2)hNwqXWH-Iz)aLh-TOp}>N|>9g`=DGg00042Nklt9Uuc+#CbTN==8h54f+WDgt4(D01jsc@ z9-^QCE~Mcma?ThcGGs*o{=uTjulu+qQk(^ri|1iD#y0!CUBaE>5L#D}5RdXi(Bi8x_W6$B z0bfqBe3E%6{C41u1e64zLI7ouC6b(Lnx)CisFwz1|yU`;)uu;jJd&Mg0Z2U5`RMFH6g@WE85|pCV1(P zOqnw@9owd31`p}GljHhBYM@IWB!lng_kTK_WJUQe_2}^fK+_*+fN|#EK*}^<$pmaD zN;PKPqSO^ag9dhOcD+bxBs4vfX0xE!6oBr*3`W{vGgG8ma-D9i*!G;mVnA~%5_^o< zEH)vEpe|$e8Gm4!iWt%JeV@`*2DLc3-lS&fkb0fqwB<`+=U+|D=asvDCxB}CE{w=( z?$iZ#N^%+M^uQ2+j9MO}c(_2kT*T6XT0Q4FER*97RBd%Wx}$JI=%QYlJQ?CE#W`cr!c_%Uwzj;3Ho2 zU+QS#j7Y#k^ZxNsmk&XhJZv4@TqA_~5#S$2$A3~KZ8&gd*xrAtBeZapp9YFTmV{{U zUw;*#AAyMnR3(J?C4wOVog?DHI+=X_RBMwgW_1u6{E^D^I;3QvjizI$ohJ&JS&!P_ zEC%xoCBElK*2vbvm2P|rL7 z*n0y&Wr-R0VD>#3{m`V@5X26V))j>Q3NXUD0BDZwpty{zraKz|G@Zr%Y^7`SHWNUF zR&jSjWe%&0jf7T4+;ys~P!|mpwKng>ZUiZ8?1}~si?$=C2b?+q>N%N|SSnGIPs~jH Y27ghvGnl9eVE_OC07*qoM6N<$f)UA?t^fc4 delta 950 zcmV;n14;ai2fzoA7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sl+mF8001g1 zDHWav3qW~2aWzUzNe^180Dk2)hNwqXWH-Iz)aLh-TOp}>N|>9g`=DGg0009%Nkltd`R41^6LDK6^!zilT8H&@qnO@ExWXXj%GA)&)?8GlZret-SpGySOHR35_5 zfUFk)n{PO zSA;KKJVgz!0Q+=E_J81UAG3#R0Hs18DuAc}a?4@> z5Ki=O00}1my@xY4uqIM~bX2+k%x3=pSn;!K2XPL_NsuhcE*$QF0eo5k2o->290A&a zm}xFqaB@fr-~d2q1_IGBjaFMi5DUm*r(Xi>FXa#%S%-SlTUn_EIRUl+fO(PhFWni` zX!2UyLVqY~DIb+vsDZkE&*<(3d+q}FnoQgb5T`vM_IC?~?W@>(ZN(a!=mkJCr|q54 zhDZTW=aY*6Np^q?34u=KgWfC|AUi&OmfuYRfF6LfHN$w4*zc>1qHa0O1cq zly?VP3~bv>0E|6A2-|jiW$XwFLH@RlXY67e(SIfcP%Oa2H-IdUkIJ|syR@JbKZq1tBEaL`V2AB1@OVCGdlFh77P*Rw3}`5vz!(P224NG|F2k z7~%4jVq-#rDu4$0lEI{ph1>5$$=%i)CL3=*yz?CGHcUETzdY0qE_%K7gmwM-vDyJv z#ehlCzr1p0}PA1FnmHTesnOy(l7zryYl z>RY$l!tFdvQ`KhxdbG&#&veTITJmU*ES#bqqx2RxjnjDVB#49neOZ!Zb@@x^re3UL z!AaIN2c(z!ZYfv+;A_f-s20fj(+#}>N-q_ZB`M#CJNgD_`V6^U1hO7l(fYU(WyRFaRJ}4>@NgkA*X8TOeJY zN_fO$pqEgGgnp;Ga?HbY_u6N{xvm8T1?J(~(!>Ti0005aNkl!n8yHkvjr~%3?>i)qWv0%>;FUqyc=O2cA$4N-AQ&=<9-6q2po$U=YD|I&q#9E zt9Ko8eF9J~q10zUFF_(VfIh-%faI~lOZ?OWCh)Sug_! zfXfz=fg`{rLVsV5eQk4PE zEoe-jqBJ)qLcr55q#m|_lp%!E2*&_Q5kjCrK-MXsX~7VnuHOR!0X&1W0A05hAjcB~ zex3oG+xOC`K9U;1t_j{(1Q+GKf0({R8$jNXD?o?441aLa5bsO*N@Vr4`OwFni%iq4TYtAsDMY&FC+0{O7?Ej) z;&=jP_#eX&P=N>F;RG>Nz<3YPKe|%E6cRJhcm23<{y72!Aem1#}C4>zXDugTc>wc?_hla zHh+pI0(>CEWl!jz>`%bz$L1_aP6XH!a0x9-S_#r0!8-u%v@Aa$q$J<_Z{4~zreDn3 w5z-|qs3$c5000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g4sm;=>Px# diff --git a/graphics/pokemon/sinistcha/front.png b/graphics/pokemon/sinistcha/front.png index 4131a22b9f68f9c39c9323f9993f47aafa008971..eeb1b7a71a775b8baa64059d8a005d3d2b39b87d 100644 GIT binary patch delta 629 zcmV-*0*d{H1&#%fB!2;OQb$4nuFf3k0000mP)t-snbM>s8yieIIyq-0X+#@pTOeJY zN_fO$pqEgGgnp;Ga?HbY_u6N{xvm8T1?J(~(jJ}90006ENklM-DMNV$cBc2SEXvgJ=zk5Af-q01*x$7x9#V^O-`Peh>zeqYn_7&0090!ZQ(7 z4}k4Ote(qHst$$t*CS37VBH51y40sya2%16SsO_=J%9EOwbp9&0ABc%Q9cwswr|y1 zH4qmd5F*G-6x4*uL9KV#sbxne0>DKIYwDK#r~vhf=i&jp0_vwF?7eoZwZe}D56KC* zYCjiV^An;Kr`^rX3M; zUZ3N_$Z6xrG{e3yZOswK+>65+k4Z^f$H32o46mN8>jXYAkHioC|GT~bd2b`Y1hB3N P00000NkvXXu0mjfPVO0L delta 621 zcmV-z0+RiX1%?HXB!4YXOjJd4#iUF+I%z~3lZr&2nS$HWk*B(HEg>N@V#r7-9l8|eLK{3w zA>I+dP}`1yD@ry_p)@z}h9M%f9f2SK?=-=U(ZF%z{2QXro5T zm7fZjlmxt$X9~6ox?;8dM8OC5iYGkXJ~z~(4m@WaZh_&t)KstQ%JSCF(a(1B+d##r zltPwLKv3H`&VSMBSO!)jMfIYZ5HJLzA;K8E3_`wOTjF?|Vv00KPjMmhSH)j^Fd1nz;uLV7*)5U_m>6Pg1d- ziGawswLUOB&IXO5dF#jt2BronN|84l0dB&GCk426?0>J~8xy?((9Ia@gn(Li9;8I@ zI}8XgwMt5Wqi+Tt3BV%(c?WouQ-T8>bQj>sx=degJqa79l<$$j|@)01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXX Hu0mjfC*KyY diff --git a/graphics/pokemon/sinistcha/normal.pal b/graphics/pokemon/sinistcha/normal.pal index 16008ccdf1..0697645151 100644 --- a/graphics/pokemon/sinistcha/normal.pal +++ b/graphics/pokemon/sinistcha/normal.pal @@ -1,18 +1,19 @@ JASC-PAL 0100 -15 -115 197 164 +16 +153 210 164 +37 27 27 76 58 58 +57 103 37 105 68 27 -147 138 68 -159 153 130 -219 210 145 -167 186 114 -45 33 33 -51 99 34 +106 91 32 93 158 74 120 196 99 -247 215 98 +160 151 80 +135 132 126 +167 186 114 +204 195 116 +247 218 103 +193 185 174 5 5 5 -208 210 193 -241 237 235 +230 225 219 diff --git a/graphics/pokemon/sinistcha/shiny.pal b/graphics/pokemon/sinistcha/shiny.pal index c769e9d1a1..6b9d62ab8c 100644 --- a/graphics/pokemon/sinistcha/shiny.pal +++ b/graphics/pokemon/sinistcha/shiny.pal @@ -1,18 +1,19 @@ JASC-PAL 0100 -15 -115 197 164 +16 +153 210 164 +10 48 0 32 88 15 -105 68 27 -147 138 68 -159 153 130 -219 210 145 -167 186 114 -45 33 33 -51 99 34 +57 103 37 +143 133 51 +106 91 32 93 158 74 120 196 99 -247 215 98 +160 151 80 +135 132 126 +167 186 114 +204 195 116 +247 218 103 +193 185 174 5 5 5 -208 210 193 -241 237 235 +230 225 219 diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h index 37eefda7f9..fd86f22ddc 100644 --- a/src/data/pokemon/species_info/gen_8_families.h +++ b/src/data/pokemon/species_info/gen_8_families.h @@ -2655,7 +2655,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Dipplin, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, + .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Dipplin, .shinyPalette = gMonShinyPalette_Dipplin, @@ -7730,7 +7730,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_EnamorusTherian, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 2, + .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_EnamorusTherian, .shinyPalette = gMonShinyPalette_EnamorusTherian, diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h index d617d36f1b..7402619b9a 100644 --- a/src/data/pokemon/species_info/gen_9_families.h +++ b/src/data/pokemon/species_info/gen_9_families.h @@ -7086,13 +7086,13 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Sinistcha, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 10, + .frontPicYOffset = 3, .frontAnimFrames = sAnims_Sinistcha, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, .backPic = gMonBackPic_Sinistcha, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 13, + .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Sinistcha, .shinyPalette = gMonShinyPalette_Sinistcha, @@ -7147,13 +7147,13 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Sinistcha, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 10, + .frontPicYOffset = 3, .frontAnimFrames = sAnims_Sinistcha, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, .backPic = gMonBackPic_Sinistcha, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 13, + .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Sinistcha, .shinyPalette = gMonShinyPalette_Sinistcha, @@ -7370,78 +7370,78 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #endif //P_FAMILY_FEZANDIPITI #if P_FAMILY_OGERPON -#define OGERPON_SPECIES_INFO(Form1, Form2, type, ability, color, iconpalette, isTeraform) \ - { \ - .baseHP = 80, \ - .baseAttack = 120, \ - .baseDefense = 84, \ - .baseSpeed = 110, \ - .baseSpAttack = 60, \ - .baseSpDefense = 96, \ - .types = MON_TYPES(TYPE_GRASS, type), \ - .forceTeraType = type, \ - .catchRate = 5, \ - .expYield = 275, \ - .evYield_Attack = 3, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ability, ABILITY_NONE }, \ - .bodyColor = color, \ - .speciesName = _("Ogerpon"), \ - .cryId = CRY_OGERPON, \ - .natDexNum = NATIONAL_DEX_OGERPON, \ - .categoryName = _("Mask"), \ - .height = 12, \ - .weight = 398, \ - .description = gOgerpon##Form1##MaskPokedexText, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPic = gMonFrontPic_Ogerpon##Form2, \ - .frontPicSize = MON_COORDS_SIZE(64, 64), \ - .frontPicYOffset = 0, \ - .frontAnimFrames = sAnims_Ogerpon, \ - /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ - .backPic = gMonBackPic_Ogerpon##Form2, \ - .backPicSize = MON_COORDS_SIZE(64, 64), \ - .backPicYOffset = 0, \ - /*.backAnimId = BACK_ANIM_NONE,*/ \ - .palette = gMonPalette_Ogerpon##Form2, \ - .shinyPalette = gMonShinyPalette_Ogerpon##Form2, \ - .iconSprite = gMonIcon_Ogerpon##Form1, \ - .iconPalIndex = iconpalette, \ - SHADOW(7, 13, SHADOW_SIZE_L) \ - FOOTPRINT(Ogerpon) \ - OVERWORLD( \ - sPicTable_Ogerpon##Form2, \ - SIZE_32x32, \ - SHADOW_SIZE_M, \ - TRACKS_FOOT, \ - gOverworldPalette_Ogerpon##Form2, \ - gShinyOverworldPalette_Ogerpon##Form2 \ - ) \ - .levelUpLearnset = sOgerponLevelUpLearnset, \ - .teachableLearnset = sOgerponTeachableLearnset, \ - .formSpeciesIdTable = sOgerponFormSpeciesIdTable, \ - .formChangeTable = sOgerponFormChangeTable, \ - .isLegendary = TRUE, \ - .isTeraForm = isTeraform, \ - .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, \ +#define OGERPON_SPECIES_INFO(Form1, Form2, type, ability, color, frontYOffset, backYOffset, iconpalette, isTeraform) \ + { \ + .baseHP = 80, \ + .baseAttack = 120, \ + .baseDefense = 84, \ + .baseSpeed = 110, \ + .baseSpAttack = 60, \ + .baseSpDefense = 96, \ + .types = MON_TYPES(TYPE_GRASS, type), \ + .forceTeraType = type, \ + .catchRate = 5, \ + .expYield = 275, \ + .evYield_Attack = 3, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ability, ABILITY_NONE }, \ + .bodyColor = color, \ + .speciesName = _("Ogerpon"), \ + .cryId = CRY_OGERPON, \ + .natDexNum = NATIONAL_DEX_OGERPON, \ + .categoryName = _("Mask"), \ + .height = 12, \ + .weight = 398, \ + .description = gOgerpon##Form1##MaskPokedexText, \ + .pokemonScale = 356, \ + .pokemonOffset = 17, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontPic = gMonFrontPic_Ogerpon##Form2, \ + .frontPicSize = MON_COORDS_SIZE(64, 64), \ + .frontPicYOffset = frontYOffset, \ + .frontAnimFrames = sAnims_Ogerpon, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ + .backPic = gMonBackPic_Ogerpon##Form2, \ + .backPicSize = MON_COORDS_SIZE(64, 64), \ + .backPicYOffset = backYOffset, \ + /*.backAnimId = BACK_ANIM_NONE,*/ \ + .palette = gMonPalette_Ogerpon##Form2, \ + .shinyPalette = gMonShinyPalette_Ogerpon##Form2, \ + .iconSprite = gMonIcon_Ogerpon##Form1, \ + .iconPalIndex = iconpalette, \ + SHADOW(7, 13, SHADOW_SIZE_L) \ + FOOTPRINT(Ogerpon) \ + OVERWORLD( \ + sPicTable_Ogerpon##Form2, \ + SIZE_32x32, \ + SHADOW_SIZE_M, \ + TRACKS_FOOT, \ + gOverworldPalette_Ogerpon##Form2, \ + gShinyOverworldPalette_Ogerpon##Form2 \ + ) \ + .levelUpLearnset = sOgerponLevelUpLearnset, \ + .teachableLearnset = sOgerponTeachableLearnset, \ + .formSpeciesIdTable = sOgerponFormSpeciesIdTable, \ + .formChangeTable = sOgerponFormChangeTable, \ + .isLegendary = TRUE, \ + .isTeraForm = isTeraform, \ + .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, \ } - [SPECIES_OGERPON_TEAL] = OGERPON_SPECIES_INFO(Teal, Teal, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN, 1, FALSE), - [SPECIES_OGERPON_WELLSPRING] = OGERPON_SPECIES_INFO(Wellspring, Wellspring, TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE, 0, FALSE), - [SPECIES_OGERPON_HEARTHFLAME] = OGERPON_SPECIES_INFO(Hearthflame, Hearthflame, TYPE_FIRE, ABILITY_MOLD_BREAKER, BODY_COLOR_RED, 0, FALSE), - [SPECIES_OGERPON_CORNERSTONE] = OGERPON_SPECIES_INFO(Cornerstone, Cornerstone, TYPE_ROCK, ABILITY_STURDY, BODY_COLOR_GRAY, 0, FALSE), + [SPECIES_OGERPON_TEAL] = OGERPON_SPECIES_INFO(Teal, Teal, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN, 1, 7, 1, FALSE), + [SPECIES_OGERPON_WELLSPRING] = OGERPON_SPECIES_INFO(Wellspring, Wellspring, TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE, 1, 7, 0, FALSE), + [SPECIES_OGERPON_HEARTHFLAME] = OGERPON_SPECIES_INFO(Hearthflame, Hearthflame, TYPE_FIRE, ABILITY_MOLD_BREAKER, BODY_COLOR_RED, 1, 7, 0, FALSE), + [SPECIES_OGERPON_CORNERSTONE] = OGERPON_SPECIES_INFO(Cornerstone, Cornerstone, TYPE_ROCK, ABILITY_STURDY, BODY_COLOR_GRAY, 1, 7, 0, FALSE), #if P_TERA_FORMS - [SPECIES_OGERPON_TEAL_TERA] = OGERPON_SPECIES_INFO(Teal, TealTera, TYPE_GRASS, ABILITY_EMBODY_ASPECT_TEAL_MASK, BODY_COLOR_GREEN, 1, TRUE), - [SPECIES_OGERPON_WELLSPRING_TERA] = OGERPON_SPECIES_INFO(Wellspring, WellspringTera, TYPE_WATER, ABILITY_EMBODY_ASPECT_WELLSPRING_MASK, BODY_COLOR_BLUE, 0, TRUE), - [SPECIES_OGERPON_HEARTHFLAME_TERA] = OGERPON_SPECIES_INFO(Hearthflame, HearthflameTera, TYPE_FIRE, ABILITY_EMBODY_ASPECT_HEARTHFLAME_MASK, BODY_COLOR_RED, 0, TRUE), - [SPECIES_OGERPON_CORNERSTONE_TERA] = OGERPON_SPECIES_INFO(Cornerstone, CornerstoneTera, TYPE_ROCK, ABILITY_EMBODY_ASPECT_CORNERSTONE_MASK, BODY_COLOR_GRAY, 0, TRUE), + [SPECIES_OGERPON_TEAL_TERA] = OGERPON_SPECIES_INFO(Teal, TealTera, TYPE_GRASS, ABILITY_EMBODY_ASPECT_TEAL_MASK, BODY_COLOR_GREEN, 0, 0, 1, TRUE), + [SPECIES_OGERPON_WELLSPRING_TERA] = OGERPON_SPECIES_INFO(Wellspring, WellspringTera, TYPE_WATER, ABILITY_EMBODY_ASPECT_WELLSPRING_MASK, BODY_COLOR_BLUE, 0, 0, 0, TRUE), + [SPECIES_OGERPON_HEARTHFLAME_TERA] = OGERPON_SPECIES_INFO(Hearthflame, HearthflameTera, TYPE_FIRE, ABILITY_EMBODY_ASPECT_HEARTHFLAME_MASK, BODY_COLOR_RED, 0, 0, 0, TRUE), + [SPECIES_OGERPON_CORNERSTONE_TERA] = OGERPON_SPECIES_INFO(Cornerstone, CornerstoneTera, TYPE_ROCK, ABILITY_EMBODY_ASPECT_CORNERSTONE_MASK, BODY_COLOR_GRAY, 0, 0, 0, TRUE), #endif //P_TERA_FORMS #endif //P_FAMILY_OGERPON