From 2237e33ab2feb989888b23beac77261e1a6381b5 Mon Sep 17 00:00:00 2001 From: Cafei <46283144+cafei-uh@users.noreply.github.com> Date: Sat, 10 Aug 2024 21:43:19 +0400 Subject: [PATCH 01/11] Pokemon spite fixes (#5126) Various Gen 8 (+Sawsbuck Summer) sprite fixes for overworld and battle sprites. --- .../pokemon/articuno/galarian/overworld.png | Bin 1354 -> 1352 bytes .../articuno/galarian/overworld_normal.pal | 12 ++++---- .../articuno/galarian/overworld_shiny.pal | 26 +++++++++--------- graphics/pokemon/bounsweet/back.png | Bin 467 -> 424 bytes graphics/pokemon/bounsweet/overworld.png | Bin 1247 -> 524 bytes .../pokemon/bounsweet/overworld_shiny.pal | 4 +-- graphics/pokemon/bruxish/overworld.png | Bin 1559 -> 838 bytes graphics/pokemon/bruxish/overworld_shiny.pal | 4 +-- graphics/pokemon/cursola/front.png | Bin 895 -> 863 bytes graphics/pokemon/cursola/shiny.pal | 8 +++--- .../pokemon/darmanitan/galarian/overworld.png | Bin 747 -> 747 bytes .../darmanitan/galarian/overworld_normal.pal | 14 +++++----- .../darmanitan/galarian/overworld_shiny.pal | 18 ++++++------ graphics/pokemon/darumaka/galarian/back.png | Bin 558 -> 496 bytes .../darumaka/galarian/overworld_shiny.pal | 16 +++++------ graphics/pokemon/darumaka/galarian/shiny.pal | 8 +++--- .../pokemon/farfetchd/galarian/overworld.png | Bin 745 -> 745 bytes .../farfetchd/galarian/overworld_normal.pal | 2 +- .../farfetchd/galarian/overworld_shiny.pal | 12 ++++---- graphics/pokemon/guzzlord/overworld.png | Bin 1871 -> 1882 bytes graphics/pokemon/guzzlord/overworld_shiny.pal | 4 +-- .../pokemon/moltres/galarian/overworld.png | Bin 1172 -> 1192 bytes .../moltres/galarian/overworld_normal.pal | 10 +++---- .../moltres/galarian/overworld_shiny.pal | 20 +++++++------- graphics/pokemon/morelull/overworld.png | Bin 1163 -> 441 bytes .../pokemon/morelull/overworld_normal.pal | 4 +-- graphics/pokemon/morelull/overworld_shiny.pal | 8 +++--- .../pokemon/mr_mime/galarian/overworld.png | Bin 670 -> 670 bytes .../mr_mime/galarian/overworld_normal.pal | 4 +-- .../mr_mime/galarian/overworld_shiny.pal | 14 +++++----- graphics/pokemon/pincurchin/shiny.pal | 4 +-- .../pokemon/ponyta/galarian/overworld.png | Bin 723 -> 738 bytes .../ponyta/galarian/overworld_normal.pal | 2 +- .../ponyta/galarian/overworld_shiny.pal | 22 +++++++-------- .../qwilfish/hisuian/overworld_shiny.pal | 4 +-- .../pokemon/rapidash/galarian/overworld.png | Bin 964 -> 965 bytes .../rapidash/galarian/overworld_shiny.pal | 12 ++++---- graphics/pokemon/regieleki/overworld.png | Bin 963 -> 817 bytes .../pokemon/regieleki/overworld_normal.pal | 2 +- .../pokemon/regieleki/overworld_shiny.pal | 4 +-- graphics/pokemon/runerigus/shiny.pal | 2 +- .../pokemon/samurott/hisuian/overworld.png | Bin 1300 -> 1100 bytes .../samurott/hisuian/overworld_normal.pal | 2 +- .../samurott/hisuian/overworld_shiny.pal | 2 +- .../sawsbuck/summer/overworld_shiny.pal | 12 ++++---- .../pokemon/slowking/galarian/overworld.png | Bin 744 -> 741 bytes .../slowking/galarian/overworld_normal.pal | 6 ++-- .../slowking/galarian/overworld_shiny.pal | 18 ++++++------ .../pokemon/slowpoke/galarian/overworld.png | Bin 642 -> 638 bytes .../slowpoke/galarian/overworld_shiny.pal | 18 ++++++------ .../pokemon/sneasel/hisuian/overworld.png | Bin 683 -> 629 bytes .../sneasel/hisuian/overworld_normal.pal | 8 +++--- .../sneasel/hisuian/overworld_shiny.pal | 18 ++++++------ graphics/pokemon/sneasler/overworld.png | Bin 1061 -> 935 bytes graphics/pokemon/sneasler/overworld_shiny.pal | 12 ++++---- graphics/pokemon/sneasler/shiny.pal | 2 +- .../pokemon/stunfisk/galarian/overworld.png | Bin 519 -> 519 bytes .../stunfisk/galarian/overworld_normal.pal | 10 +++---- .../stunfisk/galarian/overworld_shiny.pal | 8 +++--- .../pokemon/weezing/galarian/overworld.png | Bin 1300 -> 1302 bytes .../weezing/galarian/overworld_normal.pal | 4 +-- .../weezing/galarian/overworld_shiny.pal | 10 +++---- graphics/pokemon/yamask/galarian/back.png | Bin 388 -> 350 bytes .../pokemon/yamask/galarian/overworld.png | Bin 577 -> 577 bytes .../yamask/galarian/overworld_normal.pal | 10 +++---- .../yamask/galarian/overworld_shiny.pal | 20 +++++++------- graphics/pokemon/yamask/galarian/shiny.pal | 4 +-- .../zacian/crowned_sword/overworld.png | Bin 1224 -> 1222 bytes .../zacian/crowned_sword/overworld_shiny.pal | 20 +++++++------- .../zamazenta/crowned_shield/overworld.png | Bin 1166 -> 1166 bytes .../crowned_shield/overworld_normal.pal | 2 +- .../crowned_shield/overworld_shiny.pal | 18 ++++++------ .../pokemon/zapdos/galarian/overworld.png | Bin 1034 -> 915 bytes .../zapdos/galarian/overworld_shiny.pal | 6 ++-- .../pokemon/zigzagoon/galarian/overworld.png | Bin 830 -> 862 bytes .../zigzagoon/galarian/overworld_shiny.pal | 14 +++++----- graphics/pokemon/zorua/hisuian/overworld.png | Bin 845 -> 721 bytes 77 files changed, 232 insertions(+), 232 deletions(-) diff --git a/graphics/pokemon/articuno/galarian/overworld.png b/graphics/pokemon/articuno/galarian/overworld.png index 734f4802d9ac181e17817ad8d8a395d09aa2a3ab..51e46babdbde6230a5451f4b2d8b7c8650b2d90e 100644 GIT binary patch delta 1320 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 literal 1247 zcmeAS@N?(olHy`uVBq!ia0vp^2Y^_CgBeH`yR~lzQjEnx?oJHr&dI!FU|?nl@CkAK z|NsBP7cUMxD0p##p<;(e$IPh@G8!HvOgJ3aI@2v@g+oNMY)r6}o~^s9f`bCkgi$aW z0>dc;u219K56l<6o-U3d5v^~hJ zbK9O>Ir{O=)!CY3Qkwsv?%s5{o7W(|GrJS!?WY74}N12 z_4^*ZjbkfsmJI8G@3!oQY$>gTe~DWM4fbzSpw diff --git a/graphics/pokemon/bounsweet/overworld_shiny.pal b/graphics/pokemon/bounsweet/overworld_shiny.pal index c97f75961d..769d9abd9e 100644 --- a/graphics/pokemon/bounsweet/overworld_shiny.pal +++ b/graphics/pokemon/bounsweet/overworld_shiny.pal @@ -2,11 +2,11 @@ JASC-PAL 0100 16 255 255 255 -225 232 232 +247 240 184 216 192 248 232 200 0 160 128 240 -136 153 149 +200 192 128 224 104 128 200 112 152 176 64 104 diff --git a/graphics/pokemon/bruxish/overworld.png b/graphics/pokemon/bruxish/overworld.png index 18b2325a80c8bcff63230dad180aa5a88c541990..04757426e6ccfe11dbca043c33b9b45f78f60077 100644 GIT binary patch delta 385 zcmV-{0e=3M48{hKFaiKDkuo$0oANmY0008SlRg6>3f7&;%fa?85<*#%X#;=(+mq@8 zx_|1vAx-!O1m??)f8{rW=yJ^;^^VDyYhn480xw1psz3290pNy1q=zm{#N{v=7`V20s}*K3{m<)q7ohihn~$ f?Vh2j`!B?A9=I&8XZhQq00000NkvXXu0mjfzq`B$ literal 1559 zcmeAS@N?(olHy`uVBq!ia0vp^2Y^_CgBeH`yR~lzQjEnx?oJHr&dI!FU|?nl@CkAK z|NsAwFJHcXbbolqVac@@M@}EwyUY1S#g+}JN3AncdxGY9dr5^GRAlP-sEKO>O&A5E zAuyamK=9zZM+^*1M?GB}Ln2z=PQO@mSAoYRms@#3!@vLeyOmZR-^hAriRW_uu(VG_ z8}@d$T!@{fKCj|Yr~15%iJ!~${~T9*Xqsqwf?xY*ln006z72Xwck5p|#Bk`H(>b!@ z^e(odb%&3q|5?w(*HxU%esQPK1$|2%(XbEmPtV(NBsFV6!7HhTeFjAak1rT(G=Fqq zzQyx}%`b|cT`3M&$+=|SA<6mQ+ZCrzvGEUDqk70rwYt~k>5u!>RfiVl=Oi53{9~K5 zPMWpr_vgp#sVVa%Ss> z8t+E&#T-}X|Cq*5a9Ht@b9CH&)&SR~_s%0p@wdjij=wk*#>x3> zOPWLVg|`AzAALx3(H6XC_N-u^zHXgtX3Mob3wI@4wn;VKXTmI#{i5gTtfG(!7hSxy zv!}YRbqm$h`*Zjpd*7*in;3Q`%`H2d_V;#WCLH>2@xt%6)%w}L#P5Ay7Vy+LzO8xE zl4T*h>)waY%Tw+ZP}|y2x$ZXGahbrq6K_4Pyv`$`>vOI2c(wVRk{!tk7pi@F*589-ei4<$t?ig3e!sHN_jQUtq4Az3p7gmAEYSmt|90$|GcB zo(kVnJM?eM+Ru6Ed^)bHzQ5<%yZ*a#UBT4)$H%Sa6#N#d=;fE?`Lcb*)_<#_Zpl^} z|NAyku%^+ReXeQLmdo>#zs8Bre{^3UXm@(XtAE@dr8|UmX5O6t_XjA0db;|#taD0e F0sy1Mk?Q~e diff --git a/graphics/pokemon/bruxish/overworld_shiny.pal b/graphics/pokemon/bruxish/overworld_shiny.pal index 624b47c64a..7de5796528 100644 --- a/graphics/pokemon/bruxish/overworld_shiny.pal +++ b/graphics/pokemon/bruxish/overworld_shiny.pal @@ -5,13 +5,13 @@ JASC-PAL 248 244 244 232 208 136 225 220 64 -224 216 208 +248 248 248 196 203 194 200 160 80 232 56 40 104 208 152 59 105 101 -140 82 158 +56 160 104 75 74 26 56 160 104 105 44 76 diff --git a/graphics/pokemon/cursola/front.png b/graphics/pokemon/cursola/front.png index 2e4036381214f9435653aec22e26c869cfdbff17..5dd4cea7de0a60382d0071ee68d84310448e1fb2 100644 GIT binary patch delta 803 zcmV+;1Kj-o2Hysd7#0Wv0001;w}I>c0004VQb$4nuFf3kks&pI^78VFifhgQ00P}f zL_t(og{78>va28rh8q%?o~zdPf7_cC#jRqQ>5Q%XAKB^ab+Q1?-rQS|68?l$0B#t- zzuq9|DFQ&s4S|2V1JF}sFXp@l+%X^kEPrBv5lHrKBjEb4fz*>oH`l%Lz`ql?g&&KijD<=S)zpgQnFXU8z0jSRHVrd99*xzAt4^~UG zdE4R(!ZwjQ`H}$4a{rAU6DjKERPv{6}Ch> zAX^Gt-vVU%QFv_nq8=DQY{-zC%(r@yyk?Js0CFksS(ZSGgn{xR2?qdH&1dNeK$+iv zqGyVPA~lVF_$T_mx91`>0iar3+hkxi!2BLYro6}EW6Wn-%~#F( z8DN;lfnC@Gylz!~R8v@!z@K^4AeakbfHo#K=f(A)qS7y(I_p4fAzSHsPOO&(M zkm|E(v`(*#554+mgi;;Y^wqh#j(@j7_0-BQW^>bjz*$>K-*XN0nm6Ie@|yTPyhe`07*qoM6N;tV1mtWdJ_Nu delta 835 zcmV-J1HAm-2LA?-7zqRe00013M{MnpE;WDn@c2~zWrP3#010qNS#tmYE+YT{E+YYW zr9XB6000McNliru=LQD?6C9&xg)jgB0^&(TK~zY`g_gZ;+b|S`DR49jn6#Z;*RtTj zEfmojJ4lws4z9%RHV{8Zw*E|ggg!x#)oF*Uae*SumS*YRJVOs9Igw>a;b7S0$9sS7 zJ-j5$SY-&-JuLFNSpaIkPW_{00YD{Qi5>$M^(6&*57?{`(4~ZI0GPBR8tlJA;V4Z> z4)v{mo{e<+)=?Igw4pLC#B3oO(j4vqK@l}%F`tu7Ibajk4+9wO`64QTkYdrVmjEF1 zNje??N#RimnBj>}LvtKMX#&*%MC5-uh57H)m(2GLDf+7{RDZ}O_j8mo4r|tnEjWqLZLB$BP z)?TGmFtuQc+tL;9H_w2m9;6s(pEfHY&el-SP+-sJsg~FjYB>=Ys}r(EsWE@y={!{u z0+=l610ll6XgwKu)wbhtriB3}n{xuPSv$+J2aSscfS?b+oqnY$Z2*U5+gZh-CoFWosh^G zArK%c)}4dKwu;H6I5XW-j_TC_;N;uPm4XA2P_@gY;xOM88*z0Sjr0Dh-f(ql0^|*6 zS{@%t*4`QXwsHB2?0qk{<^b>ups=6kA2laTM@ve)wr7&(K+Qi^(-40&=y++lsUz)r zixFbd3CwYUye@#pN#{D_S@r^;lSTXLt1aGytRu(U**z|G_IBGAfPVf?boOvd_iez# zT^v8atJy^((ECR}@7|f7ncXx4k3_F;AG-m1^Z1u&*9@>9Pr$Ec;3@}xftZ#R1z|}9!pB-%KbpXBXC0(#KuUQW}dvx)_KY*j{{{af1x2>IlIjjHx N002ovPDHLkV1hU@dV&A| diff --git a/graphics/pokemon/cursola/shiny.pal b/graphics/pokemon/cursola/shiny.pal index 552b1077fc..9259843950 100644 --- a/graphics/pokemon/cursola/shiny.pal +++ b/graphics/pokemon/cursola/shiny.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -184 184 184 +145 145 145 248 240 248 120 120 120 224 216 224 208 200 208 -144 136 144 +92 92 92 184 176 184 -224 96 144 +192 96 224 248 248 248 -248 160 192 +221 173 237 16 16 16 72 72 72 56 56 56 diff --git a/graphics/pokemon/darmanitan/galarian/overworld.png b/graphics/pokemon/darmanitan/galarian/overworld.png index dda43e6e075e81e0cda84e932ceb70ff8daf09b9..f6d78555e5bcf46abb9ae1e10b8bd0e2d29dc9a3 100644 GIT binary patch delta 30 ocmV+(0O9}Z1?vTnMH48%r~m)}c$?8rZ=nDG|K`-J_OV!#0@r;Hk^lez delta 30 ocmV+(0O9}Z1?vTnMH5}T(f|Mec$?8rZ=nDG|C2uO8?jiE0@e8rZ2$lO diff --git a/graphics/pokemon/darmanitan/galarian/overworld_normal.pal b/graphics/pokemon/darmanitan/galarian/overworld_normal.pal index f573721897..2036748fc6 100644 --- a/graphics/pokemon/darmanitan/galarian/overworld_normal.pal +++ b/graphics/pokemon/darmanitan/galarian/overworld_normal.pal @@ -6,14 +6,14 @@ JASC-PAL 167 167 167 215 215 215 10 34 40 -93 188 210 +40 192 168 0 0 0 120 155 209 79 111 160 255 255 255 -10 10 10 -11 11 11 -12 12 12 -13 13 13 -14 14 14 -15 15 15 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/pokemon/darmanitan/galarian/overworld_shiny.pal b/graphics/pokemon/darmanitan/galarian/overworld_shiny.pal index f573721897..e61043b14e 100644 --- a/graphics/pokemon/darmanitan/galarian/overworld_shiny.pal +++ b/graphics/pokemon/darmanitan/galarian/overworld_shiny.pal @@ -6,14 +6,14 @@ JASC-PAL 167 167 167 215 215 215 10 34 40 -93 188 210 +72 160 216 0 0 0 -120 155 209 -79 111 160 +190 224 117 +74 105 37 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 255 255 255 -10 10 10 -11 11 11 -12 12 12 -13 13 13 -14 14 14 -15 15 15 diff --git a/graphics/pokemon/darumaka/galarian/back.png b/graphics/pokemon/darumaka/galarian/back.png index 94115f536adc13cf784b4068ddda0a3f869c423b..8aef0d7756517a5132535cb4b277f64f5bccd049 100644 GIT binary patch delta 455 zcmV;&0XY7y1n>ip7%&I}0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!goU1$&x z5Gbm^Xxiu?lAw`TAAhB>4FCWEZb?KzR9J=WmC=%eAPhxIl$5~#|L=06xU3SS`qWwP zbbR6*2oU;uJ$dqf;=Q|v&of=eUB>6hU0#CA^yIz2yaWgOj=-;it2LAbTwcOGK|($i zMpnld@AIMK(0=jNF~&PLO*4`e6}~7&1f;d9WXD5MMt_BXUq^r(`OOd_QM3x8 z4qpruMa~4&Bl6(_ieu&X3R{3HPSr@DIJZAZ9X^K4Cs`3(7}?{z+$Kv918tba zTY`|2YbB}E;(sjz>0V*pGP{ARpmmdj?sYP;S`Z{QnhAZ%hfQw@(2#9GU^?d+4JqMJ zMCOTx1S&bcO4{NyD&S;1YvTejZX_*LHkx=t^=m#!5G3Ors04OHP|Y_LsWbgzNcQZ? xcX1p@Sc@4W`~F5KduJo(c60D96PXi(@X3k(1N002ovPDHLkV1n^J%eMdk delta 517 zcmV+g0{Z>%1Fi&+7(fIA00013M{Ml?0004VQb$4nuFf3k00004XF*Lt006O%3;baP z0000mP)t-sn9!goXkZW!5GcT?Xz0)&poo!3AAc312><{932;bRa{vGi!vFvd!vV){ zsAK>D0f$LMK~zY`?UONY!Y~kpQ%gvZSc-QTPILGb<1!Jx7R`}6;rx) zX$>1w@q~~7rTKHULkM=_rc#G?=^On%-#h0n-oO4(?D88w4qE-|c-U+6FXD)eTY+2F z4u5nMFly`aiYWy@2fBIw70_YYKX9J!oK24IBUbpF&vuRiy(o@{tnd}FX#zKlMe!Xk zHPc6_|6~K~R6t3U@K*yfi75Y}@^uNaUetl`3_NZ;Ux<~RG3EwqL10~p9P3Vq-36+n#yfu?r^{Ka`#&jR-i zAQuMkmOul5Y+gkO+5{9*?G&LNbpY^Td@SMuvcQ@JPO3?3sjjI#tb?%&1z?Y>k2==2 zC?K&Hf}nLDFsW};Sng`6ZQ~CPEgzeIc;9;A*8A5l%kw?~d4w8$(!|hQ00000NkvXX Hu0mjfTwc~B diff --git a/graphics/pokemon/darumaka/galarian/overworld_shiny.pal b/graphics/pokemon/darumaka/galarian/overworld_shiny.pal index 44a066b5bc..409dc17fba 100644 --- a/graphics/pokemon/darumaka/galarian/overworld_shiny.pal +++ b/graphics/pokemon/darumaka/galarian/overworld_shiny.pal @@ -5,15 +5,15 @@ JASC-PAL 10 34 40 36 36 36 0 0 0 -93 188 210 +120 203 214 215 215 215 -56 134 152 -29 45 70 +32 146 160 +31 51 8 128 128 128 -120 155 209 -79 111 160 +182 212 119 +120 184 40 167 167 167 -55 72 127 +64 104 16 +255 255 255 +40 93 104 255 255 255 -80 108 152 -15 15 15 diff --git a/graphics/pokemon/darumaka/galarian/shiny.pal b/graphics/pokemon/darumaka/galarian/shiny.pal index 21bd015c8a..f7748fd8d4 100644 --- a/graphics/pokemon/darumaka/galarian/shiny.pal +++ b/graphics/pokemon/darumaka/galarian/shiny.pal @@ -2,11 +2,11 @@ JASC-PAL 0100 16 152 208 160 -40 104 96 +40 93 104 16 16 16 -40 192 168 -104 232 208 -32 160 136 +40 170 192 +104 218 232 +32 146 160 184 184 192 232 232 224 64 104 16 diff --git a/graphics/pokemon/farfetchd/galarian/overworld.png b/graphics/pokemon/farfetchd/galarian/overworld.png index 343ece6bd68120ffe37d440cfdd7d708685e032d..bde1b5b7ecf99b8e08858dd3316c1150247279a6 100644 GIT binary patch delta 639 zcmV-_0)YML1?dHlQ5n_J#X)sBIWRF&L_yWk#TXP2DJ&`Nbp?fyYAAo*ma8xbg^MvY zl}O(IZ4cm2J0qaWUYxlQ*UZhglk82<)yLzmyY9N{uDkB~GetyS@gu?E`tORj&p9~b zOMbNcAl`}aP%&rBaG7V})#C@4EynGM)2{~k3|Dl>C0-OD#A-2UPfS;bxz-@$0Vk>~ z0Dpu+EEc&vK>(k&_Go|dkJz8t;YHx`^@yCAdjhJ8-3~CXneYm2V;kBCVj!CaW`WP& z0Rnz*Ifknp3d0B^Ky8gRt?hfH0`mC}gO0@mEL``$Le*f`foMdwpEMCb_PJ{6V$h!R zH})*5LkGuH48p5Zhaxi!f(G=tI+QnrUy}-*5#a+HCII@yq4j^6is>T3j-K+F#HZOm z4j6GM{>o@k_X1;BH*DmCQcBC7#h5O;BN9~TOAn@oIN-*;YXmjOmt_WsFqFO&gr{=> zA>9(B#QusnGz@CMm3vc6paTN0q3r_@uGq>4Kz)zQ5s2qBroZv5N!%g1D>=nXkV38w zml0{huseh5hRuI`>XH?}o#IY}bTsclZa6`KRLL^P0XJ@bjd>Nj6O+`2(FpK?_xWZ` zN}8~eC7=cJpS_-Hnh_k_)i#d<0utOx6IN;`5a9nDGAm>{J^z z^QnTrBfv(T{RN^&RnZqBGyR7};?K}EzHaa2lj6m}Z+_mMx$9095j`pL`HAhXZ+_Q* Zs(-t;D19o?kp%z%002ovPDHLkV1l&tJ<P%OYAAoplIt)CM1y6; zDkGu)|Jw`rk<1vdD_PuG7}w0^w4`o?U3on2y6djH?z-!)KT|~X6+aW4uK%uh`<#O_ zzT{`iPvTt&4;6F93?K6>yn6fuv&FbQar(_5pW%v5xx|YCgjg*G?TP8;FxMJ{JmEx@ z1>lcRh{YneCkWuv-XDKm{t^2#JG=^9z8#S>b5B53vD*RWH4}b9``o8KgBZxBfkoi+ zSAc+DTaMvshr%?&3{ZP#P4CAZsepX`!=PjF1Pj;wKcQ-H7(g^4J5HJiAp2Z3bv0QH2cLC}CcSBLV3@M}_GFe1ER!vw&%I<$X2Q!!m7IM7o*llV0I z#{nZQ#a|gM8X6eGx?>|Blu~;3EXH)*9g(2ISVk~4!~u8iT_dPLzAQ69grSV3AUvH5 z27=lej~2S8|G(Acb5V zt|QW?>2L1^JE+;D;dsgh-o1Mb}X8uKc4Cnl*+vk~A8AM-7m zlr&)_OF%2+KYKmZ)DW;G+aSES*?`3%KPdhWN9g@1HuI^ZHN7M-TTCnDboLEs16pgz zG5E%9ipvZU!mQ6P4jVS}E&Df}Pj0alAn7Y47hvJ#2)0|8tO2~lmnr2j;r;nJsCI1T zQw4uVfQ>r)3q+5qVk|^v`ZtTjpP|qAw!M>2iWdjJ`FVTht~*sk^rFb;7q488 diff --git a/graphics/pokemon/farfetchd/galarian/overworld_normal.pal b/graphics/pokemon/farfetchd/galarian/overworld_normal.pal index 0a555549b1..3df22685d9 100644 --- a/graphics/pokemon/farfetchd/galarian/overworld_normal.pal +++ b/graphics/pokemon/farfetchd/galarian/overworld_normal.pal @@ -10,7 +10,7 @@ JASC-PAL 238 234 255 49 89 41 255 202 49 -0 0 0 +213 210 197 65 117 57 57 48 49 82 68 65 diff --git a/graphics/pokemon/farfetchd/galarian/overworld_shiny.pal b/graphics/pokemon/farfetchd/galarian/overworld_shiny.pal index 0a555549b1..2d02e605e7 100644 --- a/graphics/pokemon/farfetchd/galarian/overworld_shiny.pal +++ b/graphics/pokemon/farfetchd/galarian/overworld_shiny.pal @@ -4,16 +4,16 @@ JASC-PAL 57 153 197 0 0 0 156 161 115 -180 174 156 +200 176 112 180 145 41 -115 93 90 +128 96 96 238 234 255 49 89 41 255 202 49 -0 0 0 -65 117 57 -57 48 49 -82 68 65 213 210 197 +65 117 57 +72 56 64 +96 72 80 +240 216 176 24 20 16 41 44 41 diff --git a/graphics/pokemon/guzzlord/overworld.png b/graphics/pokemon/guzzlord/overworld.png index f9e52bd083253e54a274ecf503c5d489cb18da41..f8e2dd5fe50a5ee03991eec027348821b6f79303 100644 GIT binary patch delta 1083 zcmV-B1jPH#4%!ZoP6IPHJ+V>c0)J8XGdlnP1PDn)K~z|U?N`x~q#z8G5hQTr|9|&7 zAt*Yab6d5w_prD+&NMFFNfU5ce%o*RZNKgRY0T~N75L{HJKnGV4*z^h(I@%vF?|7E zo-_2_8RW>Emc;n{0{onz@6I5{h=0yFqfum%EAa%rw5JR`;Y9cR=D0CTF@J3v_-$L# zA((?J%Tip>tY6`#Z*NZ-dcx_!TvJ>bvJhr^tzmsp{Tc$X2w)0f0Gqy!-zh_-aH+7} z-DeO%q&sun;mQyiobwyrTC_KbG|Yad8U zek$M&uM8#1I6V`4p@tIxhJV2*xEa7z-$4-0h%pA7>JbE>4TmRrx!|2Z?V?ecRfl`L zGK4>f;SO>*U-E^Q79o5N;Hs|@lnhCHg`!-NCUDQd1V89#RFZmYX!Iw%l#I|i+Td{q zmv7|oJs%y0@UG91W(W+eB~9S6&w*u#(~*H9QQ=6DN-WEJ6FkuzUw<-OKpv5@<~&^D z@@KHlP#Ha{J)}{*1Zs%ybD+@r(o!N&c@MJSo0wpNV{H+8XV}c^;e3{)wMqW~D?JM@ z8^gC!|Au!GvzMr7u~UXM$l~G3RdE$aLtGcf;I}n{nZw~-UN;~35O51ify~MaBjBjF zxr-C?06&Upu2Ipc6o1txLX0DrYC*2J3LN1&0*Y(_!~D_%4B@)vi0}g(v#aqXJ@nq? z$e-aw!UBV$D%c#ULDm^B{xMtx4)7ME5I}KVU$57S&!THrXR>#=<1ZdFhSB(m!*&4^ zybfQ8@|H6M6vH&gSSO^jzzshHcKFUOppwESdSJqw74QHK+s2>&Zg-9i=37iLRy%f2Oy z6THF_i$oj3g5rkSCIp3}@YVf`c9`OO0&un}gBcTghE?Ag<~{{lLv)e~KP@Fv^A3SS zoXkN%(oY*F`G3D)Xao&s>oCI`f6&3Ur!`S`Fw|Q*!S={*a;^-Mome%A=p-Z4Y*E&q_+69N~zO2rj86Nr!md#mxq<*sUB6<^IuRk9Ous5V`Fzi#1U`LnLr|SSbPdjLr8&PliMvut%q#nN#>;zVPG+fTPzE=(T zDZboxcr0(-D8sZ(o|^TS-|$Kdl{arK595qF`~_ZYS#T+*25bNT002ovPDHLkV1m*L B3;F;6 delta 1072 zcmV-01kd~04$lsdP6InXMzK-l0)ICq@*4mE1N})vK~z|U?N`xq;~)$)F&K$M|NpzU z5@6#P>|AF$y@x`bI9XA4r3I5^`E9@LxBa&Nr-`(eufRXw#L52p@9@tzj-K_+NB#o5 zJXh$uD=1Nf7Z$vK0e-H~cUMqi#6K5Yu~HP$SCR?*)}AW#h|dc9h*yRjd4Jo$Z`;_W z5D6|XOLoDk{th>NdwZ(T6V4Cjn&QS#l(5ii4eN`_#}G(VfKUhnxa#Zpohp>Ge~fpAZe;s&6NVx){Y6wL;nL`ZPhfJ>#9g5(8=M zrvmQq!cen}%L|EDYPbMk8h^}!n*m((9R%Tw7-PU?9zg=ybQmei8{P@D5X;JJceuw3 zL->OP?jVQjr5|Kz8N&MjF8T^Vt&rwdDe4Pb0rv__@Pm$Jh0R+-qd(y}C#2TV29Gvr!_ zl+W<2X+c)7E3`FYNwyWQ{;9YM9N;ZSA%Nn#zFw~t@7bPRoyo3n$6q~G8OF*_9kvUY z;AQ$ul(qztIrHu>#`bN&3OD=^*x@_BfSnXJv5p0ERv-g7NPj0ln#J2PweRE;9M7{% z+m=@EnAKUfT=*pyyUC?6+^>V+F7Sk_H);X& z6hn+%fi=T$7F%n03z*_1!+O5)J_oXnF&)Et3oka<`#PjsB~)2f?&k?iV2>X|kzvaA zcofei=8atonBXM@T~A*)A!t7{JoHsq4`*daFMz0SB7efvpK~5?Ev*rh%-oWD9$5lr zcnLu-r~J}S3=e%3E=x;?ybV~DBv%*KUz2f;(=rU0000cThfNq57`RJ<{DK+&!$ECX?bVHKN-O|oI1~;5 diff --git a/graphics/pokemon/moltres/galarian/overworld_normal.pal b/graphics/pokemon/moltres/galarian/overworld_normal.pal index ef0bee86ea..ca9a549d10 100644 --- a/graphics/pokemon/moltres/galarian/overworld_normal.pal +++ b/graphics/pokemon/moltres/galarian/overworld_normal.pal @@ -12,8 +12,8 @@ JASC-PAL 249 181 225 120 200 248 160 224 248 -11 11 11 -12 12 12 -13 13 13 -14 14 14 -15 15 15 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/moltres/galarian/overworld_shiny.pal b/graphics/pokemon/moltres/galarian/overworld_shiny.pal index ef0bee86ea..8330f2687a 100644 --- a/graphics/pokemon/moltres/galarian/overworld_shiny.pal +++ b/graphics/pokemon/moltres/galarian/overworld_shiny.pal @@ -5,15 +5,15 @@ JASC-PAL 0 0 0 0 0 0 61 0 25 -24 24 24 -56 56 56 -173 28 86 -235 88 147 -249 181 225 +229 185 8 +248 208 48 +240 80 32 +240 128 48 +248 232 104 120 200 248 160 224 248 -11 11 11 -12 12 12 -13 13 13 -14 14 14 -15 15 15 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/pokemon/morelull/overworld.png b/graphics/pokemon/morelull/overworld.png index 6d164768a6902a4a5f6556909a928b46e24af0b3..5f85740da2f6f8a4c662c096d45936cfd91e617d 100644 GIT binary patch delta 403 zcmV;E0c`$@3AqE1Fn<6rP)t-s|NsBySw(czAdqARqt$0LZwg*_Z^90003uNkl7`22)G_|8EPnxhb@v z887T)dU*)!nluEL%jI&pTrSr~chX93)%`{iCS1+!0WCK07k@5PT+Ph}FmXY`RooT; z0AR`~aIvApHHh5D45;!*p?1E8$jkCjp z=R9hl@M8vuH!N_<726hLgFG~;@=D!Xj9cT%-+8a$aK^9K7aWnAZ}i}}zsdpMJmM+N zYEb7Fpz|$K!hiHLD^WNed~#glT!F$T@CA=u^LOxa&bM=(Q^6zBBQ((X+5iGRdBNwr zfy%kRfpb8j0h#jz(mLJ)5(Cf-1pb>A@YUQJP{6X6U0Q%}kp>vgcY{&`Eg&i=@`6Q6 x*mj-_N)FY4`U>Z%`FuAh-;fy4di@^I3y6Ul{S~)TFAM+x002ovPDHLkV1hudzdQf{ literal 1163 zcmeAS@N?(olHy`uVBq!ia0vp^2Y^_CgBeH`yR~lzQjEnx?oJHr&dI!FU|?nl@CkAK z|NsB9$1lHLx_Rf)i%&<+9XWDj|Bddd}!hQ;K(D60G{ zRVy{!IU))QeqHZ2om~C3YQq%1^5S}j$>Kk_!ez>fzcWoaG9g3kJ8MJ76fdu(U!)^q z*mMpFZ~Q9toyCFS0I$oH)%k@tKRigXJ)e58U2wvoomnnfhvI6xyB|I%3~+dwdmu>Q zs&tsebFWhN6%xti4&BZ@5scro&VAlfsWRu^^RJBRj~?9)D}Qy}-13q<`>rFdTkChv z|0HXXSl6q=w!E3YFM5uw^h)MgGP91|fABUY@3~d_Vg3(`MK=7n!@#sR^}zQX4JViG zYxZ_{#bh;|Z%ySM)+KBSx&lwk*FM<2(|m!$&zbXYG4yP{cA#>f?h4TjOi9ky*w2I= y+V^?Sf^7>W1Ee2XmCn!Ser3Ld%_ROg^DoxrqEeOe(m$qvQiP|gpUXO@geCw3Ajt9n diff --git a/graphics/pokemon/morelull/overworld_normal.pal b/graphics/pokemon/morelull/overworld_normal.pal index 52cbf93f93..6efa8c740b 100644 --- a/graphics/pokemon/morelull/overworld_normal.pal +++ b/graphics/pokemon/morelull/overworld_normal.pal @@ -6,11 +6,11 @@ JASC-PAL 245 210 217 220 210 232 242 196 206 -196 196 196 +184 131 178 191 196 122 158 158 158 171 152 193 -184 131 178 +196 196 255 146 150 89 224 124 140 120 120 120 diff --git a/graphics/pokemon/morelull/overworld_shiny.pal b/graphics/pokemon/morelull/overworld_shiny.pal index 87d1e9509a..7f3068c455 100644 --- a/graphics/pokemon/morelull/overworld_shiny.pal +++ b/graphics/pokemon/morelull/overworld_shiny.pal @@ -2,11 +2,11 @@ JASC-PAL 0100 16 255 255 255 -176 112 64 -240 144 120 +230 227 233 +186 57 24 220 210 232 -208 120 24 -196 196 196 +209 134 54 +240 192 72 191 196 122 158 158 158 112 40 24 diff --git a/graphics/pokemon/mr_mime/galarian/overworld.png b/graphics/pokemon/mr_mime/galarian/overworld.png index 122bda4a1306a594dc5d24e86ba01c9727dcb55e..fd95946076a2b9c7833996e53e5c485dd14ba1b4 100644 GIT binary patch delta 566 zcmV-60?GZJ1)c?vNFRrGb^rhX_Tu6H|Nl8TIi%k5zP`S3s=jDwXi*?IvXN&me?;My z_kY~kK$C1W9M&I`CgrG#I)4W+H>X>cM~@yodi3c3iR=~)vPP+CYof7@QQQ4LID$g$y`VRv_i^yO$He1IXJ>wsynJAGP2 zyZ2&}hsgn!lit$ntPeD_3DR!u4xlP_t0%Si)jEOzYo%GM>=O(Pa>B|A*&8&bA%rr3 zSXg{zfD)U+CqMOrV?#-iWpPS|<^)DGcpm~qmTSh2<%)5npus78<0ZK_e~t|`MaN!t z*Uo=TL-O8J%*R2hmys5$JQd0wUu_*oXr z0j>n?`T?3xbkOq4-6MkeTP`p--+ZnE0w%;C{k^^bAq*lf{RW=>3;+NC07*qoM6N<$ Eg3l!nq5uE@ delta 566 zcmV-60?GZJ1)c?vNFT47nE(I)_Tu6H|Nl8TIi%k5zP`S3s=jDwXbn!6?2%_Lf1q&d z`#s6Z5*bt8_x(pk8d=1U zW5WuWQFhMNA-t;EB*Kdra%^~=s({fRj3{Y$b%;aNx|hFc2}6zzm;B);doZHpNIuR{ zA3(p>&=Q6m8?FS;=~)w)P})d8fBtCl)B=kba%_0baI`yfdOG?DA7IF_p>L19JAkU_ z2tiEpFgd_-(tCP?^?`;?>9BSOP!+p9kXpiS9YKJ#((Fz435EtaVReP<4Vu#!V;w*& zEWSEGjV<9Pf9eOvhMFSF;?xYy3Cw5=Ax26p*Nh#@72`xvgG=~@*W}(fe>Suf9S7N6 zZ{|OzF^3Q+mB)irk4H%)ksOyWXUkG1%Kn&;Mi~_ zNr6+cXE39J^eL-SQqk3V##ZnP4~pM7Hk^tvb17_>sW_#r%s9!=jjPZELyiq1y)1|P z@-S1Z(2uD8Qqmh%>YL7*f503=jtwHYEZL9VQw@%&?(j}cdoVlzLyiqwy)9CsMlV8z zdDwQ7D%TgrI-OVa^8Kng?4Wx>p1_U6_n?`T?3RbkOrF!y|(ETP`rT-h8bC0w%<7{k^^bBjF+&e~UZ=3;+NC07*qoM6N<$ Eg8iWr5C8xG diff --git a/graphics/pokemon/mr_mime/galarian/overworld_normal.pal b/graphics/pokemon/mr_mime/galarian/overworld_normal.pal index 0166ba80d5..9783b2507f 100644 --- a/graphics/pokemon/mr_mime/galarian/overworld_normal.pal +++ b/graphics/pokemon/mr_mime/galarian/overworld_normal.pal @@ -7,7 +7,7 @@ JASC-PAL 89 106 134 59 49 48 53 69 94 -175 154 153 +135 118 118 0 0 0 246 226 225 255 255 255 @@ -16,4 +16,4 @@ JASC-PAL 190 190 190 113 170 190 104 104 104 -15 15 15 +255 255 255 diff --git a/graphics/pokemon/mr_mime/galarian/overworld_shiny.pal b/graphics/pokemon/mr_mime/galarian/overworld_shiny.pal index 0166ba80d5..b2ee5a4fd1 100644 --- a/graphics/pokemon/mr_mime/galarian/overworld_shiny.pal +++ b/graphics/pokemon/mr_mime/galarian/overworld_shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -197 44 44 +128 63 60 0 0 0 15 20 29 -89 106 134 +112 96 136 59 49 48 -53 69 94 -175 154 153 +96 72 104 +114 93 92 0 0 0 246 226 225 255 255 255 57 57 57 -164 222 242 +144 176 208 190 190 190 -113 170 190 +112 136 184 104 104 104 -15 15 15 +255 255 255 diff --git a/graphics/pokemon/pincurchin/shiny.pal b/graphics/pokemon/pincurchin/shiny.pal index dd03c31a28..a2b0a156a7 100644 --- a/graphics/pokemon/pincurchin/shiny.pal +++ b/graphics/pokemon/pincurchin/shiny.pal @@ -13,7 +13,7 @@ JASC-PAL 248 136 40 248 240 40 192 88 16 -0 0 0 -0 0 0 +173 255 239 +20 255 210 0 0 0 0 0 0 diff --git a/graphics/pokemon/ponyta/galarian/overworld.png b/graphics/pokemon/ponyta/galarian/overworld.png index ac613865766b406f7a743c17bad7381f62e11239..683780312b2bae83528b1b921dae2d0c72fa92f7 100644 GIT binary patch delta 696 zcmV;p0!RJR1>yyeHh-AVpnFJrgLzsYARye+x5aJ6L2+u;nbp0zy&R63?&|*l003&< z-g9w5=DOzg^4^Wcd71zK0$@o*K~z|U?U&uI+#n2uVqB6LKNUtY^`!}4I0P!icEG^4fgeoF4I%fq8VCVA z7*{kEpF@GeoHFt8(F#{E7$ z<9rlp>-uWFT=N%426(xa0gkEXSPG@j-OM7E^P#fG_k`j&d^7-QrUiUX7#t^`bYtxCXM$;<7nyW{ z!$!v1$mM9|gA9~*WN`$>D0s@VZGiE$z|Qz1!8Wkq2BJuz!I*@xe;T?+gADYz#S;jF z3p*dQ+9TN?j|BH05mrzi=0|6*B9m%=n+RO29x;E8=TFA}UR*Qn43nNBZn3{I{>{zA e4!$Ad--%y-L?(TD`=;Lj0000srHR@s5a0i8`(v`FXLbcU+1|7h zX7=hs`BA`ZO1Is1+ikbqcH94AL{w5Km-&Z=oeM%-=85XQOMekp;EaE2*jo0zx(a8U z_F8MH*>jljkBxFQ+g$-uZW4Wc6OId}5*I+oPlY>03L>slshU95OB@$mkziB+Ay2B5 zGsD9ZFykBa<(z4|#&J9}DS(hCZIt=(GgET}%y<#WSwzYu&P-@>&Yr>Qzv6F!Daelhm&VRUHWlO-GJR0+4XTYz#D-`Y} zG7fHJ^464RXb$-wClsTeaYa9t73yUZVFkUaOFV2jK_0&#`$Q{*7b?J zmHCsyW615Ax{s$&``*oMVm%)!e|>k5Aj79X8TZkXI}TQ7tpx&Soc4Y){`%9wPhkBf zaFoE4uYbJ}UNJ5PCE|}sj8SlWPBCqkQ0j*3PVf zz?>CNdG!-u=;L7h;ov8bP=RPtXmB=RoS&JU(ZB;UE=2;7VB+9|)@CHf>){aoBSHkr z!~N*&UF1@mZxeyZoAKv*{$%~{;O6Ojxbzfpi6Z@#^pHSD`Z1H1lbIafMnBi=Z z)SuGvoDIZkAl*3m)JhOvH46bPN>|UofMBxk23_oPR@F*2{_!FXMzjjpo_2He0j~}Z zJb``Erv)8?HywQXca1)wt|#1gYp1-+<-5Qc4#rXD%||-vqr-3bLz9pKF##Ww!U8mZ z-JbJ+yR(vx9EguN3_&AOgzB9L^MwB4`CI~g&)y7}JKydGeEoafn8k`H@x0CsVQfP? zZ^Y9cvhXXsEc^(URyDZVdi%3YEohO(06Q6CBq#}s`x-fl1o5E*i11u8c*VqZcR6aE zBrm`~wHBw-fsV=S@iVVulhBaLk->g@NnL{^B>XvIlrpoe;I!Pj_Wlv;>vKE00000NkvXXu0mjf Djb`~;Ex>6tkZfg?zZ-~*{tb7J zK$#-!^SvzX6R_?dtc!&Yfe0AJ%Xka0NdgCt*mr@zw2fR8w z@C5crpB8io-gNNk-!=M#x}I>~t)22Nmq&p!9E_vPn~!wTM~4siQOBvo{0g&bPY(U;kb=X0aklJg>7u7~9a! z8}YPFL{AaX(&adkDU&dcsoi!;7<#7}M0000J2eAf_7#0Wv0001UMu)cm0004VQb$4nuFf3kks%|0=y$LH0000000000 z000000000000jwHwEzGDuSrBfR9J=WSJ`62APkEk3GM&?@O%K_uyM0>Z((cNA`p_z z)opvqQ=W3Cz#s8{FOC2R>joaaV6 zV#F5@brb)9AG>3JUwr8O9fPhwtPTW68X-=BEO@Z+Pxzx0qrYR&7bsvEL&cFnNNyWM zO)>YSqU&22bOn|M!GIaBO|0&=L26LttNd$&D}lf>Z!`#8KjCr4KQ$P-{+}C!vb;ut zWxZ4O_DSGg^XT9`e`B!QPXq_Z|JoF^4D#~Q1k|O1d*1Cd z9D=z9$=zrG1E>n9Axuf|S4LlgWA)bIL;sAs{Kdd4o~RuS1l0f=1j1p!X#`E+r9bi< z353ue!5F6~3S0crci|WRU|^WZqL8Q1tiKr4Gn6OsD6mWc)F&Z+^BDY20jBB>uiJ2k zxBQ*KQN){nw|R<&Vqj$uOo2sTOeg297W{T{J-B$oKN%bxV09n^QM)W;g9#hV1`_QG zg8-t+!;?N*i5E=kj}?N8d;Fb)Vqn%^3{qYLjQSI&vlT#TPdoy`=Lx(Lvj+M=iq12! zfi>>&H$r%?C54s)=`V&ygo?RjkA9)G7WB+o#aGQ3tA0w>!Q*S}CVq>b z4=G~?iGvi!H3F4?5Wpjh102V(_`#&%_xST^Yw;h`F)VAp-U&JZC_&tM9dCKkb1M<-n>5YgX`2YX_07*qoM6N<$ Ef+}ia^Z)<= delta 922 zcmV;L17-ZN2EzxC7zqRe0002CwraMKE+c;c0000000000000000000000000@G#7* z0009{Nkl!NaG15(pS24YkP@_j2Y510D1A;4>*6aj65xSz(wr!s0qWuL6}G-Ftt-jCLc} zIqw1v8fS%p=dU2!ZS3xW=_0JN8OZbf_Uo@kR|z#*^EEwJ z^ST(A?jP1sxGv(gr$^B-R81F&_Gc-3&?AFSc?tR<(l%CT%Q5VO)p@C`);#Ednm2s| zZ@mRbxzpZ$#DpnPbiXi+7%YD#@QPOZQ-bQR!xv_>62fZ3+klZd%mOk7fskH^@JaD5 zTAg)@6T=O;m0LTWzKdArc9lyps)@xh6ytg!q5(drVs%9B)UM ztV+L)`Vev(ph*p54CuEB7aR0WkV#`Dp(=>?V|tX=L%NG1AS7mg!l*Bm#H4YVNQh1Y zz4f&A?NEVE6GrsC5#E$vZ93LWU@`%F4(87~M*wr*PcOUBWoKummuFr+Y<0ba3SG|E zIJAT}VeSu8Mo-P?3uk|jbqsa)+kx@}6uO-6{^h@p{Dju_t0q9G@|M70Ge9U-i7X2; z>Hp6i=u#dKyq9_YAVJHA`aWM4Xj{X&kfFzWx|9cndvfS2Aj$^2t!FI=R6arbxB!#& w7!R2mY9h)AZ}{0!{?&9XKl+(-J0_2Rae)b&nk+CZ00000Nks-uM6N<$f=6eejsO4v diff --git a/graphics/pokemon/regieleki/overworld_normal.pal b/graphics/pokemon/regieleki/overworld_normal.pal index 1c69e174c2..f6bab934e8 100644 --- a/graphics/pokemon/regieleki/overworld_normal.pal +++ b/graphics/pokemon/regieleki/overworld_normal.pal @@ -10,7 +10,7 @@ JASC-PAL 208 168 8 248 248 192 248 152 192 -0 0 0 +232 119 176 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/regieleki/overworld_shiny.pal b/graphics/pokemon/regieleki/overworld_shiny.pal index 52fc33ef18..ae43ceece9 100644 --- a/graphics/pokemon/regieleki/overworld_shiny.pal +++ b/graphics/pokemon/regieleki/overworld_shiny.pal @@ -9,8 +9,8 @@ JASC-PAL 172 164 205 172 172 106 238 246 172 -230 238 49 -0 0 0 +248 152 192 +232 119 176 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/runerigus/shiny.pal b/graphics/pokemon/runerigus/shiny.pal index 6166d5bfd6..8fd4e72f06 100644 --- a/graphics/pokemon/runerigus/shiny.pal +++ b/graphics/pokemon/runerigus/shiny.pal @@ -10,7 +10,7 @@ JASC-PAL 216 208 208 184 88 208 144 40 168 -168 56 208 +56 208 174 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/samurott/hisuian/overworld.png b/graphics/pokemon/samurott/hisuian/overworld.png index 6dd47d57773cb2526046401c53de0d4d3040207b..7d4db0b87d2c2c0d20004de530cfd9318e49a060 100644 GIT binary patch delta 1045 zcmV+w1nT>g3d{(Q7#0Wv0001UMu)cm0004VQb$4nuFf3kks%iY4i+$xJ05?oxxUK) z00YWNL_t(oh3%N(mf|1`g(Wluu;Tl_?cPwU6qM-BnVtEuoKvmd5Wa*!(bMUF`>4@R z16a)fr2NYxumCCl@(2t-m49^r79jn62^ke)0IL4Y5m<{bdiO8K5@jRnIvK zF4etz8xT9grjtOY7hxKJTXb2V%d;Yx0d6{G2OvmL%o(%P=q4Zr#@;{@kR9OBt9h6K z)^V^zbI^@)+-hckRd-&p+-3-O-Zi=jNJtA*n4v{Leh!Ex5i%Aj4B~$}^UP}x~Ub^@UKq84@>#VO&OJoM9 zOBC^?kdvg0jYcCpF4H-n8c>WoV5Ckq0aFOtQEo%@3AO-H;aK59kg-fM?&LI7`3z7? zY=MDlxG-N`i5Y-eWzK&k=sE@>>d3b2gHncd_$EFZeR`bLz?G+ zL?xbm!sY;jc#n|zJwP2#_Z5Gx^4aU2;~Pc`5FgbeZ{bB&@4iid1xV*oXi4NZJ#HmV zkwxAC)X~TJ(Z&9s;DG@evoU;|>8>fSOOIrRoYc zsha_^z3VJ>fE}=e*pDBjuv;(wvN|p()&95=N&_h4X(p(Itk&1U{loSFc;`C+?tZj$ z$f(s^xIOjZ(RBcf9RZ&7aJH`N6&IYuE&xhObqD0W#wdTGKTJ>+rQVE1b_Z0x8{w04 zGg1)?UosMYI8I^lwSdweCRBHq^>V@GV9*`7YE~OS=`ySd z(DL;e9+3yf(C>gWX86sY^2(R?+x_l^pXvV}U;OvxulpbK_|t!a{gd_wn3Xn~TdaZe P00000NkvXXu0mjfiEZHp delta 1247 zcmV<51R(p&2$Twt7zqRe0002CwraMKE*Aq37%`DZ9)Af0l`sGR1fNMnK~#9!&6a;m z8)X>BpL?&AGJaj@0Ku(XPkzT`U8m?!Mj_eM#TX14jDNUhGei^PrXiVfGv1QIs4iJWA^sXJ!AA_FnU9T&59Bhlk`2Nw}bI)_1 z=icx0+<*JN0RPj0?lq9SSD>J@%ToEZeUnmJb>q-lPgMy-PUjj+euh!n<@CR-fl6~? zIHJ&;Sii{KpG0b@3h7m~EN=OLzP|*8tH-N=C^G9^sd@*J#YpBZMMit~z=}W%6ut(A zS80OQ00LR8LkkGe4ntF* zhA3`WB9R)H#5zfEPJ$*7zy#vUSezuK0R;FXv<0z%GOdXODj+=cRX@PRQ?w=!U?dg5 zNPofYbXEh1N86|!iy7b(36ww!JSTvU7ov4?RaHO`h8!#jti!DZ#8cY$XH*O=iYHJ5 z19aq>>WR^9yMW;}fkvhiJS==+p)`PaypjACMA=QmemTK1Abg$uuB)ug=+XuxbN7L2amjyV&p?Oz6{nGf9Nxu%S$Gx8zR8qORMyAhAR=`2KGZJ zFKqMXg8PBL^iolXuI=Z)A*~QN#iN%W{RN0yXVZeaQf5xK^fY*%AeRA!R0B(`zkd}f z2#pzMc?}?hr#In_$)CI!3`q$Tz#b5U+dOfzdz{=j_Mk0|Tn^;IwyW#vZG#h=uTEmo#^fI>9MAgC>Tnlk*#^){WcP%1P+H>!Zbw!6Z@N0& z&E8nme5JJB0mqBYa+{*M90x#S#D9A-W?#1unE^&P4~@G1(;}c?j5QMr0D60Wg}C8_ z>$g90nX9bc@U6Vm6`1DRo_52`#%nQP{d;%@Td$Ze$h%E>(_Gij73BBvzP0kx8L;30 zvZl4>2=;T+!ThO)>sEMSXGAK!UmrMjR3Dv^rXHTOe{cjGR6cb#cB%olHAJF*+Tnl{nC3$7Q zAPGn$$$pg6@vCR5w{y4bmw+`t0ensl%c_CLJ^onWyQ8t@1!D|27ys5Nfy$sV2Z&l3 z;E;e_S#cnBIm&v-A$=gRz<;ym!hPI^&*EjmI&EH@6`#jNMm39WiV%`OUM)qthyt#x zVo+j?-=@<4c10Jp?rx9Cf>~r7cMy#JipC<&?O~+UQ!T&MO$iP6YRyk zi~H$!+9Pj*$Mqr*8b6HN7pjBdFGu2jX=H~dcjWfnS@KcUnNc`VB}5ysy{N31QP_$7 zhe@JysiM->75vhv;PrOw5Pz1&s18%iT@E0t`5CDJ5DowN_y?ir6SM__iYx#C002ov JPDHLkV1n)APv-yt diff --git a/graphics/pokemon/samurott/hisuian/overworld_normal.pal b/graphics/pokemon/samurott/hisuian/overworld_normal.pal index e6be3b5f56..15854747e9 100644 --- a/graphics/pokemon/samurott/hisuian/overworld_normal.pal +++ b/graphics/pokemon/samurott/hisuian/overworld_normal.pal @@ -6,7 +6,7 @@ JASC-PAL 0 0 0 238 238 255 189 189 197 -16 24 49 +14 22 48 189 49 49 32 24 32 41 49 74 diff --git a/graphics/pokemon/samurott/hisuian/overworld_shiny.pal b/graphics/pokemon/samurott/hisuian/overworld_shiny.pal index 827453552a..494b52f0aa 100644 --- a/graphics/pokemon/samurott/hisuian/overworld_shiny.pal +++ b/graphics/pokemon/samurott/hisuian/overworld_shiny.pal @@ -8,7 +8,7 @@ JASC-PAL 189 189 197 16 24 49 180 164 156 -197 189 197 +84 80 84 222 213 222 139 115 106 238 238 246 diff --git a/graphics/pokemon/sawsbuck/summer/overworld_shiny.pal b/graphics/pokemon/sawsbuck/summer/overworld_shiny.pal index 34f7d0f0b4..4d2a5df53c 100644 --- a/graphics/pokemon/sawsbuck/summer/overworld_shiny.pal +++ b/graphics/pokemon/sawsbuck/summer/overworld_shiny.pal @@ -5,13 +5,13 @@ JASC-PAL 0 0 0 8 136 64 27 81 44 -40 19 12 -199 170 85 -233 219 172 -176 104 32 +238 222 164 +74 16 8 +84 35 16 +178 114 49 128 64 16 -207 124 25 -141 98 51 +183 167 84 +255 255 255 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/slowking/galarian/overworld.png b/graphics/pokemon/slowking/galarian/overworld.png index 5babfe384b6e99ffc44d02d1f10ced3fde735854..4ff3b7f4b70518426ee559b0e61a19810be7adb6 100644 GIT binary patch delta 690 zcmV;j0!{ts1?2^hKYzCCi00<@oSk!8P;t4lBEoCVqmI9xi+T#DIamkVZ$={b%9gE3_*KZiqs{vxuu!(+Uhgp;H{$q0A>Z4F0)93>fw| z5}0$s?Lv>b3V%tKqk%^__c+5*;L8OEV8SSC4~@sAL@1A_> z-w|?nza*%Pyfh_i33yx%5J8qg8wO^)tt*K|u}ACLo`2-ymH<)F3+(ZJ05b&gX&9LC zbrpvr`tQ$ikzjXj@_FpP&u<6tw(-n>$suSBT|(fWcJ$|Qkr0OvxOV07*qoM6N<$f|cf2;{X5v delta 693 zcmV;m0!sbm1?UBkKYzu_)#m2*oSk!8P;=oFbsroa_Ec<_WQqWcLjHC2U!H#Yx?6f8Is{!qm?ad zG7Rr{$2;EfKSfI4%2UW=x(aFyRIlcP;fs`^HIh1-Z?gGp-MMU5#!8#=VI$>0xN+VmP{T;Z^I|43-C z)Wj_yq)Z@a?tdcG;fNb_S9rC!!m-64un3Q$Wj|_Sx@F*uppJ85_x-Q%_P8Tgcw&>N zT9V<6(} zQr*J-KF2A+*K6a`8#FO}CaAYtjSO@-1Q;!i_8JF{)5S5TMC-cE&AX>D{R;-x_XyKD z2@W_dZs+4n*(1tJYBRR)_i>VpZ zJdXGKIA-+=IN}StjQzD-;jlQ~r%a#Oo0T!O3`&PRe~${tdp)iTKAxBU`i=YRp%^nf zW-3n8rw7D5`v&mdqPH45vmm1N#zngM=XnY0qb@Zxa@YP(-AVA9M2G(RA*%nm{tx&& b{(bxa!!kBqO<;Gz00000NkvXXu0mjf4UAbw diff --git a/graphics/pokemon/slowking/galarian/overworld_normal.pal b/graphics/pokemon/slowking/galarian/overworld_normal.pal index aa19348aaa..7b64228b1d 100644 --- a/graphics/pokemon/slowking/galarian/overworld_normal.pal +++ b/graphics/pokemon/slowking/galarian/overworld_normal.pal @@ -4,16 +4,16 @@ JASC-PAL 41 194 156 49 52 74 16 129 8 -197 202 213 +182 235 136 230 230 246 156 157 115 90 80 115 189 210 139 -148 109 115 +49 52 74 98 36 74 0 0 0 131 121 139 -164 165 180 +82 64 128 131 76 106 189 174 189 131 113 180 diff --git a/graphics/pokemon/slowking/galarian/overworld_shiny.pal b/graphics/pokemon/slowking/galarian/overworld_shiny.pal index aa19348aaa..9a2bdbc76e 100644 --- a/graphics/pokemon/slowking/galarian/overworld_shiny.pal +++ b/graphics/pokemon/slowking/galarian/overworld_shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 41 194 156 -49 52 74 -16 129 8 -197 202 213 +60 52 140 +166 48 112 +215 117 170 230 230 246 156 157 115 -90 80 115 +80 91 138 189 210 139 -148 109 115 -98 36 74 +49 52 74 +128 39 93 0 0 0 131 121 139 -164 165 180 -131 76 106 +82 64 128 +154 70 116 189 174 189 -131 113 180 +112 140 196 diff --git a/graphics/pokemon/slowpoke/galarian/overworld.png b/graphics/pokemon/slowpoke/galarian/overworld.png index 277a1f3a87ffd23d53bf5128ad5ad2d58f02c70d..38352ce27eaf0768de8915ee6db295d718f7735d 100644 GIT binary patch delta 541 zcmV+&0^H?@0 z)=wD@{K{4yZ*f@14EVtDHZL1ccrNjax6lljoc%e+HC7UY<-jj^jY;geT3|BBd*NMP zgdyjDOsnYGxJ9}g#US!2t4&fGsPg5^*OVePCjZRZF1piyOpEUZF~=C`*-D_#adYVL zha6*yR2G1vLA=jJ;MbfJE9X^hkpowHh%3yc4>Rafj0b*MfE1L<5@7dt&e7sEKEzZM zL2Utxv&3Apg_@il=F-|++#dI>ix{afG0|CQB|dA_z|I#nz#_ktdI@ZN`CdM<7>STa zN%DHcmG43H9z}lhQ!^;rR<8EAK#r{$ED2WL7!l;k!1h<;HHccj%i_CVD%&(y7SxTh f;r6Od{C}!1dlMOiWBjv600000NkvXXu0mjfw9^Ps delta 545 zcmV++0^a@p1cC*SHUofwfRQ;QBi$d8qyPW{2}wjjR9J=WmH}?VAPhxgr-lT$|9NK{ z5+#{|k$@S00QiVMEQI;>YB*F*f9L0?Lg$E{W5&0t>xJw8p{%-VeOS993oG@Y@En@=sdgy9+~6pGC#xIC2P1(FXNP->*#&NL0BJ6+ zF)zp#&;3%kULzJ~gT(cjMO-5?66kO>=+s|5fhre!Iv=@7QNN=5TnsMcN{>3zA0GH( zF2GV@`;_s(uWXg^R)=NGP!61K^Sl9vmlD5Z3(G*4i$4IVv5_Dy2Y$h8h-wc?f!Uz! zMR$3B7WtGCui|Ir7HM))gCwVHHc4)v!k05&V+`Dw@-u6@=uZDJdwe%YDTKh!S^{lO zn?pxG

7yvLGG}(tWN%x26kGsEfjy+!D zV~AM+%@*i!k(#TvP?d|rlv`Vh+v2Wv5fe9TCPhB0C}(XN*!f}xSoD`tD}jwK-^<4q z0~7YBNnVe*@I8p#qa<&6S_XC7!p$C6D6uVrIl;m!BSKOc-2Pg;1TpJ(S$y|PW1H&A jjG9q4Twm3Q|4;P=($g7@`2r4`00000NkvXXu0mjfH}(Q) diff --git a/graphics/pokemon/slowpoke/galarian/overworld_shiny.pal b/graphics/pokemon/slowpoke/galarian/overworld_shiny.pal index 39773f539f..ee20b05797 100644 --- a/graphics/pokemon/slowpoke/galarian/overworld_shiny.pal +++ b/graphics/pokemon/slowpoke/galarian/overworld_shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -128 128 128 +152 208 160 66 63 0 -96 40 48 -173 166 8 -239 229 9 +80 72 0 +136 120 16 +171 144 18 0 0 0 -204 109 117 -240 152 160 +200 176 0 +248 216 0 160 168 176 104 80 16 208 168 96 240 216 144 232 232 248 -13 13 13 -14 14 14 -15 15 15 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/pokemon/sneasel/hisuian/overworld.png b/graphics/pokemon/sneasel/hisuian/overworld.png index 7f4c335a9e8f96797384e9172ec08d38bbdc31e3..a830d0c0e8db9e6bb97665cb824e98a4b6ffd6b8 100644 GIT binary patch delta 616 zcmV-u0+;=(1@#1w7=H)@0001UMu)cm0004VQb$4nuFf3k0000mP)t-sn9!g~N@5TY z5JnS5VsoUVz1}%WQgK0%dyBOH|NlodVWfNB%`r;$v_a;J5Mdc%aPaC50005=NklzuU-9?SGx8XRzXSKKMAyqQA>3PW+*uz!ksWbaIfU_FR7z$5r^a=^$C%2qkAu z9aen59iu!9{!LkN4X_<%@Yo^)1(%0Ee~VOnSAW~8>nr{}Q*o{E_GSj(wrB+kE^-~R zV2_uabn0zY>>I4Ol^C_g8%BGy;vgRi=CAlp$m<&ASATPL2y`3-7(KKpZ-_7~ft9nj*UJIL9x4%c{)!Kw3Up{RAmylUrQGiVt)u(U6Lkeyc#%2Zyy#y;h3}P2sp(ulbBU-Nk5N)z+6GvPZ_tdSW z1@_;$ieWzn=_U^zs+xlp2jXrJ>dq?Hrdu5Jf&UBdXaY9;7Jj$B3Q)_;6dEa(3W1LCw~!dd+5m?yc867g=O(j zyL%8%EtW;JXq%{&RX2Z3GIWv|W_s+!eT0GEyd*P|nalw6qaXd~$I*qP@-3(8iY9#z z>qA2;^NkzOro#eR4#`qR#i&%s8(7C3HtF6FD{+~%+7O(3Nz$|f%Rk+Q(g_eadW|-< zB#*CijAG}!(SO2lH~4Unr!94-+>t_a_#n+Xj7O(-ZhX4h}dZ??lZ@tz3{UIv;2HIHXJ2N%rCd1SmMH?TIM zV&bFF6_^9JX7h|k5S#_Ln;HS@c&1FT0k)z0fNR`{7={80Vzon)Dft=w+Ni9I-3 zs;nud$bVsvZr(%C;u$wE5YC8FME&2ec&Qj~RIx|9Bm-Vz| zUA{%_zGcYL$BD%3{{{Upf~>O#2wlUTSJ9UKzZjg={{Vsr`XO>iT*?3d002ovPDHLk FV1h0cNJ{_! diff --git a/graphics/pokemon/sneasel/hisuian/overworld_normal.pal b/graphics/pokemon/sneasel/hisuian/overworld_normal.pal index e909571475..3a4e58b0eb 100644 --- a/graphics/pokemon/sneasel/hisuian/overworld_normal.pal +++ b/graphics/pokemon/sneasel/hisuian/overworld_normal.pal @@ -4,16 +4,16 @@ JASC-PAL 152 208 160 74 74 98 16 16 16 -32 24 32 +70 19 70 98 115 164 164 189 222 57 74 82 -74 49 90 +113 65 145 123 139 180 255 255 255 -90 98 106 +71 53 97 164 123 222 205 49 74 246 180 65 230 139 16 -131 148 172 +97 25 97 diff --git a/graphics/pokemon/sneasel/hisuian/overworld_shiny.pal b/graphics/pokemon/sneasel/hisuian/overworld_shiny.pal index e2b78ba441..580e24ee3e 100644 --- a/graphics/pokemon/sneasel/hisuian/overworld_shiny.pal +++ b/graphics/pokemon/sneasel/hisuian/overworld_shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -82 82 82 +48 48 48 16 16 16 -189 156 49 -98 115 123 +87 68 9 +47 66 69 131 148 156 57 74 82 -230 205 82 -115 131 131 +255 212 0 +79 110 110 255 255 255 -90 82 98 +50 39 61 90 82 98 230 205 82 -156 172 238 -156 172 238 -131 148 172 +135 149 204 +112 128 193 +204 170 0 diff --git a/graphics/pokemon/sneasler/overworld.png b/graphics/pokemon/sneasler/overworld.png index 29f5dc9d48c78cf9a1a38db6c753b7240ec4aa12..b81dedda541b2316facb35115c0682b065c5e970 100644 GIT binary patch delta 865 zcmV-n1D^b)2&V^-7#0Wv0001UMu)cm0004VQb$4nuFf3kks&{SB}qg(a-Z?L*{O6ODDY4XEDr3zs?EPRt`&s z2omWghaXz#Y1fc{@Y)ER@lu|1JVQ#y4LPhOeSsH=s4<}P^ouC_Tb*kSjQJIwM{p!{ z@C_cXe;h}YXcuAMsXPg^VLhYkpfSJn9cg{N)WLI3n}fbDD0Cao*pqH@bkxEvrYM~8 zGr|`XT8HiwI(W`$-J$Ob3imhwJz4`b?+v(1U)w?^Cg?nWhmY6hIp!|!1kN~Z`!~<< z_r9@#wh?MB7;rAPcq@>S0hONuF*h3;)Hy5NIc6MFOqk z(Y8>{%Y@W_Y9k4pP&FZE653{fy#PQPw{z*I#bt+3Qv7~2cHgqQv3A@7$ES?9%pPYk=Dt}Xz9&p{DB9-rrLrrw%O4} z676os`LVm1*{&6D3O>kYKl|PH-t3z3vx zGdi5+fAL{g4YIU>0SM(NKR9cKOJKhlJARA6QeF%9PdNbFSG%r3mT@vA2xXA~jMoET zzqH1VT!STy2Jb%F+>4>G+kJol3yb%c3BpzgixL?QD_H%U<=vn&CDTt?)%(052ASK5 z-1fG$hj9pt1ok-W$Y28Go|J=ZoZ^3nyzd@lh#doaVsPR}2#W;hkbw**3E&P&=K?rl zXlGsTAajQVJht<*6L=|$1n@0`@lFCAo`cK2mHY$u#yT@Q4Vm1zO%@4ZnE+oR7LRdb*r$Y_rpi+_`=h?Yc_%&Pi%K&32rL$}Zx$NwbJL}iIf6{1z!c);yg_XRk zVee}vO|yGaiXAKK8uJovT`Y|e)G?(ow102Pg@#NRY=TKW-DRk4ltpLLYAOY=9G#h6 zFHIocnM3>8S(-N`*9j@kV{ea5%$11LJ+sO40(?uic#g6uI_j;11i6{Z zRyU;Sq?lN=p_}A#qby*p43u?qf?S`@T1n||St!|4n-+R&#C`QF)RcdW^mP_Q$$0{l z>~=dw={%^ifV}4|q3;<1WgP(Q8L1}I%H58Gu&AhSGgy?IcM>5{Gv)hJ2S+9CxOj$H9OCFJ> zXKOG;TZ56@3iunHzo80&ceJCnDGmJwpdn}BI>5>OC^n?<85Bc9tpwb*7)lEy>`XA+ zvU&{nd`_)XucT>2c>?b6%1~s(C!XHpZ=F1OQgy2xkBQ delta 21 dcmZo?X=j-b!j*4rbo}`7XOrG5Z;V^X2moG=33&hj diff --git a/graphics/pokemon/stunfisk/galarian/overworld_normal.pal b/graphics/pokemon/stunfisk/galarian/overworld_normal.pal index 9070fb58ea..5d6a48cd76 100644 --- a/graphics/pokemon/stunfisk/galarian/overworld_normal.pal +++ b/graphics/pokemon/stunfisk/galarian/overworld_normal.pal @@ -11,9 +11,9 @@ JASC-PAL 255 255 255 0 0 0 119 108 95 -111 59 50 +168 20 20 199 199 199 -12 12 12 -13 13 13 -14 14 14 -15 15 15 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/pokemon/stunfisk/galarian/overworld_shiny.pal b/graphics/pokemon/stunfisk/galarian/overworld_shiny.pal index 9070fb58ea..7fe680b775 100644 --- a/graphics/pokemon/stunfisk/galarian/overworld_shiny.pal +++ b/graphics/pokemon/stunfisk/galarian/overworld_shiny.pal @@ -5,13 +5,13 @@ JASC-PAL 29 32 27 59 64 56 95 102 90 -142 172 96 -157 146 133 -205 246 140 +168 160 56 +160 128 112 +240 224 80 255 255 255 0 0 0 119 108 95 -111 59 50 +168 20 20 199 199 199 12 12 12 13 13 13 diff --git a/graphics/pokemon/weezing/galarian/overworld.png b/graphics/pokemon/weezing/galarian/overworld.png index 883a3637decdd256a36a0668c0d15aed30f5dcd0..869fd482d1af89003af74c8cd6e850de2530ff31 100644 GIT binary patch delta 1196 zcmV;d1XKHz3YH3xJOh-Gl#xFt1jV_6Q;}*Pe|SkmK~z|Ut(c3Fq#z7MMH?g9E&u~h;#4g)+dbn6;U)xxou+o1zu#};ar-Gfo;!}-Ie6Vh{l983uj{$arKov6&s7bK zr+G%>b+-L$w~E*EtlYK)w3`vo=O_A~@yjJqH%5w$4LCr3ys~lX*ASQjoTdNSjo=c{ zf5EqaMstpM2s9Lq_?;Ym%&<=2k*u29Q*|5W> z7H3@%;5ZIItEChu93yo;wsUBE_we=XoFLTnDy(%UfrF21$6=vqksMgdg%ggbO3 zUXss-fT>x)8Mg&oL@2Ucu7MH@i9^lrF2}ZkZzfndI#NzPQwUUfmjKr+;Hl(|WyCz_ zZzjQ%*W*YWDlVP9$bygpfGowr;kW{1r*IFDG8Ebcd<$%F9V%o2+!pMAgD&S5f4t_M z0|?R!N)8%e(5!$AFA35C8U>nsba)!-78qg~z?KD&^CU2aB7hD0JUKN9N(0mds&m=n zX{aO+H$5~lMF!hu{MS5tlmeh$@W9onNzf&*EKty?>T>mz1O^X)JBle`7;t=qUKb}c z1z-$X{N9FAEJk2n;>T77kk5Zwe*;l7Oc8s?O8A+F7`$IR)~5)JWql2JCLq)Wno6k0 zxydZkG*iHUUmLvT4zo*b@wZjhcfjocjRJke1J5!~GgipYNB_ee;~htji!^^**}em= zR)S2m{e=he?H8Wr7HznIPgE(wko;%Y0)Y`}S&f0k*EPR}%U zsXudm$8)3e4xgs7G97WY@rp1tn4W5(3^?x%nk8JHA8Z@Ax7^+OG})a1I$UhTJ?I8e zz6+i?Zw=_1zepjy8r*yCn9#&V-0K!OHiq|{WAq#tCKs0%9SJjo0jI+vE>jwU*ZBRG zdB<^!@Kl{hy#!ml?MGZTfA_FRfw~>40G>Iy-*Icf;CAon%$Xl{M;y0mtWI8nHoNp|YXZN0CMiy{C9^&)i63+v8 z=5E2F!mWjW@K;|P=to?QXp(i6;9ghW3Z6NxDe)cUR#)a|!11-Zf6<9bKA}qRh|7Hh z>nznbwaUp8cgZ)Vc%vyU?;8UiVE_DnANq&W6sikf#dH079@kw;6xLUc2aXVTW?GvV zBdwRIY!xq8DXJsSsL}J)>3HT@_v=Q5vKCsOl}e~~!xPct0Y?QPNE77NryBiIbF*n(Sy5{wx9Tri4^f6I&OmbqQ& zDC)$R)O@=5b)#~;NYV&)fRg75(}jVL8igXO_Tt%XOa8nb7$-KyE1`Cf>q?e-H(=Ji zqpOgqsi$c3Jw(f4|?(<5nCIe6V>{l9A9*Y#X|Ez0}zT-CsM z@*a&>Z~M1y6|d*nxa|q(HzQ!oPxSBc%VkkFMv9FMI6!^8vT^R$5tsw?(*GPra0wXT ze_KGOIY&H38VX1JE{;A*zMe6X77b7web3d=2X&+VDA2h|KL<#WQvaH_0=flk1#|;Q z5nDh3U+2kiDTm3N;$nVb{Ds`2EWk!qsTAm(^3|b(me&IM1#ATL1M~@7aM%(X4*1gJ ztSbQ=#{p>NYk|TsQWsK>7XtbPYy{W>e=Z`#=0Gij9RuLvTaSw_Px?0spwTDXp(F8< zeRc#a-2yfoiUO`86j`p+K#7ISq2+g%W7{Bf6RaE^DJP#f1ggACfa@0UQuEF-VjlH3 zlVHm0abyk+m(D?CLCgU_kz(O+TmiCExCh7?iv0q<1$MX&6^j6F3--UkkaLScfAh`( zMCk=J2MsW4RzQZA1nB^s0?j@KJP&mXjHwP_D*`Ba7MNlczy@QUotgyY0onr9xg7C4 zR2GPv9-5dUgKabZTV6cM0Z=b^;Of*Q=n_~LDCkrTxq8Y1V*tP%#gs5iI6gwJ-U-bC z7=s?ax1k)15m=V^vDE>T^Pks1f6@$7!~u#DeuPZP;6oIL(uL&;%#I`_l35_^6 znPr-03K;NfgSXsacB%PrTNQmL+z!ww&{sV2Eb}yDh5SMaKio0iarEe=h1<&Zop7}h zWUB37cqHG!^E9Wl)1k)g#^{m96htBBCtC$?I#0MHI9-UVtuC_(=WSZ1e>pil)7Yi{ z%=sP9jm|rKnkve4#@Qw)!qi}TnuRjqyft{pl|*nh4gB0@3~__6Ps|a^KxvA?>Wa9I512uE-yL~76ubehecebGz72l`z`a1 z;}#L9I*|qmwtCyoxNPpxe@lV79hv~1Il13)Yr)|55a`TV9(HFOw`#0TUYc4gp?+IF zb1IOq?}<`O$J8bP&zz##F)XC?1tHY+_snyUk*l0s5;C$TMmTe04gWdC~p4QK2kP>yuL5UOC2`Mj+Q8-sf6~qt(1nNZG-i@`sIz zOYci%0vc|*UpEpbfBtEPBfGsVI^1G`+GqruAr@P4t5AXwgP)5=k@0VNb=@+zD;-6h z7?YMS7r$;)ju%ND!46RKQenO@@KK{uWYu20xNXUw*8}6k#&{*v4su<|a_F&K*w|$B>BDw^KZY4jXW=oL%(4-ZCmFdfSH91(Sqp=dWX2d1IRb$3GSk zo6Iv2yt=Wx`*!$VIC{6T`@tl0j&(mv85jC9JP^6VtuSf5!#W3T)niQETw3$%mxr%V z-?6!V2d5No!fc?Q@2A}m!JDRLmukUeWP(68nhi8G)OwTx> z3p3|0J(}&X;eNzf%ZXeM>X!DhZs7D#t&U>cv7h@-BI`sw+4>U> z9tU>pcyQy!g@lX=6&*k&aPUj|gglVLS>O>_%)r2R7=#&*=dVZs3f}c}aSZV|{`S&o z-ev4N zhPeB!yTUqQ-B+!BjrD;Cwly;JFd2m~WGtv=%u!OFB`dPi!YL$$!`n=7PN9EJ&$Z6q z9a~wv78!m?;5*}Dc0svRw!`?>_NjBN3|5FH{8g0Mk=c;`W~cjSQ4YDswQQU@%Nwk? z)L7R@UpUO}&VD+9;k~y^erozG2ZpBsMX?OoUHdwlk|KYd|Mb#&i>S8#zxu-K46(^)D_M6d0baelF{r5}E*sK!)A` diff --git a/graphics/pokemon/yamask/galarian/overworld.png b/graphics/pokemon/yamask/galarian/overworld.png index 718654dd3829b1417b7c4934f1a10df0ebfb8a96..54276f9a041015ce66650cd9df234470c67a3a84 100644 GIT binary patch delta 36 scmX@ea*$<$t7MWvsjs_7Lqo&s*yuw$c6QX&Z?-Utw4ZQwW87m#02-zcNB{r; delta 36 scmX@ea*$<$t7N!#hOfIvLqo&s*yuw$c6QX&Z?-V|_jdQ1jd70|0U?_afB*mh diff --git a/graphics/pokemon/yamask/galarian/overworld_normal.pal b/graphics/pokemon/yamask/galarian/overworld_normal.pal index 0e81179680..af4005de75 100644 --- a/graphics/pokemon/yamask/galarian/overworld_normal.pal +++ b/graphics/pokemon/yamask/galarian/overworld_normal.pal @@ -6,14 +6,14 @@ JASC-PAL 24 24 24 56 56 56 159 83 188 -87 43 104 +98 48 117 77 71 72 128 128 128 235 93 91 194 184 185 136 126 127 179 56 54 -12 12 12 -13 13 13 -14 14 14 -15 15 15 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/pokemon/yamask/galarian/overworld_shiny.pal b/graphics/pokemon/yamask/galarian/overworld_shiny.pal index 0e81179680..7cc24b4ab8 100644 --- a/graphics/pokemon/yamask/galarian/overworld_shiny.pal +++ b/graphics/pokemon/yamask/galarian/overworld_shiny.pal @@ -3,17 +3,17 @@ JASC-PAL 16 140 78 78 0 0 0 -24 24 24 -56 56 56 -159 83 188 -87 43 104 +40 40 72 +72 72 128 +24 216 152 +24 128 88 77 71 72 128 128 128 -235 93 91 +209 105 192 194 184 185 136 126 127 -179 56 54 -12 12 12 -13 13 13 -14 14 14 -15 15 15 +173 55 152 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/pokemon/yamask/galarian/shiny.pal b/graphics/pokemon/yamask/galarian/shiny.pal index 7ab1ad8cb2..276ff7ab14 100644 --- a/graphics/pokemon/yamask/galarian/shiny.pal +++ b/graphics/pokemon/yamask/galarian/shiny.pal @@ -8,10 +8,10 @@ JASC-PAL 24 128 88 24 216 152 16 64 48 -200 64 72 +173 55 152 192 184 184 224 216 216 -208 96 104 +209 105 192 144 120 136 0 0 0 0 0 0 diff --git a/graphics/pokemon/zacian/crowned_sword/overworld.png b/graphics/pokemon/zacian/crowned_sword/overworld.png index b8069ecd51e5386ff36aa8be110d183f5db769dc..887fa22ebd2b4b800d2024da826cb226cd441b2d 100644 GIT binary patch delta 1128 zcmV-u1eg2B3C0PKZGS{bL_t(oh3%M)a@;Bmg>4Uifw3+F>GbPha z;!iP0;vnoU%fIn&{Fg?gh2kIZzdfRbK>Mt4#{c$+)>0(;fJQg3$S+PRpqVFH%Q=- ztFl;k237}w*AmaTTrOTFSQh5QEc%f^p=-p2UujjClPX*}4GR3sAuY@Pj(eWB63=*( zClkb|6T~PJ41W?h@jiitk|w%c^r}mjF=$mA1wZ| zTM=>LzT3;5?IF-|->V*ZbhsbK>IvzxRz=cRdDT}utH6l*ia@@VSWR}~{R;Tz^6GFO zF?{?Ak0m;4u0nEJVWjy^aKfuT>-C7VG2ovZnEqxm>whoYcP_`3+GwQ3z+%O@bD6x< z?cfrybGG;)+r*-8l@b%3Ei&V~K6ofvgAZe)IH*hD!n*{#gKSD6goN)Fjw3Rs7){{d zQjeWSv~ICPA|5t?8E*nh6^NTxfu-}@r}u%EcN8>c@C41s8JtN54W zVZIqZReu<#qs0OdHe2p2f+Ot0?R^vD4+15%2##91Kab!c1O4O=7+#ylAIAvJ`(rm)P##gxC!K?vyiskgMZ5s903G@My`}10#}?jsL;BS?|9J= z{U-b}2e>wxs%2v?ah&L zcguj&%edmqEAilwbHX9fuDC4*t@geGn!t%)60n*asX`H`S*%oA#GA`9IPIcg6<)4J zC4b5es8cq9laIJC1m(7UtjuW{H?^x>x8E;%6}gf2zZ3T3xzks1(pt5)uY{uz;b*2tM5ZC z6-lZsBgvwb`az)tS+jGGn(&0nXXKY-P(nAV?EcQ zOn$;ad3%hQ@MDN=QMKU?s?)WI0fXrGx@~aTrX?N+ZNo*zGlF(P1|RN$gZCD1cVUnP z=wB4h5yd^cRd3;*g}&?bqAYG2Mff uCxOjxALV_XQThm*W>~6HSzey=)r*000073CIbMZGT2dL_t(oh3%M$a^xTkL~VylFc$y+x7!l<1P@6zRl8fYq%sGO zn3iaSooV{t{a!OiX7uNog0{mov0wO5{1-VA-603Nw2 zi)CkEbujRn;t`kb>}7&!VouDW9|2^#j=1nEEehA93TIB81V3{~TV;R8EzVntN4(0D z31ZX$$7Eef(wJMT6%ZtA3Sp`PqR|N7c#cHw>Z&$!qmluco zi00#Gc+AmJbrpis3?s}VzyUA%tpAV`#>RkOOz`1vCV#X3!hPd%^prv)B?cDD&Yjcb zC2u>I0UKwF535Zq`esQn(b*y+zUhO9qBW7Cu~8h<1aRR^0Nz11r4T~GyM^P3%xR1U zuye`B#v@9%SRxU33&4n1fw>68#f!k)cIqR z?r=14c{}(nFqje|QWTvFZ~ zDR;LBIK7O^&b$(LZaD`W677u3qS0*cE1&_K_$2_V!I3Hyff~h3xsEuvEQ8Z38fM}7 zYJXIs^<|9{zul|sCpaWBEy$FTXQcTkzGj_5FmKGto4%N9*>f6&rhWZWZYC1mjK9@u$n@nd=g zS%CII;XER{ho|Z#Tr@3R8*YPcgSU(8-cob*O}g{xF#!C$|AzzVm`=aB%z68I>+RER w(DWp*`t7Z}_xR12+oJZ@c#te27bwNRz_38WVanV!SFhbW PFeAaX_(H(OEEN_2CR!VT delta 60 zcmV-C0K@-|362SnIWZ|fln@*_q?sv{93bA(Ak8c})zWH8ND!>9y%;QF0000WFmsfh Stku@u&B8hDrC2kuY9s`+wHSl| diff --git a/graphics/pokemon/zamazenta/crowned_shield/overworld_normal.pal b/graphics/pokemon/zamazenta/crowned_shield/overworld_normal.pal index 54124216e5..0906c9bf94 100644 --- a/graphics/pokemon/zamazenta/crowned_shield/overworld_normal.pal +++ b/graphics/pokemon/zamazenta/crowned_shield/overworld_normal.pal @@ -6,7 +6,7 @@ JASC-PAL 16 28 57 164 153 41 148 28 32 -222 210 32 +232 48 56 205 44 57 213 210 106 74 72 16 diff --git a/graphics/pokemon/zamazenta/crowned_shield/overworld_shiny.pal b/graphics/pokemon/zamazenta/crowned_shield/overworld_shiny.pal index 54124216e5..57e6bf2744 100644 --- a/graphics/pokemon/zamazenta/crowned_shield/overworld_shiny.pal +++ b/graphics/pokemon/zamazenta/crowned_shield/overworld_shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 131 129 131 -41 64 148 +200 48 104 16 28 57 164 153 41 -148 28 32 -222 210 32 -205 44 57 -213 210 106 -74 72 16 +168 48 144 +232 80 192 +232 80 192 +224 208 152 +107 67 47 172 174 189 -24 44 98 +200 48 104 0 0 0 -32 48 115 +160 40 64 148 157 172 213 214 222 -205 194 57 +192 152 96 diff --git a/graphics/pokemon/zapdos/galarian/overworld.png b/graphics/pokemon/zapdos/galarian/overworld.png index 648884dbe6a61c0b9916ec243f200c0a6fb72bb7..47321a67f4362237d457a62d1c122e39b5633277 100644 GIT binary patch delta 845 zcmV-T1G4;z2$Khp7#0Wv0001UMu)cm0004VQb$4nuFf3kks&{S5lKWrR9J=Wn2nO# zAPj_!z`_lF|L5(lu#<)#>pbnvO=p4=CzDTxl@NlvW%;yE`?OE{XD!Iz@tKV3v{?h3UDyNM|j$sd3<@}qX8TaftUI{E)o;QfRh5V zkptI!dE=u293IktiV%k|*MG^OkC!>gs~y7Qrf@aBPQrA}P2U=)A$GVZd?U9PzN_5g z7yvvXzIGqP$>Erm1Txj{ai%yq1)}vy?(wB^q)6o>1yf#1!Q`fx6&3?=9%sYaO27$b zQCY5T@(V~$aW-V7th!l*H(jO8QlCpk-wAhAOWbdArfA|6V~eoPLo>pkJj>Ga#C~^VTErcd zx}9Z@2hmK8N_7ZVxX0@d%ufhI=Xkf1d~(UbY*I6esBo+7kNDVS4PB*oIg(06^}MyE z-s4pv=7`dNBE#Jq7_Sx`7fuhdvy?|E+_3fCL7!7$&dQcE_1)snC_$WJB$#u$2K;a^ zwjBK{Hkky0NEUqWBY4e)*}}atk|}Dwj942*Phd@{AzUd7C+-_3MsJPvJQSY*m5Q%(!;2Hvn9;8&F|tXuS=0 z;%m--S;n=OQk_7O=Qaz(HX(Cxz$uVMjP$U7i#$?i;-J)ZYAba3yu%keBphR#3*Cu= ziBPA1$W1t|t!zU9_PZ=o2Th#4Ck{M$UtnHVXLQD$ybOAN3K!WX0_yKm2c=LM-b2g> z4_+qPtdntczGCnaKK-MjvFinzgBQ=A0h-Dz+pq-Y*faR*KV81-`C9CTr{ymj{D18? XtQ{NHbg64-00000NkvXXu0mjfO6i$Q delta 965 zcmV;$13LVZ2Z{)g7zqRe0002CwraMKE4AWQZd zr)!90m1b@pX2+wDQYgXOUN+VSn!fih+0*`x6}rbVw!vU~%EIW_%MypNb)|JBxonHK z65q*Av1B{C>14^4RT)|+d+LFOe|M6<)2H)&0(jHjw3lm0on`!b0_0};^#nj=OPzmV zKLC~hO+|f0L!MNp0!A$GL$QQ}%(+X92Ay%EP2UF0Fr4XR{)h&MIOQL^0uux}IpGzJ zHrxX#G8{DzfDwUrv1x_RBW`d>rH!S1nB{!7sU1fGM9oul@z~jX)+;?YJv-`*8)OF_ zwV*X`L!$Af-D8myO_>KE=a(sBG5LvcL+Y4bb4SAN}Yp)222f*HpR#ipnhoQDOPWc2sr%L_jc z$5KYaG4lXYtG3!?>*=3^q{c0abAuClbk>C=GeSC~M0%3t$ozuPOQ#k$Pf>rq{EI*xvTlaq-%Zu(^TeOi-c-T%f?*i?T*`EJ+sUG@*rr@KSp7}E{ zDwfxUXgRpUxXqo^*9g8%ZO^c`a*FIwv5Y&rV}sgk6K=kWE-ba2znl!q1v83U^)e!7 zmgO&{WP2N{gsNut{9C3S8vb2-w9f7S(dsA6n=+|~Hym?!5y^n$L7smm+pAxg?ki7O zr#Nw?x$2v*B1S(PQn)K@w9 z8b)veAtz6$z3%RYMjvcYr@C}tCL37Jo~u2u7mluv_E7HURt9nV1&5t9&dk5B)W_S& z&DDR>e>TP&u+=RLv9o_`%reMker1;|y#3QrXmRJjwz)?obE{^UN~EePs_}HIHt|*O zGl*0y{(Z1DvF<+h{E|krVL$tw?DbyZr{bqaN_&WPh)pdaMFAIGz_Cf zQcbBQ=#iQLwat`+Z?6^>qx z8$N*$>bBi>+ikbqcH94AM4NN&UsGI~@&R*Vo*na4eG4N7qo0VLIWYT~{0`=K#)%4v zLwM&U@S!qJ5PeJ`q!j8`gcY#DdL2XB2gl=_J200fPfP+0qeVhPm=oe zXUUH-c0k($qQHdZ;ouE@1t=+tePdjxCf*!x#=-+Ic?P?V1J!JRt=3osDM($7j4+kvG}3~ zJ;DGOz3y@a)bL}l^?V-m#=RQ_|q%z!ZjgjY(yQCEG6`dwyfdX_K^*+GKVS!z) z>z|Qm7@Qp-J!Q=?Rgctlu>z#v_(7Uu>A`NSHWcv57pyc!5;d^#Q~HBOlFOu%r@K@+ z&wwYn>3>5EE&(@*?xP+R^5LSfNdb89iFFELb40AY{`!8CgU~r3hUP);mgp?2Zk5DK zK#b2EYcpn91&p2>Uz}v2+5-j{B9yYDhpUq;9J226sa$odUS0ui3J|@IsOjvJnyUX6 z;QoHV5Rt6_6NhP2K0&#TYOEuCm78w#j{&FwigpR8=Bk;MM%x7qaPqz&uGKk1{d{PU zpb+rbMyLt=L_TyIPq+b2=vz;ZPrD9lE+`;b0l4e)j?t~8p#Gs87yzr>9?(*E_D`XR v0$%WIPnYrnbM>OUTxJi<k} delta 733 zcmV<30wVq12EGQ6ZGXH;L_t(oh3%GsZW|#ChR@i5Ax-oCZ@b@+cF|#=tu`&vVkP91 z-v^(;7>?s*FMHX`UiPy8#fXj&!oQ|in(+a1Vk|*qsy>C0fRQI6i$oEg$ z*{iU)`@l1T-5 zs>0)O&MU@Hnr2Ij0#_-aIq%agV4FZT4UI!+fLfKSHGj^110^D=9rVZ&P@dmkF;XaP zZZR$iTq?zs+zDI)njFwo2yy5#NbXb0}nBc1dcvI8$ zEsP7;0DnLD)H^A$ITC7%efYe|myA?^6k2>LvDglB`1gPehrlTz$TU`2157NPFHNct zB523tkfCcvH6)W1S7F?AW|!p+;9&qs@g*k%JD^Me`v4RXK@u;)2F6E#>&4awhb$vS z)jtF~Aay`>0nI|QcVD($&;iFC)E$u57M%0?npW|8#Y=jNAiVjrcOT%r15O=mpv%?2 zhxHH)kh}!E>+_DUcSQ7Xo2;d}4 diff --git a/graphics/pokemon/zigzagoon/galarian/overworld_shiny.pal b/graphics/pokemon/zigzagoon/galarian/overworld_shiny.pal index 6b74af8455..0277759a9e 100644 --- a/graphics/pokemon/zigzagoon/galarian/overworld_shiny.pal +++ b/graphics/pokemon/zigzagoon/galarian/overworld_shiny.pal @@ -4,16 +4,16 @@ JASC-PAL 52 87 191 31 43 44 36 36 36 -52 52 52 -96 101 106 -62 64 66 +82 9 36 +200 24 88 +144 8 48 163 164 163 245 245 246 0 0 0 178 179 178 -113 119 125 -238 150 178 -217 74 127 -110 59 81 +140 17 62 +152 248 240 +16 232 208 +46 79 75 64 72 80 168 184 208 diff --git a/graphics/pokemon/zorua/hisuian/overworld.png b/graphics/pokemon/zorua/hisuian/overworld.png index 9d98e3fd7af9a6d62940ded1900dca40083d2ed3..1bc82dd88a3c624983f46b21685bda34daa453a3 100644 GIT binary patch delta 649 zcmV;40(Sk)2GIqO7#0Wv0001UMu)cm0004VQb$4nuFf3kks&{SPf0{UR9J=WmeFqP zAPhvq00z_j|L?tHl6KX^kW{HuT`BHM)Z-mICYUVC6Hh$x#1l_E@x<>%yFsrcT*$Z= ze{G;m`JDEQ*DPgDuPt!Wp_}#JG;nHgo*_aU#@K!w20VlyUEdava7bJEial-#=-g!B z3gAn?;ryr6@R}HZfKiD9ju?xGgjdKSB}TZMxQfer0xUs9F%ZC}@9_n-))-orQT?RE zBaWC-p+>BlOG?iAoyS_?a`vZ`q6$EjPvIb7Tsjv%mm?-#m}`f|L?6b5QK* z$9w_HqB*P0o_@-uDC<{mZ{FPB{7pZvTR`=c4*fajOE2z!GhBfgw_Pb}+I{a1C%tp| z;@&V`7s!L<&$%U7Z%Z2spi_^_YAj6+yt#XufE{@8Po4e0!WW=fg>7KactLahiFVGLXMB-N0}2jnbw`DgD`{5Ey8rDeY~C6?1K+umVGYjp zgDD?1yDdI{<7_b7Yr_uNofO6qLxjg+!aUm?q?}XjwVz_&c)t^lTL5e)Y%r+KI8|Gp zg`-I~X1Mk!T8!bi#S0VG{Wz&xWMbf>a zJKXpanF=b`SL4Ksy>_YoTb$S;%g2A2W+pa;Ca4~(U&NNHr~@I7BiV_p91M9_`MG8v z&^JSzi01p~;M}n0jV+R;REi!fgn2z*wO7D~8CdOacm);_dA+~kHKcUYP7BQvJES_! zl3iqhGZ0sQ(G!>qBF(`e5Hpx@PCF6~+*qn-@*UczvRNRpho19V^U)2=mScZw03JEE z32)jS(44L)7@N!~7`_8p;LdtEJl||c^hT_ZNEeK3dJP%CPgCGzMape7thDI`n5sLG z?%Q>^jZFqWP?6#qA95>{aAIAFXEl=-{|J}b=`{FZ^Ocl=NB2gd;?ZmnV!b^rhX07*qoM6N<$ Ef~qNZW&i*H From a4dc9a0480cb3c1ce610540f6e2d928c4a940836 Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Sat, 10 Aug 2024 16:59:23 -0500 Subject: [PATCH 02/11] Add Dowsing Machine expanded name (#5134) --- src/data/items.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index daf1f9b957..f97c4670c1 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -12243,7 +12243,7 @@ const struct Item gItemsInfo[] = [ITEM_DOWSING_MACHINE] = { - .name = _("Dowsing MCHN"), + .name = HANDLE_EXPANDED_ITEM_NAME("Dowsing MCHN", "Dowsing Machine"), .price = 0, .description = COMPOUND_STRING( "A device that\n" From 77afb01477a7fd377f889fdb5d4c8feb97fadc2a Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sun, 11 Aug 2024 00:23:51 +0200 Subject: [PATCH 03/11] Fixes Zigzgoon battle being able to use a Gimmick (#5129) * Fixes Zigzgoon battle being able to use a Gimmick * add commit * Update src/battle_terastal.c * Update src/battle_dynamax.c --- src/battle_dynamax.c | 4 ++++ src/battle_terastal.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index 06a26718a9..cdcf05f7db 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -76,6 +76,10 @@ bool32 CanDynamax(u32 battler) u16 species = gBattleMons[battler].species; u16 holdEffect = GetBattlerHoldEffect(battler, FALSE); + // Prevents Zigzagoon from dynamaxing in vanilla. + if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE && GetBattlerSide(battler) == B_SIDE_OPPONENT) + return FALSE; + // Check if Player has a Dynamax Band. if (!TESTING && (GetBattlerPosition(battler) == B_POSITION_PLAYER_LEFT || (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && GetBattlerPosition(battler) == B_POSITION_PLAYER_RIGHT))) diff --git a/src/battle_terastal.c b/src/battle_terastal.c index 6866c6aaad..a0580a73d2 100644 --- a/src/battle_terastal.c +++ b/src/battle_terastal.c @@ -63,6 +63,10 @@ bool32 CanTerastallize(u32 battler) { u32 holdEffect = GetBattlerHoldEffect(battler, FALSE); + // Prevents Zigzagoon from terastalizing in vanilla. + if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE && GetBattlerSide(battler) == B_SIDE_OPPONENT) + return FALSE; + if (TESTING || GetBattlerSide(battler) == B_SIDE_OPPONENT) { // Skip all other checks in this block, go to HasTrainerUsedGimmick From 527cc33e0d7ae8a338e1b410eaaa3d2e534e6fc9 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sun, 11 Aug 2024 13:01:10 +0200 Subject: [PATCH 04/11] Adjusted AI calcs for Triple Kick Effect (#5127) * Adjusted AI calcs for Triple Kick Effect * use strikeCount * fix compile --- src/battle_ai_util.c | 41 +++++++++++++++++++++++++++-------------- src/battle_util.c | 5 +---- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index f138252fa8..a094dfd694 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -577,13 +577,13 @@ struct SimulatedDamage AI_CalcDamage(u32 move, u32 battlerAtk, u32 battlerDef, u if (critChanceIndex > 1) // Consider crit damage only if a move has at least +2 crit chance { s32 nonCritDmg = CalculateMoveDamageVars(move, battlerAtk, battlerDef, moveType, fixedBasePower, - effectivenessMultiplier, weather, FALSE, - aiData->holdEffects[battlerAtk], aiData->holdEffects[battlerDef], - aiData->abilities[battlerAtk], aiData->abilities[battlerDef]); + effectivenessMultiplier, weather, FALSE, + aiData->holdEffects[battlerAtk], aiData->holdEffects[battlerDef], + aiData->abilities[battlerAtk], aiData->abilities[battlerDef]); s32 critDmg = CalculateMoveDamageVars(move, battlerAtk, battlerDef, moveType, fixedBasePower, - effectivenessMultiplier, weather, TRUE, - aiData->holdEffects[battlerAtk], aiData->holdEffects[battlerDef], - aiData->abilities[battlerAtk], aiData->abilities[battlerDef]); + effectivenessMultiplier, weather, TRUE, + aiData->holdEffects[battlerAtk], aiData->holdEffects[battlerDef], + aiData->abilities[battlerAtk], aiData->abilities[battlerDef]); u32 critOdds = GetCritHitOdds(critChanceIndex); // With critOdds getting closer to 1, dmg gets closer to critDmg. @@ -596,20 +596,33 @@ struct SimulatedDamage AI_CalcDamage(u32 move, u32 battlerAtk, u32 battlerDef, u else if (critChanceIndex == -2) // Guaranteed critical { s32 critDmg = CalculateMoveDamageVars(move, battlerAtk, battlerDef, moveType, fixedBasePower, - effectivenessMultiplier, weather, TRUE, - aiData->holdEffects[battlerAtk], aiData->holdEffects[battlerDef], - aiData->abilities[battlerAtk], aiData->abilities[battlerDef]); + effectivenessMultiplier, weather, TRUE, + aiData->holdEffects[battlerAtk], aiData->holdEffects[battlerDef], + aiData->abilities[battlerAtk], aiData->abilities[battlerDef]); simDamage.expected = GetDamageByRollType(critDmg, rollType); simDamage.minimum = LowestRollDmg(critDmg); } else { - s32 nonCritDmg = CalculateMoveDamageVars(move, battlerAtk, battlerDef, moveType, fixedBasePower, - effectivenessMultiplier, weather, FALSE, - aiData->holdEffects[battlerAtk], aiData->holdEffects[battlerDef], - aiData->abilities[battlerAtk], aiData->abilities[battlerDef]); - + s32 nonCritDmg = 0; + if (gMovesInfo[move].effect == EFFECT_TRIPLE_KICK) + { + for (gMultiHitCounter = gMovesInfo[move].strikeCount; gMultiHitCounter > 0; gMultiHitCounter--) // The global is used to simulate actual damage done + { + nonCritDmg += CalculateMoveDamageVars(move, battlerAtk, battlerDef, moveType, fixedBasePower, + effectivenessMultiplier, weather, FALSE, + aiData->holdEffects[battlerAtk], aiData->holdEffects[battlerDef], + aiData->abilities[battlerAtk], aiData->abilities[battlerDef]); + } + } + else + { + nonCritDmg = CalculateMoveDamageVars(move, battlerAtk, battlerDef, moveType, fixedBasePower, + effectivenessMultiplier, weather, FALSE, + aiData->holdEffects[battlerAtk], aiData->holdEffects[battlerDef], + aiData->abilities[battlerAtk], aiData->abilities[battlerDef]); + } simDamage.expected = GetDamageByRollType(nonCritDmg, rollType); simDamage.minimum = LowestRollDmg(nonCritDmg); } diff --git a/src/battle_util.c b/src/battle_util.c index 821f785810..329de506d5 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8898,10 +8898,7 @@ static inline u32 CalcMoveBasePower(u32 move, u32 battlerAtk, u32 battlerDef, u3 basePower = gBattleStruct->presentBasePower; break; case EFFECT_TRIPLE_KICK: - if (gMultiHitCounter == 0) // Calc damage with max BP for move consideration - basePower *= 6; - else - basePower *= 1 + gMovesInfo[move].strikeCount - gMultiHitCounter; + basePower *= 1 + gMovesInfo[move].strikeCount - gMultiHitCounter; break; case EFFECT_SPIT_UP: basePower = 100 * gDisableStructs[battlerAtk].stockpileCounter; From 137c15a9ceef368d18b405d0d7ef6d0390e5c702 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sun, 11 Aug 2024 13:21:49 +0200 Subject: [PATCH 05/11] Clean up for #4928 (#5120) * Clean up for #4928 * agbcc * review comments * agbcc * Update src/battle_util.c --------- Co-authored-by: Bassoonian --- src/battle_util.c | 114 ++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 64 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index 329de506d5..56701e2d99 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -4060,6 +4060,54 @@ static inline bool32 HadMoreThanHalfHpNowDoesnt(u32 battler) && gBattleMons[battler].hp <= cutoff); } +#define ANIM_STAT_HP 0 +#define ANIM_STAT_ATK 1 +#define ANIM_STAT_DEF 2 +#define ANIM_STAT_SPATK 3 +#define ANIM_STAT_SPDEF 4 +#define ANIM_STAT_SPEED 5 +#define ANIM_STAT_ACC 6 +#define ANIM_STAT_EVASION 7 +static void ChooseStatBoostAnimation(u32 battler) +{ + u32 stat; + bool32 statBuffMoreThan1 = FALSE; + u32 static const statsOrder[NUM_BATTLE_STATS] = + { + [ANIM_STAT_HP] = STAT_HP, + [ANIM_STAT_ATK] = STAT_ATK, + [ANIM_STAT_DEF] = STAT_DEF, + [ANIM_STAT_SPATK] = STAT_SPATK, + [ANIM_STAT_SPDEF] = STAT_SPDEF, + [ANIM_STAT_SPEED] = STAT_SPEED, + [ANIM_STAT_ACC] = STAT_ACC, + [ANIM_STAT_EVASION] = STAT_EVASION, + }; + gBattleScripting.animArg1 = 0; + + for (stat = 1; stat < NUM_BATTLE_STATS; stat++) // Start loop at 1 to avoid STAT_HP + { + if ((gQueuedStatBoosts[battler].stats & (1 << statsOrder[stat])) == 0) + continue; + + if (!statBuffMoreThan1) + statBuffMoreThan1 = ((gQueuedStatBoosts[battler].stats & (1 << statsOrder[stat])) > 1); + + if (gBattleScripting.animArg1 != 0) // Already set in a different stat so now boosting multiple stats + gBattleScripting.animArg1 = (statBuffMoreThan1 ? STAT_ANIM_MULTIPLE_PLUS2 : STAT_ANIM_MULTIPLE_PLUS1); + else + gBattleScripting.animArg1 = GET_STAT_BUFF_ID((statsOrder[stat] + 1)) + (!statBuffMoreThan1 ? STAT_ANIM_PLUS1 : STAT_ANIM_PLUS2); + } +} +#undef ANIM_STAT_HP +#undef ANIM_STAT_ATK +#undef ANIM_STAT_DEF +#undef ANIM_STAT_SPATK +#undef ANIM_STAT_SPDEF +#undef ANIM_STAT_SPEED +#undef ANIM_STAT_ACC +#undef ANIM_STAT_EVASION + u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 moveArg) { u32 effect = 0; @@ -6024,40 +6072,10 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 case ABILITY_OPPORTUNIST: if (gProtectStructs[battler].activateOpportunist == 2) { - bool32 statBuffMoreThan1 = FALSE; - bool32 handleSpeedAnimLater = FALSE; gBattleScripting.animArg1 = 0; gBattleScripting.battler = battler; gProtectStructs[battler].activateOpportunist--; - - for (i = 0; i < (NUM_BATTLE_STATS - 1); i++) - { - if ((gQueuedStatBoosts[battler].stats & (1 << i)) == 0) - continue; - - if (i == STAT_SPEED) - { - handleSpeedAnimLater = TRUE; - continue; - } - - if (!statBuffMoreThan1) - statBuffMoreThan1 = ((gQueuedStatBoosts[battler].stats & (1 << i)) > 1); - - if (gBattleScripting.animArg1 != 0) //Already set in a different stat so now boosting multiple stats - gBattleScripting.animArg1 = (!statBuffMoreThan1 ? STAT_ANIM_MULTIPLE_PLUS1 : STAT_ANIM_MULTIPLE_PLUS2); - else - gBattleScripting.animArg1 = GET_STAT_BUFF_ID((i + 1)) + (!statBuffMoreThan1 ? STAT_ANIM_PLUS1 : STAT_ANIM_PLUS2); - - } - if (handleSpeedAnimLater) - { - if (gBattleScripting.animArg1 != 0) //Already set in a different stat so now boosting multiple stats - gBattleScripting.animArg1 = (!statBuffMoreThan1 ? STAT_ANIM_MULTIPLE_PLUS1 : STAT_ANIM_MULTIPLE_PLUS2); - else - gBattleScripting.animArg1 = GET_STAT_BUFF_ID((STAT_SPEED + 1)) + (!statBuffMoreThan1 ? STAT_ANIM_PLUS1 : STAT_ANIM_PLUS2); - } - + ChooseStatBoostAnimation(battler); BattleScriptPushCursorAndCallback(BattleScript_OpportunistCopyStatChange); effect = 1; } @@ -7006,43 +7024,11 @@ static u8 TryConsumeMirrorHerb(u32 battler, bool32 execute) if (gProtectStructs[battler].eatMirrorHerb) { - u32 i; - bool32 statBuffMoreThan1 = FALSE; - bool32 handleSpeedAnimLater = FALSE; - gBattleScripting.animArg1 = 0; gLastUsedItem = gBattleMons[battler].item; gBattleScripting.battler = battler; gProtectStructs[battler].eatMirrorHerb = 0; - - for (i = 0; i < (NUM_BATTLE_STATS - 1); i++) - { - if ((gQueuedStatBoosts[battler].stats & (1 << i)) == 0) - continue; - - if (i == STAT_SPEED) - { - handleSpeedAnimLater = TRUE; - continue; - } - - if (!statBuffMoreThan1) - statBuffMoreThan1 = ((gQueuedStatBoosts[battler].stats & (1 << i)) > 1); - - if (gBattleScripting.animArg1 != 0) //Already set in a different stat so now boosting multiple stats - gBattleScripting.animArg1 = (!statBuffMoreThan1 ? STAT_ANIM_MULTIPLE_PLUS1 : STAT_ANIM_MULTIPLE_PLUS2); - else - gBattleScripting.animArg1 = GET_STAT_BUFF_ID((i + 1)) + (!statBuffMoreThan1 ? STAT_ANIM_PLUS1 : STAT_ANIM_PLUS2); - - } - if (handleSpeedAnimLater) - { - if (gBattleScripting.animArg1 != 0) //Already set in a different stat so now boosting multiple stats - gBattleScripting.animArg1 = (!statBuffMoreThan1 ? STAT_ANIM_MULTIPLE_PLUS1 : STAT_ANIM_MULTIPLE_PLUS2); - else - gBattleScripting.animArg1 = GET_STAT_BUFF_ID((STAT_SPEED + 1)) + (!statBuffMoreThan1 ? STAT_ANIM_PLUS1 : STAT_ANIM_PLUS2); - } - + ChooseStatBoostAnimation(battler); if (execute) { BattleScriptExecute(BattleScript_MirrorHerbCopyStatChangeEnd2); From 779cedd16f7fe9a28b0d82cbe740ed6b171563e4 Mon Sep 17 00:00:00 2001 From: PhallenTree <168426989+PhallenTree@users.noreply.github.com> Date: Sun, 11 Aug 2024 17:13:46 +0100 Subject: [PATCH 06/11] Fixes Dancer, adds Revelation Dance interactions with Z-Move, Roost and typeless mons (#5133) * Add Revelation Dance interactions with typeless mons, Roost and Z-Move * Fixes Dancer-called moves not updating their type * Adds Revelation Dance tests * Make sure target isn't immune in Dancer test * Missing ... in message * Missing Assume * CI ends Dancer test too early? * Z-Revelation Dance is Breakneck Blitz (Test) * Fix test (Zoroark too strong?) * Replace H!Zoroark * Remove Ability specification * Remove HP_Bars * Fix Dancer checking for battlers that don't exist in single battles --- src/battle_main.c | 10 +- src/battle_script_commands.c | 6 +- src/battle_util.c | 6 +- test/battle/ability/dancer.c | 19 +++ test/battle/gimmick/zmove.c | 19 +++ test/battle/move_effect/revelation_dance.c | 149 +++++++++++++++++++++ 6 files changed, 202 insertions(+), 7 deletions(-) create mode 100644 test/battle/move_effect/revelation_dance.c diff --git a/src/battle_main.c b/src/battle_main.c index 6bbcc0e3bc..526c54d62f 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -5824,16 +5824,20 @@ void SetTypeBeforeUsingMove(u32 move, u32 battlerAtk) { gBattleStruct->dynamicMoveType = ItemId_GetSecondaryId(gBattleMons[battlerAtk].item) | F_DYNAMIC_TYPE_SET; } - else if (gMovesInfo[move].effect == EFFECT_REVELATION_DANCE) + else if (gMovesInfo[move].effect == EFFECT_REVELATION_DANCE && GetActiveGimmick(battlerAtk) != GIMMICK_Z_MOVE) { if (GetActiveGimmick(battlerAtk) == GIMMICK_TERA && GetBattlerTeraType(battlerAtk) != TYPE_STELLAR) gBattleStruct->dynamicMoveType = GetBattlerTeraType(battlerAtk); - else if (gBattleMons[battlerAtk].types[0] != TYPE_MYSTERY) + else if (gBattleMons[battlerAtk].types[0] != TYPE_MYSTERY && !(gBattleResources->flags->flags[battlerAtk] & RESOURCE_FLAG_ROOST && gBattleMons[battlerAtk].types[0] == TYPE_FLYING)) gBattleStruct->dynamicMoveType = gBattleMons[battlerAtk].types[0] | F_DYNAMIC_TYPE_SET; - else if (gBattleMons[battlerAtk].types[1] != TYPE_MYSTERY) + else if (gBattleMons[battlerAtk].types[1] != TYPE_MYSTERY && !(gBattleResources->flags->flags[battlerAtk] & RESOURCE_FLAG_ROOST && gBattleMons[battlerAtk].types[1] == TYPE_FLYING)) gBattleStruct->dynamicMoveType = gBattleMons[battlerAtk].types[1] | F_DYNAMIC_TYPE_SET; + else if (gBattleResources->flags->flags[battlerAtk] & RESOURCE_FLAG_ROOST) + gBattleStruct->dynamicMoveType = (B_ROOST_PURE_FLYING >= GEN_5 ? TYPE_NORMAL : TYPE_MYSTERY) | F_DYNAMIC_TYPE_SET; else if (gBattleMons[battlerAtk].types[2] != TYPE_MYSTERY) gBattleStruct->dynamicMoveType = gBattleMons[battlerAtk].types[2] | F_DYNAMIC_TYPE_SET; + else + gBattleStruct->dynamicMoveType = TYPE_MYSTERY | F_DYNAMIC_TYPE_SET; } else if (gMovesInfo[move].effect == EFFECT_RAGING_BULL && (gBattleMons[battlerAtk].species == SPECIES_TAUROS_PALDEAN_COMBAT_BREED diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 9d10c87cf7..317613c479 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6257,7 +6257,7 @@ static void Cmd_moveend(void) u32 battler, nextDancer = 0; bool32 turnOnHitmarker = FALSE; - for (battler = 0; battler < MAX_BATTLERS_COUNT; battler++) + for (battler = 0; battler < gBattlersCount; battler++) { if (gSpecialStatuses[battler].dancerUsedMove) { @@ -6278,7 +6278,7 @@ static void Cmd_moveend(void) gBattleScripting.savedBattler |= (gBattlerAttacker << 4); gSpecialStatuses[gBattlerAttacker].dancerUsedMove = TRUE; } - for (battler = 0; battler < MAX_BATTLERS_COUNT; battler++) + for (battler = 0; battler < gBattlersCount; battler++) { if (GetBattlerAbility(battler) == ABILITY_DANCER && !gSpecialStatuses[battler].dancerUsedMove) { @@ -12898,7 +12898,7 @@ static void Cmd_settypetorandomresistance(void) { gBattlescriptCurrInstr = cmd->failInstr; } - else if (gLastHitByType[gBattlerAttacker] == TYPE_STELLAR) + else if (gLastHitByType[gBattlerAttacker] == TYPE_STELLAR || gLastHitByType[gBattlerAttacker] == TYPE_MYSTERY) { gBattlescriptCurrInstr = cmd->failInstr; } diff --git a/src/battle_util.c b/src/battle_util.c index 56701e2d99..e517a81605 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5565,6 +5565,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 && TARGET_TURN_DAMAGED && !IS_BATTLER_OF_TYPE(battler, moveType) && moveType != TYPE_STELLAR + && moveType != TYPE_MYSTERY && IsBattlerAlive(battler)) { SET_BATTLER_TYPE(battler, moveType); @@ -6049,6 +6050,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 // Edge case for dance moves that hit multiply targets gHitMarker &= ~HITMARKER_NO_ATTACKSTRING; + SetTypeBeforeUsingMove(gCalledMove, battler); // Make sure that the target isn't an ally - if it is, target the original user if (GetBattlerSide(gBattlerTarget) == GetBattlerSide(gBattlerAttacker)) @@ -9860,7 +9862,9 @@ static inline uq4_12_t GetParentalBondModifier(u32 battlerAtk) static inline uq4_12_t GetSameTypeAttackBonusModifier(u32 battlerAtk, u32 moveType, u32 move, u32 abilityAtk) { - if (gBattleStruct->pledgeMove && IS_BATTLER_OF_TYPE(BATTLE_PARTNER(battlerAtk), moveType)) + if (moveType == TYPE_MYSTERY) + return UQ_4_12(1.0); + else if (gBattleStruct->pledgeMove && IS_BATTLER_OF_TYPE(BATTLE_PARTNER(battlerAtk), moveType)) return (abilityAtk == ABILITY_ADAPTABILITY) ? UQ_4_12(2.0) : UQ_4_12(1.5); else if (!IS_BATTLER_OF_TYPE(battlerAtk, moveType) || move == MOVE_STRUGGLE || move == MOVE_NONE) return UQ_4_12(1.0); diff --git a/test/battle/ability/dancer.c b/test/battle/ability/dancer.c index f54f7ab76a..660a719c69 100644 --- a/test/battle/ability/dancer.c +++ b/test/battle/ability/dancer.c @@ -126,3 +126,22 @@ DOUBLE_BATTLE_TEST("Dancer still triggers if another dancer flinches") ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentLeft); } } + +SINGLE_BATTLE_TEST("Dancer-called attacks have their type updated") +{ + GIVEN { + ASSUME(gMovesInfo[MOVE_REVELATION_DANCE].danceMove == TRUE); + ASSUME(gMovesInfo[MOVE_REVELATION_DANCE].effect == EFFECT_REVELATION_DANCE); + PLAYER(SPECIES_TANGROWTH); + OPPONENT(SPECIES_ORICORIO_BAILE); + } WHEN { + TURN { MOVE(player, MOVE_REVELATION_DANCE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_REVELATION_DANCE, player); + MESSAGE("It's not very effective…"); + ABILITY_POPUP(opponent, ABILITY_DANCER); + ANIMATION(ANIM_TYPE_MOVE, MOVE_REVELATION_DANCE, opponent); + NOT MESSAGE("It's not very effective…"); + MESSAGE("It's super effective!"); + } +} diff --git a/test/battle/gimmick/zmove.c b/test/battle/gimmick/zmove.c index bde241bfd7..1eb2c7ae74 100644 --- a/test/battle/gimmick/zmove.c +++ b/test/battle/gimmick/zmove.c @@ -599,3 +599,22 @@ SINGLE_BATTLE_TEST("(Z-MOVE) Searing Sunraze Smash ignores the target's abilitie MESSAGE("A critical hit!"); } } + +SINGLE_BATTLE_TEST("(Z-MOVE) Z-Revelation Dance always transforms into Breakneck Blitz") +{ + u16 species; + PARAMETRIZE { species = SPECIES_ORICORIO_BAILE; } + PARAMETRIZE { species = SPECIES_ORICORIO_PAU; } + PARAMETRIZE { species = SPECIES_ORICORIO_POM_POM; } + PARAMETRIZE { species = SPECIES_ORICORIO_SENSU; } + GIVEN { + ASSUME(gMovesInfo[MOVE_REVELATION_DANCE].type == TYPE_NORMAL); + PLAYER(species) { Item(ITEM_NORMALIUM_Z); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_REVELATION_DANCE, gimmick: GIMMICK_Z_MOVE); } + } SCENE { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_ZMOVE_ACTIVATE, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_BREAKNECK_BLITZ, player); + } +} diff --git a/test/battle/move_effect/revelation_dance.c b/test/battle/move_effect/revelation_dance.c new file mode 100644 index 0000000000..489dee1c87 --- /dev/null +++ b/test/battle/move_effect/revelation_dance.c @@ -0,0 +1,149 @@ +#include "global.h" +#include "test/battle.h" + +ASSUMPTIONS +{ + ASSUME(gMovesInfo[MOVE_REVELATION_DANCE].effect == EFFECT_REVELATION_DANCE); + ASSUME(gMovesInfo[MOVE_REVELATION_DANCE].danceMove == TRUE); + ASSUME(MoveHasAdditionalEffectSelfArg(MOVE_BURN_UP, MOVE_EFFECT_REMOVE_ARG_TYPE, TYPE_FIRE)); + ASSUME(gMovesInfo[MOVE_FORESTS_CURSE].effect == EFFECT_THIRD_TYPE); + ASSUME(gMovesInfo[MOVE_FORESTS_CURSE].argument == TYPE_GRASS); + ASSUME(gMovesInfo[MOVE_ROOST].effect == EFFECT_ROOST); +} + +SINGLE_BATTLE_TEST("Revelation Dance changes its type depending on the user's 1st Type") +{ + u16 speciesPlayer; + u16 speciesOpponent; + + PARAMETRIZE { speciesPlayer = SPECIES_ORICORIO_POM_POM; speciesOpponent = SPECIES_DUGTRIO; } + PARAMETRIZE { speciesPlayer = SPECIES_ORICORIO_BAILE; speciesOpponent = SPECIES_BLASTOISE; } + PARAMETRIZE { speciesPlayer = SPECIES_ORICORIO_PAU; speciesOpponent = SPECIES_LIEPARD; } + PARAMETRIZE { speciesPlayer = SPECIES_ORICORIO_SENSU; speciesOpponent = SPECIES_PERSIAN; } + + GIVEN { + PLAYER(speciesPlayer); + OPPONENT(speciesOpponent); + } WHEN { + TURN { MOVE(player, MOVE_REVELATION_DANCE); } + } SCENE { + if (speciesPlayer == SPECIES_ORICORIO_BAILE) { + ANIMATION(ANIM_TYPE_MOVE, MOVE_REVELATION_DANCE, player); + HP_BAR(opponent); + MESSAGE("It's not very effective…"); + } + else { + NONE_OF { + ANIMATION(ANIM_TYPE_MOVE, MOVE_REVELATION_DANCE, player); + HP_BAR(opponent); + MESSAGE("It's not very effective…"); + } + } + } +} + +SINGLE_BATTLE_TEST("Revelation Dance changes its type depending on the user's 2nd Type if it has no 1st type") +{ + GIVEN { + PLAYER(SPECIES_ORICORIO_BAILE); + OPPONENT(SPECIES_EMPOLEON); + } WHEN { + TURN { MOVE(player, MOVE_BURN_UP); } + TURN { MOVE(player, MOVE_REVELATION_DANCE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_BURN_UP, player); + HP_BAR(opponent); + NONE_OF { + MESSAGE("It's not very effective…"); + MESSAGE("It's super effective!"); + } + ANIMATION(ANIM_TYPE_MOVE, MOVE_REVELATION_DANCE, player); + HP_BAR(opponent); + MESSAGE("It's not very effective…"); + } +} + +SINGLE_BATTLE_TEST("Revelation Dance changes its type depending on the user's 3rd Type if it has no 1st or 2nd type") +{ + GIVEN { + PLAYER(SPECIES_GROWLITHE); + OPPONENT(SPECIES_TREVENANT); + } WHEN { + TURN { MOVE(player, MOVE_BURN_UP); MOVE(opponent, MOVE_FORESTS_CURSE); } + TURN { MOVE(player, MOVE_REVELATION_DANCE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_BURN_UP, player); + HP_BAR(opponent); + MESSAGE("It's super effective!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_FORESTS_CURSE, opponent); + ANIMATION(ANIM_TYPE_MOVE, MOVE_REVELATION_DANCE, player); + HP_BAR(opponent); + MESSAGE("It's not very effective…"); + } +} + +SINGLE_BATTLE_TEST("Revelation Dance becomes Typeless if its user is Typeless") +{ + u16 speciesOpponent; + + PARAMETRIZE { speciesOpponent = SPECIES_BLISSEY; } + PARAMETRIZE { speciesOpponent = SPECIES_BLASTOISE; } + PARAMETRIZE { speciesOpponent = SPECIES_CHARIZARD; } + PARAMETRIZE { speciesOpponent = SPECIES_VENUSAUR; } + PARAMETRIZE { speciesOpponent = SPECIES_GOLEM; } + PARAMETRIZE { speciesOpponent = SPECIES_AEGISLASH; } + + GIVEN { + PLAYER(SPECIES_GROWLITHE); + OPPONENT(speciesOpponent); + } WHEN { + TURN { MOVE(player, MOVE_BURN_UP); } + TURN { MOVE(player, MOVE_REVELATION_DANCE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_BURN_UP, player); + HP_BAR(opponent); + ANIMATION(ANIM_TYPE_MOVE, MOVE_REVELATION_DANCE, player); + HP_BAR(opponent); + NONE_OF { + MESSAGE("It's not very effective…"); + MESSAGE("It's super effective!"); + } + } +} + +SINGLE_BATTLE_TEST("Revelation Dance becomes Normal type if used by a Typeless Pokemon due to Roost") +{ + u16 speciesOpponent; + + PARAMETRIZE { speciesOpponent = SPECIES_SABLEYE; } + PARAMETRIZE { speciesOpponent = SPECIES_AGGRON; } + + ASSUME(B_ROOST_PURE_FLYING >= GEN_5); + + GIVEN { + PLAYER(SPECIES_ORICORIO_BAILE) { Ability(ABILITY_DANCER); } + OPPONENT(speciesOpponent); + } WHEN { + TURN { MOVE(player, MOVE_BURN_UP); MOVE(opponent, MOVE_TACKLE); } + TURN { MOVE(player, MOVE_ROOST); MOVE(opponent, MOVE_REVELATION_DANCE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_BURN_UP, player); + HP_BAR(opponent); + ANIMATION(ANIM_TYPE_MOVE, MOVE_ROOST, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_REVELATION_DANCE, opponent); + HP_BAR(player); + ABILITY_POPUP(player, ABILITY_DANCER); + if (speciesOpponent == SPECIES_AGGRON) { + ANIMATION(ANIM_TYPE_MOVE, MOVE_REVELATION_DANCE, player); + HP_BAR(opponent); + MESSAGE("It's not very effective…"); + } + else { + NONE_OF { + ANIMATION(ANIM_TYPE_MOVE, MOVE_REVELATION_DANCE, player); + HP_BAR(opponent); + MESSAGE("It's not very effective…"); + } + } + } +} From 805bb2888cf5400ec1b031c5766f0115e9ace35d Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sun, 11 Aug 2024 18:27:22 +0200 Subject: [PATCH 07/11] Fixes wrong padding in struct SpeciesInfo (#5139) Fixes wrong padding in struct SpeciesInfo that is if I counted correctly. After I opened #5138 I realized it might be an issue on master as well. --- include/pokemon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/pokemon.h b/include/pokemon.h index d1484fe2ce..22c465214c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -441,7 +441,7 @@ struct SpeciesInfo /*0xC4*/ u32 dexForceRequired:1; // This species will be taken into account for Pokédex ratings even if they have the "isMythical" flag set. u32 tmIlliterate:1; // This species will be unable to learn the universal moves. u32 isFrontierBanned:1; // This species is not allowed to participate in Battle Frontier facilities. - u32 padding4:14; + u32 padding4:13; // Move Data /* 0x80 */ const struct LevelUpMove *levelUpLearnset; /* 0x84 */ const u16 *teachableLearnset; From 863b96f75964ccc35ee6545e48652ecd9872cec7 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Mon, 12 Aug 2024 01:05:38 +0200 Subject: [PATCH 08/11] Fixes Stomping Tantrum effect not doubling power in certain situations (#5140) * Fixes Stomping Tantrum effect not doubling power in certain situations * fix dancer test --- src/battle_script_commands.c | 14 +-- test/battle/move_effect/stomping_tantrum.c | 134 +++++++++++++++++++++ 2 files changed, 141 insertions(+), 7 deletions(-) create mode 100644 test/battle/move_effect/stomping_tantrum.c diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 317613c479..8056b3ddf2 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1364,9 +1364,8 @@ static void Cmd_attackcanceler(void) } // Z-moves and Max Moves bypass protection, but deal reduced damage (factored in AccumulateOtherModifiers) - if ((IsZMove(gCurrentMove) - || IsMaxMove(gCurrentMove)) - && IS_BATTLER_PROTECTED(gBattlerTarget)) + if ((IsZMove(gCurrentMove) || IsMaxMove(gCurrentMove)) + && IS_BATTLER_PROTECTED(gBattlerTarget)) { BattleScriptPush(cmd->nextInstr); gBattlescriptCurrInstr = BattleScript_CouldntFullyProtect; @@ -5825,7 +5824,9 @@ static void Cmd_moveend(void) gBattleScripting.moveendState++; break; case MOVEEND_UPDATE_LAST_MOVES: - if (gMoveResultFlags & (MOVE_RESULT_FAILED | MOVE_RESULT_DOESNT_AFFECT_FOE)) + if ((gMoveResultFlags & (MOVE_RESULT_FAILED | MOVE_RESULT_DOESNT_AFFECT_FOE)) + || (gBattleMons[gBattlerAttacker].status2 & (STATUS2_FLINCHED)) + || gProtectStructs[gBattlerAttacker].prlzImmobility) gBattleStruct->lastMoveFailed |= gBitTable[gBattlerAttacker]; else gBattleStruct->lastMoveFailed &= ~(gBitTable[gBattlerAttacker]); @@ -6267,9 +6268,8 @@ static void Cmd_moveend(void) } } - if (!(gBattleStruct->lastMoveFailed & gBitTable[gBattlerAttacker] - || (!gSpecialStatuses[gBattlerAttacker].dancerUsedMove - && gBattleStruct->bouncedMoveIsUsed))) + if (!(gMoveResultFlags & (MOVE_RESULT_FAILED | MOVE_RESULT_DOESNT_AFFECT_FOE) + || (!gSpecialStatuses[gBattlerAttacker].dancerUsedMove && gBattleStruct->bouncedMoveIsUsed))) { // Dance move succeeds // Set target for other Dancer mons; set bit so that mon cannot activate Dancer off of its own move if (!gSpecialStatuses[gBattlerAttacker].dancerUsedMove) diff --git a/test/battle/move_effect/stomping_tantrum.c b/test/battle/move_effect/stomping_tantrum.c new file mode 100644 index 0000000000..1a5870fdd0 --- /dev/null +++ b/test/battle/move_effect/stomping_tantrum.c @@ -0,0 +1,134 @@ +#include "global.h" +#include "test/battle.h" + +ASSUMPTIONS +{ + ASSUME(gMovesInfo[MOVE_STOMPING_TANTRUM].effect == EFFECT_STOMPING_TANTRUM); +} + +SINGLE_BATTLE_TEST("Stomping Tatrum will deal double damage if user flinched on the previous turn") +{ + s16 damage[3]; + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_STOMPING_TANTRUM); SWITCH(opponent, 1); } + TURN { MOVE(opponent, MOVE_FAKE_OUT); MOVE(player, MOVE_CELEBRATE); } + TURN { MOVE(player, MOVE_STOMPING_TANTRUM); } + TURN { MOVE(player, MOVE_STOMPING_TANTRUM); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_STOMPING_TANTRUM, player); + HP_BAR(opponent, captureDamage: &damage[0]); + + ANIMATION(ANIM_TYPE_MOVE, MOVE_FAKE_OUT, opponent); + NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, player); + + ANIMATION(ANIM_TYPE_MOVE, MOVE_STOMPING_TANTRUM, player); + HP_BAR(opponent, captureDamage: &damage[1]); + + ANIMATION(ANIM_TYPE_MOVE, MOVE_STOMPING_TANTRUM, player); + HP_BAR(opponent, captureDamage: &damage[2]); + } THEN { + EXPECT_MUL_EQ(damage[0], Q_4_12(2.0), damage[1]); + EXPECT_EQ(damage[0], damage[2]); + } +} + +SINGLE_BATTLE_TEST("Stomping Tatrum will deal double damage if user failed to attack due to paralysis") +{ + s16 damage[3]; + PASSES_RANDOMLY(25, 100, RNG_PARALYSIS); + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Speed(100); Item(ITEM_POTION); }; + OPPONENT(SPECIES_WOBBUFFET) { Speed(10); Item(ITEM_LUM_BERRY); }; + } WHEN { + TURN { MOVE(player, MOVE_STOMPING_TANTRUM); MOVE(opponent, MOVE_THUNDER_WAVE); } + TURN { MOVE(player, MOVE_CELEBRATE); MOVE(opponent, MOVE_TRICK); } + TURN { MOVE(player, MOVE_STOMPING_TANTRUM); } + TURN { MOVE(player, MOVE_STOMPING_TANTRUM); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_STOMPING_TANTRUM, player); + HP_BAR(opponent, captureDamage: &damage[0]); + ANIMATION(ANIM_TYPE_MOVE, MOVE_THUNDER_WAVE, opponent); + + ANIMATION(ANIM_TYPE_MOVE, MOVE_TRICK, opponent); + + ANIMATION(ANIM_TYPE_MOVE, MOVE_STOMPING_TANTRUM, player); + HP_BAR(opponent, captureDamage: &damage[1]); + + ANIMATION(ANIM_TYPE_MOVE, MOVE_STOMPING_TANTRUM, player); + HP_BAR(opponent, captureDamage: &damage[2]); + } THEN { + EXPECT_MUL_EQ(damage[0], Q_4_12(2.0), damage[1]); + EXPECT_EQ(damage[0], damage[2]); + } +} + +SINGLE_BATTLE_TEST("Stomping Tatrum will not deal double damage if target protects") +{ + s16 damage[2]; + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_STOMPING_TANTRUM); } + TURN { MOVE(opponent, MOVE_PROTECT); MOVE(player, MOVE_STOMPING_TANTRUM); } + TURN { MOVE(player, MOVE_STOMPING_TANTRUM); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_STOMPING_TANTRUM, player); + HP_BAR(opponent, captureDamage: &damage[0]); + + ANIMATION(ANIM_TYPE_MOVE, MOVE_PROTECT, opponent); + MESSAGE("Foe Wobbuffet protected itself!"); + + ANIMATION(ANIM_TYPE_MOVE, MOVE_STOMPING_TANTRUM, player); + HP_BAR(opponent, captureDamage: &damage[1]); + } THEN { + EXPECT_EQ(damage[0], damage[1]); + } +} + +SINGLE_BATTLE_TEST("Stomping Tatrum will not deal double damage if it failed on the previous turn cause of Protect") +{ + s16 damage[2]; + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_BRIGHTPOWDER); }; + } WHEN { + TURN { MOVE(player, MOVE_STOMPING_TANTRUM); } + TURN { MOVE(player, MOVE_STOMPING_TANTRUM, hit: FALSE); } + TURN { MOVE(player, MOVE_STOMPING_TANTRUM); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_STOMPING_TANTRUM, player); + HP_BAR(opponent, captureDamage: &damage[0]); + MESSAGE("Wobbuffet's attack missed!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_STOMPING_TANTRUM, player); + HP_BAR(opponent, captureDamage: &damage[1]); + } THEN { + EXPECT_EQ(damage[0], damage[1]); + } +} + +SINGLE_BATTLE_TEST("Stomping Tatrum will deal double damage if user was immune to previous move") +{ + s16 damage[2]; + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_PIDGEY); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_STOMPING_TANTRUM); SWITCH(opponent, 1); } + TURN { MOVE(player, MOVE_STOMPING_TANTRUM); SWITCH(opponent, 0); } + TURN { MOVE(player, MOVE_STOMPING_TANTRUM); SWITCH(opponent, 1); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_STOMPING_TANTRUM, player); + HP_BAR(opponent, captureDamage: &damage[0]); + MESSAGE("It doesn't affect Foe Pidgey…"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_STOMPING_TANTRUM, player); + HP_BAR(opponent, captureDamage: &damage[1]); + } THEN { + EXPECT_MUL_EQ(damage[0], Q_4_12(2.0), damage[1]); + } +} From 5df53a5c1c1e67b8c333e15bfe5411f6fb722d36 Mon Sep 17 00:00:00 2001 From: hedara90 <90hedara@gmail.com> Date: Mon, 12 Aug 2024 21:39:11 +0200 Subject: [PATCH 09/11] Added fixed Unown follower sprites by Sarn (#5146) Co-authored-by: Hedara --- graphics/pokemon/unown/b/overworld.png | Bin 299 -> 419 bytes graphics/pokemon/unown/c/overworld.png | Bin 348 -> 462 bytes graphics/pokemon/unown/d/overworld.png | Bin 330 -> 443 bytes graphics/pokemon/unown/e/overworld.png | Bin 305 -> 422 bytes .../unown/exclamation_mark/overworld.png | Bin 2556 -> 360 bytes graphics/pokemon/unown/f/overworld.png | Bin 301 -> 419 bytes graphics/pokemon/unown/g/overworld.png | Bin 316 -> 426 bytes graphics/pokemon/unown/h/overworld.png | Bin 321 -> 433 bytes graphics/pokemon/unown/i/overworld.png | Bin 263 -> 377 bytes graphics/pokemon/unown/j/overworld.png | Bin 286 -> 399 bytes graphics/pokemon/unown/k/overworld.png | Bin 289 -> 402 bytes graphics/pokemon/unown/l/overworld.png | Bin 294 -> 404 bytes graphics/pokemon/unown/m/overworld.png | Bin 319 -> 428 bytes graphics/pokemon/unown/n/overworld.png | Bin 323 -> 438 bytes graphics/pokemon/unown/o/overworld.png | Bin 317 -> 428 bytes graphics/pokemon/unown/p/overworld.png | Bin 278 -> 392 bytes graphics/pokemon/unown/q/overworld.png | Bin 313 -> 430 bytes .../pokemon/unown/question_mark/overworld.png | Bin 2741 -> 405 bytes graphics/pokemon/unown/r/overworld.png | Bin 276 -> 391 bytes graphics/pokemon/unown/s/overworld.png | Bin 322 -> 436 bytes graphics/pokemon/unown/t/overworld.png | Bin 260 -> 369 bytes graphics/pokemon/unown/u/overworld.png | Bin 299 -> 409 bytes graphics/pokemon/unown/v/overworld.png | Bin 272 -> 387 bytes graphics/pokemon/unown/w/overworld.png | Bin 271 -> 385 bytes graphics/pokemon/unown/x/overworld.png | Bin 281 -> 398 bytes graphics/pokemon/unown/y/overworld.png | Bin 287 -> 402 bytes graphics/pokemon/unown/z/overworld.png | Bin 313 -> 419 bytes 27 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/pokemon/unown/b/overworld.png b/graphics/pokemon/unown/b/overworld.png index b2500cca0cd4b49f896564dd672d1c9c03929b08..1e8ab69c117e625fc102b25ca591dbbf8f8ccd85 100644 GIT binary patch delta 393 zcmZ3@w3vB`sf3l26xHjcEt2NyChFo>79MwA5SrR}8R%`D`i2xK!RdAqwXbg;^L06E7!T^vIy=DfXf zkoS-Q59@`B=3Om}36m8zGb~~*NcbD~VS zt?ViO)1@2&zHDE{%f?VEFX6!BGJ$Ew(}&8^tZm0d9^^Y5tJrz*_E(Fqj0-<1)Z}Vg Rw}3qB>FVdQ&WS0Z2>|ZEiopN? delta 272 zcmZ3?yqal(O1(jVPl)T;vupk{{D+`>_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z4BI?i978JRyq)69)oQ@gvisD@Cl3u{rUZO{Bq%3$`&U?6lkA~rPRRnpxd!p|2ZDlD zhG>0Ndig0{k7t7uqu8cBjqVHT<>IXwTXo7Ao-e<-CL!^%*_oT2OWw_vWLyv@#VE_L zCuHq+HU=&xnF-8qI0ZOb`8*h1m!Gda8XNhZS(^0*6U#3d8|E*CyOlL2XvfbhW_wY7 zYd>Sa7xT|NJo64PZWL&IXwDHI`DbGDJf`sf3l26xc12r}j2;FC2JsTth?3y^w370~qErTVAC~|>cZIUl zA_ZeTlfu>|4}nTJN(%hkfilKGHiK7#raX{hNq6*hWMJ6X&;2Kn705RT@Ck7}dv*wfo#SkZ+91l4pvzYAm@{(i(^Q|oVQZ~ z`I-y_Ty~qk5U^>u#}cfc@PwhR;=lHeBQE9X6PIp0r z{4bAXPx~&#JaJc1+eyw9ue2LZ|23@PlHkx>dSgz5al<@D3m$`378XX19c&9)`5rX# z90+rGb$oVY;(~Yjs_z+IEIfG4uwa$Tw)R(z+6@2JrX_fNnaiS3D|&Ep>Vq?KOxGBi z49_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z49`7X978JRyqyxrcgTRp`S;Yxz8%S5k~dW`91#>au9hRDa_-u?TjGnR{U`|foy$7$ z(gh&+@6izaoB8iP$ELOKW;@l#*;lu&-RrmNZ&Udll@$RcGgIr=Yn?L;kbm*>guy*# z)z@;@gbkSXv`=|C>#1?FLXczQO<{wNzg-U0?4QZRmbA0@G3O4(4{?k$KF(!T;BYvg z%%EGsz@NfU#mIU2sE@>skY~aSe=pU@GKMppC};fB(3su8cr`w-=X!&5I>!wrD-NeQ zuMf}nw>=p5;@pomq3^~USUn!G3o(`0F<3JmWM_CT{jdEi)0Y?Z)~CMQUI6qogQu&X J%Q~loCIDTgnLq#l diff --git a/graphics/pokemon/unown/d/overworld.png b/graphics/pokemon/unown/d/overworld.png index 426e517d5df4b06d05a19b2288a0f406a055e7e9..d8796d020083830aa2f931832747b577d60fac67 100644 GIT binary patch delta 417 zcmX@bw3~T?N`sf3l26x4wX~S8qP279MwA5SrR}8R%`D`i2xK!RdAqwXbg;^L06F(PT^vIy=DfXf zkoS-Q4{Jbr^A0WM18S~`j4tdC4*b)eaPQB5aZdsDB|p-9KEG1ic(X^+IPJ`j#Rd7( zCO`l7c_qKa(;aqay|u!J@&niYPL!6t z5#@D9k+tHo>UwtTc}gs=mmNBoUcm66x_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z3|Bo}978JRyuD(`cUXakHNbz4PFEFA+ly}I5L>6K$>L`J--~%zyB?bD{Gpj8XIs+I zE>Ueg5r=XM#qZCT8#0{SxsRcqQD+jnz_DNn7e5oJ0}L7WPFBkK>I{3?d0uS{DPX(c{#EPY?TEc6mcKvP9`_{vqQ*4= qGXv%fzx<41?gq2%iRF9!_Ar))=4_9Zeb55*B7>)^pUXO@geCyKqKF~@ diff --git a/graphics/pokemon/unown/e/overworld.png b/graphics/pokemon/unown/e/overworld.png index 741a5ef42e1427da054fe295f6bf44ff6257375a..34fd50f0040e92fcedfb2417da1470b5c77d5949 100644 GIT binary patch delta 396 zcmdnUw2XOzN`sf3l26xPMP2TIfWS*7{p6lBT9nv(@M${i&7cfeOv11JIm^)LpEW)^Z$1hN^EyxmZR_X4 z;MmgpCoEXn!hc(tgWZD$7KI56*IqWUHGVOEB~;Jwq;9h;i`zbCiwFNqWZBOB%J?Pd zaP4~a%4mkJRZ;Q>7$&4neI3**d!U9PYyN?A<{uoSUo?C)*Z7_0c4(sL)n_M!)~{V% zxRLS8KGtIlW)e4E|7Y0J`0hBD`y+-3UZJ;(;ux+^k1jiVxo&6c?XNb!82VG>k~yuV Rn?U~cboFC(S?83{1OP$si!%TK delta 278 zcmZ3+ypd^wO1(jVPl)T;vupk{{D+`>_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z40}9X978JRyq)66b=ZK1rS{Wlr9EbK!w_Et-rf<q-V@91VEv?qfpx*HZT5FJGDrA3ycf3E+05~!k#WWUM&15>!hJmQ zHhY=b1SD$XSXepI)tK}cjyY6rG+|hL@QThX)`FVWMDrNg_StjReZMHbq9-YRI=}vH R1E5bBJYD@<);T3K0RWj8d`$oV diff --git a/graphics/pokemon/unown/exclamation_mark/overworld.png b/graphics/pokemon/unown/exclamation_mark/overworld.png index 4271c7ab99a223d67cfe3431f957ca0a2ffc1213..96073167d0ab7a66365f64460cfef042896a1ed8 100644 GIT binary patch delta 334 zcmew({DNtMay>K`y~{$!fU_3=HBWt`Q}{`DrEPiAAXl?mjL7e(nlo zsYMFLdM1UfOCAE1aFi7IxdUa4fouk^22FV&#ggvm>&U>cv7h@-A}f$@5a1KydiLxZ zATuFjf`dndhJnM27e99F*Z~xQf_fMOPBRO+C;~Z*N#5=*3>~bp9zafyr;B4q#hkZO z4ssqg;BkG*t70yzaPNrg-35{h+TZMVI#>9xzQ;pxL4EbKr|ie3d8kc3nUXi9s4#Zb zqqdA#xx;N68?Q?KmoYefdOxdjyuLxNp>RaB>7kH-X!qa~|C-LQES+6?x_f@;gh@RL~E3(Nt<=?9}dyGzp2>fGzT(J1^S366F9XF+9)mFd#26D2etDnm{ Hr-UW|@49qP delta 2547 zcmVaB^>EX>4U6ba`-PAZ2)IW&i+q+O3ysmLsVV zM*p)4FM$XM0+z$`oY{ew?@LNmUDe(8%-B{+$`nZg5#J+F*#G?Fgn#goR&&VawX{+q zuiSFe&P9!{S9`uC=I8r)&G#*Se`^o=aYJcJoYU*4_jmtJyMO(7;A0LM-`hid-_iOW zNInOCUg^$!uh-W_(yp&|$?t*MeqEGS{p(W4d!YI5_$=l9$)C%5o$l}Ot-;CCGA2r@ zJ4uSqcYduPy*`~!;agLtpCo%)THutDz6T>A-@^Mi$M`it-;(@s6@JdX_TML8`@2W_ zDVOD)BQAb>Lx1e2_VhWwew{ddu1LS%sQqK8Uz2>!s^{!ibUha`THcI$k}V&@&~cFR z^gLELoR4ws&(Sz)>~RA5f|-M3N)rW@6C}%$E=Trro-$ct)~(K2b!vLrYI1El)5R&@ zLymfCX{8E&Q+EKfob+=o^32dHSkp(c6qS0feC} z2b-2UV1MOo@W*q7L*0^PGb`p+gEi|Vm0YZp;^mrL_vG2li@R5E-fOD4S}oOUt*!Q^ zE#ZOIO7m7*YrSjeOw<{x)4$U)bfl4ojWT@H(MF%pXXa_MOrLeO*_W=gu!&Wcue#dm zTf)XEcHXwj_FZ?|{lK-8PCjy=V=g$otlhWE zwh`-)Y`k-1A?a9IrO%TMKWXL21m#gJNPnFk(}1j}PJ^`g^(0o@+9qYS7;tagt_hrKlo@hC{5FSp)3r3$ zIeEV6ZW_eqMt1~v(>zxhi^s}BZ%;rmT3&gdotB=w;OB1exud4GAz zUi-N+lvZ@s-7}-38SSg4HA_aOV6<7fl?X|PZMZK>yFH&3c3C{Lt>k_6CK+C@xnXp5 z#_G)h{Dvf(V!5PQ9dqKxPzABo+gqrFfi$=?0);lmK6XA%nN4Fo)a$PZ4Y}VNbVo6Tq|q1mC!7+ z&4wUzTbtyq+@C2MQ$7TVg3XK)Mk?Nwx;cjvtl643V~LD0m9v|k4bFRCcH*tKTx z{iJ+|jZKYX)}ir`7m6<{?q1sEOioR1@VSyyLfFsBP~g$tVeHB?(pNNkkDOA zKREo_jnNbAqE|^e2h+~e3xBtt2zItIx+8ep0ljXYGMpalt*ix7N?kZQagNGPZNhOU&Pk>tt2xp}T4<|vG+}+ONE8}_^B~y=u1PZ%Ceynh*53)img@{?p z7zh7~y`5I$^)NJB^?xO3>SIq-LwhCimZLezDjA=cLR>aaMS1Mz*x=RG$!AqFaDY{C z2Ed^tUY@Y`M%t*el2=GnXC&CB=eud$gOa_mTPpDlaAhg$F?dhcqZ^fggy|S#AI~>J zBj3G;y#V55sT6;B%kJSimBvpyLVMs!^t}POPy`m{!rs6OgMX4oHVv~bwtlgL<2ZOa zo3%xy&$k9@*M?-|6P6DPcQ$TfBO6q+zNoXOj=aM#HXII_WHgi`x1)-Azo z=dTMUdq-rC#lF7#P0YZF;)}C^y%UmTTkaz3+Xw`wkEqWu{qOT zX0oed;1xZHAVlk^%q(M0l9KQoU-$6w{Vv9{yzBlP{eNoCVt`L1o@ItvCEg&O-mDs& z_ld)-D67Qh#A7C1kob}7ipy`D3l0lBGi;_)^Tc6dvCzRv2eYE75l<0ERZXXSA>*>j zd5g1FuCdlV`3r+NePx;JG>4GDB9w#001yhOn+2G&CRU;0RR60|Nj90-rnB-|NjsW z5TvA}b8~Z2Qd0i_|Nj90{{a900RR60|Nj90lMVIt00009a7bBm000XU000XU0RWnu z7ytkO2XskIMF->t7!wI1K`x$P0001WNkl1+cp%wvN=*BwH-#@H-Lk|bG(GI(y)`GPvP)A>R)kNkI_*D*VQ=>hm)Z;vY;25M_g z9hG_%DEJUO4jeeZTo2qAn5zN9wmWrzdK?H2$N~ACm)_rX9bVFrRju6ZN@4&2002ov JPDHLkV1nyS@;3kg diff --git a/graphics/pokemon/unown/f/overworld.png b/graphics/pokemon/unown/f/overworld.png index ea3332e941fec718005c262d0c32954bf0900999..789e65cc1de3569feefe0d28839ad5b68b3f9dc3 100644 GIT binary patch delta 393 zcmZ3>w3vB`sf3l26xZk{W3)n6GH7{p6lBT9nv(@M${i&7cfeOv11JIm^)LpEW)^Z$1hN^EyxmT z=4<_(T=oo!tD4Sz332z+Sj^6Rt&AvVc=G4gzU~$4jp`S4T#1^lJi&|QgfFw0O9Fd| z!_AqDnGVg9Dnu4+s=Jk4?;xhRb(Jdf2KJ1*lkFtLa!mI+a(rWW7s2E)L1F`c0QVEe zV|DNBJBs*c$TWUdaIR;Y5Sw+p{LBeE%h|^n3Z+gyww2)Bb7#@*uTCGCS)VBczGdP0 Q4f3p~tDnm{C#HlZ0JtcK-v9sr delta 274 zcmZ3?yq0N#O1(jVPl)T;vupk{{D+`>_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z3_Cns978JRyq#jm$E?W168kfCxyJbg4r2TrpIS7|pL=goRY84itsu~L=wY}?-Q8Cz_Kl)h%oP`UPe`^?*-3~yHp8ocsY9m?;Z zz+A^*&G1t>z~%t++80_5IlF(Va@ah&%f;r$_>IB7?ZDn=j68D~OU_SfaC*jnU_8VQzITG%ZSOq!_fju}8MuMo N@O1TaS?83{1OP*`sf3l26x9>%AA6Z;t$7{p6lBT9nv(@M${i&7cfeOv11JIm^)LpEW)^Z$1hN^EyxmmdKI;Vst0H_&-v;Y7A delta 289 zcmZ3*yoYImO1(jVPl)T;vupk{{D+`>_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z497iP978JRyq)66b=ZK1rS#Kjr`V%C1XeKaYn#vEz#>qvg^6h%>kR$rf4R2y zygO>Zuw0EPQhu(|WPfMhugna09<1zh;B4qV&$h!+<^jWjV`e?uU!4B=`{${mH62n~ dB0uGib0-O9@=vZc+Y0m)gQu&X%Q~loCIBbmhu;7I diff --git a/graphics/pokemon/unown/h/overworld.png b/graphics/pokemon/unown/h/overworld.png index 9abe3e40010435444e7dbc9a94ce90c5dc9e9f40..a5f030dbd6011979dd9f59efdf4dafb53f69dd14 100644 GIT binary patch delta 407 zcmX@ew2^s&N`sf3l26xUdBID7o1~YU=S~HjVKAuPb(=;EJ|f?_i+jEb5|%! zEmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7M+SzC{oH>NS%G|m0G|-ovuD=; znF$#a96Ta43>;p(__1Th4xk7O)WaAsnpwz25y)mt@^*J&=wOxg0CKK+x;TbZ%y~QI zF7F`&o|d`1MWK=mW{fjg1!No8zr{C(cnHk*j=8ej%W@_EJI(JWe{S>$2ZHN$Q;f`h zPGXXlRBL2Xj!!w^tMKXfZ&8V#atW`eJb!wXi>v2P{USq#2PJD}Jv(qBp5ca+kGUr{Icg1P9tH-8s z-q&1rdLiSp0NsLv<_AO>%5{Acp0qQ3-w?3sN=3z+b_R2)XS+_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z3}-xD978JRyqyxr)odW(@?Bef@}=ZA?vX_emz1Z-?dEivJ@=~55q(AFx}0NYj4!S^ zaRmfQr(E&-IjJKzOOKIhX1)HTt=uND@Ao=9b8lEb`P$2~JRB+e5=0rlRhoAnb9k1| zz@T5bGy7L>V!}t=@*2Jk$6sguH)OfB>RR~$L5H2Q7+91TUOm?4IIx*vga#svmHf3VP>aiQszsN=O<9A{U{v%CFVdQ&MBb@0C6;o+5i9m diff --git a/graphics/pokemon/unown/i/overworld.png b/graphics/pokemon/unown/i/overworld.png index 39aa3b8572199448f2de292cce8c0766a7b9300b..b360c0faac3b951477fff43841dfdd94048a9ed0 100644 GIT binary patch delta 350 zcmZo?`pGmwrJlXS)7O>#1qYj;n&BFoTy6#i2JsTth?3y^w370~qErTVAC~|>cZIUl zA_ZeTlfu>|4}nTJN(%hkfilKGHiK7#raX{hNq6*hWMJ6X&;2Kn705RT@Ck7}dv*wfo#SkZ+91l4pvzYAZM{tWVwMTHS(=j#=cN2`~{iUJJaAhaUEe4$j2kzZr+4F8c`-A6Sw*B9j X=Ta@bJdf+S0>}%Vu6{1-oD!M<sJN_ zhDn|-jv*Cu-cH%bbwGi~#rS7x&@V|@l^c7%2z%M@?mNrMvxv_rZ}*&??R-KzWAvtH zE4H4re7bnwh1r)m*$WPy(p}G$5@jpRP$zHM$fO<4z}mBWMndAVn6tVL9^a3OCOlXq zb%CuQ>7l9sBiD^8X4W^X0>|Il2l|Koa=FJhftBNmWrc79^XdiC26xW0KX`6(OMeaj Y$>o8kJr2)J2Re_z)78&qol`;+0Faexw*UYD diff --git a/graphics/pokemon/unown/j/overworld.png b/graphics/pokemon/unown/j/overworld.png index af240eafd38ac6c7c4f941c00b56c9393bae28ac..e1c88938d7bbae3950aec4c44a287cf120d62234 100644 GIT binary patch delta 372 zcmbQo)XzLYrJlXS)7O>#1qYj;23r@?(=G-E2JsTth?3y^w370~qErTVAC~|>cZIUl zA_ZeTlfu>|4}nTJN(%hkfilKGHiK7#raX{hNq6*hWMJ6X&;2Kn705RT@Ck7}dv*wfo#SkZ+91l4pvzYAZN3ui(^Q|oVQmF zavnC|VGYP;KD~okMLMNLq_lAo&jsi2@e8lN;{Kx9>g4!eZOMS{k%6q)y`P ztdgbK=l6?m`?o8HQ{(ooJ=}sa0m>HVcF%SwxN(({!7Y~|Yp3nJYNoE4Kliam&*r&s z`dt>klE49mGd1jtf5b9A+uWJ>V50BlFDEn>yjsuNu<^YkpUIB09SU!Q9SXc7p4%VE wX4tTdS%ky=!$SsUm(R2K9$Y?fZ<+lmZsr#0-O_OuDj<(}y85}Sb4q9e05T|o_W%F@ delta 258 zcmeBYp2svnrQRUGC&cya*){(e{zK5cd-wkT|1TgQuw==S;^N|sJN_ zhLxT!jv*Cu-cGs5*^E$UF<*ttLZT(!i;rAvZV zhG>0VxFySA>MGN^xQPGzWElgh`)YR!+iYlbPmord?2r(Axxs;-LI3lv8KR5LhFN`sf3l26xO-9~Y#|#Dr2JsTth?3y^w370~qErTVAC~|>cZIUl zA_ZeTlfu>|4}nTJN(%hkfilKGHiK7#raX{hNq6*hWMJ6X&;2Kn705RT@Ck7}dv*wfo#SkZ+91l4pvzYAZMGWi(^Q|oVQaB z@*Xnaaed7DNQkY0*UD)^B*R5Uiw*y|4xIhBaE3$miYN8Ie{P(w`!qw^|Ewpyd za>aVRALjnnI~rKy-u+zWxL%*Hp}+miW?qf`pY$A<=M?DKoMXzAd9p<79)m2y-2CsW z`Wa3r1zjy=sAGOmYkH6AB$L1mdq$>>icEiHr@TCsb&^3vPifbpxeXt$E=V_9e}ZYg ycWUfKhFS(Wg$vI({xELX5ij2`|MI1}!&MBgJ!JR4ExfY}_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z3~M}H978JRyq#jrcgR4%CHCz}r6YzhE{iWH_cd5Jo|E=@Dk&`H9OQEA<*~7;T-sRsqe_Hb>fblSVb z+<`se@mnuvCYM0d*oONI22D21y^LIM?l&@RUC8v;`ar=VgTe~DWM4fa3p#d diff --git a/graphics/pokemon/unown/l/overworld.png b/graphics/pokemon/unown/l/overworld.png index b11096a1ab728da126eb4716749078ff2a215c94..dbbe738b8bb2ca7fefaa52ac05f16f66ce0dbbf9 100644 GIT binary patch delta 377 zcmZ3+G=+JBN`sf3l26xO2lJ4m1$iT3%pZiZDE0Avx;1l9{_UsxU zGa+MwgGYphfy0XzKX&Zc0Th9OdKd#nGYh#W0@;j7-tI089jvk*K+X8H&F zlf~9gQ2Qt?lrVF7_`yaae{YVm9}Xu6)hOVlPr+FpYoLZ^{&U^&8`oiHt>2 zzPXMpGA|kg-ydka&t$S~wj^g?&Wbi=Z$`oD9ELBo+|L*uZWO7R@TFLRt>0exUHVq` z1#S<5KkR(IAZ-T6wR{F124#VD-@=`X%>M?LU9FYgzf2)#2FQ1wu6{1-oD!M_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z3>!UN978JRyuEUe^RNLAYrtHaNDbM;?H@ies4BPkOsIUF{Kfu6A$M!jKi_SO(`D4t zX8Nd2KKVyy>7rxW0fOZc49_>#$FnjPzDegWyQR>aTWQtcko`fHC8gojrab-a%4`>f z8;`l`Fof;6)y%`8!Ep7`goF8vhd=G;J2CNVU0$8s2VRLQl^;x{8Eg!)J}?S2|2^ID z{5j()$r-G^aZ>lCzB61mZ*X!*RESx-zwO}um-9cd{r(V8yrbNZ73g{fPgg$|mUT`E FO#m^Hd_n*K diff --git a/graphics/pokemon/unown/m/overworld.png b/graphics/pokemon/unown/m/overworld.png index 0d5f60e297013c1b355d5085da527a88198dc32a..19524911541f4c12e51ba4c796a79f4a62e85aa0 100644 GIT binary patch delta 402 zcmdnbw1#`sf3l26xEw$#T11JIm^)LpEW)^Z$1hN^EyxmWO|B$^*$a*Z8yFTbe>nJ0dxC;X^70$4b&5~_z43m3G*e{JGBB9V#NO~> z^Ze;I8U#HbA9pzK|LO)yQ}wYuF6_JNcqf!5yxLiRXChz8pCtzwA8dI3$RlLIbA5&s z-dD@G+spmg)$Hf-+-Gn3{I+fmvx$J>F^yWr80G`(crG~b27LW49CBbSgVZu@Y2gb3 ziwjeBE@il|okPGrlu5jXF^2I3Z=tU1g6F#%(j&KBx~`LbyPUByDrd#(_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z45vI@978JRyq)66*KEMUQhVxjz}5604Pg)CzH)}fAE`sf3l26xZSm9dr|o87U=S~HjVKAuPb(=;EJ|f?_i+jEb5|%! zEmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7M+SzC{oH>NS%G|m0G|-ovuD=; znF$#a96Ta43>;p(__1Th4xk7O)WaAsnpwz25y)mt@^*J&=wOxg0CH}5x;TbZ%z1m| zBIh9k0k#LH*>;-oEs*XI4!Oj7gzrJ~@AVHtUElxv=Hw#K@`t}M`&6y3r_+^7An<8* z%MZEhhqAszi8R*bGqSv2d-&iru{RH1>)a@QvO-F!USsW(-g~U!4AI38?wV;aIH=7` zm!Go4$l-2D5JQvE{QisV;SDU>68hHJS!AEFyBmGrfW z2AtaY;j|XRv>9y-r%JvY{3*!5b70Tg2vY`u?Ya%74Kgyk3_mIkvc6_0{WAZ->SL>w j89Yw!UQuKIH&iswYrEo8rLzpjK>^_D>gTe~DWM4fo2{8F delta 296 zcmdnSe3)s1O1(jVPl)T;vupk{{D+`>_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z4Cg#u978JRyuA|0b;y8+?SakL6lWVZdAE%FN0mF&1@^3++2#FDZ>h6D%OC#c64iL? zYeKF{6FpQutzNRnZu_BEFSov^XZo7P$TENJ<-6C!bT(LVhn<@f>ddlq>X{XKI~Z@w z5{}o8WMnWpS^e!`>I(jVnSERi0r!ee+JWRQ*VxSzHCu3m-JM}xDKm>;L)CvisSnW& z6;@Bq@p=3zwY$l|a9_fafkB30+WkD)Y==L&m+Kt(`q&t1d`Pt|FKf><0}t_ iplb22@0aaA#cchtl;3&fsaHV1F?hQAxvX`sf3l26x9pUE9M^YIW7{p6lBT9nv(@M${i&7cfeOv11JIm^)LpEW)^Z$1hN^Eyxm3>$W&tLy%xye+{MvJ$Yw;cCE$&*kSIaIlIJLPxh~dHMnL9r1GB{PvaLd@|b8|uL z=2pw;(aQad74dP`*B)S!bai>ob%XgqaBM=OSi+z8>IDZDGkAQSET!I{a_L7(!hg-z zpO+f0_P%;xZVaO}!@KPvt$}h(n{>~I9jIj8Y0uA?XCkuIt^MTR4aN6*#J1a?_`kw@ ZL%H(RKhw_oGH?UE=jrO_vd$@?2>@c&l!O2P delta 290 zcmZ3(yq9T$O1(jVPl)T;vupk{{D+`>_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z3@1EY978JRyq)6BcgTRpW$&kxT1O1`tXLz%P{?v*W1&M<^6ndsu^T>y#QM0;obE5$ z5VSHxYpR*z=an)BZ?E&d$eF=hZ^G5+Gyi*Z;7WLgSt32{s~XvNGWjvw$zRE}*@m^_?fE!`V3j97ZCH1#UfBJtxc;VP{yJ$f ebGwuOSBO6pZ8le&bKL^yD+W(jKbLh*2~7Y?$A{Jc diff --git a/graphics/pokemon/unown/p/overworld.png b/graphics/pokemon/unown/p/overworld.png index f3699ebdcdbaf109114d2873dd3c3bce8692e251..fc497afc096bb23b98d7a1153690247114024526 100644 GIT binary patch delta 365 zcmbQn)WJMKrJlXS)7O>#1qYj;E_1v5QwIhH2JsTth?3y^w370~qErTVAC~|>cZIUl zA_ZeTlfu>|4}nTJN(%hkfilKGHiK7#raX{hNq6*hWMJ6X&;2Kn705RT@Ck7}dv*wfo#SkZ+91l4pvzYAZLxIi(^Q|oVQmF zavnC|VGXEcKD~okMLMNLq_lAo&jsi2@e7wbeYN*!oyYad{N}Oqf_<)9Q@xf3RW2`m z`;qId)cXkxw|CWWvAo)qqiFGsJN_ zhJ~Ikjv*Cu-d;J#*| zn|w0m-IOk=^$xCg7Bb8H{wBgwd}N=j;*E@Eo^6Rm42{`sf3l26xJ+XuDgEANx7{p6lBT9nv(@M${i&7cfeOv11JIm^)LpEW)^Z$1hN^Eyxm+EE(Y$XU}ik97f zI^nf^)lG&OXF_v&LYXrb^qNN|um>g{Ug~`$y5Up3f$hA-5f;bi-4Q!G0xkQbAe(0&c^+Z)-gPOtP^&HcbZ$OHlqiV-6xUbSCs?K1hG^uWMbG` zTq5JpySjYJC+57F%Y_!qH&gih>uUE0+k{)ozl+S#V|4g_GXL1xnR)7eWfuIOcjx(c b_bNu&my%~_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z3`aa&978JRyq$88?~sCk%l9quZmZ^BbT&S8_Xlg+m(8yFcV&|@x61j49YZ!i2l;qC#~Yw0&4 zUd2Z+8dx&;O+ToUc;NCcHns`t{TdkCnOG7F;$N^hwaPPeUFox7eY|krho{o5PfoL| zaBJ{(`>Sr17W&5gBTKvIdGz~3XB(!PN|)s`zW8x2{PDY)?-c&Z9LV>7{qeWBvMob? XvR}31lm$^hA2E2k`njxgN@xNAt1FDM diff --git a/graphics/pokemon/unown/question_mark/overworld.png b/graphics/pokemon/unown/question_mark/overworld.png index e4d210288364040bd08298e5864d79e4640eac28..743b7edbfe9ddbb1eed54c6d3c880e4b17f192cd 100644 GIT binary patch delta 379 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 PkkdU~{an^LB{Ts5b~SWm delta 232 zcmey!)WS4DrQRUGC&cya*){(e{zK5cd-wkT|1TgQuw==S;^N|sJN_ zhJH^M$B>FSZ>JpOY%maDd7ql8E_k^-P}k0{_n2}_ab<&u2=@;zj>nfB?k%%VWq09^ VIs2EP$Q`sf3l26xBc5BozWFmSFo>79MwA5SrR}8R%`D`i2xK!RdAqwXbg;^L06BX-T^vIy=DeM9 zkoS-QkLz3BM?!23z7A=OF6<8u{L`NB&FPQxV~?p5Cj6-`ivJxSwNdXJ1@OJK3C|-1ZW*Eqep00i_>zopr E09{&*t^fc4 delta 272 zcmbQqyqal(O1(jVPl)T;vupk{{D+`>_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z4BI?i978JRyq)66b=ZK1rS#Hir6^Sk_{U9_h}%qJn;M=;GKy~cu*P9S%&7-#Nwv-4VqD+;9$5H+yZjJmqprrR zo8oRZA~$x}wzn$svwE@L;*WS%sc}Qf#{K)$wmrX1TmCQme^OfGW!~|u=Ch1IFK{w= My85}Sb4q9e0A_ZC2mk;8 diff --git a/graphics/pokemon/unown/v/overworld.png b/graphics/pokemon/unown/v/overworld.png index 0bb8dba96c8ee604ff3aa40de9017de606116df2..c1fd90ff23d7ed51db049589440d237cca8d4bee 100644 GIT binary patch delta 360 zcmbQh)XY3VrJlXS)7O>#1qYj;k;QL6re6#U4B{oO5hcO-X(i=}MX3z#J}v=%?h0k8 zMGD4xCWWm_9s-qcloa^617(bXYzD6eO?e>2lJ4m1$iT3%pZiZDE0Avx;1l9{_UsxU zGa+MwgGYphfy0XzKX&Zc0Th9OdKd#nGYh#W0@;j7-tI089jvk*K+bYc7srr_Id7+& z=500*aJep9@l(XXiZNHJV?l$=rF!lIXM3j3Re931MOn{(@z>3%DHA-Jjx*HJefm^|2aAd#cx#^McP4DWaAiYFdmjnuy+*!b@L`xx#CA5Yvj z5?yk;pljuVNV%J-vt!blO6vEy^`AZSn4jfVzg%$Rqox0Tv$!bSHAp1?FgrQRUGC&cya*){(e{zK5cd-wkT|1TgQuw==S;^N|sJN_ zhS{Djjv*Cu-cB*(I-(%rveqUtqKK#4V20fr!9#M@zR%C8*Prm}Iv}4T*KFr%xYR>M zsMF=wlcIZ$=f!Lrrn2lU$gRzdk4}7gvn982zNgBQd97g%HE*`XH;9MSX16jN|1p2< z0R!2eTHcQT-Z<;9md@%vy+TjhG47tU%`@-m({orN9(>&K;F++B&-zE7UTE+7JM)z+ h$FuW(wRQZb#6wp_+5Z$5F$TJm!PC{xWt~$(699={bRqx% diff --git a/graphics/pokemon/unown/w/overworld.png b/graphics/pokemon/unown/w/overworld.png index d49a4cf96cb94452d43965c5f6cc87e14eefb037..8c424c88b9a1aa91f2fdce0459aa68d25c3b219d 100644 GIT binary patch delta 358 zcmeBYYGj_EQqNxE>Fdh=f`d)aSWm36?G*z9gLsK+L`iUdT1k0gQ7VJGk4u1`yFyuN zk%F##t%t9`TKsIBNx4R2N2dk_Hkh9d&#WAE}&f6)D ze9aCV3=i46Z?WH)f8znWRILO5-~ZxA;<#?7Ogu8fBr%V~G4!aj`_~Ti2ef7LjRA+LBm*MRC?_Xpe z9>2<%l(zZ4to5P`z_>|7cIHL%V;LZ?c)I$ztaD0e0sv`>fTI8a delta 243 zcmZoFSZ>Jb?H5l-?8b3`@l2dm6`9e?5(PrCKO}8AKE`=wSdzbx@xAG8SaTH*Y zKcxS=Gw$BkWJPXXrwi`QA!l;#I!On-maK^_C}Gn#e%cY(X8ZTz^X;l7OcUM&ZAwB($NJKd|hp)ElcJ9M=o5CNk*yw#Q gFWB?z{ulW$ecRaJ|K9z7fX-y_boFyt=akR{0G^0&f&c&j diff --git a/graphics/pokemon/unown/x/overworld.png b/graphics/pokemon/unown/x/overworld.png index e1621d278bd6be49e0b8f4b04d1f21761dbceecb..4de8713939353ce73e3fd8749c8713c802d9c594 100644 GIT binary patch delta 371 zcmbQq)W#1qYj;iONpVpT-Of4B{oO5hcO-X(i=}MX3z#J}v=%?h0k8 zMGD4xCWWm_9s-qcloa^617$$U8N3=a<$)ASx}&cn1H;CC?mvmFK)ykMPl)T;vul9N zgp3Ie9uXP_4liE(*s)^=Py`0*VGJ0}EaajHWHTmtySp%Su*!M>Ih#CP978JRyq$cI zx7mQlbuMp`2YZHj0*h8TV+h-e#=qeTJCE8=>b(`LYJcS6XJvcAlP-<|ERF&(ZLep4 z`d*uxdvK2B`MV4(cdDe|}?>likmw|3s;=I*JFMxlKRSJ^bt$%l%JeT%gSl#ZH%vQPow{$@M@^tlcS?83{1OUfefsJN_ zh9#aZjv*Cu-cB~;I&8q>YWg!p?Tdumnd3LT`vt0+=9s@q^HkXCIjt$~gu?#?>g+C4 zR6HlCoV?y}|I)eVbAB~#UAQ*5jQOs?sm``b+KD&s-+srj_zss(to-NBJP+o>XF2yR z_;Ou%oLhFN`sf3l26xQ_+tXPIxddFo>79MwA5SrR}8R%`D`i2xK!RdAqwXbg;^T9JI~T#WAE}&f6&m zd7BM*T<7v8d9Y`gC$MOhGlsCeX#5-Ap!{#zn`MFg9zTQl?#ut1Tw@Rz4g}Xzj~w^@ z`TdVa?SUDV{mYqjdWse?eqivq{MgR&fW~%)$Jd`0*c^0{dh+sFNR2~P?Y5iDT^;94 zFEDX2{V>yB-^gKbK!Tx_BZoC0@_v@;j!jCB*6FYqY@Wq%;hB^Kv&a8@uI%E+hxw!a v-e>IGd9t4I%H$|{<_Be0tBQS_UstKV?ah*RU)&Mw0P>rstDnm{r-UW|jCq3+ delta 259 zcmbQlJfCTTO1(jVPl)T;vupk{{D+`>_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z468g{978JRyq)66)oQ@wvia0W7aKQm)hm1dD4(!ze7^N`8B^!qU*b+|yJqm5X=Za0 z;c9hSc-`aG<1f{5!O|PlJhOvq8d~H0LKyfR?DqXmWY``sf3l26xGl5mp^H~@e7{p6lBT9nv(@M${i&7cfeOv11JIm^)LpEW)^Z$1hN^Eyxm(It?!vYD)f#zEIycxhCX8^OWDaV;)Vn@NHkX8VFv88`-bW zd{@fKI)n8>8Uw?IgG@|vmswbn&N;9wxGy$^)llt0{R)P6sjh;?414D|aCF4nb2x3Xw8+@1G&DMOUYp64uA80?oaF{m*7xT~(PfaSs53$nWXSBi6PN=*E8 zm!Z9#^T6AuPemE7Fcg0=33$%6p#R6x<+`cy%jFqgl=CqBcvaDS=>NvJHM8W{Z*?68 Qd62==)z4*}6H`JH0Oq5KIRF3v delta 286 zcmZ3?ypw5yO1(jVPl)T;vupk{{D+`>_wN1w|6f2rV9Amt#l^)zK|ydSIAb#J*RKo= z3`aa&978JRyq#jr$7IOkvi;M^u#V(_HEs*tWf%*aZ1pcZG}mC8#-@4s=j6&lq10Jz zAW*mT!osYHzxYHGbQ?A@)iWd9Zze#7#N(r)*ovyb?`P~xWLe1Kkq<8G~?uFcZ-kp z`TPvq&#=LsS-wwGYbP0l+XkKw1k5t From ba1512f864e17e8a623b1015f2a82afc239500ea Mon Sep 17 00:00:00 2001 From: cawtds <38510667+cawtds@users.noreply.github.com> Date: Mon, 12 Aug 2024 21:52:55 +0200 Subject: [PATCH 10/11] Fix specific tiles changing to pc tiles when using boxlink/debug pc (#5141) --- include/tilesets.h | 3 +++ src/field_specials.c | 22 ++++++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/include/tilesets.h b/include/tilesets.h index c7cc8edac9..b495b6c52c 100644 --- a/include/tilesets.h +++ b/include/tilesets.h @@ -7,4 +7,7 @@ extern const u16 gTilesetPalettes_General[][16]; extern const struct Tileset * const gTilesetPointer_SecretBase; extern const struct Tileset * const gTilesetPointer_SecretBaseRedCave; +extern const struct Tileset gTileset_Building; +extern const struct Tileset gTileset_BrendansMaysHouse; + #endif //GUARD_tilesets_H diff --git a/src/field_specials.c b/src/field_specials.c index b44c8327aa..d1b27e2df6 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -44,6 +44,7 @@ #include "strings.h" #include "task.h" #include "text.h" +#include "tilesets.h" #include "tv.h" #include "wallclock.h" #include "window.h" @@ -969,6 +970,20 @@ void FieldShowRegionMap(void) SetMainCallback2(CB2_FieldShowRegionMap); } +static bool32 IsBuildingPCTile(u32 tileId) +{ + return gMapHeader.mapLayout->primaryTileset == &gTileset_Building && (tileId == METATILE_Building_PC_On || tileId == METATILE_Building_PC_Off); +} + +static bool32 IsPlayerHousePCTile(u32 tileId) +{ + return gMapHeader.mapLayout->secondaryTileset == &gTileset_BrendansMaysHouse + && (tileId == METATILE_BrendansMaysHouse_BrendanPC_On + || tileId == METATILE_BrendansMaysHouse_BrendanPC_Off + || tileId == METATILE_BrendansMaysHouse_MayPC_On + || tileId == METATILE_BrendansMaysHouse_MayPC_Off); +} + static bool8 IsPlayerInFrontOfPC(void) { s16 x, y; @@ -977,12 +992,7 @@ static bool8 IsPlayerInFrontOfPC(void) GetXYCoordsOneStepInFrontOfPlayer(&x, &y); tileInFront = MapGridGetMetatileIdAt(x, y); - return (tileInFront == METATILE_BrendansMaysHouse_BrendanPC_On - || tileInFront == METATILE_BrendansMaysHouse_BrendanPC_Off - || tileInFront == METATILE_BrendansMaysHouse_MayPC_On - || tileInFront == METATILE_BrendansMaysHouse_MayPC_Off - || tileInFront == METATILE_Building_PC_On - || tileInFront == METATILE_Building_PC_Off); + return IsBuildingPCTile(tileInFront) || IsPlayerHousePCTile(tileInFront); } // Task data for Task_PCTurnOnEffect and Task_LotteryCornerComputerEffect From a8cd459370c5f512bab666435c29fb61573633e6 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Mon, 12 Aug 2024 21:54:24 +0200 Subject: [PATCH 11/11] Fixes Purifying Salt not halving dmg for dynamic move types (#5145) * Fixes Purifying Salt not halving dmg for dynamic move types * forgot to add --- src/battle_util.c | 11 +++++++---- test/battle/ability/purifying_salt.c | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index e517a81605..3be34d1afc 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8257,6 +8257,8 @@ u32 GetMoveTarget(u16 move, u8 setTarget) { u8 targetBattler = 0; u32 moveTarget, side; + u32 moveType; + GET_MOVE_TYPE(move, moveType); if (setTarget != NO_TARGET_OVERRIDE) moveTarget = setTarget - 1; @@ -8274,7 +8276,7 @@ u32 GetMoveTarget(u16 move, u8 setTarget) else { targetBattler = SetRandomTarget(gBattlerAttacker); - if (gMovesInfo[move].type == TYPE_ELECTRIC + if (moveType == TYPE_ELECTRIC && IsAbilityOnOpposingSide(gBattlerAttacker, ABILITY_LIGHTNING_ROD) && GetBattlerAbility(targetBattler) != ABILITY_LIGHTNING_ROD) { @@ -8282,7 +8284,7 @@ u32 GetMoveTarget(u16 move, u8 setTarget) RecordAbilityBattle(targetBattler, gBattleMons[targetBattler].ability); gSpecialStatuses[targetBattler].lightningRodRedirected = TRUE; } - else if (gMovesInfo[move].type == TYPE_WATER + else if (moveType == TYPE_WATER && IsAbilityOnOpposingSide(gBattlerAttacker, ABILITY_STORM_DRAIN) && GetBattlerAbility(targetBattler) != ABILITY_STORM_DRAIN) { @@ -9771,7 +9773,7 @@ static inline u32 CalcDefenseStat(u32 move, u32 battlerAtk, u32 battlerDef, u32 modifier = uq4_12_multiply_half_down(modifier, UQ_4_12(1.5)); break; case ABILITY_PURIFYING_SALT: - if (gMovesInfo[move].type == TYPE_GHOST) + if (moveType == TYPE_GHOST) modifier = uq4_12_multiply_half_down(modifier, UQ_4_12(2.0)); break; } @@ -10467,7 +10469,8 @@ uq4_12_t CalcTypeEffectivenessMultiplier(u32 move, u32 moveType, u32 battlerAtk, uq4_12_t CalcPartyMonTypeEffectivenessMultiplier(u16 move, u16 speciesDef, u16 abilityDef) { uq4_12_t modifier = UQ_4_12(1.0); - u8 moveType = gMovesInfo[move].type; + u32 moveType; + GET_MOVE_TYPE(move, moveType); if (move != MOVE_STRUGGLE && moveType != TYPE_MYSTERY) { diff --git a/test/battle/ability/purifying_salt.c b/test/battle/ability/purifying_salt.c index e188262497..4c25321e5f 100644 --- a/test/battle/ability/purifying_salt.c +++ b/test/battle/ability/purifying_salt.c @@ -19,6 +19,24 @@ SINGLE_BATTLE_TEST("Purifying Salt halves damage from Ghost-type moves", s16 dam } } +SINGLE_BATTLE_TEST("Purifying Salt halves damage from dynamic Ghost-type moves", s16 damage) +{ + u16 ability; + PARAMETRIZE { ability = ABILITY_STURDY; } + PARAMETRIZE { ability = ABILITY_PURIFYING_SALT; } + GIVEN { + ASSUME(gMovesInfo[MOVE_TERA_BLAST].effect == EFFECT_TERA_BLAST); + PLAYER(SPECIES_WOBBUFFET) { TeraType(TYPE_GHOST); } + OPPONENT(SPECIES_GARGANACL) { Ability(ability); } + } WHEN { + TURN { MOVE(player, MOVE_TERA_BLAST, gimmick: GIMMICK_TERA); } + } SCENE { + HP_BAR(opponent, captureDamage: &results[i].damage); + } FINALLY { + EXPECT_MUL_EQ(results[0].damage, UQ_4_12(0.5), results[1].damage); + } +} + SINGLE_BATTLE_TEST("Purifying Salt makes Rest fail") { GIVEN {