From f9b9e4ec331d9e7392c86efe8d1abf8d0731960e Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Wed, 29 Sep 2021 22:34:37 -0300 Subject: [PATCH 1/4] Updated Arceus' forms' animations --- src/pokemon.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/pokemon.c b/src/pokemon.c index bc04c42f9..c9d8c9e23 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2767,11 +2767,28 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_CALYREX - 1] = ANIM_V_SQUISH_AND_BOUNCE, // Forms - [SPECIES_ROTOM_HEAT - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ROTOM_FROST - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ROTOM_FAN - 1] = ANIM_FIGURE_8, - [SPECIES_ROTOM_MOW - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ROTOM_WASH - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ROTOM_HEAT - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ROTOM_FROST - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ROTOM_FAN - 1] = ANIM_FIGURE_8, + [SPECIES_ROTOM_MOW - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ROTOM_WASH - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ARCEUS_FIGHTING - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_FLYING - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_POISON - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_GROUND - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_ROCK - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_BUG - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_GHOST - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_STEEL - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_FIRE - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_WATER - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_GRASS - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_ELECTRIC - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_PSYCHIC - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_ICE - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_DRAGON - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_DARK - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_FAIRY - 1] = ANIM_CIRCULAR_VIBRATE, }; static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] = From 377e46e2ec889f233ba1ab22d57e4fc0ebbd9520 Mon Sep 17 00:00:00 2001 From: SonikkuA-DatH <58025603+SonikkuA-DatH@users.noreply.github.com> Date: Mon, 18 Oct 2021 17:49:08 -0700 Subject: [PATCH 2/4] For Magnemite sprite errors Fixing Magnemite eye to use whites Also fix back pixel --- graphics/pokemon/magnemite/anim_front.png | Bin 574 -> 689 bytes graphics/pokemon/magnemite/back.png | Bin 481 -> 558 bytes graphics/pokemon/magnemite/front.png | Bin 417 -> 525 bytes graphics/pokemon/magnemite/normal.pal | 38 +++++++++++----------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/graphics/pokemon/magnemite/anim_front.png b/graphics/pokemon/magnemite/anim_front.png index 7d3dc54ec6f428f97b5ecb52a5d33ef408d439db..512593696c9bd8b3c595df043a79a939dced7c4b 100644 GIT binary patch delta 655 zcmV;A0&xAl1hEB>B!35VNliruOV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_h=_>)|Nqd?&`?N75D*YJFfiy~P>3iXfT*~@;E_oUf86x+<>&@g00001 zVoOIv|D^}=#Q*>S)k#D_RCt{2R{%hLFd} zvr;cK!4GkKrJ~(WvwUd01SKDlCvVAt3HsRwGJtff35vzwf72u0;h8RQ=_!3 zKYo3Vkzmg3IYrQVG##fcm`G54mg^zF$Q*eB2@_ekS~jA986w3)&sY&KLwE!Y{3UHm z4pM4sUy0RO=72$HA~iUr~v(lZ}fx p%G+Gv%&|7It_{5f3j7Cr1EXQZ0)IVfJpcdz07*qo1w^hwV1lwf8-D-* delta 516 zcmV+f0{i{31-=B3Bn~i8OjJdf(4dHji0JtEk&GmN==k`qIk~F<00GHKL_t(oh3%Fx zOT$1E$FGnG**s}xK{vNTyIZ&$q)RG2rCqFp?cxXM2k;X}J3P9H4mmf$Auad`+O^+7 z931Q>7%z9(d@mVA%zw%7etGv^2>1UpR;kjjs>XMV>-)_{A>n;U(LyUbBlnbb-bR7( zM7T45l!|cRhGzs!8^`$J{u$>H1AWgs#CV2~!GYFdjvg@@GQS(18bIp@?Df@#v2OTu zlmRi)!e8@|*9~>NOmKji5f$&~m-K6)VMZ*$2l0EFzT$vgV(^%z>1PZxUtx$+4gi?- z1pYY8HmBDN0p_xA z0aP+lFx|EypI9Q(b5APf6H8e6E%QsNHlL6^YCzh)R_zRr&)eyTr<_!Genv z09esg48}H>jK0hR>%0+Z2kh2aGi4|&xO3J_SrQAh6=`a0kpqM+3gv*9Fjir#*)_mx ztyyH|?i!%xp2q`Q$ACOwfUN_TKvtWfi6{vG0pua4Z|i8ja0$aVWg;f!LCaV(mv{pc z)w1PPkBVyJiTgNY*ei{Txx7OvaOSG*l|vHI1>N>02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(DOV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_h=_>z`1sJ!&`?N75D*YJFfg#Nuuw=yz_5_u*ng;yh)}Swuuw=yu&}WB z_{dCy;0OQ!00Cl4M@0Xn2lB-L00B}-L_t(|obA!EPQx$|2H*_!14JNo;4#XcMly*+ zmLTRfMiTf6~qfCM~uUB$EqV<(aRnck?`$)$d_!SxeR&{{W2fm$|p0z`yK zr1e5kz3O)hNIAqwt+i@vX)S_)bhEmph7AOXXtM>Xv6oFEYI>lV z*AS2|dSIt)Mc-HR98yN?K!z9;zknCo838NFl;a#%`JysJ5dNDqP2cLpLdQ>MIoAKv0mn-G68BBrz%Wp1L~Ne+ZYH zFF7YCmbJ|`e;Xm_+xfw*P@=G?rw3Lkom6TjI9|NS6zsdAN`TI*)|UyetGjlK0)|ipUSpPqVCNa= zYFgx=iAC&ky*>x5I)o6)&**l;5C{SWvLD@S7-H1?Xh7jt5BlpM>oMx;x*rSkr>0`o x#vx)s>?#(sR=b%9DhvRye~4=^H@VF}$QNJi!`}Vz;Ftga002ovPDHLkV1lCH*#iIo diff --git a/graphics/pokemon/magnemite/front.png b/graphics/pokemon/magnemite/front.png index f39c25b7ab263e60c6a72df6f61b2ab48a03db89..366674eef1c804d19e049dfce10cd268974ac29a 100644 GIT binary patch delta 489 zcmVOV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_h=_>)|Nqd?&`?N75D*YJFfiy~P>3iXfT*~@;E_oUf86x+<>&@g00001 zVoOIv0Eh)0NB{rZ!k*F#qdn?%k>XKA_pmu_R zbm0I!07qyBD=Q2!8xljP1Q(zy2k3?v+lfkmW3lnvwM)Lm!~634{Z<%jXxJ+)INCiw zj=DRIV69|KP7bn5e|M@j^hsellRb9_BAq?G1!)gG@Ahbcp93UJn>!eI*0Y8>6voIR zp~jgt(s0-@mV4^+w|BQ=2h=4&JrG@hfpp;k`T#saGn}%*5VIjMgi1UCU3mw@ zz(6-7%*C*A?%E~)a>IT8{r{GQ=+tSe>Z!fW`~76Fk%&HxPT9>)ap9-ws}T##=6dMw z0N}lUXE#dIz{Oz51M)*Qmy`b^wtTrXb3P@aLoZtT35@ajbJjt<&2UTu`*{KU}ZAE#X8Mo zphT<3i2)%4CA?%xUlK-Y9`x|;a2f{wjDlBm>a=bB01XIjIiNO+O8@`>07*qoM6N<$ Ef}nV*=Kufz diff --git a/graphics/pokemon/magnemite/normal.pal b/graphics/pokemon/magnemite/normal.pal index e86b80511..151a7a79e 100644 --- a/graphics/pokemon/magnemite/normal.pal +++ b/graphics/pokemon/magnemite/normal.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -152 208 160 -136 136 136 -232 248 248 -208 208 208 -80 72 72 -16 16 16 -56 48 48 -232 96 80 -136 40 32 -128 168 184 -192 224 232 -64 96 112 -96 184 208 -32 112 152 -168 168 168 -232 248 248 +JASC-PAL +0100 +16 +152 208 160 +136 136 136 +255 255 255 +208 208 208 +80 72 72 +16 16 16 +56 48 48 +232 96 80 +136 40 32 +128 168 184 +192 224 232 +64 96 112 +96 184 208 +32 112 152 +168 168 168 +220 244 244 From c84811ac20ec676cb1903df8976628d82a9b8b0c Mon Sep 17 00:00:00 2001 From: SonikkuA-DatH <58025603+SonikkuA-DatH@users.noreply.github.com> Date: Mon, 18 Oct 2021 18:02:22 -0700 Subject: [PATCH 3/4] Magnemite back Retweak. Shiny broke things for base, so went to source --- graphics/pokemon/magnemite/back.png | Bin 558 -> 577 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/pokemon/magnemite/back.png b/graphics/pokemon/magnemite/back.png index 4c4a248ae77e6fa4f331aa0db3fd93870abdda1a..ca7ad25b0abe94c39b7d4723c24304188cb2d426 100644 GIT binary patch delta 460 zcmV;-0W(P_sHmvi^z`NE22}t600Cl4M??UK1szBL00Cu5L_t(|obAyuPr^_T2k;KO z575NTgfHQ)G81B;?|RR1cG=}`BPIVhKX`|nC``-QK^%RY9+YfwGJRDUn0XQz(0D_< zN`Z@eZjA#T&VuCRyDl&@h=%lVP6z!0T%Cj>5jbP>qtgtnMG%m#nq(i) zy8mhQfVPyCpZBSU4FnKau7Hm1Ws|7HIWWv^2nYu`u%}E#Uf2B)0!FNXLM%tWfCr?^ zEg{ZVpozT5L6wTsId@-OeUESoP>NaULYX zzSK;N>NG?mm|Z1eRI680!9@T7^^a%`_9l1v2l)o?GTT!0$qqsQ0000-E(RPo+>1C9ku+6*`1ttH(9lpwNDvSZI504RfMiTf6~qfCM~uUB$EqV<(aRnck?`$)$d_!SxeR z&{{W2fm$|p0z`yKr1e5kz3O*=3rIP{Nv*YNYiTWlfONCEyFjV=+L{3*qM!e1h7AOX zXtM>Xv6oFEYI>lV*AS2|dSIt)Mc-HR98yN?K!z9;zknCo8XfH000000NkvXXu0mjfh=a!f From dff6555287cf570a381b3514c7c39a7de5cc23df Mon Sep 17 00:00:00 2001 From: SonikkuA-DatH <58025603+SonikkuA-DatH@users.noreply.github.com> Date: Mon, 18 Oct 2021 21:01:29 -0700 Subject: [PATCH 4/4] Magnemite made highlights white --- graphics/pokemon/magnemite/anim_front.png | Bin 689 -> 686 bytes graphics/pokemon/magnemite/back.png | Bin 577 -> 577 bytes graphics/pokemon/magnemite/front.png | Bin 525 -> 525 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/pokemon/magnemite/anim_front.png b/graphics/pokemon/magnemite/anim_front.png index 512593696c9bd8b3c595df043a79a939dced7c4b..c4c71b23f65ed0f6aa25b899d62e20ddaabf34a9 100644 GIT binary patch delta 516 zcmV+f0{i{31+E2>X@Vc(^iC=D5yK=PAIn-#*aevMv?XUnLRWnt zL2DgSBDKSns=ooCz?oeB)Yw=zf1kcSXGk#T_JSg4J)O^z7EC0lJ}b=-U}{c0frN=H zjMuFwV1`KW&@)y9%n%+y3x7#_AV;i*SGUJJAroS+C{dzBi9dj%C04Wsa~3H8h`dz{ zXq$7vFZ0Bjor_pI5Lc-+bA}?S*QqsgmL#gqgEckrm=PFT)HWr=jInC8a^_Tkwq~7} zdn!PhdlnCTog!ob1AHB*fU$V#V?>z&Fa&`)3`5R|uao&AO&9@|nV6IXEwpB7XaS6B z$?&$vMYZ85eH;vX^c9Hz?+H<$z^|etH&)j->$R1P@|)2OvQmjp{AspiizM_1y6Nw*f0own zUr3DyT-BO1AvlmS65wuRn`sXjrmCFNqlhZU$moRKJ%_lZKA$aw=!Ez0DIp;wg1L;# zozNxIF+;!>t!%p|wL5VzWQLH($+J=~G{FyXe5aK9NMIO{k7cbV>;MdV+LE&(p{qWS zptTMuk*)n_wf72u0;h8RQ=_!3e?NYGj*(!_>^ViydNduUEtp79eU|GXz{nhV0tpjY zxLP)%fEgmiL(fP=3K+A+2}YDL07DR%!!YC=`8t^|vV;*}nTbhx&_ZjLh8Do6 zmJV-wTvY21vd6)&M_*Bivy+XBIm+8y;LNc$vaSui1q%EJd;_Cl#R7jlYCQk|002ov JPDHLkV1m!8?g9V+ diff --git a/graphics/pokemon/magnemite/back.png b/graphics/pokemon/magnemite/back.png index ca7ad25b0abe94c39b7d4723c24304188cb2d426..f0b50adba2a6b6f6d4c440659ad5bd065054f320 100644 GIT binary patch delta 407 zcmV;I0cifg1i=K5Ee8YuGEJX39g#GPf0%aB20j1)0cA-Le72z!{q_?}7zRsAMr1o8{B{<(MfKN={vR z`(~+o#ba}CgR^UJd^s_()}V*6JwdmH;8%dO4Mct^}DgXcg07*qo1w^hwV1lhv ByYT=3 delta 407 zcmV;I0cifg1i=K5Ee8NN0F~Z+x{)-Ce*lOD9Y_EG0cA-c`i&2OgPBIz!xBX0|yd??KX$v@VvHC z65iqJAphy5_iOKZ&vACyV;|2RK*hny%(%h^F3eViVYY;ZDtRT-Fh5*g5Ve?z=V zfs1=?jRPLeg5>18E-*8QhV*bw2mJzEorEG0IAinWU9i9jl`IBhvwV8L95dxY$*D_k z-z;^ncx>)%aCQxjFDE9}8uT!>C+M~i{E9IHO?foWHfR^opBSUl46Q{Fkgl3!AJDr0 zY4w1%l$D?NsfP^&5Lm8&j_qZWf2hPcFwAWT2nRW^r%Xj&*ZmLzMy!ECEJwe92c*m` zAjWr$uCYxLLM&L&v(=rwU3B*MPb zOpNL@L?W17C1O;oS5v`7008xmXbtuzclihT2JbT4QuN6VLI3~&07*qo1w^hwV1j4R Bw`2eS diff --git a/graphics/pokemon/magnemite/front.png b/graphics/pokemon/magnemite/front.png index 366674eef1c804d19e049dfce10cd268974ac29a..2a262e550bcbb3784fa18424617e913b224a90c2 100644 GIT binary patch delta 330 zcmV-Q0k!^(1dRlcEe8Yu8Q~+qU6C}4Oqh1j20j1)0WnELK~#90?UFH0!!Q(vT`5Ll z!&6omVm2g(Pzf$TR}Rn(v38{+B1kktqV1F0*Ojc&o^