From d1261165b8e1252ab551e0b4c1e4cc98a380e1bd Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Tue, 25 May 2021 11:44:47 +0700 Subject: [PATCH 1/5] Fixes to Shroomish, Popplio, Xerneas Active and Minior Meteor --- graphics/pokemon/minior/icon.png | Bin 296 -> 330 bytes graphics/pokemon/popplio/back.png | Bin 546 -> 500 bytes graphics/pokemon/popplio/front.png | Bin 589 -> 543 bytes graphics/pokemon/popplio/normal.pal | 2 +- graphics/pokemon/shroomish/back.png | Bin 642 -> 515 bytes graphics/pokemon/xerneas/active/back.png | Bin 1226 -> 857 bytes src/pokemon_icon.c | 2 +- 7 files changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics/pokemon/minior/icon.png b/graphics/pokemon/minior/icon.png index edda34a25bfa420674afc09a5eae2dde1b23922f..1ce9b5a57ee43243ec2c90b8d674b7ad09879b45 100644 GIT binary patch delta 295 zcmV+?0oeYi0?GoAEPs1@d%eB1|NsAUbIqiz_Oydq?!}A6tSR>PDfVJglzYv^q|Lo4 zoMK{HK|w+3M6_Q3007lVL_t(IjqQ>#3IZ_@MRS7?i<1@<68U>gPjY-VAKFCS1XWN))+Kr+EV t_@NWGN`bV?OdyQ-D$!y)Vf1%}c>#0zcshe8d=&ry002ovPDHLkV1jmkg!BLa delta 260 zcmV+f0sH>S0;mFzEPsQ8bG^O2|NsBJq(S!fDb->@_LM1$d;ele&F*uY|Foo}#s6xo zoMK{HK|w)TsgPs<006T|L_t(IjqQ>#4gx_4Mdtnr03xwQVC5pUgJ}b;0~ryJSA9>{DFWPIJP^j^HUJ@s zAZ=@E2X1e(yU2se$l(qkj)xUh#$9}X-sk)gE&m#oeJRP8qR|)gBl`08WA%aVizXn) zk!jq?$pbPQW)H-K8NPhL6?F(6fdr4?Ay7?fu8su5vAfrw{h2lxg6Y`#GCMardyMVlUjiVG zySws5k%Pcp`Qi)!(k=PJVhLbGgJT0q1tdGTI1loj2MzMvl(>8ve+Hl`O#xj2(!1-M z;G7ChRR?Va`5uBOflY|X+kF7Qj>+rL2eAWAp0C0d><}+Rk1hzNkhs7v(CIlq#6IZd zZiT*g=}`vuR|qKk!4RYcB$Qd#2dM+V1FRAw>pMlFuiPzxY;2Vn2Y@-ZB`_g?RYEdM z0&rB%r&9*zFst(^G1atL_TVC-T+02rH>Y$oDUW)Xudu|fipfp zT#0!I7$R1%7Ub*HOS@B;tyW?_)q-fWy(@K+RN{LpFoT}f)De&QMo{@qmgUQJqb|~b zEc+EmiAUi81o{_LErHohs!0uWm#O|<8J39DOK1zUGpE|z7{?#S4~d3AIgO?!0{{R3 M07*qoM6N<$g1ei!Y5)KL delta 462 zcmV;<0Wtpc1EK_wBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks&^R010qNS#tmY z4#NNd4#NS*Z>VGd00DbRL_t(Y$L-X;PQx$|2XI$nAPZ{BlCU)_naK+yVvCKw@X%A($$4NjD@Gg6)LXUnxwm^w#_7Z^u4|?CO6CAPk4w`dO9& z!)^WS1OVcm{(ja0DE#1mP=Qu0D8@zr#1);aP)ZLZb2{hRQv>-Q;1Ap2Mk6AV4)30shKdgE5Z%mKu>EryYQ2WSzTVB~;A$s%5+ zvkubNC0+FkDCpAJBKQFUPF;k|z3D|eGzBr&BGRqIE*)+B0MdQ~MQ|#(bab@7Yl_hJ zE}M(=5ABfu@BVl1-aE_M=--MlmhS^V9>Ge7X5!??vY~W90PN`et&20ug-k_%9dKGb zKjtC_xUB}2~R+amHwy)ULy2>6I=}wif9abhEvK;+8-tEn@Z6a+DR$GeQkG5 zSK*}T&9itXz;FsH;^{!#w+C1^RO*aVj=N)yp@6dX6cIzL(=Tj6s0AF%)O2K13s~{o z52qh`+nRnxsF{*3W7}Uy0lG6x{9i&!-3}AKrd;)>ufdV>i+uUu zUmA*_j{3gD&~ynTE+wMScPayrBf9!dDcRt~xqu5^qyW<%HbB|Q0c>*0GFCv*vKd>Y zY)-QnVqF2i+_j;a`#@E)mU>$XUiJ$@y{RS<3IG>y`MTV`@Oo;Ilyjg-h%5c#11!8` zi&~xvTkWS4;U3REwkYaatW7QTa%l102sXC0)k zOSLO(BO)uJ^DTuiik#41S>1g8zkoFrWf|KCV(b4*@DMH)3Y%by- zk|F=!{qyeLJNB=?E6#bo4*+=tFYSNZiK7GNKxvNv*fRMWrzgyVOhprLTs=D!G6%S> zhL!$35or0xO&C@N;~w~ZX$IWzV$`RI#;9khQgzb7xbMB_6!S(qDMfhC?XK-8+%&y< zl&=I>s$j85hw`>P#JXjt?j#ksJrNj5C>yJYIbxljs0EP`a4}QURZSznlDU5$P2bEm zn|{RP*LP=MQ?nlgHJYfImMLR1SV#k=8s38+LMdhhYTDH=^B!EKKFL>i!8x-@1%blI zb_gV)6rwbDDg#g;dge}PIp8O`fCql80oy+ufU=tdIOLR7qJbiFIA5h4L9-ZPT?4?q zwV|5(K)d8EeYZ5c>=&fIQ%zbTGyopp@^N_s>G$*^rRG2pSNbJ}Sa`}7wR|16+D|ve z9g%%(QPiben_BASVo`!!Y;?_Iy$GYL^I-327MAD#>sQ3sH$~2_GcD9(oB#j-07*qo IM6N<$g89(vu>b%7 diff --git a/graphics/pokemon/popplio/normal.pal b/graphics/pokemon/popplio/normal.pal index 6656ef50b..d977d88f4 100644 --- a/graphics/pokemon/popplio/normal.pal +++ b/graphics/pokemon/popplio/normal.pal @@ -7,7 +7,7 @@ JASC-PAL 112 152 216 136 48 112 232 112 192 -248 200 232 +152 208 224 184 80 144 56 72 144 16 16 16 diff --git a/graphics/pokemon/shroomish/back.png b/graphics/pokemon/shroomish/back.png index 2aae86b83204cf16d476be6e945868ed5bf8aa66..2baed2a42ff1d9145b15f023e1fd65b7c98e3f03 100644 GIT binary patch delta 432 zcmV;h0Z;yd1%m{TB$0kRe+h6%S#tmY4#WTe4#WYKD-Ig~00DVPL_t(YiS3k2Zi6ro zhLJ_@5!tcCIup`uL`W5Ni8E3zP{O`a4v;pLkJ4jyjPV1A+eNqe7YO7qqXIBHBW+B9LOA5es7GPt5 zcjW-Rm;x6Ayp=A*6cAwi?!!fx<*o1FHZ~f}xMFFQq&{eKv(0&%$H`pQEl{ zum0Grn__q%d-z##%gS84#3Cfa7=Ga&n}%()(bg3o}5 a{?HGVPTl9>9Cg$H0000MBW delta 557 zcmV+|0@D411cC*SBv%J?NliruOV1ZP1_K>z@;j|==^1(6{? ze*t1kM@0Xn2lB-L00E{+L_t(|ob8lNYQr!Pg@tf8IYqD{@H&dqt#RZMx|A}|3pB~T zkOQPm5j{s1A*bxfwq*H7-4`+oWAr}HyqOUuC;J^SBivt_Le_)XBA{L~`5#T!FGGU?yFeXh}U5ExqC-kRU zZviz?gNxI_127&Y6{r3F;5@+FCOT01LEzboe vALI)%5wrW%TDe<(O0S28f6AElhOc7gsL5P#6G>OBL3j}AyP2L`Y!;oO4(ZSnh_lT(WJ zKG#6D0n&wcQU)cC9(MsBBwaWTEl{Ecyu0(^_f@k2phOc;37`i`9Ibr_PCzgqAgu(P zgqiFE^l3EM0pM*7P>oaLe6ejGJ!(L0fUSe?W9?H)0^Gqwbwn0qoIGj(CnyQ%JAa2M z0Vb2^aRB&Ej&Gf>jzF3UfRIAh0<(;6LjW2*&U_bNLZ49~$&SmcXM7ikxJ>-fAb=_Z zO#-)m)D%*BV)Cfji46T6I4*CLshm|jB4;*P7wlviVgz)U&3nWJJ(TE89)MmvQ1vjo z1)reDtugwoWE+Ud|)El7E0-q6vqo zVY>?@X61J{kvJ5MAIoXk-2>3%wGc`ZV8HNqlB}HOm8zn^x5O&6i z9U>Bk?5d&8LypD5CPf~0ihm|x$da)gTbqwr-Ut)~*l3Um+{3ej?*su1nfe+FFs380fY802qyUO_A{-MobW0000c00D$)LqkwWLqi}?Qcp%nOho_yD3N`UJxIeq z9K~N#r9~nNgNw7S4z7YA z_yOYL>ZIr*CH^ldw21NGxF7HCJ?`ECLZiY|vuhksHOolFV}D{cw<-o+5yUY3n1)Yc zrk+SIX5cx#?&0I>U6f~epZjz4DtVIuK9P8i>4rtTK|Hf*>74h8!>lAJ#OK6g23?T& zk?XR{Z=8z`3p_JyWK#3QVPdh^!Ey()lA#h$5l0kNqkJLjvch?bvs$UK);;+PLwRi_ z&2^eXh+_!}B!3}7Mh#_DU?EDYMv93P?Z-U)gN{E*E}2|qFmf!Q3Kf#$2mgcL-I|5T z2{$Pe1G-;q`(p$M>;lcYZGRuzcJl=AKLb}<+h1(}v!A5b+gjuZ=-UP^uG^Zt2VCv| z15dhSNRH&EDHIC8`x$*x4(PuHde+?DTKhPC05a6o@-_`{a0rYRDSO@H-NDY@{yo#` z?+0~ua;Wrsg%>vG&M2!)p!@Jfm|egC)Z0dzsW#cuz!OjhHybUq&tR+882GMJCA?*_m5@cRD* z@OudW32Uyn6Cmo>;A}Z3@cRPLo(#Y#Apj!F^$|m*aD^!Oa`Vcg}M^%0%m<6hsCrvpJPiEF^5{|YYykq&BM z0xS-&5*_RPMbrf?iC9I-4j2X+QuSZ@Mu!QmkWeD}&bEMmnv?fNKm5=j41_kO3g{y} z74G`NQ$sj`Qd*XN+d9(#AEC*>tY@w^S(`Z!8bAP;E2s%9u`u2W{85RdHdO&I@FCOJ zOkNW8n5o;<2x_8k{{&cMt@=`;UKeWpM0Nxc1&9Iojf12Dc%!c^gLyAQ2jHQZ$xFb{ z_txF&%>u7~tH8pCvI3aeLIqRu9gXj3d4fT22t812A|6>Ck>m!wCfov3XWn_CeFo6{TGKDs>M<5&HT# zVCe(&MO*O9Kud!Qksl8o;M)$pxjWY@LNq*e;?$3S3Bwhr>8HO^=oi8e(4?xZ#Y6}H zpw?g}KtxrPlWJwu;)dQKaB6^zQL?_CBoFkKN)iQtkQ5+^pXqU)W-&m*heb(G09cC$ zD?kT>B-N*MQ%`0=g_-;(WrN;yVUL4M0s7G)ss1(~cR+KWYE~002ovPDHLk FV1mY>A^iXV diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index ee6388578..2373a7376 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -2017,7 +2017,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_PYUKUMUKU] = 0, [SPECIES_TYPE_NULL] = 0, [SPECIES_SILVALLY] = 0, - [SPECIES_MINIOR] = 0, + [SPECIES_MINIOR] = 2, [SPECIES_KOMALA] = 2, [SPECIES_TURTONATOR] = 0, [SPECIES_TOGEDEMARU] = 2, From 788b9f675fed32fded976895c56e1a1a38d28c95 Mon Sep 17 00:00:00 2001 From: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com> Date: Fri, 2 Jul 2021 14:28:06 -0500 Subject: [PATCH 2/5] Fix redefinition error in pokemon_config.h --- include/constants/expansion_branches.h | 10 ++++++++++ include/constants/pokemon_config.h | 2 ++ include/global.h | 6 ------ 3 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 include/constants/expansion_branches.h diff --git a/include/constants/expansion_branches.h b/include/constants/expansion_branches.h new file mode 100644 index 000000000..a2ee2d61f --- /dev/null +++ b/include/constants/expansion_branches.h @@ -0,0 +1,10 @@ +#ifndef GUARD_CONSTANTS_EXPANSION_BRANCHES_H +#define GUARD_CONSTANTS_EXPANSION_BRANCHES_H + +// Branch defines: Used by other branches to detect each other. +// Each define must be here for each of RHH's branch you have pulled. +// e.g. If you have both the battle_engine and pokemon_expansion branch, +// then both BATTLE_ENGINE and POKEMON_EXPANSION must be defined here. +#define POKEMON_EXPANSION + +#endif diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h index 131702a85..a14ac688a 100644 --- a/include/constants/pokemon_config.h +++ b/include/constants/pokemon_config.h @@ -1,6 +1,8 @@ #ifndef GUARD_CONSTANTS_POKEMON_CONFIG_H #define GUARD_CONSTANTS_POKEMON_CONFIG_H +#include "constants/expansion_branches.h" + #ifndef GEN_3 #define GEN_3 0 #define GEN_4 1 diff --git a/include/global.h b/include/global.h index c42afa4b7..198659911 100644 --- a/include/global.h +++ b/include/global.h @@ -121,12 +121,6 @@ f; \ }) -// Branch defines: Used by other branches to detect each other. -// Each define must be here for each of RHH's branch you have pulled. -// e.g. If you have both the battle_engine and pokemon_expansion branch, -// then both BATTLE_ENGINE and POKEMON_EXPANSION must be defined here. -#define POKEMON_EXPANSION - #define ROUND_BITS_TO_BYTES(numBits)(((numBits) / 8) + (((numBits) % 8) ? 1 : 0)) #define DEX_FLAGS_NO (ROUND_BITS_TO_BYTES(POKEMON_SLOTS_NUMBER)) From 630d172393fdb205931c5a26807aa5d53002b623 Mon Sep 17 00:00:00 2001 From: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com> Date: Sun, 4 Jul 2021 12:41:21 -0500 Subject: [PATCH 3/5] Include expansion_branches.h in global.h --- include/global.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/global.h b/include/global.h index 198659911..a3b8cfd42 100644 --- a/include/global.h +++ b/include/global.h @@ -10,6 +10,7 @@ #include "constants/vars.h" #include "constants/species.h" #include "constants/berry.h" +#include "constants/expansion_branches.h" // Prevent cross-jump optimization. #define BLOCK_CROSS_JUMP asm(""); From e55fe62d593ae1e12a2195bf177982041b7df902 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 15 Jul 2021 13:40:05 -0300 Subject: [PATCH 4/5] Assigned dummy anims to the front sprite of each Pikachu and Pichu special form --- src/data/pokemon_graphics/front_pic_anims.h | 195 ++++++++++++++++++-- 1 file changed, 180 insertions(+), 15 deletions(-) diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 421c830df..bd25b0402 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -9133,6 +9133,96 @@ static const union AnimCmd sAnim_DEOXYS_SPEED_2[] = ANIMCMD_END, }; +static const union AnimCmd sAnim_PIKACHU_COSPLAY_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_ROCK_STAR_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_BELLE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_POP_STAR_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_PH_D_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_LIBRE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_ORIGINAL_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_HOENN_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_SINNOH_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_UNOVA_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_KALOS_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_ALOLA_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_PARTNER_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_WORLD_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PICHU_SPIKY_EARED_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + static const union AnimCmd *const sAnims_NONE[] ={ sAnim_GeneralFrame0, sAnim_NONE_1, @@ -14411,6 +14501,81 @@ static const union AnimCmd *const sAnims_DEOXYS_SPEED[] ={ sAnim_DEOXYS_SPEED_2, }; +static const union AnimCmd *const sAnims_PIKACHU_COSPLAY[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_COSPLAY_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_ROCK_STAR[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_ROCK_STAR_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_BELLE[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_BELLE_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_POP_STAR[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_POP_STAR_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_PH_D[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_PH_D_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_LIBRE[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_LIBRE_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_ORIGINAL_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_ORIGINAL_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_HOENN_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_HOENN_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_SINNOH_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_SINNOH_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_UNOVA_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_UNOVA_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_KALOS_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_KALOS_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_ALOLA_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_ALOLA_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_PARTNER_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_PARTNER_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_WORLD_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_WORLD_CAP_1, +}; + +static const union AnimCmd *const sAnims_PICHU_SPIKY_EARED[] ={ + sAnim_GeneralFrame0, + sAnim_PICHU_SPIKY_EARED_1, +}; + #define ANIM_CMD(name) [SPECIES_##name] = sAnims_##name #define ANIM_CMD_FULL(name, anims) [SPECIES_##name] = anims @@ -15402,21 +15567,21 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(DARMANITAN_GALARIAN), ANIM_CMD(YAMASK_GALARIAN), ANIM_CMD(STUNFISK_GALARIAN), - ANIM_CMD_FULL(PIKACHU_COSPLAY, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_ROCK_STAR, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_BELLE, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_POP_STAR, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_PH_D, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_LIBRE, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_ORIGINAL_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_HOENN_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_SINNOH_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_UNOVA_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_KALOS_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_ALOLA_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_PARTNER_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_WORLD_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PICHU_SPIKY_EARED, sAnims_PICHU), + ANIM_CMD(PIKACHU_COSPLAY), + ANIM_CMD(PIKACHU_ROCK_STAR), + ANIM_CMD(PIKACHU_BELLE), + ANIM_CMD(PIKACHU_POP_STAR), + ANIM_CMD(PIKACHU_PH_D), + ANIM_CMD(PIKACHU_LIBRE), + ANIM_CMD(PIKACHU_ORIGINAL_CAP), + ANIM_CMD(PIKACHU_HOENN_CAP), + ANIM_CMD(PIKACHU_SINNOH_CAP), + ANIM_CMD(PIKACHU_UNOVA_CAP), + ANIM_CMD(PIKACHU_KALOS_CAP), + ANIM_CMD(PIKACHU_ALOLA_CAP), + ANIM_CMD(PIKACHU_PARTNER_CAP), + ANIM_CMD(PIKACHU_WORLD_CAP), + ANIM_CMD(PICHU_SPIKY_EARED), ANIM_CMD(UNOWN_B), ANIM_CMD(UNOWN_C), ANIM_CMD(UNOWN_D), From 365b578a663d37bd060f40817c8be1077262f743 Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Sat, 24 Jul 2021 13:46:02 +0700 Subject: [PATCH 5/5] Fix Arctozolt, Heliolisk, and Chespin --- graphics/pokemon/arctozolt/back.png | Bin 626 -> 583 bytes graphics/pokemon/chespin/back.png | Bin 646 -> 543 bytes graphics/pokemon/chespin/front.png | Bin 1459 -> 575 bytes graphics/pokemon/heliolisk/back.png | Bin 666 -> 620 bytes graphics/pokemon/heliolisk/front.png | Bin 695 -> 660 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/pokemon/arctozolt/back.png b/graphics/pokemon/arctozolt/back.png index 7f25ab7beb62543f7ba283fb420e649d1027da77..941f900e1db33280a92e1f44a077f9ffea799ad5 100644 GIT binary patch delta 501 zcmVAr#fl+`dzxe)7^qTLj+t?v z6dXZ4fK^_=4SE9NDphV0PH8uoKN!dX^ereV{mpxCIxzOH9z~ac*t-M-_!xp>@E8vU z0d)xom;(bD0>F!V05QggGXTU>!59Y!D8?QSVh})gB>a8=55p7-e?T8V84x%F09n8Y zAcdtJXe=VGd00GNML_t(Y$L*3$Zi6rog^j$aSYeWM&yYx{E5IOCUDb`9eIk5> zwg;%x1Ed?&Q$*<|;*=dj{;|mg@)ig&pXWV4LGE%Xy9MOIEg-_j5R^keXfz0jTR=oS z81P^KLGA$97$4pMkWU$ZArv4oHg5v2*GcNi gcp!erT?Y~J4_GO?8<*XzqyPW_07*qoM6N<$g3t!#tN;K2 diff --git a/graphics/pokemon/chespin/back.png b/graphics/pokemon/chespin/back.png index 735513b1fe0c7c10bcdb644ff844ed1cf48a05f5..1cf511302f1c0069211e976f7d6cf3b5498432c0 100644 GIT binary patch delta 95 zcmV-l0HFVd1)l_vBttMzOjJbxweMpH2oMku-YGha85!?NQZX42l!RkaF)78Zj8alk z|NsAtS{c^0Le|#Sw delta 199 zcmbQw(#ASLrJlXS)7O>#35OJ?4*!cTr+o|z4B{oO5hcO-X(i=}MX3z#J}v=%?h0k8 zMGD4xCWWm_9s-qcloa^617(bXYzD6eO?e>2lJ4m1$iT3%pZiZDE0Avx;1lA?u=TxH zvZR23z|w18)pM+_z3*|-6xdoFRP3esY-zTaleX3W|NrMWX@1Xkx_0eaUtpH}LLEM! tX2v9McbET5**_fxvR8S!IEGZr*_gh9QJ{ax!Fxb?22WQ%mvv4FO#oDPLhS$m diff --git a/graphics/pokemon/chespin/front.png b/graphics/pokemon/chespin/front.png index efc827db9e9cc00a6d213c16532da5b7b68243c0..f12f3a8737bea3f6b98a2da5e69c1637ed94bc28 100644 GIT binary patch delta 562 zcmV-20?qxi3%>-A7=Hu<00013M{Ml?001yhOjJbxweLz}84wTu@xbG>fSWq-qJmwK2Rf09I0@9E(gEfmJMZb77dmTEYa?GL305EI7~T9Kvw+ zdz<=@lqJ&0kLtQ1pu?44_;p8H#NnPr1%%(_qn zpWe$R&5$-}lUIp2m-1MRQ8+}zc@>ByKT^Q8M?_u)9M0(|OMv#9+9{@hFx-^VdPcqi z#wI{0g>3C*E^zAa8vsXq0jBHz2DCrk55VM4dl-n+=v#bn%=t-b=)hWj5W-V2=XZKw zGc000McNliruOV1ZP1_ zK>z@;j|==^1poj808mU+MGz1WW(p279Ti6_7K|JpQ7|Y>L4P~9BqZG|IGIB&cTOo* zR#r`B9F9?Hj#(V-PF9wHVX}Hq@^3?XnLXlmb^y2U)_{q@sg32NYtynrqti;()X~xE zjQ{`t9v&VaA0HqfAR!?kA|fIqBO@dvBqb#!CMG5)CnqQ@~D=RE4EG;c9 zE-o%FFE21KFn=*IF)}hTGcz+ZG&D6eH8wUjH#avpI5;^uIXXHzJ3Bi(JUl%;Jw84@ zKR-V}KtMr3K|(@8LqkJEL_|eJMMg$OM@L6UNJvRZNlHpeOG`^kOiWEpO-@cuPft%! zP*71(QBqP;Q&Uq^R8&<}RaRD3S65e9SXfzESz20JTYp7mzbECnVFfInwp!No1C1Sot>SYo}QndpP-Ll?si~=|s;aB2tE{Z7t*x!DuCA}IuYa(xu(7eRva+(Xv$M3cw6(Rhwzjsn zx3{>sxVgExy1Kf%ySu!+yuH1>zP`S{zrVo1z`?=6!otGC!^6bH#KpzM#>U3S$H&OX z$jQmc%F4>i%gfBn%+1Zs&d$!y&(F}%(9zM+($dn?)6>+{)YaA1*4Eb7*VowC*xA|H z+JD;G+uPgR+}z#W-QM2b-{0Th;Naom;o{=ruz*=jZ3>=;-O`>FVn0 z>+9?6?CkCB?e6aG@9*#M@bK~R@$&NW^Yioc^z`-h_4fAm_xJbs`1twx`TF|$`}_O+ z{QUj>{r>*`|NsADAz*U=0004EOGiZirGE$V#Q*>T2T4RhRCt{2mCp`JJM?P-Fn5XEU}d0Ei=k2S?IpOgfQo0ElWrAk|A6(b6w!Fe8L9fq#tN z1So+ha4;jR>6b3_1kU|*Iz^2@S-oMS65>QZl)<#zN-7C>R*ld@GCRi1iuLGg3Ez5< zl!85d2EY}=wpBfc2dQQb@B+*DI$n+d2Y};2UJw4=7&L?h5Yd$ZOo1yT6hL^(5Udph z@6JxLZ~GSVYcK)W!WpWnYNdSu$bT#WF08LUxaIHPpDQ&mx$FV3eKI+Cv7>Ma4YhZX z07d&iQoy9u=Sl*Z3?zlLz;P!*fca&X1<29E$qG~-f_*(NJJbD<3aG(*h^3HQhH;$L z8cpBJ^wf8lmSu{FSR*66N50UZt`W^~CICgvfj$N38zXGS9MBJE>roxx4SzLsnTQ#H z$LjPj`XB|=KK^U~$XHf1BS31e2;2Z@hVyaT2x^{mSKD2f0KCuc;xzy}*vkh%Rh0t9 z;8Q?Uy*>}{auQz40C)NXD7+6Afb9RuM!<>>k7^(%;wc-!Bc@G-avBN&&N)9$oN{rl z1mHT?b$0;n$P$)-r0;Im4<z$a?{xFm}KW_!GbnLpe3%A*3K+00000NkvXX Hu0mjf+Ge^R diff --git a/graphics/pokemon/heliolisk/back.png b/graphics/pokemon/heliolisk/back.png index a72e923370311a21be05e059c7589268c1f322d1..3866779b3f68b62814802c327554cb710916caa5 100644 GIT binary patch delta 539 zcmV+$0_6Rg1?&WnB#}Woe*yPNL_t(YiKW!BZrd;r24EV|rX`fTbTrimh(rNh)tG1? zyU|kw?E|!^U!;rXW@0mR$YdLxyvaj`EFBVb@K%_40z)~FdaSKMe}aOb18IPOlVlH~ zcYOqO2`s$0LO^f;K74iq{_T?qJQi`NW|4G)fu;{-1-z|<^(SA>9DuWM^3~k&03^`` zcLF|0&rh9z2h0RyxNoO|J3*Y6B0+$cimiEHmgNuwL!N4p{sHhE1G)(hEj7qYKy`e` zd9J~|+21ZXCc_XGkLdy~}SqVOd zAwTpG6U?U7nDYWg$m^Jzz^|^y{z51Kx5Y|QV~P19BmQ!sfBs4FTd9$xFM&RuxduW( zt)!&Ld(M}I+SN$jm@n!ts}>Y9`Lja6VGd00Hw!L_t(Y$EDOUPUAon2H=Ts=O$yP*)n4efITB^>m?(I72#7L zH~@$oU?~P|o5u1bC@2y|;tVNhwg7FB4rOwJ$hBqYE=$MhMCLK_I!dqrIwbXZgU1O>qkhyVcx$p?sj_EJ{@ z3s28eR{{%9F5Q6NT(p75A`Vp_M2s;|_o1wSH)Q#9siDE`ALGA1w@jKz=N0;zQ0e1D=TG zkOSVU2Q2Ue$Phm)0d)cZ2zZj{&L1-aQcubS)~+`aHUfWfrg**0v9-V5NITf>e1FdX zJ7^w_4IBh}K*-$S)2r;FefVQa9KfF|rQ$6?fIn4tatb809Ad6Y$wx5cw;9p~^JzKa zJckkLHl}Uhm$xH-eku19AS0x{{9xD13nB|!nAT`udDT>^4R^)nH zLv`1_s9%%~$mi-$iGZ`020+Hc{a4^guSv-DP-ge-Lwo|uOtv$~^A4=D6d954K$WG^ z4K}G)T92TgbyY3M$PSizU2Xo^69B-7l>@9^bRA+#(E1D_zG~wDD>JRa-~Ts?kT)E~ VK2is6*C_x1002ovPDHLkV1ieb`e*6nnz=WLG z5~xz$h2}3XBg8*oFgpW3fXSBuiB7Re89Jp@Vql_jymTwRs?Z6DAMYAdrO3}PAfD{$ zeSYtIcjq&Ve;ccR$eV6U4nOYoIbFi^jGl0Lmj*gL!Cg-GF!_LUf438C(iH>(!9$;R z;0O$dA=#skfVVg7k-%dOJbgq1x&pudgl=JLhxLGzG;ATdx8mnCVD#DDIF4HY`z7X| z(Rm~u#4l*aD{su0rsU!j=>y- z4i~p!{(%}p;W_}mgoFbMiHZhts1ybkAuKiBKWNR?OaPEj=VGd00Iz6L_t(Y$Gy}sZ__{&2XI^VR$1y*9jb1=cwuX<9$<4~OT?AB z(R>AFg!lkJhi4#LhMbBwCSL|5IyAA77&@gzVqkEn@?CgGO_d_Q%K+lk?frW1f4O(I z{_)!0P`7X*wJ;iUy*>}eKNIBU#Jd$Q^xiSRW3dfU|tmp z|DuurTk58my_?U*RD!L~XKDg(XY@!c^9!7angm{!DSwm=C_l7+hVYb{VLgYkIKPX@*1=p|p~%nX)30?Sob^{ym(%JpN#v1I#Q;Vt zBo14D12t6Dxn(7*MOCKy-fzlJ_g>L5lco0V)di$F>ziVFxqe_*%G+s7@tnsP_x*Kp z?+3X9F2LAJ^!nqRsmy<6_v);Du-&DM8c9t4ce!es5g