From d379ffef3e86f38739e95827cca3daa2cacac0bc Mon Sep 17 00:00:00 2001 From: hedara90 <90hedara@gmail.com> Date: Tue, 20 Aug 2024 14:24:42 +0200 Subject: [PATCH 1/8] Fixed Confide+Crafty Shield interaction (#5202) Co-authored-by: Hedara --- src/battle_util.c | 17 ++++---- test/battle/move_effect/protect.c | 65 +++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 8 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index b133b7c629..c2e05cbd4e 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8560,16 +8560,20 @@ bool32 IsBattlerProtected(u32 battlerAtk, u32 battlerDef, u32 move) // Protective Pads doesn't stop Unseen Fist from bypassing Protect effects, so IsMoveMakingContact() isn't used here. // This means extra logic is needed to handle Shell Side Arm. if (GetBattlerAbility(gBattlerAttacker) == ABILITY_UNSEEN_FIST - && (gMovesInfo[move].makesContact - || (gMovesInfo[move].effect == EFFECT_SHELL_SIDE_ARM && gBattleStruct->shellSideArmCategory[battlerAtk][battlerDef] == DAMAGE_CATEGORY_PHYSICAL)) - && !gProtectStructs[battlerDef].maxGuarded) // Max Guard cannot be bypassed by Unseen Fist + && (gMovesInfo[move].makesContact + || (gMovesInfo[move].effect == EFFECT_SHELL_SIDE_ARM + && gBattleStruct->shellSideArmCategory[battlerAtk][battlerDef] == DAMAGE_CATEGORY_PHYSICAL)) + && !gProtectStructs[battlerDef].maxGuarded) // Max Guard cannot be bypassed by Unseen Fist return FALSE; + else if (gSideStatuses[GetBattlerSide(battlerDef)] & SIDE_STATUS_CRAFTY_SHIELD + && IS_MOVE_STATUS(move)) + return TRUE; else if (gMovesInfo[move].ignoresProtect) return FALSE; else if (gProtectStructs[battlerDef].protected) return TRUE; else if (gSideStatuses[GetBattlerSide(battlerDef)] & SIDE_STATUS_WIDE_GUARD - && GetBattlerMoveTargetType(gBattlerAttacker, move) & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY)) + && GetBattlerMoveTargetType(gBattlerAttacker, move) & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY)) return TRUE; else if (gProtectStructs[battlerDef].banefulBunkered) return TRUE; @@ -8586,11 +8590,8 @@ bool32 IsBattlerProtected(u32 battlerAtk, u32 battlerDef, u32 move) else if (gSideStatuses[GetBattlerSide(battlerDef)] & SIDE_STATUS_QUICK_GUARD && GetChosenMovePriority(gBattlerAttacker) > 0) return TRUE; - else if (gSideStatuses[GetBattlerSide(battlerDef)] & SIDE_STATUS_CRAFTY_SHIELD - && IS_MOVE_STATUS(move)) - return TRUE; else if (gSideStatuses[GetBattlerSide(battlerDef)] & SIDE_STATUS_MAT_BLOCK - && !IS_MOVE_STATUS(move)) + && !IS_MOVE_STATUS(move)) return TRUE; else return FALSE; diff --git a/test/battle/move_effect/protect.c b/test/battle/move_effect/protect.c index 973033bc33..aca5ef859d 100644 --- a/test/battle/move_effect/protect.c +++ b/test/battle/move_effect/protect.c @@ -482,3 +482,68 @@ DOUBLE_BATTLE_TEST("Crafty Shield protects self and ally from status moves") } } } + +SINGLE_BATTLE_TEST("Protect does not block Confide") +{ + GIVEN { + ASSUME(gMovesInfo[MOVE_CONFIDE].effect == EFFECT_SPECIAL_ATTACK_DOWN); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, MOVE_PROTECT); MOVE(player, MOVE_CONFIDE); } + } SCENE { + MESSAGE("Wobbuffet used Confide!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFIDE, player); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); + NOT MESSAGE("Foe Wobbuffet protected itself!"); + } +} + +DOUBLE_BATTLE_TEST("Crafty Shield protects self and ally from Confide") +{ + GIVEN { + ASSUME(gMovesInfo[MOVE_CONFIDE].effect == EFFECT_SPECIAL_ATTACK_DOWN); + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT); + } WHEN { + TURN { MOVE(opponentLeft, MOVE_CRAFTY_SHIELD); MOVE(playerLeft, MOVE_CONFIDE, target: opponentLeft); MOVE(playerRight, MOVE_CONFIDE, target: opponentRight); } + } SCENE { + MESSAGE("Wobbuffet used Confide!"); + MESSAGE("Foe Wobbuffet protected itself!"); + MESSAGE("Wynaut used Confide!"); + MESSAGE("Foe Wynaut protected itself!"); + } +} + +DOUBLE_BATTLE_TEST("Crafty Shield does not protect against moves that target all battlers") +{ + GIVEN { + ASSUME(gMovesInfo[MOVE_FLOWER_SHIELD].target == MOVE_TARGET_ALL_BATTLERS); + ASSUME(gSpeciesInfo[SPECIES_TANGELA].types[0] == TYPE_GRASS); + ASSUME(gSpeciesInfo[SPECIES_TANGROWTH].types[0] == TYPE_GRASS); + ASSUME(gSpeciesInfo[SPECIES_SUNKERN].types[0] == TYPE_GRASS); + ASSUME(gSpeciesInfo[SPECIES_SUNFLORA].types[0] == TYPE_GRASS); + PLAYER(SPECIES_TANGELA); + PLAYER(SPECIES_TANGROWTH); + OPPONENT(SPECIES_SUNKERN); + OPPONENT(SPECIES_SUNFLORA); + } WHEN { + TURN { MOVE(opponentLeft, MOVE_CRAFTY_SHIELD); MOVE(opponentRight, MOVE_CELEBRATE); MOVE(playerLeft, MOVE_FLOWER_SHIELD); MOVE(playerRight, MOVE_CELEBRATE); } + } SCENE { + MESSAGE("Tangela used Flower Shield!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_FLOWER_SHIELD, playerLeft); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, playerLeft); + MESSAGE("Tangela's Defense rose!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_FLOWER_SHIELD, playerLeft); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentLeft); + MESSAGE("Foe Sunkern's Defense rose!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_FLOWER_SHIELD, playerLeft); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, playerRight); + MESSAGE("Tangrowth's Defense rose!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_FLOWER_SHIELD, playerLeft); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentRight); + MESSAGE("Foe Sunflora's Defense rose!"); + } +} From bd38c64f298ea64c1b1051181f1aaa7ec1697cd8 Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Tue, 20 Aug 2024 13:16:32 -0500 Subject: [PATCH 2/8] New Garganacl and Naclstack battle sprite + various battle sprite fixes (#5142) Garganacl, Spidops, Wattrel, Kilowattrel, Shroodle, Bombirdier, Orthworm, Veluza, Aerodactyl-Mega, Medicham-Mega, Latis-Mega, Diancie-Mega, Ponyta-Galar, Rapidash-Galar, Magearna, Landorus. --- graphics/pokemon/absol/mega/front.png | Bin 1028 -> 1001 bytes graphics/pokemon/aerodactyl/mega/front.png | Bin 1135 -> 1070 bytes graphics/pokemon/bombirdier/front.png | Bin 897 -> 877 bytes graphics/pokemon/diancie/mega/back.png | Bin 934 -> 856 bytes graphics/pokemon/diancie/mega/front.png | Bin 1171 -> 1118 bytes graphics/pokemon/diancie/mega/normal.pal | 30 ++++++++-------- graphics/pokemon/diancie/mega/shiny.pal | 30 ++++++++-------- graphics/pokemon/garganacl/back.png | Bin 526 -> 621 bytes graphics/pokemon/garganacl/front.png | Bin 837 -> 951 bytes graphics/pokemon/garganacl/normal.pal | 30 ++++++++-------- graphics/pokemon/garganacl/shiny.pal | 30 ++++++++-------- graphics/pokemon/kilowattrel/back.png | Bin 550 -> 535 bytes graphics/pokemon/kilowattrel/front.png | Bin 608 -> 593 bytes graphics/pokemon/kilowattrel/shiny.pal | 4 +-- graphics/pokemon/landorus/anim_front.png | Bin 1501 -> 1491 bytes graphics/pokemon/landorus/back.png | Bin 948 -> 885 bytes graphics/pokemon/landorus/normal.pal | 6 ++-- graphics/pokemon/landorus/shiny.pal | 32 +++++++++--------- graphics/pokemon/latias/mega/front.png | Bin 975 -> 897 bytes graphics/pokemon/latios/mega/front.png | Bin 975 -> 897 bytes graphics/pokemon/magearna/back.png | Bin 716 -> 646 bytes graphics/pokemon/magearna/shiny.pal | 20 +++++------ graphics/pokemon/medicham/mega/back.png | Bin 792 -> 909 bytes graphics/pokemon/medicham/mega/front.png | Bin 1002 -> 889 bytes graphics/pokemon/medicham/mega/normal.pal | 32 +++++++++--------- graphics/pokemon/medicham/mega/shiny.pal | 32 +++++++++--------- graphics/pokemon/naclstack/back.png | Bin 555 -> 389 bytes graphics/pokemon/naclstack/front.png | Bin 711 -> 551 bytes graphics/pokemon/naclstack/normal.pal | 30 ++++++++-------- graphics/pokemon/naclstack/shiny.pal | 32 ++++++++++-------- graphics/pokemon/orthworm/front.png | Bin 700 -> 698 bytes graphics/pokemon/ponyta/galarian/back.png | Bin 721 -> 661 bytes graphics/pokemon/ponyta/galarian/shiny.pal | 14 ++++---- graphics/pokemon/rapidash/galarian/back.png | Bin 738 -> 663 bytes graphics/pokemon/rapidash/galarian/shiny.pal | 6 ++-- graphics/pokemon/salamence/anim_front.png | Bin 1519 -> 1458 bytes graphics/pokemon/salamence/mega/front.png | Bin 1102 -> 984 bytes graphics/pokemon/shroodle/back.png | Bin 402 -> 387 bytes graphics/pokemon/shroodle/front.png | Bin 396 -> 381 bytes graphics/pokemon/shroodle/shiny.pal | 20 +++++------ graphics/pokemon/spidops/front.png | Bin 800 -> 766 bytes graphics/pokemon/veluza/front.png | Bin 698 -> 574 bytes graphics/pokemon/wattrel/back.png | Bin 554 -> 437 bytes graphics/pokemon/wattrel/front.png | Bin 625 -> 492 bytes .../pokemon/species_info/gen_9_families.h | 6 ++-- 45 files changed, 179 insertions(+), 175 deletions(-) diff --git a/graphics/pokemon/absol/mega/front.png b/graphics/pokemon/absol/mega/front.png index e7656154da2a58a0892486f637a9751924d2feff..bc89ac2de0f156fca489866bf0ac589db5cb6ebb 100644 GIT binary patch delta 933 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 diff --git a/graphics/pokemon/bombirdier/front.png b/graphics/pokemon/bombirdier/front.png index 97159715f25cfccdb4311cf70ae0b1a77afa006a..b8aa83644ba1f142ff37e0e980d17ef7b4ef173b 100644 GIT binary patch delta 796 zcmV+%1LORG2ki!sBnkm@Qb$4nuFf3kks&^R0_#acK~z|Uy_SK_s~`-8g{BB9`u=Zw zPYWtK6!tH$VLGbi#(

OMX+f)Yks{TF&?&RwWiF#*OmfH_=L z18QaP#{$siJ`w<4SXRsf#> z?=(!V!g~>R0203e#KfDvumDC;hQon>R>2seriDF=yFTxuH4lW+f@Z;Y19>C5l8|t8 zcOYZ*n8BUkd}>O2IxtS!=-I(AxKr=Fx87r|EiAP31Cb!C+}?Y}8-!~P<}HJSAR4Vd zLI5%g2#>#74ss<<087!7pkF&2DBvKlT*!HszxT)!phyA$=Y${$bm~3Y=mg+@w0Fru z^ZsZ)W)gh?kmkt_T6#Wuz-b?dM$QKXK%D_0;9WiZQv*(U6uk6(x)eR~Pm>s?Fobz} z089v}0T$W?AqbxVkQ<6bQ2j5LQi+%__bTxXHl72#J9vH@L)ZNLkF=>)_Oq<;HXI(&G%+(zqV zh-Dk`F7#4Wd+E}IK<_!c08j!Ie-A^s9z4R1U!Kt9Sh2imumGAZuzu6vrYW;-{f-UrY0LcM;pP!=+dAB}WKpMOi z!O-^tvEHFLr}ja9N30k5cj9bytRMGc;+j|mFQSqm{GdE5e0f1f?QG2ON4A8JBeXb#dKXlOu zM(ADhSLi)$yU?y;2K09TT3odBx~eyZoEE4a0P;7_FBZ&%P$zN*kk0^aY(WLkAW*p0 z_m%#thC4vt0C>ydf364{Knx%oAb1NZRk$z00zl#ifSS0|R~Epi%CI`HDiAS0T3E6; z>dQVlx**gREDJdrC>!xA2@TIj2RcTV85{{dPymnHJuwS&iT zQiLo9%mN4le{7^CAPtFCo{s`GAfj&onBIap4jK(W!q?H}(Tf4}SOP(U7uo<_G6zFb zpLm%%UTVsW9n1!-h+Rx60gxK{6xnZsi_d0e;-b%oAxfBdh(kPVWKy}!qKK~|Odu2k zwh-HZ3xMi$PBCizmRnwZ1YCaRX*a~Wjd)dht*YB~e`!Xb_dG5DjKI~;U01IMkFn#s z*3x6e$!sACc$}hXJojcM$PB>q6ua?EaI+5Qtbj*-$K#3M<}HO6fXODOp`YCweQy1c zSAwhb?*N(u`o8=hwaQ=Xiv^@1a}@&pTYyy|pCJVTJJWmpYGHvmJyE{VmnziponHHQ w+UxoGC?G!~rk(sdaWTPvkuQwzt^Ydy0Vbp-S0oA0vH$=807*qoM6N<$f{K5Ai2wiq diff --git a/graphics/pokemon/diancie/mega/back.png b/graphics/pokemon/diancie/mega/back.png index cb9a177a0d55682f96e4e8930397d5d47eea1a6a..3816c40d78e86db71540b37b03a0d07003f7ce32 100644 GIT binary patch delta 845 zcmV-T1G4<42iOLX7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!g;JV1;s zW2QQA=2dzBbm$L2SuL@Xr2zhXHJV?AtKjM zgd*or^$M_ZbblL0>doPm@S~Sm>9pT*B@kW-S3TBhTslVV`v%YuT76TEYs<+ED?%o? zJAGaRe|lELC7lkM1Adx7RQvf?@_#nw15}4*g+BKH)nT6?mC;tF zWQ9I=85YvT3~>YSF8M?H+yh!f&0;WFKI<8<4gi7>2GIo|%Ttm&T1N(yunM9{AR8j0 zm9l)D7!bg^67>LHTmh_>+f%&~N?5FIAy`q%nCi8X@-flZo^~{!6|MT4>lb}#aRViQ zocV|uL4S{WeJE`E^=m0XVvN2bo&fw*sA~gg2gYcKmjK`gNfIcacEei-05OsQE zBtRiZxL5iml|XiZw-2&h@4eGo0`K;HX9y(qgn!WMI{+h^yMqwDe$ORHfSzz?0lEb! z^>GF45T=ACVKR^sXb}Yh5N3cbKo2<2a}&nY!X=<4XaI_UFxiNUfs^tlJ_7^+VHlz} zK^``*7V+Wl9)@Oje8gmWKFANFL>o=;OW6TjY+D-^f9pP3V zKt`r69Y7wYEmyH3ZUF&6^;`MJDmCIJj16MAdng-y0G`Ngv|jb`q X;E7iUepH|4BqaRDVdv&6GcD+dvq`6-^m3 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 D0)nV% delta 814 zcmV+}1JV4q2gL@EB!4haOjJdg)1|Ysv)S3%^78VEii%A#CX{Ge0001HJuJhLd-ano z`|>s}D=1x7P~5+>k%M|SPY5*t000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00Oj0 zL_t(oh3%H$-hJ zU;vr_fPVtmRO^}m>FYboLK_(X()VpTlnkIAFrP~gupa{KmwgYwyXO)>6I+Y8+@{Le zuLdB!xC=vUD2v-7~)1B_#R0&sEP_W@uu zh;9H_mKdi2i&Hgb&Ml~cd(p^WBmq||_Dwj!?0e)z#D8MP#}`>K+K6AWA5i=$&vZ;) zT9XmMS{ZtMm;L#Z$pESZl2z=pe+b6`L=J$hB=EEaTL7=Z);+-<;*OmY;D4T)OLXcV zOXf_#VjV&Jf#6@S0h}xV(4Saq=OUYlWlNyrCwnQ+04EetF098cJs>dv$mTJ&fK&u~Z0cVK&0!`01OV+hfHFTCLiW#ubj09q z2$ES${ypHNl*3V1#9MBYoW(e6;V)D14B+oPKmaUo?ExkMbeCZ$`AYQ#V7-Kt;@c9S z+)(&$z-df*EC~Q_3qY9)kOlSn-~%HO6+n5caDSY8weJA(L|t`65i-_xl0ylABjARt zeFR*5Ix@f+c)$hGXeH`kO9s?LfJek9J&LB4&q3>c)92mJs3{m+P^70^dZbHIZbNg( zQJTq6&t9XKB7TdVsX;&cmrJ$+>bQ;oou&cHJ)p#8hz5WQ-2iS0qYSQc_?rN}wsc^x sFDIn|ptt?;N*e-ZtVg=NK!3M>0S7xM&o0zD=>Px#07*qoM6N<$fkh>GZx^prwCo0M^H%m)TbQEQeijGnrg#0s;aFKQ1&hG<;bI;#R~cctj)^Sa>i_o$-}{fkB`o$S?Rm O8aS)CY0Ac|wTu9lG9|(Q diff --git a/graphics/pokemon/kilowattrel/front.png b/graphics/pokemon/kilowattrel/front.png index 3a8e971644638c9ae20a3a4330afc78b31bbe879..fdb1a38e482218abc0eac631f7dd8bb7b81fa5b2 100755 GIT binary patch delta 24 gcmaFBa*<_%3KwH>kh>GZx^prwCo0-)tbWP}0BvRoN&o-= delta 40 jcmcb}@_=Q6%0xqJDF%U(Aiv=MXyB~krYReY^Z$Q4dH@C+VVthJE}hjT ztv z78uDQ_l}{jj?~*mdI6C1ehAz>4t`xxhSDtuz`@_HBnjVGOM3Id2&X)&&(t^ALOs4k(`Vijl3~(<< zi-!O%j-nGk$uqz>>Kz})?qSP-UC+PB69FG(x%WJgq(?$WK85c$0eH_ZxM&UPy>|zo zm%J~v_Zr@qMxJo$ADf4y@6Mj+*VRIpCfIq!(%j(!N(rEmtZNs5o6mA5K%)SbZn1w( z1pZwi)Ou-uN$z?0@>(S@Ae;sXybm1#yfCZ+0QgD^8)md<(jl+6|Z7of;1{Y2068nC%&p0pt|m zJcddSNoVC7jp+Tp5Hf()K{x>3rPVG@5~ z5Bh?=vW|t1*!>gMr8>IK?h8sAjpcabiDhti!doz=xHga2O$%R=ZV=_Mt$#w0y2Q% zDS)X4P%;7+H1zQjOHBNMQK@J9nSh(jw3-HhP!lj)c*d|IgbJm6zR*TFkK#)~@SL0w z8lZs)K%ZB%%Wg*jGRYT2o|Ah51#wQrk<+1nL~=y~a0lpoN&^>I*Hj$(#dM1#DMPVX zIZp=|srR``>Xn&H06Do5h2NRwT<0nE4%P-sJUr7ODko_L*ts6n5cmL1Dg8VUQ0l2z z<_*#$fTST-<*9g+w^V-ta0zC3YqbfGtNIiKK$6Esy#o(JNd!a;j|0C8AyN;^(JLH( z1vBj_?U1Pp1AEHzc*>`N&B7!5eClkx@BgU%=>kD4{Evvj|3AJ!I4%zaaA*69mRDUm z3?5z})b>C5|M3fimi>R=|J(L|7@*q!u?qy<{tsOs?7ICo%fJPK^j_Nkc|Pp_zy-qD z{+2mB{0u6+kc!!&;Voh zzvuo(?Y{~bw*T7U{=ok0_XmT2_FoHO-2Q8XA^T4il%7bgO1k#{wn*jYI`;n_KsBCj z|C96X67KCkg`gKZknc`a`wx3`%?bo=>_6~-!0_hK2%y^kpMxMR z^sRfc|9fHoBbDm)A=AYNYgDFpG6~NNI9%QTU)ulf{;%yHo)dr&td~0tI{*Lx07*qo IM6N<$g1>V?n6km4hn^Oq zHSB49sGLI&@gW}fkV7f8z0gDV7i>32`?7(ataJBNFtH0g={NMfkz$QTa$GuxSmb|w zdNcDR=6%w%{1KWf0(WtGKM_)=(O4DS3d4|6hp}01n6WyA!9vz>bK_Ku8eJ?{9`H#V zuhRu%EN7X2pEM(61rQ#e9iC9?17PI=AwBjEU(%;tDt6IO0odH}%MSO4!vdvlBa>l^ z9-ka{dYyis7if)H8DLKBvnD^{{XTz8!5S88s0k?bzU_X|x%jM08C$q&p%7^Heti7f zj(yH>5M_o%ojyH({pRfswfh245{zNx&mJGx@KfrISf&c&0D`677=KL0P?;JbMg>@h<794@nU%iQ~)qeagK+a!~88kJWhgl zGO+8t62J%x;dw3IZ3pA!E(Cyu8jgCfMGt{dB}h^n7*VMo!u;@PV zqWgadK$}dHr-iG;Vvq5e{`x08aLgb9Wdyd(4Jbya{o?T1eFmlMm##v2k?|a`*XDDlboCFf+H+baGO%gHqfDK8tqSMQ+@_|c z&HAf$DB(kG-3i{xx^w2yG27?X2fjaDNcwEyRy=U;oVX!SCm*^n0j6u zB4(T{Km6av*6sb_aPHhgKp1-SVzwe2Vi=ouu3=#Pgg-zn7iKmd>jAtEPPR4UNc6zT zHbyO_2f2W(2X=oBkkSKGklW1ti5^g9sg?uHJ<@}V&ruKX?a2T_4_@!ss0WQ()wH1d zgC4vg(ETGlu#`fdXNKP&(eRQ?vDu+!N}-=Dj2zXAPI(~ z2U?;Bi9bkspf&IG00d)MC|M6$OFj5L5e!KWHY7ce{2|eU2Z{Ngz8;t|kf#R{kgo^wDsuFoR!=XJ6cjzk z9OVT?4>Ev7zm)Z$#@tyN&@+1ADs7h#MGxE=G;SHO6g{vSl!kI|*DYBO7=e%90!>Y# zlSB_NMcvWUA4@_ZszMLIF4%2eQzIsL0l^=r!-^#Ku1Ei`=6-d{Tu%P~IsOGpgZ%C* S>!daS0000c0004VQb$4nuFf3k0000mP)t-snar75b6OD* z5&!@Hq`jnbK{@VX2()t;|D-8WF&O{F04W#{N--d;QXpD$T53Tl3~|sn0008>Nkls{a1Chpyq?U|)QGI*2E?|v?SKC$gPI!5)QTdmiKiXa zbvI@&)wQMKrd=Dz+S;9ghL<)|mDXCbTNR8HV29)J27hBJi{^9;DvJ0HCk)gb+ODK7zcZ9vzAn11t8u(b=(@(gmLtyTb4L zbIgV{&xQ$)@pBy0FqQ&DcR|5i5a)^whSFFbUGtDE2s} zj*3E0DggJ*W9NlSJOmO!@uwD0x_lC(?!-7lOMySLp#9Bb z&C3S9WQKVuaHAl!1>*sqXPvS#iL~OYpsrTx8cr_1jR`sfxq;6sSa5QuO9DS8==Kwh zd>=pH9Dn$N4O~@*CZ)$E5@zj@$L%XDn6ybseY2=9&e09|XDidtM&W`TTXAO3*K(FPmrJ z*+AVsJAJvg`&CR4Xt+La_8fhf$1XrbZA_9X|;kc~?7zc;AmBc;+FX^v!4FRe;b+^O!mLl7d(DXTe(ldGk)+Dooo2 zPh-4(KS6;0tAtqwFhrGC2A|&_tAQ2*GL`3!Spn2|d0(R%f)9+5jaUtMk*p(-jxYe_ zz|&i2>R`rMAlm}8mqY2gWny$CY@585eEBR)aLUjP6A07*qoM6N<$g7V;` A@c;k- delta 938 zcmV;b16BO>2DAr|7=Hu<00013M{Ml?001yhOjJdf(4bgwSP&2p`1tsku%K8#DDYqi zpkNUApeRr<82G>dI3N&6Fd%qHD1d-~0001u4e{6j000SaNLh0L01m_e01m_fl`9S# z0009jNklKeI&ecn37(tjUN3ia5*gQ0ZOau$J% ziA5Kq4z8E}4M7AvNQGkXEK5FX zmZh79L5QuJCZ*V4yPy!3B5Aj$fu>6lL0z;g(ekeQ=L%>j!Ie+-pqKPK&mf~;`VVnI zy9&^+RH6W^qkn|g&_L7kyei^(mer)!1%QaFus(KxL$3@#^!sih9|K(1E5{*Fi5xKh z30&^=U+czz4%AfFWyfU|aP#FP%@UA5tws(QCLsBn3Lu1(_l!yEP zTLoaUlmTh^Y%)9BX1j_-YZ1Y_q`jE?EU>p(k|Ym%0DqY?j7b==PxdCsvg}7v(odL< zX&BMuYlaaQz?_wcS4z)@_MrhJ`KWb1{BQ(FmP+TG4@ZX?93G>*0-dkN4^_b7o0kZD zcMz~EfX{hH>O&$3U1eTE%442oJJ82A0I^<^g$6pSbPM^j;do>?Dd*ZC)EPD%zJ>D1 zcx0D>&wl^};?D!`*!bqfoe)Hk5;&PM3HT`j&U6|Y(t)VG03in2 zL7hw{({Lso99simpc2IF{(cgMhM9sxx-QLb43W0wicV(-fR7z- zA_?48ftv&?d^=i5i}8DNCpz9~AXUpd3L^3I_J3E{DF9fB8;%tW$E{#N;P>qx1-zES zoWmkX1I89@996glU?YK(xg!nMBd`x-&Cym&`ue9lG-Q*ADI%y5#-3nS#hzTPYQwop(nJ{m;D7lYVTJ;5;HbuWR|O0X zv47ZCe4_yqbZx+h9T}%Q+m(T`0TZ34TLf0e447R%H&Q%!Tpw)BH(EtDd diff --git a/graphics/pokemon/landorus/normal.pal b/graphics/pokemon/landorus/normal.pal index bbacdca837..36dd9dbac0 100644 --- a/graphics/pokemon/landorus/normal.pal +++ b/graphics/pokemon/landorus/normal.pal @@ -10,10 +10,10 @@ JASC-PAL 184 72 80 160 88 56 240 120 64 -51 51 34 +96 48 16 248 200 96 -51 51 51 +72 40 24 96 64 48 119 51 85 128 128 128 -0 0 0 +128 96 72 diff --git a/graphics/pokemon/landorus/shiny.pal b/graphics/pokemon/landorus/shiny.pal index 25f3ac5c93..c76bc2922b 100644 --- a/graphics/pokemon/landorus/shiny.pal +++ b/graphics/pokemon/landorus/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -88 112 88 -16 16 16 -248 248 248 -152 176 160 -88 64 40 -240 96 8 -160 96 16 -248 160 40 -80 48 24 -248 192 0 -56 32 16 -72 48 32 -120 72 40 -128 128 128 -0 0 0 +153 204 153 +90 115 90 +17 17 17 +255 255 255 +164 189 164 +115 65 57 +238 98 8 +180 115 24 +255 164 41 +82 49 24 +255 197 0 +41 24 16 +74 49 32 +172 82 32 +90 115 90 +106 65 41 diff --git a/graphics/pokemon/latias/mega/front.png b/graphics/pokemon/latias/mega/front.png index bb513505645aa15202fcb87aa5b5376ac0d3d2c6..491f02fa4b45573254abdaf7dd1cf836755afc21 100644 GIT binary patch delta 828 zcmV-C1H=5!2Z0BW7#0Wv0001;w}I>c0004VQb$4nuFf3kkv=|u0{=-wK~z|UrI%Y` zt1t{iu`C&f{V(|H<+mZ>R{bbVm}6NU33?nB;iwVdcpo9c=JFLF0Q?Prt_!iT-sm|B z0OR`{1Q4`%9qM%ku>ivBb6^!B)&$RztvgLscWPqzEe*RY(eGgRG@&j3){w}f5>2heFBBA1tD zHS1eq08v{3MGs&-A(hdyMK(wp3ODN&0RjO3tpr&yn*LmWw_n0r6yU^-M^2g{0OrFtkOaJOEPK5~#4*^QE^W4Ve$wrghO*!UU+` zL_-Qf0ajIic|*Ve=xyS{7|?S8NMq=I)IB_43$TL_K$s9&5QJd`$XNioUJCP`SOGQobM^rBdfsA3@NJ16VOBdpXDC?-h_0)Dk7)qLvX!U`vkhj-O5nd_ zb`ZrY@NIn=b4vl(e@@8N1I5K|SGbtazex2d2*3z`n0gmxMfg(!=GU;6LOOMV)7(qR zT5)*LtN=Bx4FcXaq+ajMOlgm(eM%0HZM%uZ#yLBIa@r$m4s8@=cMqjDi>zbPhCqcN ztCYmufQ?XZS_xD~cLxxJFzl2-empjM+oaMPLDpA6A#9J}C?f%=rrIWmHLw%z^kpPi zA+%b5^8|P%)R6*>024q7H-I|RKulT_sSLSxzwZep0sEGXfc^l0q3E}SQLhO8_r(j^ z3vLLD{;*dDnLBgOSvBUz%Bn9nFRSg&0`__ZuODh&V`4UG_V;co<_En1Htya7tUe21 zdnc{++5-0*IBv?gCEP3oX|C5T;O2|_-OV=}-hcDG3jY9`Q!UyqF3U;)0000VGd00SsVL_t(Y$Ay)@Zrd;r#uWkDQ(M^$x>kj5 zHWj$&W{XJ*WJ#4U(%PU=w6=|Xp4HOj19Zw(pi^I^eW>1%k}Ua8%E7RGKYjP{?npVf zj_AYbIR{sNK-A%GpQr=N7bjBo zpGo1%2l&MK_)y%D00ivGASHczJOcQ*50IdVxaI)Mubj{K#I?RcUgiXs1DLp0%<%y3p5pN~VB-mlpwA-&ycA%8#${@M z;+j!|v4mJ8&V2+@{CZJH2`dvXO)_`LFaPv8!+v-$g~yAfmB&@Na@ply#)Oz7@C5`c z>UdfC^#yw=gau$4!9sTh9CYFuVt~No6d>yg*fa)kQnUcIM7J)!$$`71wJYE_O%7US zlVMlk2;=d51dT+wB|#>lXjbJ|Wjfq{VhNffV z)9)6@TN_OgUrRha*zD4Czd|^{wWj%bW8>3O7|Nme_22fHr`7_?*JxTVQ|!yRGh91e(wz1VB-pA=gTm zYTY7?1S9zp_kU}~3EOku03Jzyl#0|@p5NoP!&2MJqXHHU04&IHS7FE)+g#15rn8cz zW>W4LD|FeJSP!?Aku1fj&%xHfdUy^J1a#GBT^8M$r-{MZq4l5wf)3!(2oKy)A;V}6 z$^rIo(9M7kxTASUmky&2btKYie%+T7v}*U(mZ${iUl!=3`WGeYGI*_7s~~8;xtooI ztwZQ-gaa)HHJ}>6EgHZL>*qqck9Prd#A=|mqm1pomqOJ70=)~kW$TR_sALb&`oZ)b giOwsVZJBVKe_Q^CQem&%1^@s607*qoM6N<$g461yivR!s diff --git a/graphics/pokemon/latios/mega/front.png b/graphics/pokemon/latios/mega/front.png index cc20e9d1cb9fab62fd5937a24f5a695ef53206b3..ebca8034d8bd89e5f9e01e558aa8218dc97f1615 100644 GIT binary patch delta 828 zcmV-C1H=5!2Z0BW7#0Wv0001;w}I>c0004VQb$4nuFf3kkv=|u0{=-wK~z|UrI%Y` zt1t{iu`C&f{V(|H<+mZ>R{bbVm}6NU33?nB;iwVdcpo9c=JFLF0Q?Prt_!iT-sm|B z0OR`{1Q4`%9qM%ku>ivBb6^!B)&$RztvgLscWPqzEe*RY(eGgRG@&j3){w}f5>2heFBBA1tD zHS1eq08v{3MGs&-A(hdyMK(wp3ODN&0RjO3tpr&yn*LmWw_n0r6yU^-M^2g{0OrFtkOaJOEPK5~#4*^QE^W4Ve$wrghO*!UU+` zL_-Qf0ajIic|*Ve=xyS{7|?S8NMq=I)IB_43$TL_K$s9&5QJd`$XNioUJCP`SOGQobM^rBdfsA3@NJ16VOBdpXDC?-h_0)Dk7)qLvX!U`vkhj-O5nd_ zb`ZrY@NIn=b4vl(e@@8N1I5K|SGbtazex2d2*3z`n0gmxMfg(!=GU;6LOOMV)7(qR zT5)*LtN=Bx4FcXaq+ajMOlgm(eM%0HZM%uZ#yLBIa@r$m4s8@=cMqjDi>zbPhCqcN ztCYmufQ?XZS_xD~cLxxJFzl2-empjM+oaMPLDpA6A#9J}C?f%=rrIWmHLw%z^kpPi zA+%b5^8|P%)R6*>024q7H-I|RKulT_sSLSxzwZep0sEGXfc^l0q3E}SQLhO8_r(j^ z3vLLD{;*dDnLBgOSvBUz%Bn9nFRSg&0`__ZuODh&V`4UG_V;co<_En1Htya7tUe21 zdnc{++5-0*IBv?gCEP3oX|C5T;O2|_-OV=}-hcDG3jY9`Q!UyqF3U;)0000VGd00SsVL_t(Y$Ay)@Zrd;r#uWkDQ(M^$x>kj5 zHWj$&W{XJ*WJ#4U(%PU=w6=|Xp4HOj19Zw(pi^I^eW>1%k}Ua8%E7RGKYjP{?npVf zj_AYbIR{sNK-A%GpQr=N7bjBo zpGo1%2l&MK_)y%D00ivGASHczJOcQ*50IdVxaI)Mubj{K#I?RcUgiXs1DLp0%<%y3p5pN~VB-mlpwA-&ycA%8#${@M z;+j!|v4mJ8&V2+@{CZJH2`dvXO)_`LFaPv8!+v-$g~yAfmB&@Na@ply#)Oz7@C5`c z>UdfC^#yw=gau$4!9sTh9CYFuVt~No6d>yg*fa)kQnUcIM7J)!$$`71wJYE_O%7US zlVMlk2;=d51dT+wB|#>lXjbJ|Wjfq{VhNffV z)9)6@TN_OgUrRha*zD4Czd|^{wWj%bW8>3O7|Nme_22fHr`7_?*JxTVQ|!yRGh91e(wz1VB-pA=gTm zYTY7?1S9zp_kU}~3EOku03Jzyl#0|@p5NoP!&2MJqXHHU04&IHS7FE)+g#15rn8cz zW>W4LD|FeJSP!?Aku1fj&%xHfdUy^J1a#GBT^8M$r-{MZq4l5wf)3!(2oKy)A;V}6 z$^rIo(9M7kxTASUmky&2btKYie%+T7v}*U(mZ${iUl!=3`WGeYGI*_7s~~8;xtooI ztwZQ-gaa)HHJ}>6EgHZL>*qqck9Prd#A=|mqm1pomqOJ70=)~kW$TR_sALb&`oZ)b giOwsVZJBVKe_Q^CQem&%1^@s607*qoM6N<$g461yivR!s diff --git a/graphics/pokemon/magearna/back.png b/graphics/pokemon/magearna/back.png index 17568f8bb23011aa8a1964305d00bebfb33bc7c5..2e3a77c5121415d79935553c11fbb9109e445185 100644 GIT binary patch delta 633 zcmV-<0*3v}1%?HX7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-snbW0ba&qeI z?4G8k(b(9cu&{1|f)Ef8USwpy!orM`ll+>z_)>2SsL9>wwn9%7Cj_PgL~01NhJ)z z9P~wl9G$Rl+unzjyD%C=m*BQ-ZTt=DYg4Ce^$&4``!RAk?F(MTLa)LaPbl7Sr=`jYbKGbU?pb$cu1htc^ z2=hb0Y!^Qr-}wn3)&gKcus*~kT>UhQH-O+804?MTLVrpHul%`>jDV2D%U1xklY^;~ z@HmbT%kJ5{oj?H6?P72X1Q_@U5D(Hb0EU3lPKFA4K$(#h5d2>N^cHr2db9vYAiIaK zS^y6|`3ZoKb=E@<@%iQgsCHqTkH83M{e;K>qkl#)&tQ>_xhK3RfV!ba;JX53TW$!! z)B(z$l5!E%Y8rb;#2#T0gPRBW9Vz4Y1;~fdXM`^&`D^8$5LiBpl!@~D1Sj{AQ2%vO zYI^pcq;!7vBkgjx1gyJ=cli1IBqfAX|4{b;<@d;TMtD8$?O{2MskdP~d0)00J*bL_t(Y$K{l z$ms*rQiD!jBo~>yI6?!oXouiZZ=HG>J2dg>eLCh5nrA2}$&O_+T|1OO0+IUilc6X@ z(SK~C30ObSaVNJku*pprxNrT*Y|gJA1LT=Mi(FoSZ}TPt z7e#xT>m~=A{%C>Dz9&K;*mpz#^!B4j%K*rW!5GGC*?#~+XlhW$AYuWbH_x95U}KJ2 zt&G+iW6XCF0NZk2nJYky`z&P%5=BHxY+1q>ON=>^*J<;US%AGWU#TL;CS{NTpyd^y zW)9$@s-Fm;I;1uObaF)i<6X7o2;iA4%@FvoucRLp!G(F+?TY??tYtf#!aVQy1K@B0 zu$%Q&0Dsf0C}8_{Kx^p%Ndr+NWv=zw14lia8JWY4RaS^sk3=W!zEXHegrR`7@&o`i zH4m`|RLPel5b0K8^+*p)LzHBVIFp`uZ^#sIT!qF;bC_>R;)PNmqm|aNIpDgV0iFkZ z(|BetDieb?zzdXQamhu7YnEia1lVD=C{HK8z&U27Y|+bLUzOLV^ZAt8H!JM{r3F5o m!G5_l&j{cX0>4S%U)mojnPBNov#jy}0000c0004VQb$4nuFf3k0000mP)t-snbV~JdT^9d zAfuTWIby6@gU#jQB%HMW0KvYrdqK^dVi6G$|M`sOy@UVer26{$hgfNR0009ENklr+4^=-wuz!GLAmoQtUmXhoEx-_nN|z2$1qzrfAQ6a2U1orc*N09&1aNPJco70X z>=Ckom~x}v0hFMkj8K3YXfj^=cNVN(5J|7mLZcs9fB-FE0M)~+BJSCTYcf5N#ippC>YVzcdOyBa_tFk&O$v>;i9<1=Q5pdA3{QjYd) z2J8TrQL$T-jfKzwQc`dyHxC;NHhY@Rkh7Z}nwk#=VGLmDS}N4&t*tbt&}0Bjq*CM7 zfUR_zP=BnaBl-6WX!QW?ZW-Soa`^|*y>74hAKXneDMdNm{XqW3x=*OwmWLNZ2I$OA zaxjZda!~hFtnVGXlqlWsMJ`Ajr1~rn(9@mc_v>eOWzN&7Kro+{fbHaEA;^ko4s)^7 z=P6eUnx5%QrE({+w8x&%g_byrG`>*6#7SU&+J9RPEo8m?EY7(_hLHd=5R``piyBOL z36k{%K$+?e_M}`9`I`U>z$+lmD9P!`rUFo>vAmeL1qCR8IKysiNNuASPUq5NvBBs# zq$dAjr~z7jzu$ilq>IUuW4Ut-c_@!n69X<5@b`=mR(>3Q}Uhg3&nHEAyfr~R^Uf1;op$tIQr0R+IEA;cZ3rNwOI*{P&%mDs| zo9_&Pa`d<>kOb$*bF^^w9oYe#E7l9({6lmHSSZO0;2vRKDP{dt+Z^?G0V}m?(+1zd Yf8`ujB=CERy8r+H07*qoM6N<$f~;|#XaE2J delta 781 zcmV+o1M>Wh2bczs7=Hu<00013M{Ml?0004VQb$4nuFf3k00004XF*Lt006O%3;baP z0000mP)t-sn9!gQNLUaM5Qu$mrn6*rpHaY;l$RDVdv<&#~C+b|S`6?p^A zFe!N%@Z1<-LI+F)ex3x)0$Q34SRleIBL(ASbo?l?lF*mVd-u|Nb>&QcNCLd-*LV$8-a7xV30Gw7MK@%Y)GIlGKfkGoe^TK$IJWD2)Uo9GIMcHb4Fwn?4rcf><$47NC5CTHeV4*ArLM^Fe>jc;UVn8Shqq}GK&ju;10Mf; zN_X)63V+4y+cZyi@P6t0r~CC5#2DbAc=&B*Uq?EiZp`DIS&sp4Q)A4gFlLs>FnI?+ zi7N#>y_<*o0eDFO*c#)-S|c0004VQb$4nuFf3k0000mP)t-snbV~gOI=by zN~CisgF#BPN?Pu{TIO?$L!-TmgNv-BtPv3r_TGcV#l_y<-un9bF51|{0008_NklZiI$`w3`NTzXo%?l|Lwd4#C=?5(tWBL^<9z>BK`Z_S%2Hg#T|y-%71OwofDYH zab$X+@B9g%$Va+!1pt2nQ27|6={UnK5a$5Xo3Rb(h?qxh)^B}W^a&vlq%js+ePo(S zdPD&jPIS~KBHH`22Z$8?0^mhnE~Ep&6c`YtBx0ijfa(SKL1{~%tf0goWPJsc`E~_R z5xf8l$4GJM8I+3Ro>+Z$H+7lK6S<>y<>cBF)UXH}&YFv8C z$_XU0>$D2#FnxZK@_bwU8X@HIb3T1RSWhI%B}Szu6olR+?^$-!=e404FQYrw5~~c> zw+1tJhqP=eY!0;Uf-FR|%0jjm~$ zcK}5Y2Pe|ttk;S3{bPb?=8Zv4x~4ZmCocebewauHz)W}-08B(rsugf{WW5GRgAE@1{i2wiq delta 992 zcmV<610VeP2I>cp7=Hu<00013M{Ml?0004VQb$4nuFf3k00004XF*Lt006O%3;baP z0000mP)t-sn9!iGNLW}vNQi)l$XIaTaESQ$_|VA6sGz725D@6NSfFqy@YsMrpt#`R z;1Ebyj>Ydt00009a7bBm000id000id0mpBsWB>pILrFwIRDVdvg_JR9+dveC&r+At zq1ZG-)4}pNSWW`Q*q}H|pl&jBEJQ=05Qsnug)B1YLWd3=9EZ~27y?yOFzr-i58Xnn ztX*o&Z8L;`7N?7#Lxv0?eRr}PJC>X`NV@yK``_KWXQQ!5+@9cz`QhO`S-2S#ixg0m zVPa+V1}LfueSf8mVPa)jxX~;0n=e&;kVQ-$0KBT!XbMS%U=}<)W2&4wDP2 z8t6a}nu9Y`rK%KRrOq<2S3kf)L4YaM4FgsRECU%TDSv2?1272yjVcQx2FxN)F-Za4 z&oFGjEMV&*kt&4fvoyn~L0}=iIV4!r#|@~3p`grqyNl`CaRY=fAvmM9yY!SrNz(;1 zM(CLUP%|MqLK(GUygr0FifX8i(wdH;3OH?$TN~h6>mg(|HZjJ(vlugjV$iHST#rw1 zn}2E_et&KG{%|SEQ0MrB^wu-_2P~>VAJNVUnr_L%o~PfMl{6?n@$Gn5&ixhqv;-y% z+D99PMo2&u%H{e%Cx%wdBWYVDI>yAH1V+ox>U|w!Xx1$S71FG%ScEMV+}XyCNp&a* zYsEqu3h3V(M~InqE45tO%mm%Uk#(>O?hWHw?tfe_WpQb-5zL7O^m0&l?!CS1z02l$ zomR;V=0w=};9hKJ*Av90Ui+taUhmIwBX?qFU6iZz+RitO!h;hy&)sgfqI8H|uZQjL zk+N;)yq*xf+_sJnJ!3vne_+|&Zg1U+%y8^D#~owNirB-$>m&1Xw_C7ms}%}do$SkN zW`Cz(Th>u1(A<~htBZp<%d+iy7{JN$+Udp10~;(tfhhpa_GR;v6_En~`BIkmo?P1Y z(RCQ`$^k@9CC^N=c@~mn%5i?k@{3gR^k4GiG6aY@4p_uf@#bDK%mBrv+m0MhJdHn2 zC7PkfNLgRv6o7ahrX!9@GYpsw1rP=UcUcDXL<9hhpL20)+QLx)LM0bt%lcZ61o)jh z0Mx*^6LH-GV7@iM0NsawF%wM+)10iMk2{lfBv$SKIFi4Ez#~6Bg#H7)K}BAH5TAzt O0000O$ z%C~Y6ckBp7L^*|{DN;wG$OTpu>7k4eBD7dE7Dw>~as-Z(v41hk*b7EVmBO#H=JU?a zV9=*epFaO4TS-^_VIk>46{ye+@O=i0ufKqZroO(M(>MS&e)C{6hY214`wmNY41tXm z_&frw9+8<)6mnYVbL+GXe4Y7~=xI&1*<+#r17^j|A@l=j zMwx}otHECXpKno76oy_dt UhqWcelK=n!07*qoM6N<$f>6hucmMzZ delta 542 zcmV+(0^$9I1FHm(7=H)@0001;w}I>c001gbOjJdg)1{l7t`(MO#VIp^E#TcR~^n0d1zHcjI4Jh=2Ky5D|R69zA;W=+UEp zrmYjKTMF|>{9U(KMgSCRUc06HXQod^KD0@yaS;+{oB zEd==^VB7XyP!Ji*oKm{;k9G*2ge8U)<4qC+0CL^2kxYty0e~saTYtCakM>f6y9vxM1wHv`^oKTqeGh7ncF%YQsDAl>_5eb{atb g(ZDSq-WLk^0m^?aAL5C9SpWb407*qoM6N<$f=e9qIRF3v diff --git a/graphics/pokemon/naclstack/front.png b/graphics/pokemon/naclstack/front.png index 4055c46cf312d0de578b48afd80040358d2da981..646b29881c1cb6ce7e95847bd2562fef4d9673d7 100644 GIT binary patch delta 538 zcmV+#0_FY31*Zg%7=Hu<00013M{Ml?001yhOjJdj)ufbST4GX4dwYAulzZmY&Be66 z|Ns9|Qc^)NDT{Mr2nY!7ix~Fi7ytkO0002fcYsC!00FW|L_t(|0qv4IPXa*{g$Y}U z)!nQnBo;7&hS&*N3vFg|H6~U*HrB9YG|>vfPU|Z`Y3L@j{C@xojRn1xws!s(?~Jc~ z5r2T3Vv9ZB+&z2l~DP=%J_6*A6{&wb!p3n+J z8XGQ4T%xvszC5Y|9 zqRUvZHIRo@1I$OylP3KRdK##310*&@nx8m)SvSUQO1hcy^$PE;1gH6z3L`9?*IS*07*qoM6N<$f;<%Vc001gbOjJdg)1`57asU7Sw6wGm5)#ITZiiM; z_QRf6EGKJ0JpZ5o|Nj6&797H75INX-<^TWy4s=pZQ~&?}|NsC0|NsC0|NsAJ!ZSqx z00KTqL_t(oh3%H@cET_ShD}2#)q4N8J0Kq=X=2->JKGQ6vwyRx+540Pg4}Ljef7^3 zg4^qYJIpMBcrPTca&Xo@Z%QaZIDaaH%DyRvaU4R9UBsRWMkfGHos&^P@aIJ9k$>8$ z0lXx*jz8~0!}1uAMq#*)UCs?clK1=xs(OU(!@cnfA``lRR4k_K-)150dgwY9|Ks|m6r7yKoB{ARYacz z;@D08AP1(lp7B{zYGAxjlea_VZ@bNL&RFY(~%V%Nk1Thk&+6Z7a6}0CZQT z!JumYP5SLS075C-vO|YFSY7~dZl%>=Sy3ESfHdBu?98o~Ndh;&js+HQJgPIp07PWF h$)Udz(RI&X=m*iDEpX8XK&k)$002ovPDHLkV1is@I)(rM diff --git a/graphics/pokemon/naclstack/normal.pal b/graphics/pokemon/naclstack/normal.pal index 2fd0dd7abd..19fea0383f 100644 --- a/graphics/pokemon/naclstack/normal.pal +++ b/graphics/pokemon/naclstack/normal.pal @@ -1,17 +1,19 @@ JASC-PAL 0100 -14 -153 211 165 -113 113 113 +16 +156 213 164 +148 98 90 +98 82 74 +123 123 123 +197 148 123 +230 213 205 +197 180 189 255 255 255 -180 180 180 -18 18 18 -198 135 110 -135 86 81 -246 195 158 -87 44 39 -107 65 60 -255 160 0 -255 255 0 -66 22 28 -194 103 16 +82 82 82 +65 49 41 +139 115 98 +8 8 8 +238 139 24 +246 230 24 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/naclstack/shiny.pal b/graphics/pokemon/naclstack/shiny.pal index a8f14a01b0..94d60d4731 100644 --- a/graphics/pokemon/naclstack/shiny.pal +++ b/graphics/pokemon/naclstack/shiny.pal @@ -1,17 +1,19 @@ JASC-PAL 0100 -14 -153 211 165 -164 70 47 -235 145 61 -211 94 44 -18 18 18 -198 135 110 -135 86 81 -246 195 158 -87 44 39 -107 65 60 -255 160 0 -255 255 0 -66 22 28 -194 103 16 +16 +156 213 164 +148 98 90 +98 82 74 +123 98 65 +197 148 123 +230 213 205 +197 131 106 +238 189 148 +90 57 49 +65 49 41 +139 115 98 +8 8 8 +238 139 24 +246 230 24 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/orthworm/front.png b/graphics/pokemon/orthworm/front.png index 87535ce92cf1fa4ca5d318bc8f2a9a3f9f3d2a18..14884ce2c7d8946a5f68377bae92be15f1bc8d43 100755 GIT binary patch delta 600 zcmV-e0;m1F1-b>0ZGSjPL_t(oh3%H%a)TfYfEx%{O_le5+a&~4Y_-9EyKC;c?l!;A z5Fqe){NfjffEsscC*i$wHx!u`wtQhP@7&7DSFfS+nGGTEPml2y?}886;BkmnMZ+_! z0yaF2hIaw~0wS;(z=g3f8{Z+|n(O-kNa|M#sDi=J8n|k?7c!mauS|el@Q}jgfQ;7}%!PQ`np5e= zLy2bz?kYxsMt>YyLrlqQ=_nglXG-4Fozvay+;ZlnN2UY4cc)5HhvyWsj3!5vXT zcL$~956_DG@)l8dmI{`o73?k|XKUoC{!g{C`cHFVzlcAjGapiaa@zR-0000X(1b;+U; zfL$O4cgz4L0?fS0Ad032I89U%FbN28KbcW@%F`ek1@M}23#j~%lF7h=`8Ch45``DR zvRG3PoPW6a9p53~n$Hq10FwHZ0;*szYz&>CV&)(nmY<(GxGr7i(BDagZA!;gkxh*HCdou>>&?M4(l4hdcF zF(vzXR14PtWpn5?)NZf_^X}9s5QQdz%uhE2K)x(&=BFDe0FjqzDfl$;f%`7FzD4kk zD50x^Qu2p)#eI2;s4Gha%hC#V7m>3$b}0bMEdtI3uzx%LtSM0GZM}l62DyfO7U0x` z1Gj?t)GLN_L7RdIDyFT&c7UD;koE#7Z|CdBmII4U1#H+9gdzw5eAxAZX%82B1+Fs* zP{u8YVC{s=q%Q(qP&sP z{wKqd+fya4RiLt}C@l+U;wdFje8u+yPFFCJ#7Ry-G~h=AV=AC8wL3G=%G+8mhDMP) o(1WW2DxXKSkFE~9&Hjt{1B31#G%zjfmH+?%07*qoM6N<$f{9EIs{jB1 diff --git a/graphics/pokemon/ponyta/galarian/back.png b/graphics/pokemon/ponyta/galarian/back.png index fe45584312b7bc9a46be9e20725d43d503a84c52..f798d5cb45a3fe010810f1a0441e9d53c31fd7aa 100644 GIT binary patch delta 649 zcmV;40(Sk;1(gMm7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!g|$mlSb zsDR+u$E$ny^vm$uo=8|o5D*YRIHlWD#Ex2TG}{{Z{;6H2;&AC zfS2^J4g#2b4e)+0U+#YrNb?5)+Wm&G&~Sbd5Top(C!PmnNRqJfwtoj8W!ScL1aQ`% zl^|m~Cr)K{kRYrVoq~TKU9k;CR2hZ2e#gkT&wj1I-{|5#sYO0C+L> z0b>L~kU^LL=qMBfEC6GKdVO?IN`Qg)YdMRE&H>ymvV^Aj;5F1zZ51 z0Fi*8sc61#qlMFk_C!?I04HZ11&BN_M}vJ)Mdrd%1~?fPj_&N)Vyll&fNJXj`cEWW z`RM}nrn>|1S-^dzgXnE55GB+CyLB}4CEW8za~95*yoG4sWDPiX03M7EbtRakwA>kl zI6mgR7Jt`#K8jd!73%c}oIg1kmD;7K?o1itcH0~q(44j@Z70XZG+Ee=xP^~I3DSpru% jP<+Ju`s|;wzZoBc9W06z2s3m50000P)Jxv5D*YpAb9Bb@W9x}h@g;Icwhhk z00000`+h_X00009a7bBm000id000id0mpBsWB>pHDoI2^RDVdv&6PiE+dvq`uOfq% z3}=VpF}8!r>S)pEQbh=~>P*%O<;arnpafx5(xIcgD$pu6dJ>HU#( z=jbl9OX&^b;Qjf1p67iJjQ*#y7tGk#IkeVKNisvP##SICgd}L_<+cWt0a@VLfFR%i zA;HPWsIf;#cz@1;`CD^~Q(hA-G9TFhd4A;ijCd+fWg{7hHQd)b+ zU~K{dO6wLR{$x^EP<9C6bI9IX0V*b$EN@>1=JD#I(E~qX)N%F2m_i30UeuuL^7d;7 zC?vp>B(VH^Z;_BPG2E?wS{jHZF~BM}TaYcz{s6f9Yk$BEHJ|`^>cor`k;U-Tozzj= zAuD0?JS1{P2U^UiyKfg`B|*rn1EA|2AVCJAUbq!-snAH}MhzNugYj$eDBg@ZfE?w> z!(yL(uZJ9#<#-1OY1*G+;iB(N51j#Wd|e`Am22FaNWeRB2F`e(o8$m3h159%ysN=@ zssX6b*MB8|9>zMbvrh*2+)bqC&^l1oz!#UO6I34TdG#yJjlesM{rY;Lxui0PBpN)M zX+af04_ZgL9z*%OP&WlEsIpO*fGSjg=D5{x;j#T)R2qPNs2-IAWk)^X?dC@zgQ({x zhz7WU?R^>UI!Gs)$Uc04Z=rC|2&BV_7Q}@OR6cxot=DvjbpUOv?^Qhm%$Lnp!U2r) r*2E1g#1L5pi+WGoZGUqA@F4UXj2(QUp`Ej900000NkvXXu0mjfRYyZH diff --git a/graphics/pokemon/ponyta/galarian/shiny.pal b/graphics/pokemon/ponyta/galarian/shiny.pal index 707eb51faa..62925ea1a8 100644 --- a/graphics/pokemon/ponyta/galarian/shiny.pal +++ b/graphics/pokemon/ponyta/galarian/shiny.pal @@ -2,15 +2,15 @@ JASC-PAL 0100 16 152 208 160 -72 184 120 -16 144 64 -128 248 176 -200 144 48 -248 240 160 -240 200 80 +72 200 232 +48 152 168 +128 224 216 +199 171 123 +247 244 203 +240 219 158 72 88 72 16 16 16 -88 32 120 +64 56 165 232 248 240 192 216 200 136 160 144 diff --git a/graphics/pokemon/rapidash/galarian/back.png b/graphics/pokemon/rapidash/galarian/back.png index df065bf1f0e64a7e0bac64d93f3c115997c86a68..59816614d913fef37169edfa0a2db9adcb8fb1e4 100644 GIT binary patch delta 630 zcmV-+0*U?N1(yYo7#0Wv0001;w}I>c0004VQb$4nuFf3kkvdi~e0luPB64*;H}m&NbhjP3?G=wRCARq5sBOwS6^IlXthZ$hZXF>(cu0YE-O-!yJx8CQa0&KS(fSwl$ zw-X4E1e^lMbM!L-2+~>mq@FL@95K5YBu9sBu2u0TFIi z2bX{Zlzhzj-6esI9rj=gv>iarGXY!@$N-I?jZo$jyZ}H2933j3+pGaT zQYe6+1L(VeNe_?$HlS6|Rv`od2rVEll2Fk9FT(-22-iBn@o>(2lzvPBFaRzEG@dMQ zxT-^NhXOwu$a+VG^QdbR1_k#*0M%at)E->_qNZF`LjzF8=!f^!Q9uB!9zFw%t6&l! z+yf>G0N2B{{X!1wtfcv7h9MJ$&f&s{BIt9eT6~Z&XfBkuV0Wgs&aK0yye7$yV*00013M{Ml?0004VQb$4nuFf3k00004XF*Lt006O%3;baP zkuDg2kRb5z@Zi{h02pBS_|Rx*c*w}mprEh-0000000000TV7D300009a7bBm000id z000id0mpBsWB>pHJ4r-AR7l6w)IE>WFc=5$Af*dabG}>1)Z`0X;&y>0rxc~o8*U)- z2LRnrSRy5Q)QzFTiJ4PXrW;VjwHqo`Rj-|Y_*D2MPVA%wF`l=`zdq03c5Ulvj%SW@ zS$z!K^Uj$c21?kQ_B_UCo);)^XwIKwHbT$q%Fj{Mn70uQgy@|BF%A%~QI@c0%>o#U zc~&Ag3S!Yfln_0}(TM`8$92?PqAI|8Fks(B%_X23^jZ-*S170e_WVn0WP;aO-2r2N z-|PNf8~gYUv<|FC_+o1;!X^+`9WJ2o{pBZP9}~!s>X5=>QM|l8%rsyF$ zKhE^CP64tq!hk?Qrr+ppd@wpx8TmZS&*_hm_IK)#3Jd@UOs6ir+r7EbBdClC6aetm z-7|21Bx9c!V4Q)C2GR*CTR;)5g6F-w5?V^MZmnm`=|{P9sK-!5;y`ZwF;zQ0P%B>8AA^C zEA6l(=o?@=se%39z<OoKG7{GH|fFBkEg$A~N1Go_)DGb1_KLhkb4N?Jr1|@LV z)#ND;`Z99LG2V#DW4A?njoma z6-(K*^wE)^P8oV8NJ^0W8_0`=!s9|glTO*9~S o=-@3o6?J+0n; z<0ueCjYWcx-O~U6?c~P3Sgx9Rn25&RWrxi@B&)djc>G_A;qnXhlgrN-qTa9w<7+*s ztrmhT5ugP>ItMWVTb3T-eU@)p0Q?>xccMd7fE}c2l4EiE4qI-iCLp3A>=G`d5b&!& zpA(`X*oF{Nyn={-`T_wh0ZM`kA;d8Qjz6USSTh6+2m!D)Tq;0%Uku2Yu+;>Q%8mYS zmh_<<&<%zmY$d>OZ)v?b*82+ZnP4^-%*N|A4D`~A1pxIs1&>|e_5*;a0W^{wAQOxW z2(a*aIg&dqRR|+O1UQ`b-I$kq?Xd)&m8KK35ZvAr>H}fCs#Q{<-&`=kv{kFeFR?4}1e`9`(=nse~Q?&mNHG!Flh2^v8jOaR@5_>YW5| z9AF`aP@NDKwkg2Txbp~H3_y9?3GD75fH;pd0q^(wkLa;31L&xOD924Y1#tWDdS9%E zOmGUoFK8Km#U3a!1LP2f>$(p4!~_{fuu1<^HR!=t&w_B`tP+6$Opw_&@@&`u(!tjP z3KYW)ZwCda9w0ZzgfTz}CL{txeN~AFD}WN{Yo)JCnN$E=qtknzy~CqgL|PLAtnGiVECASZ%-;h_;_H_BYhCmLr*wkDS+yn ziwGTABxx9Kpx^01)wJ$Y6pkN+_(*3d1lQ|_B@?i9PlTPM_|dtG`dYxjdr*Sf2>E>}1iZcK3KXT)~Iy z@vTgHnLk}u-xStaPeR7OMnfz6Ig7qzaat~s!j&To2vjq;3F^idWZ6J zjjAQ7gpdfhc<{#Pb&Ha`+u;gN((5PyG|t}WXayLZ5K_(9BN6EDakvP8<1h-qYTZ_F ze7&Jx&g1ZhXb&tdh(3Tj(q`y)lJgmj2!C*YQGyn_Oe&$*U#HJ=3k->b1mK^jj_&|~ z122RWnf8Oc{r96g1l|>Y z?%RJL51s74Lig~|{ueQXXnB!gR1Y8Re~w@i51ovf+oLI8+y6{}=%Kglp&uiHoe%~d z`kwtyW#FOj+5e;;dFWgAKk8c#EpsvqVQ@*Ddgz;kg@^uN|5e}Iu1XL6!Tu*e@1gUm zx)DP3&?h|-)d45#c_)O2K99MmhtA%Ab#DLXgbJ{*|HUvsLY(5EOZWU4;A8+#(c5wm zKiU66ACrn!9Pk$aSKcnfr(f%n1B$1 z&F=e#{YOMjKokfu&kOsXp-?0s5+b_qsr|3=2Soy+WH4Z5|BL)VPC#UWG_hd{}00000NkvXXu0mjfylt*O delta 1455 zcmV;g1yK633-1e%7zqRe0000$E@3%FRo{z1YCPzEAw`pycvg_SYngkN>ZVNU! z#2y`en6>5u*aZdRQz(>vg3wa%cL;^#;FDu&O4RpeB<<+Wno=nA&<8fVJ3qboqbGm8 zpQimAQ8A3EtHzD%jm9nGit$FnG#ibHM5QrfLzsDjKxoxAX0Sypr9@whn-FBcG?j=~ zIv|>+aK8imBf17P5LCK441*tg>pL*IoQp7|+dKq1kLiH{{voc)b(@g<;UII1KXqX+!pGaVS zJjarlqq1=D$&4BJat4U098l}lEaL{{Y&ixNQ$WsfBd9sgyL{B?biNkA+*D=})d4k* zf1(ha$IBc8I7gSt@EKW=8O*s9uo2j&d_)Lktr6@;#m&XEPG{q||&)sf@FB4lA$UIyr~FHUDKkDOLA zhvj^v0#)Ar<=5ZBrVT(}gX6Xqr!zp0k)Qv(JR-KkVGhr<>?z&Cx;8Bd5LerXj$AnZ z7HqU>+KU>jacQ0)8{cr9;CX-8PK%G=4BZMm8S^eyVOkM_vh79A2>{nE+rb0UJxc{( z4ggrwUY?N$h;^C+?3+L=H*DL9fATC9fVBg_8O$=3{*(bsoWu8h(o6xH*Hdxg+ZZfd|o96upn4t_1GDv)ba1?W9oFqXt@Ogbb{4TmY z4#OUW-Q6cxJL$dLf^T)Q{zDjs_rqiO!rK~bfu(oy{SbGoll6ZvJeGh9KtBaG&VGl2 z$F%@KNKXLz&dyFU1$h^7SsFTY4J`(~fBQB8^o?_+bZ~aON%ziQri;|o;zi&PpG8-_ zDhmvE&L@n?e1|`toViyKP4M5O(@L=Qxy{ku#L zv`qgl(F0BC-(Hy>XxaW<&;u>szw>&a<@YxZv!Wh|lZ5{L?VAw#H!JFa2zY2A zpntQX9>^4L5P<&8ih3ZoL6CUu_@qP+FnS|+dAw*kat(iZJrModg;xXi?{c6gURSWR zY3>#EKok920ykS;K@XI=0s!t-UJr6WQ4hvZ$KLFf>46F~C+Y!I4FYVk9sq!TFj)_@ z8uo5ZCh9>YZtifP<$53i&;vG656r)<2TTF<&G>Uh50du<{TJ6aL_;dQj>QSv@HAhm0PS`hy#Y|NY^g#9vgYxo$K$5Q6{!002ov JPDHLkV1l}ju0;R< diff --git a/graphics/pokemon/salamence/mega/front.png b/graphics/pokemon/salamence/mega/front.png index bec9a9254923bbd63430a73dfdd70bfa90ed29da..44812fa0580a958ab66c00fd37441e1432d4ee08 100644 GIT binary patch delta 915 zcmV;E18n@x2-pXZ7#0Wv0001;w}I>c0004VQb$4nuFf3kkv=|u16D~yK~z|U)tBp* zs~`-8OEHP8R(=1so$Le%WPXSF|4LWnU=Y9A6Wg7uJley7R287HsnGyATR(**i?wA1~b0NTLpemme?a62uM}!i%K^O!N ziynx0hY%4RJ54=*1CBN6j3c6V;z)?nIB-Hx#697lKP9vSIHlAk!hk)2?g-GU={zEX z%&Hf~{hpuz39i=HV*))Qx&?HEV5xsTRc?Cmc)|z5KG74WFhM`1M&A=gKqaVtRv#h~ z0DYow0h|;N>GfjBIooGK1~3XYgcrZGsu@WzH!P9A0hqvltQC`c&=Rg3YdD03{3QT+6d~wiR6^%M48H)Vp4|ZjM4G<^ zAZkJ-YB2yntqU=hYI$BIk+GI-F_~T!1`u)mM}WPb-r)_sUR45TfD^)VjKBfDC!p-2 zUm1at5qunf-9}JSR5uqR0Fbzh)D&GhFq&6f@S^mQ;Z%PGa6(9xV6Em0ed~fv@VWd3 z;3bm*Hb+BOzt>|*3SqW`=&mESwqPo($2wrq2TD*oB2M+ovaaNMBaq&&lybl65N970 zkZ)CwvRYU5VBW1DG$J{bFRl;x9)TPWvNjb2Ok)#&=A5s5Ubd{)_Npz~^XP z2`$tB$xl`9FItZJLI}P<1%w$=7VHDrUG>L&1+MB#4xOzvt(%~`Fx$%kb3Fk5BJ)23 zQgwk%uWi#h7RtjvA~d74sBPL<;c4phbF*!zBs_z8MW(L=+O|!{C-PX0w+w)!JFtYD zB(HLRDIFjaaVGd00XBarjh&0{W&pcLutTH%e z!k1~Wr>pmxwdw=57SLV~ey*8Yd%_z7;B4Fgj6tss zfX&wdVZ2+fI$O4gd?^#8|Gh0f4Y~jVdI9t{j+lzZh{}2Ej*Z? zjG%@5h5HIl%I?fh<$x)|roUb1=a+_MlAX?Cwg>412ueNi_9Y}+@R==UZh(#;Kfjdk zAH(Me&L$ZF;l0%KD-eLS_97L3U@T(Ha_}#LjbNO{J_x%l&W2Y?0Q4D5`X)i1U>sgQ zh!^vvyLZfn3kh(kFk(kF#JwaD&?xOsr|cPXDdQh*7ia8C$Z9Rf%&77mx{8Kl4uj0sPFyitG#5>)s? zN${}*-lAuq@4dm<$aTLhX&lB+8{yfgtgvGe0J zD70`&)wdVQtNtsMv$Hzx*P>6SoeTJ90HOsc(bJ%XIL{mN12Lhra{)%}>1PSJ01Q?@ z=j;m%JZzaVYKIEY4-XGna|`<{9 diff --git a/graphics/pokemon/shroodle/back.png b/graphics/pokemon/shroodle/back.png index ffecfe183c738a176f30d48dacffa35e38eb815b..3bb3cb4a581cbcd32eb4acc66e0ebb92f172a360 100755 GIT binary patch delta 81 zcmV-X0IvU%1A_yQBt`*qQb$4nuFf3k0000mP)t-sn9!hod3NmU=nxPPtfrYyXmvp2R#sCDb6mC&YEeg#`%_5ij1H5D*a9u%g4kC&RwB$g^RH`$lZxy-8q?;6BX?@)(9{H0B36mOaK4? delta 39 hcmey%)WbYMWul>tq(DiKU+{l4a8_~Cl#N-!i~zUY7$g7y diff --git a/graphics/pokemon/shroodle/shiny.pal b/graphics/pokemon/shroodle/shiny.pal index bb3f9a6a7d..67046e31cf 100755 --- a/graphics/pokemon/shroodle/shiny.pal +++ b/graphics/pokemon/shroodle/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 88 88 -232 236 200 +125 121 118 +236 235 232 16 16 16 -176 168 136 -64 76 104 -72 60 56 +172 166 153 +79 104 117 +72 68 65 48 36 40 -128 156 168 -168 168 224 -96 108 136 +187 210 227 +173 114 205 +128 149 168 248 252 248 -208 200 248 +225 171 233 184 176 184 -160 112 224 +225 52 239 0 0 0 diff --git a/graphics/pokemon/spidops/front.png b/graphics/pokemon/spidops/front.png index 944a9110703b59239fd9f6a4158f98c9ce3c0131..d6bfb05623f29b943304159461107219c224c0ef 100644 GIT binary patch delta 696 zcmV;p0!RIz2L1(*7#0Wv0001;w}I>c0004VQb$4nuFf3kks&^R0(?nCK~z|U?UvE9 z!XOMp8zhEatp5Ms-fVyZTH20%H8VP+u*XdZsnhg}UwjipbWQJW?h=8#^Zp{iU$)>p zUnQId5N#BlPFv7y5$_1p@f1Mi_xpVVan6DW6}^VM5sm>8$jx(>yAV2p0uBiZm^IvN z6a{pG6Baaq*Wa9f!Ud5qw+ay-w+PZ0)eK&*m&*TMPUcw}fZ{^j0+2eD27my>0Nlz$ z;4M9Jtq3dPngVrlkxx1Fj%+o-$=b+@sNa!5v?EV?7Kxf45a<>=LJtEznh=Xy=Cj_8 zhB<1me%6;F^i6MYd_02K!r=H;eL*mD0DyF*0%UahrmqcuuLw~Eu40S?K+YZ9p}y-a zR)FdVu1U)YK(rj9eAWHxRKK$7#s5jD*BS)Hhq^9E&fLk$**i+pWUX76hFHb;58jdk!z*JlmEcK~F)eW22L ziIlO>OZGRY9{KXLNEQ;|;K7E+ zcMHfC7PEkE*AcZ3z`-{=vW4Wps=N@GGw_zjugCQ$m~Fju3VM|%BgtE zrnyr`561RklKc45+t5*R0Un`e~)&ThJ)@pyi z52G~^G*|<~VX`KJya*sPt<58y7j#NUur*p@Y}ztJ~x z=(qSFmy-3SfFIMuI%FTi2%(rrS#|Gt#byR30p_wh)W?Y8T$WIsliNmmyC#1@>1ksa z?wu=Qn<aC)0azoE=F?o{ic1psa?95u6>A=NsyC#cPw z-E4fPdY$mXgf9Y~c?BDfry96_7$m?Me7j-%ozkQGhiVBh8L*OAcPbm$vBcCVBA2lvht`UqU8%n6A`m;{MVY7`E_MRbZdC%Xi4Z#aohXY^ z-NIs(ejI4q&33ze^qfFmsG*-db$e++sehlxwVR><6fFH_Y^b5e7zy*+R z4z)Q}>q*t*0zRDps)kXi0a}0lel+c000DMK}|sb0I`mI`%#mTdp>^wxk*GpR9J=W zmg|m#AP|Ke2WBj4-~VxUE`V-ZODsQ{?0S+Kn)W+$7!e$XOPBtIpqC#z9lmY=W52QZjftYTU+$#q; zroEPBc!F6%@PscDD7~xr;J`VUObpRF`W}CDU|al>&k6C{ldq{MbZG7vu}yI zb+ytfUxhB&P|8xKCKl~I6{|`ytOh4e7u-MSo5P7?VLw?6+2Pc&vY%{@@cHTJ5qeHn sjnMUq@_Oq#=g{?rGqjffrAvQDKaOA&h;chPo&W#<07*qoM6N<$f^S#r(*OVf delta 627 zcmV-(0*w8>1iA%~7-Iwj00013M{Ml?000McNliru=K~KD9|x5PZ3qAW02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(7j6e*ghuOGiZir3doG0005rNkl!d5@h;6&-TT z)XC8uqC*!q_YK;^k;)22WkObbCqbu*_?W9oy|Jie%f!%usX~IqD=Qmg@)@|-5C~4- z286osZ1($mpZAaNjL?hzlROs?Hl7>sh!c48L?CnnZ5KeIf5%$@;E_Q9Xn5_1O#tY5 zq&NL0!Gab5=rmCXF5cWo7U;w+LU{KBxP)^+i*qi7;5;Us$l|qjeX*)EXduKV9t8m1 z3-@)A8e_DvOd*7=HXDbqGP(JwrxLt3n+~rEU2IOnYM|JigWun;GL_D+K`o1va^9%L zrxr?V4AdUGe+B$Lw3Vk-YOafQRV0#9%=k@>KBO044i(fGZlpRFYF+a}A)7`QxPrAHzB$i)~M<3sr?-sCe%IJLqe}s~Y$>cKA@3(`c@`TzI*9`ox zc000DMK}|sb0I`mI`%#mTdp>^wFiAu~R9J=W zmfNy}APhx~XdpEI|Gg)nwdLYypwovl!+zDZ3=xCNGBY#tUjmwM=v6c5z$d-F9R0jo z*KZ6N?YxK8KzK&^veEvlO2M z?_tJ72d_Kf)*u2bW-%X+e(j|jfv&y~a7K>{%I$n7_#9^nV1Y=h;PN%30$kq1W-3?& zE<2C<1v*DQd^-~^PX@&Lktc)Eu!2keN`N(UGFQj{b!KK}ew{yk1rVnz{m``l0000< KMNUMnLSTaMRGQcT delta 481 zcmV<70UrLf1F8g&7-Iwj00013M{Ml?000McNliru=K~HE7$LNEW#s?>02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(7j6e*ghuOGiZir3doG0003_NklH%bibpKI$0Jgl|SJkH*0D@oDo5w-MD9bwwkoJ09yg%4N zrqKbg>S1)~u(RqrBe!j93lP>iW74jL6{w%h`Lz%)mKLEf21>_bY|%XFh>Z{eah!4* zuXKl686d94bHF_{9h8p65Qrq8_ANox01!7rfa`@$)Nwh=ArOE88pIs@K(2>90=h>B z@R*z17z`qVtTTXqCE_u_x<}&#c*K;!yub1JAVS9VcMcAqSAN%a7=a%ffafQ3s=r%5 XmjaK4oR^ph00000NkvXXu0mjfuk*q> diff --git a/graphics/pokemon/wattrel/front.png b/graphics/pokemon/wattrel/front.png index 72981aa44e918cfb83114d326639dbc6a7d22f26..c2527bab8b7ff61611573acdafce86c0c1a610f3 100755 GIT binary patch delta 419 zcmV;U0bKs^1ndKl7#Roy0001;w}I>c000DMK}|sb0I`mI`%#mTdp>^wXGugsR9J=W z)!S~vAP@x50QPW)|NqK&lssK@?K6s=!dB_|sIKi*ilP6F9b(G|Tx|Zw`%IF@m zB`AGmOXvd_!|yx5A;5VYr`ZA&7&xIwuy#YhVVu)ANI3n@2na4l*MOZ(K$JM(IMWt@ z5Q3vuN@?>p0FL9WmD_)@E+`8cWAwGAQI`5iQI}(Soj$G*$!bFtZ+gFBc3Mc*%dfcA z^XS{@KZO7zxpaWMNr3t#f7e^Tk25DQ&;+Uvpr0;N0DLXCz+XTU-W^gu0PpXBQpQY- zz|+eLvIyR^<3(}(?LrvfAu0*Abl?`u>_Qu&*0Bh`(r3XVkDY(W8Fyf&&;Le`QO|b) zbA2Ho-C9L}2=n!BR0%5;oLZLvA*9x)$+@f&aA+4MWHn_;2o4tm-U@a$0om7nnJiP} z+w_odYun#SkqNwlJR_C?K9nPm8=@n^tqW|lEA=tI^53N=PoDgJz5wfb6aE_8R;~a5 N002ovPDHLkV1j|XzXSjP delta 553 zcmV+^0@nTP1Mviq7-Iwj00013M{Ml?000McNliru=K~HE6*U_H&(#0`02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(7j6e*ghuOGiZir3doG0004%NklpAZcc6DBsjG3U5X&h zU1pI!vi*N~@7*Pmw66bIs;Z{v7~?b{YXGvFVz7l-9g9H*f8N*et{4dTExCAQL`=#6k7K5H^m2#(IaP7KJr1&ZZq~Gg5jx;flh;84RTFN=M$yK`!S2cR! z=Nmhw2@UYbZ1RPdH5)p{2f&)#1`Vu3e&_+H^A-ib$_G%_c);ttv3zQpI{zeIX9jsN zjThyC>LOtEf8J&QZcAPr^8=iA4CKtw3P9aiFbe{|>fFPBqh=C+7V3sU=!XFSomD=$ z#MiiN07smS`^JE5h1k?J^(># zpU{VfB5_$p7BVJt8uD|+ij6TQl;2_rBt#^_TT`)ZJ0dA9OE4ayXWLR-cPIjg3`lu! r=eBs=mqp+i47uZf^+}J{^{49_v!|#+h#uE(00000NkvXXu0mjf=7s1r diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h index 8880d3584d..a59dd88fe2 100644 --- a/src/data/pokemon/species_info/gen_9_families.h +++ b/src/data/pokemon/species_info/gen_9_families.h @@ -1765,7 +1765,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Naclstack, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 2, + .frontPicYOffset = 9, .frontAnimFrames = sAnims_Naclstack, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Naclstack, @@ -1818,12 +1818,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Garganacl, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 1, + .frontPicYOffset = 5, .frontAnimFrames = sAnims_Garganacl, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Garganacl, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 2, + .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Garganacl, .shinyPalette = gMonShinyPalette_Garganacl, From 5a320f94d247310b05c8278f54c49c4cf927ac3b Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Wed, 21 Aug 2024 17:43:57 +0200 Subject: [PATCH 3/8] Fixes Hyperspace Fury softlock (#5237) Fixes #5236 --- data/battle_scripts_1.s | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 083143bdf2..5bd91f8df5 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -928,19 +928,10 @@ BattleScript_BothCanNoLongerEscape:: return BattleScript_EffectHyperspaceFury:: - jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHyperspaceFuryUnbound + jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHit jumpifspecies BS_ATTACKER, SPECIES_HOOPA_CONFINED, BattleScript_ButHoopaCantUseIt goto BattleScript_PokemonCantUseTheMove -BattleScript_EffectHyperspaceFuryUnbound:: - attackcanceler - accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE - attackstring - pause B_WAIT_TIME_LONG - ppreduce - seteffectprimary MOVE_EFFECT_FEINT - goto BattleScript_HitFromCritCalc - BattleScript_ButHoopaCantUseIt: printstring STRINGID_BUTHOOPACANTUSEIT waitmessage B_WAIT_TIME_LONG From 4cc193ebf1e839f9a14aa36a2d6a8056adf8e1b0 Mon Sep 17 00:00:00 2001 From: Cafei <46283144+Cafeei@users.noreply.github.com> Date: Fri, 23 Aug 2024 12:38:09 +0400 Subject: [PATCH 4/8] A bunch of fixes for follower Pokemon sprites (#5241) --- graphics/pokemon/archen/overworld.png | Bin 737 -> 627 bytes graphics/pokemon/archeops/overworld.png | Bin 1063 -> 983 bytes .../basculin/blue_striped/overworld.png | Bin 682 -> 654 bytes graphics/pokemon/blitzle/overworld.png | Bin 623 -> 641 bytes graphics/pokemon/blitzle/overworld_normal.pal | 2 +- graphics/pokemon/blitzle/overworld_shiny.pal | 2 +- graphics/pokemon/crustle/overworld_normal.pal | 4 ++-- graphics/pokemon/crustle/overworld_shiny.pal | 6 +++--- graphics/pokemon/dwebble/overworld.png | Bin 526 -> 506 bytes graphics/pokemon/escavalier/overworld.png | Bin 1279 -> 1286 bytes .../pokemon/excadrill/overworld_shiny.pal | 2 +- graphics/pokemon/krokorok/overworld.png | Bin 885 -> 826 bytes graphics/pokemon/krookodile/overworld.png | Bin 985 -> 852 bytes .../pokemon/krookodile/overworld_normal.pal | 4 ++-- .../pokemon/krookodile/overworld_shiny.pal | 4 ++-- graphics/pokemon/lillipup/overworld_shiny.pal | 6 +++--- .../pokemon/sawsbuck/summer/overworld.png | Bin 677 -> 721 bytes graphics/pokemon/serperior/overworld.png | Bin 1101 -> 1076 bytes .../pokemon/serperior/overworld_normal.pal | 14 ++++++------ .../pokemon/serperior/overworld_shiny.pal | 12 +++++------ graphics/pokemon/servine/overworld.png | Bin 582 -> 621 bytes graphics/pokemon/servine/overworld_normal.pal | 6 +++--- graphics/pokemon/servine/overworld_shiny.pal | 12 +++++------ graphics/pokemon/sigilyph/overworld.png | Bin 786 -> 713 bytes .../pokemon/sigilyph/overworld_normal.pal | 10 ++++----- graphics/pokemon/sigilyph/overworld_shiny.pal | 20 +++++++++--------- graphics/pokemon/snivy/overworld.png | Bin 623 -> 562 bytes graphics/pokemon/swoobat/overworld.png | Bin 831 -> 830 bytes graphics/pokemon/swoobat/overworld_shiny.pal | 12 +++++------ graphics/pokemon/throh/overworld.png | Bin 1071 -> 871 bytes graphics/pokemon/throh/overworld_normal.pal | 2 +- graphics/pokemon/tranquill/overworld.png | Bin 768 -> 828 bytes .../pokemon/tranquill/overworld_normal.pal | 4 ++-- .../pokemon/tranquill/overworld_shiny.pal | 10 ++++----- graphics/pokemon/venipede/overworld.png | Bin 616 -> 645 bytes .../pokemon/venipede/overworld_normal.pal | 4 ++-- graphics/pokemon/venipede/overworld_shiny.pal | 18 ++++++++-------- graphics/pokemon/vulpix/overworld.png | Bin 818 -> 739 bytes graphics/pokemon/woobat/overworld.png | Bin 530 -> 565 bytes graphics/pokemon/woobat/overworld_shiny.pal | 4 ++-- .../zamazenta/crowned_shield/overworld.png | Bin 1166 -> 1166 bytes graphics/pokemon/zebstrika/overworld.png | Bin 983 -> 926 bytes .../pokemon/zebstrika/overworld_normal.pal | 6 +++--- .../pokemon/zebstrika/overworld_shiny.pal | 6 +++--- 44 files changed, 85 insertions(+), 85 deletions(-) diff --git a/graphics/pokemon/archen/overworld.png b/graphics/pokemon/archen/overworld.png index e25f19ba7f21e34f53caac0b73e23d7585997d05..6dce497d6d3a5830a522b00cdda7cdedc69019f6 100644 GIT binary patch delta 568 zcmV-80>}N~1@i=u7#0Wv0001UMu)cm0004VQb$4nuFf3kkv=ki0sTotK~z|U?Uuok z>>vn5MFRNn|NnQuBt1O|n5yo@+eoUiIUpBAlTwx~TefW3vSrJbEn8L!xP8Ihs=3sU z@mKMPn_H^ziSG%9PpaSnTaV^BCK!=;rtpcsCrEuB@L6D5;sg^j9SXzMpZH-?H?*Cq z@)0(NLtz%5Vsv?bOf3t3;;#%1nHgIqV2-~iKx|#p_s;RF&gq;P8fs_ zh2B8xQIx^;9XP1(j0c8!yg9`2u8>g4>kkDEPTnPqv1d^0p>z%QcudHF!w&8{=y#0K zcn3Y+9pW8-v>djyJ83Mi41pSq=dVKdv3H4QxEwg1VJpG!nJNkppCJGp4kh`c8NIOt z*{8~9Z{o0v9%n6Cpq!^OYl1f#JU+g~JRW9WQYC9+GG9CAxx=n<@}bJnsj|X69-`~} zjcZHhYsa=p6Nl69BXk%%#ZP}_r1Z%j^Z0_!9G3kT5BmXVuN1c}wVGd00KryL_t(Y$L&;2Z__{!UDraEe5#|6N<}PkKUW7Yd9CnLvYo zL9!*vgcz?U99^_#XXS^hvm`sM&a}`+Iqb@Pn^JmwvWD8uB_Ut}lZ{HH5;SNu8f_LX z!SJF}dWtGJymXlCwayw9`+Y%9U`51lSMy5;EpssPX&~u^`09~vkF7BKGN#T4alM|O zkXO3*uCO|3V?-%(Y@lC!ap}+Yiz@?v_ipMR58ZWv$)iyaz5Kpx*}VA{MC~9BSG?|d zyn+a diff --git a/graphics/pokemon/archeops/overworld.png b/graphics/pokemon/archeops/overworld.png index 8a8a23a4edf76796cc9f60309c83f8d5dafdbdb4..6d8faa6597a22dedaab3857e7c9e9db3e8232bfd 100644 GIT binary patch delta 922 zcmV;L17-ZD2-gRY7#0Wv0001UMu)cm0004VQb$4nuFf3kks&sJUP(kjR9J=WSnYD- zAPfx12yFTNpZ8YaU<{&Z&bf~tWjd2KuxNKBWYfpvXZ-u&+`AK>#oryyPYFzCK8e3Q zoTtT{SZE~RMpvB=Y~ne53vY6ICwVR=vKTO>*l*+3bsfHo!BoH@d<$JCJ6JH&k;R$$pDFF4;$>$A!Sm;k;3h*&X0EN?G{3Y?a z2aczxg)mUA9pS`Rhu^~Y0y6(De;|d-kjPwtgvQ|@Lwp~d91e;b<_`SR;R#+hP!?_| zuiCz_gi89Z^PrxRP_PA{?}7qVhe*R;Dgf~jUQlD(f={^w_%@!Do_qGH$I7~JkgEBZ5m^Zs*!+)qUOo(@(RMC*Z zV&T)_*gLH8wLg@>g@Nnv;c&RG|B62Z4EVE43Qze%K;D-VB)IV*@4Zxq#g8?PHbXE^ ze~5WJqux_>m?n7e)-o9IwM&Y1{5t{8p-54)<0)!?95%WPW5tGc8RCXnLxJNeV201t z6KKHKE~%-JXuL@j0im2NoHenQK)}B14;g(P@gw?^4<5ZLy7Hjv`uypzjgMIY=`S7r z*(DGA-B{zN0?dn*ff8un_p$ztC#~Z}8!;{H%qMN@u!+Y4#pjOM;cJ&X`p;P7MZq&~ z)_ie)ct0E-tnY?BngI>mIP(z@-vB^1a-Pmk= zb7O1q{f#ZxkP0ySd|5KSC3OVS_`cWPnVoNWa%d@cE-ye4!`qK{ojQ?)@0@kG^-VUGafHRqeYt&Ph092>KhHJ8m?XxQv+*)+Y zAJrp|_d`}<$Jv^1Ab5Po_ult?cSi#7{|{&z1LxuRy-~B@HF!V#eu1a@{?V!;aO8ho z&DA*iRz8Jq$wj>~ANAN*_rXt!Ao)e&RO8`5;!DW_+ji^i>a|^8JqyQj&WkMd@4(SC zdwq-l(SB3jE~TbAY`fAC8pt^)OQxrH;5%uO`Cu-F`>jYghtn-ny(AEh41uj=x^V|S zOp~))0>Sd;`OSDJbAOA|O4yZS&O5il&^!P|D zyAm%QD;zpEYt!Dv+*(1a(V!BrHZji6jS@|AH{QvD18-K%fb9m(j!C_#@xp(x!fT@( zACn7J(83ABq3Te6bJQ^eoYsUDj@WG6tO)klReHj5!LWeCc8(clWL6QvDc>`!OD9S( zAk;ImbJ~n?hiulA30xE6G)Sjn;5gxq@l5GcN=S!#72(oJ>RUX4NmB|SdiiM%fE@BF zldb79A}h=Z0?Z@yL{mB5=Z=462b}h`+u;ITDimRM_48{h;t8mxAU=1P!;$L36L#US zyd@LZbAwKw;z&}~mJ7%I3a?GBqmD;tHxxZV(;+_nQ?HOp!0BDKRSJ&_!`;dNC-9x$ z>EJiJV&Hfo;5telenM&AL4p&V;rJ}{X6h&^O2qqhLkvay=IejDswICe{Gs>7SKSfc zx#A^MI&k0CJI_$e~2*Jama`eIYy>XwT2Rr_F Z;y?5OTMg diff --git a/graphics/pokemon/basculin/blue_striped/overworld.png b/graphics/pokemon/basculin/blue_striped/overworld.png index b8f0a345838b41119688d4484ba889fa38f43ff5..b900662eaf1bb01d1d1b1c3062386a681999c7bf 100644 GIT binary patch delta 594 zcmV-Y0#V?!Ilty{Nl{ZEP)BS=4&xTAGMe0UYC zB2pjjgw9AkJqbMk!#zV|=K@;wQYXU!44Fo{71p>6FKuDl?5a>}3@! zQm|P(-q$B=kyZXBuluurz0P- z{ET5R?>QH)42Sq~o)U+@@~4!R`Cr`R$86R1HrT4!Ot^7>;C8RYycgnzM;V7qHe3C` z(P+ape|Z`#!~Ea4$-fmb*mf9%zb0P?1swQ!0l03eDu-n<1$^;_F=bnT7(|ocFN?up z0S9glD_G*ULAC}Rj`lTbdR6~tg9olM1;QX6QiHM)2l>}rTfk3)Y#ZQltS&FNzWkd4 zj(kuc)`u^D%!rH{=pg@^_gBn1<2-19%dxz8)D9%F20b3AR$0Hw`nB3$3XjV^mmCtt zW{sGzQLm1BY-|%bNhWq#D g{MM~oxBfBx0oE8CVDvQL=Kufz07*qoM6N<$f<444X#fBK delta 622 zcmV-!0+IcW1*!#*7zqRe0002CwraMKE;D~YNkl(J%niavB#KN^RzWuCb5qK^+6*Njl)6x=>69sEtzlSqXn? z7#MHT0iVBfP&}ke8(e571U?1#6hqW6h4sb#J zFcFyUXdz@*?%mwG_|4+I6~{K4cTp3{{N<%!@BEerjOXHjH#+43AHKx__<~*28|Ebe zOOE%^4rB8&ehy`xQ6d6PZk@XGdXAHT_fahp0l+(32xndfTWmUKQ~WL#E*XCz@g

    -BEFx%wx$T{vN0ruypI40#-Xu70D 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 TYDSIc00000NkvXXu0mjf<@Jto delta 975 zcmV;=12Fv52H6LY7=Hu<0002CwraKj0004VQb$4nuFf3k00004XF*Lt006O%3;baP z0000jP)t-sn9!hTP%w~qP)8vdsEAkq007{~SYu;j?Cka?B_^nlK)I~Ffr^2)zsI=1 z$VKS~p#T5?32;bRa{vGi!vFvd!vV){sAK>D12suRK~zY`?SEB0Z`42#HL@HjUDn1c zAeGmb>yXZC`IQb=)#&)Y+?g6fdufvuskbi(fw`94O_wCWk3igMj%y^#0wCiAOJ*YXgN8BoMOLP z$lt)W?+Nk<>042nq~tA9v_lC{;yFkFAPY54azc=vNdnQ9kk0CEj!p`tC zAb*siQyTsR7`?MZ&F4)f5f%tmr@viu=}ZZXq?C0^{U^sDWoq7<31@_&GqZ;00m(^_bc!;}2!&?CoJE-5dhtETNv@wa2|~O&F>dE;soq-?kon!b zOA~F7WkeBFe5dYVV-OrpM)9F;-NBxPTS&mF&dzyb46+p61iw|iOg;ISZvf3fbH422 x56GDr!&(ISXI=tFG-E__&XoT;$~(9$>n}^A+6sPVzUKe{002ovPDHLkV1g>Ix6}Xt diff --git a/graphics/pokemon/krookodile/overworld_normal.pal b/graphics/pokemon/krookodile/overworld_normal.pal index 04d2244669..e416936398 100644 --- a/graphics/pokemon/krookodile/overworld_normal.pal +++ b/graphics/pokemon/krookodile/overworld_normal.pal @@ -10,8 +10,8 @@ JASC-PAL 25 25 33 99 99 99 236 236 246 -99 99 99 -185 172 189 +35 35 35 +152 142 156 38 37 38 129 138 129 182 191 199 diff --git a/graphics/pokemon/krookodile/overworld_shiny.pal b/graphics/pokemon/krookodile/overworld_shiny.pal index 070a0a4e5d..c89ebe28de 100644 --- a/graphics/pokemon/krookodile/overworld_shiny.pal +++ b/graphics/pokemon/krookodile/overworld_shiny.pal @@ -8,10 +8,10 @@ JASC-PAL 168 136 88 0 0 0 224 200 88 -99 99 99 +48 48 48 236 236 246 168 144 64 -185 172 189 +122 94 0 38 37 38 129 138 129 182 191 199 diff --git a/graphics/pokemon/lillipup/overworld_shiny.pal b/graphics/pokemon/lillipup/overworld_shiny.pal index 63bbc81935..ffdd1a31f2 100644 --- a/graphics/pokemon/lillipup/overworld_shiny.pal +++ b/graphics/pokemon/lillipup/overworld_shiny.pal @@ -2,11 +2,11 @@ JASC-PAL 0100 16 152 208 160 -104 72 16 -96 72 24 +97 62 1 +171 105 39 184 128 72 -232 176 88 0 0 0 +224 169 81 240 216 152 88 88 88 232 232 248 diff --git a/graphics/pokemon/sawsbuck/summer/overworld.png b/graphics/pokemon/sawsbuck/summer/overworld.png index 7bb026e55df07b9ba2b6361942afc594924c0289..1926a5f07112089536c67e498745c2eee671d82e 100644 GIT binary patch delta 664 zcmV;J0%!fD1KVB8uc$R1tct|5Ik zMzL6T>weEa1&q(ulq8wSPeeH}C@Dt$i<)6&ilZUPmVXEse>zM65zY*1N!FrGDTSbP z-o3to7rqfN{^AgSAi|l!p%{(YByrX%Zy8R$6)?X1A;dW|I3`xg)|~WXGe=MU00PFB z34kteX3!L+NUe4S+r;2dz<3A+qbr;kwD!sEKg^MU@lb|9ugE^(%-}f7z|I2 zGOYUH7-4ScFoO;3F@%q3y{kjJ{*8yW41UkmU(X`FVE-;Z4IW*E2QI+p`iiDMxQ{?C zC0nS$$=)Xl<4bkSMSOrN8P~MU!r2HR*U?pfGU!+9idC!fR&=fDUk@vr3xv`wkM$=r%Rc)%=#363y zz*GGXh2rmyKVR=)JeKhT6EbYiHaGtQhLD#hJJ3yxX-&z zuhLI3qcMqL149EYjjN65wox%Jjb?w{mj+0zF;;b0xgDQxS?F|AA2k~n8sJ5}-_~Ew z?ll4YH>PgGB4#w7>*MZxGISI0{doVA1%!dHcLSqN?Rc~m_gbfG-L0elbV#e#~gRQhWy*QyC1Lg-F5C*!3Vk?N7M%I7I-KL5e zdb@8QM_zy*2<45v>2QBy?N^&p%x*(O{H+NCq1+|jTUAzG|9WQKM74++(5}~3uz)ad zo0@XNy)+}{{?y$QcGE%w9F}*SXlFAXh+9fWEAEuI`(&#-yNlWdq?07=H)@0001UMu)cm0004VQb$4nuFf3k0000mP)t-sfY9g+VkdKO zIT)Nu`1tq;5D=Wzob0U?bEIzdmt39tKk*Yk@wdboLa3)W zJO3Z!MD(Y>3jdinw|y6VVc)k~17ilo80Er=GqQjA09O)GIHnRG7$1Ej{ZqzA;y~a7 z>}1fe#+idh#<{J~7xs0af65SvLxFSnIM7&Abae5Ny{BtDbXS8zXLI7-DB-e{qW*AR9s;W##2f4^U>?^fP3gNOH?{8`np zKD);-?q>`rL>xG1Sr!~LfD{-7)$$Ee&$i4!>)0&#Pq2IMWp;S^XL=;;xa4z+@YoO?si-FuFF) z83wl6XRmj+OES*8=#XIy{uh}x@7nS}AhZJY7}&FB#Bw3zUIl1icA z7$$!iS${JC<*F}dUNL$VYnZs6ngD&ToOSD|I+Dgsn`Z9teP7{oOE_rV_f{X{n0L%5 z^%jZQV`Lml9>U19A+Uj5DsWxZeMlBJu;&~tYiYI@t*Ee0aH-Ik!H`H~fw?5u4Pgvr z2vwhx)%j7_v{{eqF2tDp5`C=B=@1;BLk1vJ34a3pQuNtH(7>`QD?-h$GfDln*$r;H zF!O-5O1-*@&lz5B7CescA14}^f6)UFSBPyZ16P~f;HC>DA>jE}NuizolduWn8}815 zf-M0V5qnDD)nyGHJ|mbeq?l!|fjs`C;8ZZqjnpuVzNH4=@OlFZrrv;$(UVsl(sbE{ zhkrGMqT6;MMW31Bar5BM)!d30&%R~oHMqnp814;R@WNTJ2A1d-&hF=1t9J9nmw+!M ztc}bJc-G?FL@!ASJWGcwhMu52T}VV>cKRCv21t6n0uP*Bd{^4p2Pr~}?*S4FE(&p@ zLw-D0t5B`OWEjc--=K17@%q5i6(Cjoj(@<9sw^#(7f-Qh0}UQxj|&OG$wPKP#*fuN zhM_aWTRhLg6(zfo1x8b$7Oyq#^jD*$LD+71V(1dHEAN9Sy!ksg zEQGw&3D-v_TXy#LPtAShux^!ub?m`5S+=K{a@;C~X$K6_Wf3$Le-qa+Ln lZbYb8N5(IFH1NL~{{atvHt$n(>Q(>%002ovPDHLkV1f&>^5p;k delta 1092 zcmV-K1iSmR2+atP7=Hu<0002CwraKj0004VQb$4nuFf3k00004XF*Lt006O%3;baP z0000aP)t-sfY9hDNN8trH$Zrp&)35T4i2d3Xt}R7V5V0nI55;902rJ~RHdGV00009 za7bBm000id000id0mpBsWB>pIvPnciR7l6|luvKlHWs zlFm2dD)ZVjlE6K~!<0jl#WAs^em(Ea#b1`j0EvT^U8fDj8h9Xai^x14)| zHn_{NZ%`ubF;wJ8&KuqK1hnaLwUkoLx9kgeIqk?rynoINwyx!TIpt{<=a9#6{`Yg) zNPJH~h(|=hs;2WT`vO*~qf(m2&OptT5;Uf;gv%E{-28rI`;~Y{u=hhhZ(tJnD~J@7 zNU4oIxUQIkLv?YI(778pO|ym&)S+@dhsa5t8)q#~=u{0=WEX&18s{k0h9XIpQ~O5J zLEI3q3x72z_%lfD7x!KT1#5YNH5lbP2Bk)E_Vedhm_xlt5Ed1?Py?QcKW~$DMYz-X?y0M#pOE6r8qYbzH z@N1Y<$7MpR8QW0HZ1dOqA(mgvZ1> zVt)#Lxt+M?6X6*C@8H3C*yZBb_Pax+5iF;a!WWo10}M!sV9sD5BXh)ch?);(kC|mq zCI#n%0e@pR9ZyQ41#6I2pGWyNBFxhEa#O}v_f6*=GCWl^YYh^S{in^-PY zVn?t&1=(p>@d;{NEQEb>x6F`ew5uO&UuZn{7s5Yx!O*{=5c&rz7E diff --git a/graphics/pokemon/serperior/overworld_normal.pal b/graphics/pokemon/serperior/overworld_normal.pal index 3733e903b2..6600b8af88 100644 --- a/graphics/pokemon/serperior/overworld_normal.pal +++ b/graphics/pokemon/serperior/overworld_normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 128 208 232 12 98 39 -106 115 57 +115 112 57 24 156 74 -236 173 21 +248 248 248 8 16 16 156 213 156 236 173 21 115 164 115 -12 98 39 -236 173 21 +5 59 26 +248 128 0 24 156 74 -0 0 0 -0 0 0 -0 0 0 +208 152 8 +12 98 39 +5 59 26 0 0 0 diff --git a/graphics/pokemon/serperior/overworld_shiny.pal b/graphics/pokemon/serperior/overworld_shiny.pal index eafc2d1fda..2a03f663f2 100644 --- a/graphics/pokemon/serperior/overworld_shiny.pal +++ b/graphics/pokemon/serperior/overworld_shiny.pal @@ -8,12 +8,12 @@ JASC-PAL 207 215 195 7 14 14 168 232 104 -185 175 53 +224 248 152 96 166 87 -40 56 48 -212 33 0 +40 48 56 +248 64 24 24 156 74 -0 0 0 -0 0 0 -0 0 0 +184 179 114 +43 99 64 +0 72 40 0 0 0 diff --git a/graphics/pokemon/servine/overworld.png b/graphics/pokemon/servine/overworld.png index b329b478379cf996f25e9d060fe5b6273b4e3b35..5c9caeec8c853772c2b0dea604a97cd6596b0fa1 100644 GIT binary patch delta 608 zcmV-m0-ycH1nmTn7=H)@0001UMu)cm0004VQb$4nuFf3k0000mP)t-sn9!gOQY78O zNh!rjACor#00516F#GezZa@^l!IM8(Ke$LB000000000000000#MCK|0005&NklC*2t{iJS)Bj>-@T~wvMbWM50h+4n`V+j@uEVV<9~SUvBw^J?6Lo3>C-%| zJwkr|k>@}1bL|lE&nAG`UFwUtc@WWJjbfg2-sNnNe1Q?S_>|4a^9gw-vU`iyybd1m zK0r5LK*+H|TfA0HtKboD#unUe;yrHh`{ORJ+VqJ!0weww$dokU=_L?x(+7q3c@;?{ z41t3szQxA?`hOBql9xIHB98ioKvepDZVF#ts$+H2&qa#(7y&CKs&zj81&$_Z*A8b9 zdFw;Fv^;O|?xbSoOz;KX>ui;P&zV)Vl!BiGzh57Wh#v-ujyAc?0Y++8?mr79;&3R8z_^;{WPgAQ+&UEPam%obF4^+D%a4NI z#L&l_j_DS-z;hz2uPx4}Rk$fkr2Jc7#M?nj89U88aD|+>ot4=6+y|VCWoKt4(pjH~ zxarG+kA=)C{0b+VV6rKmDvUTw>gP2_U&LE?ZGAq^|1?A#Tg#3*WPN5Tz8B51|5LnisD(4>!Ke67sAruENKB_O9_b uzO3HH>ygJ8WCLB|p;H)OzB?cLpnU@-FBBX$peQ{60000~gj delta 569 zcmV-90>=IA1jYoA7=Hu<0002CwraKj0004VQb$4nuFf3k00004XF*Lt006O%3;baP z0000RP)t-sn9!gOQY78ONh!rjACor#00516F#GezZa@@6rMO7|000SaNLh0L01m?d z01m?e$8V@)0005BNklilx5pSOw5sWOK&5<_Gj6vhRlD}Yrd1%$%B*sjv5w_7%OiV; zwFOPj1J~kMU4I=e^PE*Szx{nU$4ZBK-}310)o!TF>V1PpTS`g43~XIhk9LEk>VK_3ys{ZCQ7eUiaX2k<0006z0Br41}%e4dMNtcPF8;C`}^P-CstJNBD+mlD43i%YQe%F&-hjdh)Lf1|!5P z5$#Uk=o){=523^N`3)N!GCEm2-D1vVJ1jZJ+ituNJ3NL@8f->~;=BC0K%7ZAHNoYA z?`YWxK5lT=6?!hd%byA)X%G(p0o#j)UgqNly9CwZEKZ?ysQE(@=mZ}(xaU{&;w-*) zD6s$oq=Urc<9`NCR;yZ^&80($1r`2BiN`m=nxJl=@l`~zs>Rt{I+TcNtb|o|ka&C( zaDtYB#yL{WVEP1@oY_i~H#&UzHkLzg^0Zhs*2GfjZgRJ(h?=CIod_<&CF zCYU+Jc~%W{jv9G|O>nP4DZt>;m(8G%9G>7!5GqofF@j>C^EE+Kh4u!ufTDA05Tc^J za;NJx(BL9q>pHI^^b9P{67CF(x?8~J(hlP7#cviIm$1d}0(NgBbPZH42}bS_*QgW_ zi^<_HihmN-4%i&G8R@Q`fya4X&>r=doWmhlutXQbz~&IhZPGAsxa6m~%RFKg=y+N9 z89~d^*LYk~z=O)jz~gk>+mAd$pi;gVPioRM9!DhnR?I1>L%2M*zdeS)pdq%GWp54P z30#Bg4KFW49n0m0g;(IXL5O4}=oQG`WcYjejW!$LAG5Uu+ya9b82z#H`+$KL!7lKX j%Z>d0!QdO;_;~yPiccdgi)=zY00000NkvXXu0mjfXFx{9 delta 774 zcmV+h1Nr>P1(F7k7=Hu<0002CwraKj0016POjJdf(4Zl3fk;Lc2L}f~q~ohx8UMcp zC@3hvz{@Y2KeTfmzyJUOuSrBfRCt{2RZUYGK@jcD6yb_Q@1cmL$I$_2b0ijqqaVm0 zz+E{~PGWDaqU`Vs0{=F>eC+m&yH<`K>;voL^?R>-b|?Wp>VF+n(8&MXTYt3G8VJ>D zl<`4R$u&}^d;b^kBNz0t$Nn&$X3xjFVWW%>`WN@vvmW<*6@$`rJieO?)<&W=x}*je zUA0SjI6a5}B-Em&%nhYb-*|x5EZ!4zhH(U1*5bQisiEj!#FxUrDDI!<1DnUY8@`V2 z7V*A7G!NDRQGfGGDGw*KVur6;vIxlc-C*SLo`4J^fu@#s_=dFNrA9g0ZI})GJ7$PH zERXjEC#_pyXSKY;=V`?Z-)=X|Dtw6;qWdu5@tGjBg`hKx)bp&Hcld_1;*CZ%Vy~d{ z!cGL>^IY-xOb`wVfl#BlI-B1ps4!IB$yiMym5(?XcYoQ5(23c2!~>Ul#C$hz~QU5Y)}KL6}k=P=-g;a4hxq zn=NGXtnkmW7|0iBwQ1PteO?&7_=~Gl?JPEs1)yCmQ+6V*ppK}s292ha2Sk%BR@NYH zJvVU50)Oy(ifjW7=H)@0001UMu)cm0004VQb$4nuFf3k0000mP)t-sn9!gASO5Tz z2LJ#709XM3;xfgZ0AN5Mzqn_=xM%JDqUh-OxL6?n;xfgZ0PX&wIY+B$00057NklO>2@PlH2(?^M~ka3T;n}L;ZypG$Vo&&RDVdv?UcVt13?hR=hz}` zZVoIggq;wzlFJ=vOry`B1Y1ckwqlB?q{&%CEK?{cHHC3o!OAzVw6OIFYHuHs(+3Gf)DlrDsI?-fNg1qs94WnyFx5*_KC)PK*j2Y2Jf?x>ru5zd5=%1 z?^Cm$!9=LJUK6GPN2a@6E7*XKo6ec*W`n{pk0#vhQ~L%cvt6+hz;=`~SNApmwH_z7 zZz)XK)=ENMe#S0G_~i~T<;w7&7DBowWzNqEjBS;T8GmvEm$L&@`GodtZ)_O%dkdT) zw|Q!gw_q|qXevB%wkO8l+2kb3YqEH9jGzm^h!sngYT0)iPF{67egA)xfzlJQ>QbU~!lT zwhv#hZCh|IC(=*#Wgw_lD-lP~Z8iCL)X}lfm$cBURub@WSn2CfG@vpN21X96S4R$O wF9MGS;IQ*wgOU!hGwkvgy|Vz9|7-!g0b*Tq^;Z@+Gynhq07*qoM6N<$g7-)hp#T5? diff --git a/graphics/pokemon/swoobat/overworld.png b/graphics/pokemon/swoobat/overworld.png index ad665f8346656559d227e7c1987ad8a9f34e74a3..4648f80f6381e48b7362fe6e07fc1384f1b769a7 100644 GIT binary patch delta 765 zcmVY4})P0-hDjY_O`eEDs%4N;@>4Z@0U)W;sD>m zm*!x-IT`v8JbnWQvX}8sPcKd?NGV+##CUCRFRKI;Zt}ff^A$eicch0SPnHn^*y^R6 zD+fJ<(<$+4A4B1P6Fw!lXQsN1%=8lCvfgAr}z81I^(3gL4aef4s5A9$IsPG@=D}hs{8OYf2 z1s5NT=7gj%fw_S85u~$2xJOLB!l$tjv&;ZuBeg5V;|B+Sa3M(Kt!z2~@{a!OQJ=;p z{>MG6dH^KZQ8Hv(HTu#0#`^-4z~&540UJL}fJH8UQ z=HJi219y0TLI#I)0JQx^c{CwV81UT5o*;i3eo8%_M*fi>WoYvoyx}W>c?PgrD-m_6 zOPE8X4lVmOJSr%Kh*($(jNSIf)u!+~T$9ML=_6k@U*SFf6gct(<0!CJ5yl2Mf<%f< z*-@7n&sqw6<7q5_`9V~KFymkN$QOYfpAOmrA5Fr4H-(u!n*%xIINowny1Q|Q=7Wl2 zOD9bECvNgZ8#fjB7!C?EeH%n#)4L7~9(*g(Oeq|*^{PYTRkkJn#7+J~YMcq2>TvTx z%qqa_cy`?2AlEu-9MLL(rflDq{1Z3%d6e?u!md{*Jyjp zB&GD29iqJmu@1=~^TY`j;=ddaF>-mf*#2-mi%RsiE2p4G)rz|kg#uH5|s`hPD+uz+rI?@hXIRfs$|O`FSmQ zRUV-76H810WbvFBDu+zPO1`BBE<%4^HEe}6^)BB4YMKp#P&J6b9~*?RE4XI7WP5g% z(s-Z9fQKjR9x81DaQ;St7bY3|_S3gcS4GsurjgI|B6;f84t zNDj1r-S_?WqVbYbpC5mmpoNezbqDar!?;8#A?Y0e5-!pRht$e(>And*lR-Gj5N7i>IO zb+L6IJb)7Yt4tak5%Rz^Ad-m*IC}Rj>jfJRASv4YLPjHE4?z9^sTyjakzyKYpZ}Eg z32QG$t$-+ly!gjZPi-iMdRD_3US@p4(CPxMe>Z+cWGcWey;Qq_b4fBjVR%y)$QtAZ w1+1+k8&NfYS)Z`wZ(8IX6};h($ diff --git a/graphics/pokemon/swoobat/overworld_shiny.pal b/graphics/pokemon/swoobat/overworld_shiny.pal index 84b110886f..8a3678398f 100644 --- a/graphics/pokemon/swoobat/overworld_shiny.pal +++ b/graphics/pokemon/swoobat/overworld_shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 104 48 152 -72 32 0 +87 48 2 248 192 48 232 144 16 1 1 1 198 217 180 -198 217 180 -72 32 0 +136 192 120 +41 18 0 96 48 16 -167 89 102 -198 217 180 -167 89 102 +144 72 112 198 217 180 +106 48 87 +248 160 232 198 217 180 1 1 1 0 0 0 diff --git a/graphics/pokemon/throh/overworld.png b/graphics/pokemon/throh/overworld.png index dabd0d8ebadc6f8e5cd8519f7449b8ef1a8feeea..69b2fef48608c0d6928889e742706597412a8410 100644 GIT binary patch delta 860 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 delta 576 zcmV-G0>Ax*1?U8j7&in10002CwraKj0004VQb$4nuFf3k00004XF*Lt006O%3;baP z0000dP)t-sn9!gL3k!TWNRdAte_FUJ`v3p{32;bRa{vGi!vFvd!vV){sAK>D0m?~4 zK~zY`?bN+$<3JDq;N2~*-nDLp2`TgwL9UdAAHXJg0If5m-k5WhMmFN=1Pm?{Lcnz@ zCv~_7xF^f#4y=`;Q3BVb@Dze??U~uxMPi3I#32sxb%F;h>@nXzy8Vd;eF6oV3c?9omUtyEzU_9EfD5oHXy1=+(+A2LE`Px+-Tju`{`y=M|&pgZA^uP9<_h@lEm>#lNwWaj8Ieow%=<5exhuB$`!~sL<70%)+8=kxS|z_`F!lz?LzsrcMHzSi O0000g7zqdi0001UMu)eNF&hyt008P=0026d000+od=1R9J=Wm)ml~APht;0e0g4|NnMZkhEh!O5)D+#cI=f=3ukBnk>s@mtA(*WtUxc z+25FmE-LadC&ZG^`8g9wIcv^oA~E7vkrRHL00jJ;Nz#TcUu}Bk3bnCZ>I2KS`;-r$}!(ZUYjCDs5CL7y4>*Y1h3~f-DA+UdJ+n`$_ z4t38dl}8EkIc6N?AvS7@Ouw|&UP68jjlS-TAS935WxyR`tzp++KJ z_b9hQH*aO)fX5}*uyD{a#(fWYToBwF^)-R5M&wog6nICH?v4Xfg^#@z zR`~KPkzd0);%yI17p^Ij_l1AYIpR}|j*JGS%h{aNheyL~3Hs!x&LZAct<;A_>%;+{ zTY1>adVJnUN$97B|pYB6Kmz_8Q*)lIEHu}e|yDn z(k%lKwggZ03zH)!oivL$B=Yjh6PW`M;s(Y|OYY1)c(hDp=9~s4^AnsJFTS-+yeT_j zi`bI0JpHevXZ}Cw&*b#3bba;R*YVtGs{7N}nqoem{Zo}`dVaRgE32#-zuW>%{w>~| zwz+d_Oj_;cXB`R~<~=glIcoUZ#CZY?oTH)7IP^;W>eiEVUjKuZgzHTUGDX zeARDq;p9adcjZORGc;XW5~G=1c%@~^{xIFVvggjewvl|>Pkrjq^x7`y_VT;Ddwo{? z{5v%}In!ijpYy-IP0x7UzO{Gz7HYn^Z5@95#y+`kn{Ki5CS6|2$jEB;c-htOZ;!Dr zs+6vJ75pIoyKpA$REi=Jl_$ zHa`1Ov#i;=Xrq72@dTz88>bod#dG(ax@6DL_;Bik7c*51x_0lhGw}R9!C8<`)MX5lF!N|bKNY}tn*U%`$$jHjr#LC1_+rYxgz<_yH iv>8wbLPKtTN@iLmZVg4pA9n#YFnGH9xvX?WedY;0_7Y;1fEEFE7AYaJahSphI(%{qa9 z<*j#)Ka(0E1e6&>C<)Ld0L5hwuT`M)FZ8+o1l55B3?Yat^8Y0Ps~D}kqObFB^sOt9 z4Um0wh@t^DhENlKNWc3?>HzuBNQ0?dy1J%8J7l8HN zx`Sh&FGKp2S;L3U0_IF}NIvJ?Sp*iyJe@9-5CI~UPAZpw+<=@PEl?a#UH&-FlVj*_ zLp}=|zMp`^r|c3?+AOTE5VwKI^>d@e2HXRdS}7Ya_VSSmjQ$$*xj<-m5DYM%G4e&f z@Z$Apm*m|E#b;F+urz#=7DSF=3<&ZrSa}!>Kojx6Kl+mf+&Q3JULG)-KDwP~ozeoh zJRKnDr&AhNzL!|>EB$H!l-GrnTpm!~6*L7J8yg!NAA=uEZ4OgYKQIRX00007xV6onmGLW}_-b*_op zH7Ii0mEfZ8!JZMpet@b{)wvAi5g04-27STWCh<>zqDpkjSYG zo0lPqZGdhpH3(DA@*L%JTGo$V9GEo;g0AEpyk_Y?u3s zq6xOp%<74P(FH;=Z5TjKBtMmAz{h_h!Hd0ZNH#X6)K&%}^1gc|VNIB>HS^knsUT8w zZf=Pb8$SU3&5W<@GgFOaUO-T7cbl(-;4+ujIn-2|>5<9y%;QF0000WFmsfh Stku@u&B8hEKJPuTY9s`pnixL- delta 60 zcmeC#te27bwNRz_38WVanV!SFhbW PFeAaX_(H(OEEN_2CR!VT diff --git a/graphics/pokemon/zebstrika/overworld.png b/graphics/pokemon/zebstrika/overworld.png index fbe6fa8f566437b23a8deed106413bd0e9586aef..36f7228a62b4417a79039b86c8b840a70cfa2360 100644 GIT binary patch delta 916 zcmV;F18e-(2c8Fz7=H)@0001UMu)cm0004VQb$4nuFf3k0000mP)t-sn9!g(K|viU zDfIRC%*@OO2L~7+AO{Brq@<)dK|yeEaCE3&_}~BlsMrSw2LJ#7t-w?z0009VNkl>5*PTXuV^3N^6wqcGF7<1e=TszRn5CVHyurxah0jUz`hc{ zZFul5(8iM&TuHfzV=esk8Hd2itV6%o_$iQX0x5A|&XouP4FV}~Am>_2)$27=xWIR_ zt5o|*7Tz`qh$b^UbXIw=&1f~&~;-f%w!pI$%a^;&qP8>+NMo?f$`7iK6AqfNu zWfK?NYhm;lE;UKPjB|rRVs&wkx&ZZyM3fz}0D>cE^kRf0f#W;K*>E>yZkktnir zqg&v^0_CFANG~N3u;Qrh0)eC{hXcjW90K(sP*_~Lynj;Kq2;9bZ6Cc}uHe^8ngVlf ziVQ)c{mRQKaF3O^VpM z1Fzgw8KEU<$nz#Q(*?F7MdVco&PYOvkSCXc1$PuD1PU7MFvo%;0%9i)g&G--(Tayb z<}-!HxPPAw(#{K@M-n<^Dqzlm;X(AgVUB?lEA;z`LsN*9P}m~b(RO+aG{eZB))fEQ zc>xFViGUeL^;X1K8S_RV>RhFbIRK*D1RV!cP^F=zo zpqiv$rS1R^IhWSA9@R>5b5kwH4b~mEj&sz8fJTO0H##7((isuMIgy2-8*c!ioW&+qA zpMPKQ2oFx1{Pm9mzGlYVyw<9Rf8ct&7u@C&hMFV z*Q|cnSRGwP)Z<%E?kUG-O$E$skNU(xkhjdZt@-k3A1$Q)+aY>i=2LQ?u%$QI$CPts qbaOu)ZKI#|!+H5u^Rs_!e*i&49Da->lnspl0000pIJV``BR7l6|mcMV>KorMqq<_P!pKWTyR68IlIvqAm zmCXSf$&-KJqNEF?YRE_uQb*ZPn^LKBQdOOt5Vh)7sg)w-pQ|AT-a#FyONXitB=qt5 zzTdldckkf-$N%_iA;zCnW}7(vj|Dg`L-}ed^A@Y6h^zWM<>`HVuK}T~nEx9CQq9yD zrab1LSIw-ya(_~|#Tt;hx}q<RlfwSf?Q=W>;aHAKad)PgyLL0MW93;%s7e8RVNovOR zbj)(@){+N~?{5SSzYsjHeP#?;&U$O+;d9IbLr?fL_xVQNv|4n-n2cG7wr_`KF;|zb z43J^gVSoQSz1c$oOHA}NQ)d>rXw3N7`w6yGX~Z$fkq|s~l}I1Q*p%yyWVN&F5UEd) z!4e;hie~txk9c5~6Fv?=g2H+jj+?>Mzy%Gi!tk`=5W}8z7`}dRfCZNLL_KI~dBjk% z!i0q|aIM0I1r?>?#B&Ib0|lVNON^}^uPR{8PW49M3nT*dCA{@i{q?BZ?O?S=dJWGl7y?nA_SFEAGd-lXmcn#$YB z-R6}iUmUv~ZjUJyoyntl@P=VA7oh@mV}8vD@6RSbCnH`=-YJi`lZT8!ufr7?0devO zu`M2A-t89}^Y?}JG#g}5OWJMjn90y2mPQ2FMrABAhP{q5o*NwAWkXmbrCsI@R}7W} v*hZdTuJEw Date: Fri, 23 Aug 2024 18:21:40 +0200 Subject: [PATCH 5/8] add missing break for poison puppeteer (#5243) --- src/battle_util.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/battle_util.c b/src/battle_util.c index c2e05cbd4e..2935afc1ff 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -6028,6 +6028,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 gBattlescriptCurrInstr = BattleScript_AbilityStatusEffect; effect++; } + break; } break; case ABILITYEFFECT_MOVE_END_OTHER: // Abilities that activate on *another* battler's moveend: Dancer, Soul-Heart, Receiver, Symbiosis From 85fe398b5080d584254104c49f177708d71a5171 Mon Sep 17 00:00:00 2001 From: PhallenTree <168426989+PhallenTree@users.noreply.github.com> Date: Sat, 24 Aug 2024 13:28:24 +0100 Subject: [PATCH 6/8] Fix Starting Status being passed on to future wild battles (#5248) --- src/battle_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_main.c b/src/battle_main.c index cba22fa5ef..ad7f877fd9 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3755,7 +3755,7 @@ static void DoBattleIntro(void) gBattleStruct->startingStatus = GetTrainerStartingStatusFromId(gTrainerBattleOpponent_B); gBattleStruct->startingStatusTimer = 0; // infinite } - else if (GetTrainerStartingStatusFromId(gTrainerBattleOpponent_A)) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && GetTrainerStartingStatusFromId(gTrainerBattleOpponent_A)) { gBattleStruct->startingStatus = GetTrainerStartingStatusFromId(gTrainerBattleOpponent_A); gBattleStruct->startingStatusTimer = 0; // infinite From 2fed75f7c5a1d9744b5f7815f5cf6c6a014be4ac Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Sat, 24 Aug 2024 09:53:19 -0500 Subject: [PATCH 7/8] Adaptability, Aerilate, Aftermath tests (#5242) * Adaptability, Aerilate, Aftermath tests * Update test/battle/ability/aerilate.c Co-authored-by: Eduardo Quezada --------- Co-authored-by: Eduardo Quezada --- src/battle_main.c | 4 +++- test/battle/ability/adaptability.c | 20 +++++++++++++++++++- test/battle/ability/aerilate.c | 25 ++++++++++++++++++++++++- test/battle/ability/aftermath.c | 20 +++++++++++++++++++- 4 files changed, 65 insertions(+), 4 deletions(-) diff --git a/src/battle_main.c b/src/battle_main.c index ad7f877fd9..4165dea20d 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -5746,8 +5746,10 @@ bool32 TrySetAteType(u32 move, u32 battlerAtk, u32 attackerAbility) break; case EFFECT_HIDDEN_POWER: case EFFECT_WEATHER_BALL: - case EFFECT_CHANGE_TYPE_ON_ITEM: case EFFECT_NATURAL_GIFT: + case EFFECT_CHANGE_TYPE_ON_ITEM: + case EFFECT_REVELATION_DANCE: + case EFFECT_TERRAIN_PULSE: return FALSE; } diff --git a/test/battle/ability/adaptability.c b/test/battle/ability/adaptability.c index fecdc6b7e2..4c1c8439b7 100644 --- a/test/battle/ability/adaptability.c +++ b/test/battle/ability/adaptability.c @@ -1,7 +1,25 @@ #include "global.h" #include "test/battle.h" -TO_DO_BATTLE_TEST("Adaptability increases same-type attack bonus from x1.5 to x2"); +SINGLE_BATTLE_TEST("Adaptability increases same-type attack bonus from x1.5 to x2", s16 damage) +{ + u32 ability; + PARAMETRIZE { ability = ABILITY_HYPER_CUTTER; } + PARAMETRIZE { ability = ABILITY_ADAPTABILITY; } + GIVEN { + PLAYER(SPECIES_CRAWDAUNT) { Ability(ability); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_WATER_GUN); } + } SCENE { + MESSAGE("Crawdaunt used Water Gun!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_WATER_GUN, player); + HP_BAR(opponent, captureDamage: &results[i].damage); + } FINALLY { + // The jump from 1.5x STAB to 2.0x STAB is a 1.33x boost. + EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.33), results[1].damage); + } +} SINGLE_BATTLE_TEST("(TERA) Terastallizing into a different type with Adaptability gives 2.0x STAB", s16 damage) { diff --git a/test/battle/ability/aerilate.c b/test/battle/ability/aerilate.c index 8a5f889a66..4386034a59 100644 --- a/test/battle/ability/aerilate.c +++ b/test/battle/ability/aerilate.c @@ -21,7 +21,30 @@ SINGLE_BATTLE_TEST("Aerilate turns a Normal-type move into Flying-type move") } } -TO_DO_BATTLE_TEST("Aerilate can not turn certain moves into Flying type moves"); +SINGLE_BATTLE_TEST("Aerilate can not turn certain moves into Flying type moves") +{ + u32 move; + PARAMETRIZE { move = MOVE_WEATHER_BALL; } + // PARAMETRIZE { move = MOVE_NATURAL_GIFT; } TODO: handle this case via Skill Swap + PARAMETRIZE { move = MOVE_JUDGMENT; } + PARAMETRIZE { move = MOVE_TECHNO_BLAST; } + PARAMETRIZE { move = MOVE_REVELATION_DANCE; } + PARAMETRIZE { move = MOVE_MULTI_ATTACK; } + PARAMETRIZE { move = MOVE_TERRAIN_PULSE; } + GIVEN { + PLAYER(SPECIES_MEGANIUM); + OPPONENT(SPECIES_SALAMENCE) { Item(ITEM_SALAMENCITE); } + } WHEN { + TURN { MOVE(opponent, move, gimmick: GIMMICK_MEGA); } + } SCENE { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, opponent); + ANIMATION(ANIM_TYPE_MOVE, move, opponent); + NONE_OF { + MESSAGE("It's super effective!"); + } + } +} + TO_DO_BATTLE_TEST("Aerilate boosts power of affected moves by 20% (Gen7+)"); TO_DO_BATTLE_TEST("Aerilate boosts power of affected moves by 30% (Gen6)"); diff --git a/test/battle/ability/aftermath.c b/test/battle/ability/aftermath.c index 65c0be7dfd..5cfd5ef034 100644 --- a/test/battle/ability/aftermath.c +++ b/test/battle/ability/aftermath.c @@ -1,4 +1,22 @@ #include "global.h" #include "test/battle.h" -TO_DO_BATTLE_TEST("Aftermath damages the attacker by 1/4th of its max HP if they faint the target has this ability by a contact move"); +SINGLE_BATTLE_TEST("Aftermath damages the attacker by 1/4th of its max HP if fainted by a contact move") +{ + s16 aftermathDamage; + + GIVEN { + PLAYER(SPECIES_VOLTORB) { HP(1); Ability(ABILITY_AFTERMATH); }; + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN {MOVE(opponent, MOVE_TACKLE);} + } SCENE { + MESSAGE("Foe Wobbuffet used Tackle!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent); + MESSAGE("Voltorb fainted!"); + ABILITY_POPUP(player, ABILITY_AFTERMATH); + HP_BAR(opponent, captureDamage: &aftermathDamage); + } THEN { + EXPECT_EQ(aftermathDamage, opponent->maxHP / 4); + } +} From 572972235e5c72877f20b845ebcf4b92b9a544fb Mon Sep 17 00:00:00 2001 From: hedara90 <90hedara@gmail.com> Date: Sat, 24 Aug 2024 20:22:50 +0200 Subject: [PATCH 8/8] Disguise tests (#5249) * Start new Disguise tests * Finished disguise tests --------- Co-authored-by: Hedara --- test/battle/ability/disguise.c | 39 ++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/test/battle/ability/disguise.c b/test/battle/ability/disguise.c index c4f79d8fe3..5ab2035325 100644 --- a/test/battle/ability/disguise.c +++ b/test/battle/ability/disguise.c @@ -134,3 +134,42 @@ SINGLE_BATTLE_TEST("Disguised Mimikyu is ignored by Mold Breaker") NOT ABILITY_POPUP(player, ABILITY_DISGUISE); } } + +SINGLE_BATTLE_TEST("Disguised Mimikyu's types revert back to Ghost/Fairy when Disguise is broken") +{ + GIVEN { + ASSUME(gMovesInfo[MOVE_SHADOW_CLAW].type == TYPE_GHOST); + PLAYER(SPECIES_MIMIKYU_DISGUISED) { Ability(ABILITY_DISGUISE); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, MOVE_SOAK); } + TURN { MOVE(opponent, MOVE_TACKLE); } + TURN { MOVE(opponent, MOVE_SHADOW_CLAW); } + } SCENE { + MESSAGE("Foe Wobbuffet used Soak!"); + MESSAGE("Mimikyu transformed into the Water type!"); + MESSAGE("Foe Wobbuffet used Tackle!"); + ABILITY_POPUP(player, ABILITY_DISGUISE); + MESSAGE("Foe Wobbuffet used Shadow Claw!"); + MESSAGE("It's super effective!"); + } +} + +SINGLE_BATTLE_TEST("Disguised Mimikyu blocks a move after getting Gastro Acid Batton Passed") +{ + GIVEN { + ASSUME(gMovesInfo[MOVE_BATON_PASS].effect == EFFECT_BATON_PASS); + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_MIMIKYU_DISGUISED) { Ability(ABILITY_DISGUISE); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, MOVE_GASTRO_ACID); MOVE(player, MOVE_BATON_PASS); SEND_OUT(player, 1); } + TURN { MOVE(opponent, MOVE_SHADOW_CLAW); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_GASTRO_ACID, opponent); + MESSAGE("Wobbuffet's ability was suppressed!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_BATON_PASS, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_SHADOW_CLAW, opponent); + ABILITY_POPUP(player, ABILITY_DISGUISE); + } +}