From 74de023c381d7a9f7dd49f0dc5ccc223307f8081 Mon Sep 17 00:00:00 2001 From: Kaitlyn Date: Sat, 14 Oct 2023 14:35:41 -0500 Subject: [PATCH 01/22] Togedemaru GFX + Created 2 Frame Sprite using old Sprite + Gave Front and Back Animations --- graphics/pokemon/togedemaru/anim_front.png | Bin 0 -> 729 bytes graphics/pokemon/togedemaru/front.png | Bin 534 -> 0 bytes src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 3 ++- src/data/pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon.c | 2 +- src/pokemon_animation.c | 2 +- 7 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 graphics/pokemon/togedemaru/anim_front.png delete mode 100644 graphics/pokemon/togedemaru/front.png diff --git a/graphics/pokemon/togedemaru/anim_front.png b/graphics/pokemon/togedemaru/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..4e6534e2f8169427bdb26c811e7bfb0e44dc8a9f GIT binary patch literal 729 zcmV;~0w(>5P)0Xwpsi~>|tjFW=oqb*53%^^})!zU(*DfK%TmBH7*h7qW z7U0O&>^8q+u|Gz(>->n#O(wF@6(EXq{*+J_Ov;Ezhy_f3B829bnHvZXz?%pu$)=A9_;pni0Mkjxc0B+>OlL%t8E6R*6Qr#T zJ_x~Ucfk<=w&sTcsAp2;_iKV}D|P!ffWs8D09q^!jPwKvL;$+A19q{W?iuiUs*Yk^ zf;|4h2blpxcs-v=K;*G=&P8Uy6QU^?0dJ~nPy!bC4WNCSL1}w1E)`&S9YVJ@e@O)` zuTv;E09dNO0=)iPysooj^^x(=q zDDdyvNPy!fKwb&o{HHkcrlzK*rlzLeG}Hedr~iZBl>Uda$(a6!yCo%K`j`G;uMc|O z)2Dy#AG*Ev4R^W4;-F#fM5Ct&hILO^bhjXM*qNmubsj{dH9v#-TO=b zAek@fk~1INRCaT*r+-PVrRTkLKq%8Y0m{~lc&9(8=^Z7gNRiR|0}AjOfb<7kK(zGk znNah;hTv8|3W)0Wqd#~lCh)u#5MDMx`*XY&5a#%QDG!YCAIiJi9RJg~fY{@^^0#!X zFtQxV7XQ7TPz#6}pSggz6aV2w?x%``00000 LNkvXXu0mjfBrRh) literal 0 HcmV?d00001 diff --git a/graphics/pokemon/togedemaru/front.png b/graphics/pokemon/togedemaru/front.png deleted file mode 100644 index aa0202eef3cf1d693f57a31736034d69de48427c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 534 zcmV+x0_pvUP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_$apaL;4lyn5KvHP=&&HLz`%%*m{?$F z`1tsUh={njxHvdCkVr6iI4A%B0CeRnBme*a32;bRa{vGi!vFvd!vV){sAK>D0dGk} zK~zY`?US)i!!Qtrjhvw?JVIdUR>?yfwL?{z@&ND%ts`}u4hvt$UDXd*$ zJTf7kq3_ajA|!@0Ff#O)GX0lTP}J&dz`FFD`!uM&Yg33xHy<;|col z+@C(y=xa}alro5Q5^Ex$^~eILl#=tV)>J^61!JXVPfN))833@v_a$U%*rftmxdUc^ z+=L6F9xu#`14`tERDTYo0}6w{9R;umc3LlT>@W?X$H}z?FC%JErj7t#fJ_x0)OHgAOQM6 z0XG2os{z=wA$jlsUrNXk{2QRCh2#c1Kwbly+}Oyu$P~qj-q?QXfXo={0eH2x7Qdp> zo}1{~MwRa-TI&W_37=m**8v`%;rqQ1qG$IWAT9Pdn_E+ODsWL70>FRxwS-_N{YNo& Y1l@|cN0x0IMgRZ+07*qoM6N<$f>RsbPyhe` diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 9ff1c5656d46..663af32b39e9 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -875,7 +875,7 @@ const u32 gMonFrontPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/front. const u32 gMonFrontPic_Minior[] = INCBIN_U32("graphics/pokemon/minior/front.4bpp.lz"); const u32 gMonFrontPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/front.4bpp.lz"); const u32 gMonFrontPic_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/front.4bpp.lz"); +const u32 gMonFrontPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/anim_front.4bpp.lz"); const u32 gMonFrontPic_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/front.4bpp.lz"); const u32 gMonFrontPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/front.4bpp.lz"); const u32 gMonFrontPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/front.4bpp.lz"); diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 27e38d022173..23f921978dcf 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -8751,7 +8751,8 @@ static const union AnimCmd sAnim_Turtonator_1[] = static const union AnimCmd sAnim_Togedemaru_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 897ce63308dc..9dc8ad5f93b3 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -788,7 +788,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_MINIOR] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_KOMALA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_TURTONATOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TOGEDEMARU] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, + [SPECIES_TOGEDEMARU] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 5 }, [SPECIES_MIMIKYU] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_BRUXISH] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, [SPECIES_DRAMPA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, diff --git a/src/pokemon.c b/src/pokemon.c index 9a8ad991e4a2..8f70eae9d038 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2762,7 +2762,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_MINIOR - 1] = ANIM_TUMBLING_FRONT_FLIP_TWICE, [SPECIES_KOMALA - 1] = ANIM_H_DIP, [SPECIES_TURTONATOR - 1] = ANIM_SHAKE_GLOW_RED, - [SPECIES_TOGEDEMARU - 1] = ANIM_SHAKE_FLASH_YELLOW, + [SPECIES_TOGEDEMARU - 1] = ANIM_FLASH_YELLOW, [SPECIES_MIMIKYU - 1] = ANIM_DEEP_V_SQUISH_AND_BOUNCE, [SPECIES_BRUXISH - 1] = ANIM_RISING_WOBBLE, [SPECIES_DRAMPA - 1] = ANIM_V_SHAKE, diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 958bc3ffeb4e..6992677a977b 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -1003,7 +1003,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_MINIOR] = BACK_ANIM_H_VIBRATE, [SPECIES_KOMALA] = BACK_ANIM_H_VIBRATE, [SPECIES_TURTONATOR] = BACK_ANIM_H_VIBRATE, - [SPECIES_TOGEDEMARU] = BACK_ANIM_H_VIBRATE, + [SPECIES_TOGEDEMARU] = BACK_ANIM_GROW_STUTTER, [SPECIES_MIMIKYU] = BACK_ANIM_H_VIBRATE, [SPECIES_BRUXISH] = BACK_ANIM_H_VIBRATE, [SPECIES_DRAMPA] = BACK_ANIM_H_VIBRATE, From 5e40ed8d2f7ef4c993e9b5ba98e1be908faf6297 Mon Sep 17 00:00:00 2001 From: Kaitlyn Date: Sat, 14 Oct 2023 16:13:10 -0500 Subject: [PATCH 02/22] Rockruff GFX + Created 2 Frame Sprite using old Sprite + Gave Front and Back Animations --- graphics/pokemon/rockruff/anim_front.png | Bin 0 -> 853 bytes graphics/pokemon/rockruff/front.png | Bin 655 -> 0 bytes src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 5 ++++- src/data/pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon_animation.c | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 graphics/pokemon/rockruff/anim_front.png delete mode 100644 graphics/pokemon/rockruff/front.png diff --git a/graphics/pokemon/rockruff/anim_front.png b/graphics/pokemon/rockruff/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..d806387c61c6990249e417c287498eb6ba1c9eca GIT binary patch literal 853 zcmV-b1FHOqP)Px#Fi=cXMVQc_csM}VsED|5U=R=xfM`(gkcePNFfbq(fM{6g=+MBhpje>b`1tq$ z000000A;}u@&Et=(@8`@RA_5$0j7y=Nr^cu(!0t1R%5tjSu8Avz|JgzVR zz@4sX%XbCjtamZ21DszfbY~qv&p-%iR0r5kRNeW-gmNEnCyeR<&;VEguIm*rtRtK! z5yjX6J2V1MW6mQ0?*$4$7ICXVy9d@Li(VF>tU%rdbrt|}2^7X?5)jG?mPOnaRFW&_ zgcUQW0dfIE?IV>{z_H1nY||@2t0({m7)doLn*of766EymQ!LwYMxP~PeE^6>z{iU|U2(Do1RdZDAWj0}0{}AsISfF556-&+h|vz70!gT-70HS;U&fU)(0LyD`cMu|827(dM`+vy*?*@X&g1Gnp z4+FtsL0tX+tAQ}?nxOap4+FvEK-}B^H~%0HEBR>uzxfBFI>Mv;|J^^Z`wu_)2WI{94+>!U2g^TL f{=teB{~~??Yk(-FGI;FM00000NkvXXu0mjfW;K6) literal 0 HcmV?d00001 diff --git a/graphics/pokemon/rockruff/front.png b/graphics/pokemon/rockruff/front.png deleted file mode 100644 index 1199fbb592f9be2158adddaea184f13f6f797514..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 655 zcmV;A0&x9_P)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_csM}VsED|5U=R=xfM`(gkcePNFfbq( zfM{6g=+MBhpje>b`1tq$000000A;}u@&Et;32;bRa{vGi!vFvd!vV){sAK>D0q99Y zK~zY`?bI=g6G0RJ;I}wM(%oc5hf1>`X1lJ=kg9$9r#fW*2Vae~f_sU7gX0cI=8fz5-Er zU{;3v9&k(EVU*sL10NVCXB2Uq$k+!?pP>O4@-4t@HmmarIBZ)WhcV2QD&`d+0+UA} z&f>Z3<55$)3 zu&zuIG!6J_K(u=eR@*Z)zfDpLklGe=y$yos-E;YBW4E%a3cb+VGd3P17c#NCpjzvd zE~i_7+)JdCBU9jbq07Fmw1A^ro+cxVgdoD?D=mObCV4uFZf7f~YZm~LrWvF9J^u|V z9RT`59MVshdPNt`0zmZVOqVZ9)!EZ}3XbTHlgou(icU*Uxf6WI*3cj>_&ODIgD|XUB;RQgtxPN`CJReWMSi6B3ve0w&g9H81fIZ55z`RETMArvuVJr;b zelUp5y+KZVGrY0jz5xRd$p3(IH>joO9D+w}PST+h^s Date: Sat, 14 Oct 2023 16:42:13 -0500 Subject: [PATCH 03/22] Lycanroc Midday GFX + Created 2 Frame Sprite using old Sprite + Gave Front and Back Animations --- graphics/pokemon/lycanroc/anim_front.png | Bin 0 -> 1541 bytes graphics/pokemon/lycanroc/front.png | Bin 913 -> 0 bytes src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 3 ++- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon_animation.c | 2 +- 6 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 graphics/pokemon/lycanroc/anim_front.png delete mode 100644 graphics/pokemon/lycanroc/front.png diff --git a/graphics/pokemon/lycanroc/anim_front.png b/graphics/pokemon/lycanroc/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..fc853cf24bf727a72229f8d2fd35a32a2b4566cc GIT binary patch literal 1541 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 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index adc8ec965903..f0048216af6e 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -843,7 +843,7 @@ const u32 gMonFrontPic_Oricorio[] = INCBIN_U32("graphics/pokemon/oricorio/front. const u32 gMonFrontPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/front.4bpp.lz"); const u32 gMonFrontPic_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/front.4bpp.lz"); const u32 gMonFrontPic_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Lycanroc[] = INCBIN_U32("graphics/pokemon/lycanroc/front.4bpp.lz"); +const u32 gMonFrontPic_Lycanroc[] = INCBIN_U32("graphics/pokemon/lycanroc/anim_front.4bpp.lz"); const u32 gMonFrontPic_Wishiwashi[] = INCBIN_U32("graphics/pokemon/wishiwashi/front.4bpp.lz"); const u32 gMonFrontPic_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/front.4bpp.lz"); const u32 gMonFrontPic_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/front.4bpp.lz"); diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 916de31ff3a4..dd1b77b95653 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -8539,7 +8539,8 @@ static const union AnimCmd sAnim_Rockruff_1[] = static const union AnimCmd sAnim_Lycanroc_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index eaefececfd8f..5ea3128744d7 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -756,7 +756,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_CUTIEFLY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 16 }, [SPECIES_RIBOMBEE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_ROCKRUFF] = { .size = MON_COORDS_SIZE(37, 39), .y_offset = 11 }, - [SPECIES_LYCANROC] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_LYCANROC] = { .size = MON_COORDS_SIZE(57, 53), .y_offset = 6 }, [SPECIES_WISHIWASHI] = { .size = MON_COORDS_SIZE(40, 24), .y_offset = 15 }, [SPECIES_MAREANIE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_TOXAPEX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 39a0a2088777..48178b0670c8 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -971,7 +971,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_CUTIEFLY] = BACK_ANIM_H_VIBRATE, [SPECIES_RIBOMBEE] = BACK_ANIM_H_VIBRATE, [SPECIES_ROCKRUFF] = BACK_ANIM_V_STRETCH, - [SPECIES_LYCANROC] = BACK_ANIM_H_VIBRATE, + [SPECIES_LYCANROC] = BACK_ANIM_V_SHAKE, [SPECIES_WISHIWASHI] = BACK_ANIM_H_VIBRATE, [SPECIES_MAREANIE] = BACK_ANIM_H_VIBRATE, [SPECIES_TOXAPEX] = BACK_ANIM_H_VIBRATE, From c901cfa5545a2cc4e25a94954bb0b4fa64e7d814 Mon Sep 17 00:00:00 2001 From: Kaitlyn Date: Sat, 14 Oct 2023 18:24:39 -0500 Subject: [PATCH 04/22] Lycanroc Midnight GFX + Created 2 Frame Sprite using old Sprite + Gave Front and Back Animations --- .../pokemon/lycanroc/midnight/anim_front.png | Bin 0 -> 1387 bytes graphics/pokemon/lycanroc/midnight/front.png | Bin 858 -> 0 bytes src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 3 ++- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon.c | 2 +- src/pokemon_animation.c | 2 +- 7 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 graphics/pokemon/lycanroc/midnight/anim_front.png delete mode 100644 graphics/pokemon/lycanroc/midnight/front.png diff --git a/graphics/pokemon/lycanroc/midnight/anim_front.png b/graphics/pokemon/lycanroc/midnight/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..fdd549d9493c21b58f854e3236b8e95fe57e9bcd GIT binary patch literal 1387 zcmV-x1(f=UP)Px#Fi=cXMVQc_Fd!I!Xi$J?SP&2pU`R0N=+OTD{^kHVh^WZ;DRRKDpr!yRh!tJ{ z0000002@f}fB*ml=}AOERA_`#c)9?jR zk)L@y{|+AJ)ebO z{(N?TPl)_L9o@9cAkH}Lg2NdG0=DrWw{&x?DI~$0CI{y z2LRt!0Q~+P1lTixT`w;LAF%V+SWSiVA_Ec+niSFqa{y+eq#xMRA7w&-~hGd_y<0hjwmjH0s5sa8;m}WgbBh%z|*jaxftb!;Q8gh$@ZK9Hi=htOn1CqF1v0JJ%-+p%w9vg&aH=wH$?8B?tl)&X@Kg9}=A zc?+=uY;z2N5bOjdZy}0{Lw@KEge^n^L?6J##!j#HkFd+y0Qo|l;>?lGn$%*% zT|N(8h=n2OX^5N;_1ok#Bp=l{xTm@(M=epIepNoJ_a-~DSJ`ywsp?ncbJ0amn)dao z^d>!3{Qju?Rslcg?@K_i0rd5pA-`3?FA$pe9@Mi)#&T5fjt6Eh;H{{@ znIm8-zlWM$iW}9gqYF9Dn*bxw#BXatX!++U_=9~FzarlS5P(2g;YOm{%R`t&b%NJ- z2%1-yTxik{${QHzAE@z0o$(tMEsui53>E^WCGCY^sRpYF*&WmyZC*)^$!LG z?*dX2w=dn`LBU@GZ2R`l!*^Z5JAgq?y?4z_!F%@Ydg&jGjHSZ&vdEq_`f-JD-al9b t1nA+NPu)(rF&;0+)Xf_D`*EN~E0&tv)ULZu&;*}7n0eTb=AUW3N)_)srLbr*E#lt2ov}38t8Nqa*0?WZe>7c4PGvCB08$LbCKS@0G(E! z0C=ExN+0|jAr=WKEYuo7)qs~HEN0F@rfxwku?r9`hs=~B1fUIUU1<855Er8Z_(Wgc zUVLydNQ6l|mHbzQ=I2>l=fDmi8POaZj}9K4Oh{#Eyd2T!D_A?cx+Vqm%8dsMMu+F; z)>falfLgYJFIktC=HbZR94M& zI|IknjkFs>1Ds(8z)%{zcfgIxF%ur})G_jC^bd0B0f_@DlqEF_pjvVChJvr?J~!pW zg6r)!j%nd7Le~)*=(^FVYy Date: Sat, 14 Oct 2023 19:16:53 -0500 Subject: [PATCH 05/22] Lycanroc Dusk GFX + Created 2 Frame Sprite using old Sprite + Gave Front and Back Animations + Changed Icon Sprite a bit + Added some more colour --- graphics/pokemon/lycanroc/dusk/anim_front.png | Bin 0 -> 1620 bytes graphics/pokemon/lycanroc/dusk/back.png | Bin 775 -> 683 bytes graphics/pokemon/lycanroc/dusk/front.png | Bin 941 -> 0 bytes graphics/pokemon/lycanroc/dusk/icon.png | Bin 596 -> 452 bytes graphics/pokemon/lycanroc/dusk/normal.pal | 4 ++-- graphics/pokemon/lycanroc/dusk/shiny.pal | 2 +- src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 3 ++- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon.c | 2 +- src/pokemon_animation.c | 2 +- 11 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 graphics/pokemon/lycanroc/dusk/anim_front.png delete mode 100644 graphics/pokemon/lycanroc/dusk/front.png diff --git a/graphics/pokemon/lycanroc/dusk/anim_front.png b/graphics/pokemon/lycanroc/dusk/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..1df7c94d4122d0bfb237d9e5c3707c34a572eca6 GIT binary patch literal 1620 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 delta 737 zcmV<70v`RV1&0QZ7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(7iwf4^8J>4HPxxS;r$h`_L*`1tr8%sv1B00000-7nPy00001VoOIv z0Eh)0NB{r=D@jB_RCt`-)4gt^KoAFTBoke6O{lJpCHIjwA_Wa+Lvj)gk%DlKwGHJN z;TN#N`>>*!m%EwSU07_+?n9H0|IhQWi#_lAJwIRW_fs_@G zur4ugizV6}jhMljHM z)8!yp=AbMzBjjdBxCBPn6n})MK^dO_VEk zG{I-7bAjjUvv7pq%gU3Ifp5=Bjq^gvci|;T?&SC+wg|uZ&GbG^!y}<})cXW@&3?8* z1j;YX3iy~0xpe}FlX3(&%B)TQk`_VinH4;5J|?eF6h%Ovi4HPxxS;r$h`_L*`1tr8%sv1B00000-7nPy00009 za7bBm001r{001r{0eGc9b^rhX2XskIMF-~w2L}Knaw;oy0009JNklo&%hn$E?FI=dMe6f&>*bpSEhm^R9;DnMcNWMC(rCuAn;w^fpT5+S$feUDpClc)@z$ zjJx5K2v2RWFy$Wz;ND;J(VS%~qYz=APe7eJLP91|cDN)SZR1t3!dvi?U62$E=$*|9&J z18DO8`0wt4aCliCN%*Dc$UQ!bj1*#%3EOHmZ(s5-%E75=mG+?a&$`>I%>x#he zDHtvRR^UG;1UwTEtOADNKL_}{i$R}a7AzkmdLE`SHUetq1^w!fzX>q?{{Z!Tfy;o) zbD&*c3vA`@qOWSR5}Rd{mAxIC0Bk`=|KIYx_KpUuTDz^*d^%94&Su9>t+VdaVx8=7zZ^{KKW`Q@-hTW8z|*`S8=<1s P00000NkvXXu0mjf%|x2p diff --git a/graphics/pokemon/lycanroc/dusk/icon.png b/graphics/pokemon/lycanroc/dusk/icon.png index 7ff67638d333738686a40f0992861b58e7c2dae0..65d8394f4e670851a9d9cc4829852265081ab5e6 100644 GIT binary patch delta 379 zcmV->0fhe41jGZ77#Roy0000?P=%ZT000DMK}|sb0I`mI`%#mTdp>^wKS@MER7i>K zl*?|zFbo7OGN4c9{{P=*Ni~gLR&Fg&R6ug!cqviB9LHZ<06qY!I|NB6jvEGrC2+-AeKvwPzFdD2#*LcMzGG+_Ws!PORWBjnQTLcyvq>HyKg)pA#ccp`aw1W- z++R#-7z20_9;am0BVk^V!rclFX*S+OJxhdJOcc{qeGzP9W*B$a^x()d9cB4!;=7u@ zetIY|AKg7m*2@k^X5GC@`Ct3>!~R$TjXxF}>isbrX5o*~Ftb-b+LyERhkW$MJL1M4 z-w`+dXbm&@!-2lV=#Nn#lRsv|4F0gmFu{1^k9&cnKXBuRDiCb_@Dj+z4{JTW_W3J* ZcmiMx7sjSp6UG1l002ovPDHLkV1khloROV1ZP1_ zK>z@;j|==^1(7j6e*ghuOGiWihy@);0004aNkl0zOB^WoapC7`TCD38 zXlkqDcvaZAUYxM*<($=XBhU|JFah9P9JG&0dUHl8jv6DQf5I_#DOG6^ajp(OHIQ8B zLMGxyj$NU;T;EgDCYnH(QT%qM0?|$-E#k|$(0GHfDHx5IQW4}6V7-(nWlG-I{4p0) zqym#K)Ace@yn0*)?v%_*Pc8uRAjxaH0?H-fu$HBXt!>CwYXniZ>lF?I!`&7zXm)_@ zFY`a1+kdl-f48ItjA0dn2LZ0f2hWw-Ul|0YDD~;I7}N|R3`#|dL58ag(U{2~=%`3Y zmt4s4w%rq5snDfRa@3)JqKAr#NUKp8NItHguY*AtPX;-}dp|W8-6n&2gLo!V)hrAs zd8B6}7lWKNX(3IO&jvB*kJ&*aawCl4&TfTqTR*;q9@+X~!|j%T Date: Sat, 14 Oct 2023 20:49:48 -0500 Subject: [PATCH 06/22] Drampa GFX + Created 2 Frame Sprite using old Sprite + Gave Front and Back Animations + Changed index 0 colour --- graphics/pokemon/drampa/anim_front.png | Bin 0 -> 1259 bytes graphics/pokemon/drampa/back.png | Bin 691 -> 640 bytes graphics/pokemon/drampa/front.png | Bin 1067 -> 0 bytes graphics/pokemon/drampa/normal.pal | 2 +- graphics/pokemon/drampa/shiny.pal | 2 +- src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 3 ++- src/pokemon.c | 2 +- src/pokemon_animation.c | 2 +- 9 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 graphics/pokemon/drampa/anim_front.png delete mode 100644 graphics/pokemon/drampa/front.png diff --git a/graphics/pokemon/drampa/anim_front.png b/graphics/pokemon/drampa/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..c263a15727253457a70d7acce8fa537293f57742 GIT binary patch literal 1259 zcmVPx#Fi=cXMVQc_5Kv$c5D-|Ppm1ndD0qnI=;*kxpomZy`0!Bhr~r_lc(^!#U}#X_ zc$l!rpoIkrp8x;^X-PyuRA_A|p-bRFV*`e5E}x&DPt^)S*p$!!PzMbG#$Zj& zfMr>N_DBY7TL*wv(Uofurj7O6^!ZG0x*IDCs}U+dYNvJ6Dr{ON(r>E)&;hm`Ah$DJ zq}t0JZ-W#-JOq?}qKhhgr!VWezKeyJ07SS1tRjyQGJs}97f|#>Sl4Ww3e5t@01*8J zfP5-~#M1OI7=Tftxd1>E8zx5(06kmncL9~22pF>)6cs($0mg6vU>*OMOm6D|4r(AC zY{Wno{Sq)h-UABj4uA>!?IW{jEx86zhs7NrmwN#6OH-l`Q2o{&$ORxPXOEB!RDjs( zZCScigVuuR13+j2yxe#LSX-cVs_41puMEJ9l?7f4gI1v53E99pbOE#MInn@KfLQY_ zKm!IVfGo#{0Mkb@KvTs4y!X3C3>`pq#0XoQ;~VlM+qFNnVo-o1=wtN1WPtvnbq?)X zw2m(o;JfNEAalz$cQ&9SHC>d6ij}@=K?&Rf@`!XLZB_(`4`vu$cV-(@`!P{Sjr_GXUW54LltV6KPK0(>a$B7w?>ghg9sVzkUvQ%2WPT@%hiM zdeH@(wNwr?~Zo><#4F+jUL26^8?uHPxAu>&|613 z7YtPZ)Ea2=1CTzi^8>${Ugrk@Pkx|xNkuBalOH_!!IK}%PkzuTPk!*^2mf1s@E00H Vd+f*4eU1PC002ovPDHLkV1g_2La+b; literal 0 HcmV?d00001 diff --git a/graphics/pokemon/drampa/back.png b/graphics/pokemon/drampa/back.png index b3460057efb2dcdce3003190150c42a1704011c6..be44b000bce02acea65f57059885d99e19678e68 100644 GIT binary patch delta 586 zcmV-Q0=50K1%L&R7$FD)0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!h+NiBag z0O_&-00I6c*Zh;^qTrAiwo5k^zIzPieqsQ^DQCY)f zpUUlv%RWI=IU{!UN*-&IV8rC9UN3m2x24R62c_qI2(@m(+Nw7I-nm3rw_v3HI3mHB z4GY46Ng4A*EKXM% ztORW7gc49Jkf>y)C4gw7gEbgHW1<){q9X`E7ecZS3}QfJD`&_PR{*7{@DqOvgOf}M zBwPU$3+2lk#2uguK@tRjU;^kv5Qqy9PSpwkPw$*!lnsS70D;pb0SFU7?TROXp95$H zsC_x!6lGEI7~oww#E$@^eg_&LLePLK1O}iaC_uHq?-HE_zFQFx#1`yD6EE5i8cLx#zM+KC`6H%A^Q1APPukRN2wwvMu~cLr=;Z}#2j z^HxlL2z4JxPptuRXt09xG^5dD@H&ZdXrRx{Z}e&r30gk~j9*Ql31uFv4*(qN|Ml~F Y1NYS@9g2-WC;$Ke07*qoM6N<$f;4mTnE(I) delta 637 zcmV-@0)qX31+xW^7%>C`00013M{Ml?0004VQb$4nuFf3k00004XF*Lt006O%3;baP z0000mP)t-s0I=whIW2z>km9re000SaNLh0L01m?d01m?e$8V@)0006ENklbMvv1SI){# z89^Y?{yduhXmG@jy6)pRPOqJ(MNyRL^>Yx9bAZo_;@8ai9i4wFrHW-3Jh^kF;`sul zf*5KS1d0kIYa6TPaqbCavy6J1s!$X6ZwL}0R`wJG)B>KY?B8IQ1R4Mj)&{%89!ork zX26pNPO~7n0l53#o&tlQlnlZ-$CTGV`AzU}3*aE)TVS`S#G=|<0Of)0dsVmHW*)Td zzHNO0pmcyHl^=iF)*RZd8bI`h>&O6e<_51ryB%sow5`bqlHbp!1F_#vz|H|^qIiAQ zP-B1Cd!7m6p zl>F-%WbQ$s191B^q=ZSihtloZy-Ke~$Z5{s9+}%WA$>4D0X`^Qffo;SGyiXX_9euB X%XUjN7C`fi00000NkvXXu0mjfiYy#b diff --git a/graphics/pokemon/drampa/front.png b/graphics/pokemon/drampa/front.png deleted file mode 100644 index 6aecba694918af604105278c7ace267db12428a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1067 zcmV+`1l0S9P)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMF6nq5Kv$c5D-|Ppm1ndD0qnI=;*kxpomZy z`0!Bhr~r_lc(^!#U}#X_c$l!rprMrknE(I)32;bRa{vGi!vFvd!vV){sAK>D1B6LL zK~zY`eU-m&(?Ar*FIEP|x>g4kWULYo6+?QBgjA%K=H$#Y3XGM4`^?gzR_YrWkWkBi zkczPbD}_!TGBANq#l}!Y`3Jf{B^WGpym#j~&X00xtR(M~_rCXjmECr1d)Z~TpNh>n zuP-91f(gMY4yUubz#c>bKs2?TH|AXg&;vYSPRzNeLWE|SKxlx@tc&9SLVQIDG#AFW z(?5f^{r7-=!n$ocyfG8wq<{Ld-|xQxNMJ2ZKiD&XefQhx2?A%Nv->bjFYGCx!k^yz zdh+fI#Xx|ekIu?OgbJC8dXe>Q*Wd2%j@IUcozaxRshui;J|6L zZ}`^Z&x14|m0dPc=@`IoV1yx*Qa79G3O@!K$a0`cszyI;rBXyR(3%1Q4P;7XYM|8c z>JwH2Vg%I1957Ntxki920XhO449Wd)7{vs1r8^5ifW#0};35#k9-9Mv7?OR*T|1W; zpaf_M=(R;pAzjPUKxJk^gn=k7$aZ1g5IYHdMSx5Fr|n0Dozr9{mkbwv8u;p4A2-z*>g6t!9W!<3=o^rk%K3EOVJ+FKN{=_77=&FJ<}Jdn*6{002ovPDHLkV1gfN;4lCH diff --git a/graphics/pokemon/drampa/normal.pal b/graphics/pokemon/drampa/normal.pal index 70303462789c..5639299f9565 100644 --- a/graphics/pokemon/drampa/normal.pal +++ b/graphics/pokemon/drampa/normal.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -0 176 232 +152 208 160 16 80 96 16 16 16 88 160 160 diff --git a/graphics/pokemon/drampa/shiny.pal b/graphics/pokemon/drampa/shiny.pal index ecfd99878010..1422a88ff12f 100644 --- a/graphics/pokemon/drampa/shiny.pal +++ b/graphics/pokemon/drampa/shiny.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -0 176 232 +152 208 160 152 96 56 16 16 16 224 176 112 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 2cb6ec3f4907..52aa91551bfd 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -878,7 +878,7 @@ const u32 gMonFrontPic_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/an const u32 gMonFrontPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/anim_front.4bpp.lz"); const u32 gMonFrontPic_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/front.4bpp.lz"); const u32 gMonFrontPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/front.4bpp.lz"); -const u32 gMonFrontPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/front.4bpp.lz"); +const u32 gMonFrontPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/anim_front.4bpp.lz"); const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/front.4bpp.lz"); const u32 gMonFrontPic_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/anim_front.4bpp.lz"); const u32 gMonFrontPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/anim_front.4bpp.lz"); diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 9cef1211d4a1..b4d5cf75271f 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -8774,7 +8774,8 @@ static const union AnimCmd sAnim_Bruxish_1[] = static const union AnimCmd sAnim_Drampa_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 50), ANIMCMD_END, }; diff --git a/src/pokemon.c b/src/pokemon.c index 1b6a7b92096d..64f2e247fd00 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2765,7 +2765,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_TOGEDEMARU - 1] = ANIM_FLASH_YELLOW, [SPECIES_MIMIKYU - 1] = ANIM_DEEP_V_SQUISH_AND_BOUNCE, [SPECIES_BRUXISH - 1] = ANIM_RISING_WOBBLE, - [SPECIES_DRAMPA - 1] = ANIM_V_SHAKE, + [SPECIES_DRAMPA - 1] = ANIM_V_SHAKE_TWICE, [SPECIES_DHELMISE - 1] = ANIM_SWING_CONVEX, [SPECIES_JANGMO_O - 1] = ANIM_H_STRETCH, [SPECIES_HAKAMO_O - 1] = ANIM_H_STRETCH, diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 8694c785ddaa..f41756b8bdb6 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -1006,7 +1006,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_TOGEDEMARU] = BACK_ANIM_GROW_STUTTER, [SPECIES_MIMIKYU] = BACK_ANIM_H_VIBRATE, [SPECIES_BRUXISH] = BACK_ANIM_H_VIBRATE, - [SPECIES_DRAMPA] = BACK_ANIM_H_VIBRATE, + [SPECIES_DRAMPA] = BACK_ANIM_H_SLIDE, [SPECIES_DHELMISE] = BACK_ANIM_H_VIBRATE, [SPECIES_JANGMO_O] = BACK_ANIM_H_VIBRATE, [SPECIES_HAKAMO_O] = BACK_ANIM_H_VIBRATE, From 8d8448b40f009d33b6255aece89870f45ff41958 Mon Sep 17 00:00:00 2001 From: Kaitlyn Date: Sat, 14 Oct 2023 21:09:15 -0500 Subject: [PATCH 07/22] Cutiefly GFX + Created 2 Frame Sprite using old Sprite + Gave Front and Back Animations --- graphics/pokemon/cutiefly/anim_front.png | Bin 0 -> 8057 bytes graphics/pokemon/cutiefly/front.png | Bin 467 -> 0 bytes src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 31 ++++++++++++++++++ .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon.c | 2 +- src/pokemon_animation.c | 2 +- 7 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 graphics/pokemon/cutiefly/anim_front.png delete mode 100644 graphics/pokemon/cutiefly/front.png diff --git a/graphics/pokemon/cutiefly/anim_front.png b/graphics/pokemon/cutiefly/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..3a3a17092f78e0352b4f333408b9c0f3df0f095b GIT binary patch literal 8057 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 D)+D+9 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 52aa91551bfd..46a3cad40883 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -840,7 +840,7 @@ const u32 gMonFrontPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/anim_f const u32 gMonFrontPic_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/front.4bpp.lz"); const u32 gMonFrontPic_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/front.4bpp.lz"); const u32 gMonFrontPic_Oricorio[] = INCBIN_U32("graphics/pokemon/oricorio/front.4bpp.lz"); -const u32 gMonFrontPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/front.4bpp.lz"); +const u32 gMonFrontPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/anim_front.4bpp.lz"); const u32 gMonFrontPic_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/front.4bpp.lz"); const u32 gMonFrontPic_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/anim_front.4bpp.lz"); const u32 gMonFrontPic_Lycanroc[] = INCBIN_U32("graphics/pokemon/lycanroc/anim_front.4bpp.lz"); diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index b4d5cf75271f..cb3cfaf65bee 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -8518,7 +8518,38 @@ static const union AnimCmd sAnim_Oricorio_1[] = static const union AnimCmd sAnim_Cutiefly_1[] = { + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 35), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 3ab87eb1c9ec..09778a3a5e3e 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -753,7 +753,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_CRABRAWLER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_CRABOMINABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ORICORIO] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, - [SPECIES_CUTIEFLY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 16 }, + [SPECIES_CUTIEFLY] = { .size = MON_COORDS_SIZE(33, 35), .y_offset = 16 }, [SPECIES_RIBOMBEE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_ROCKRUFF] = { .size = MON_COORDS_SIZE(37, 39), .y_offset = 11 }, [SPECIES_LYCANROC] = { .size = MON_COORDS_SIZE(57, 53), .y_offset = 6 }, diff --git a/src/pokemon.c b/src/pokemon.c index 64f2e247fd00..078a7d991e94 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2727,7 +2727,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_CRABRAWLER - 1] = ANIM_V_SHAKE, [SPECIES_CRABOMINABLE - 1] = ANIM_SHRINK_GROW_VIBRATE_FAST, [SPECIES_ORICORIO - 1] = ANIM_CONCAVE_ARC_SMALL, - [SPECIES_CUTIEFLY - 1] = ANIM_V_SLIDE_WOBBLE, + [SPECIES_CUTIEFLY - 1] = ANIM_H_SLIDE_WOBBLE, [SPECIES_RIBOMBEE - 1] = ANIM_CONVEX_DOUBLE_ARC_TWICE, [SPECIES_ROCKRUFF - 1] = ANIM_V_STRETCH, [SPECIES_LYCANROC - 1] = ANIM_V_SHAKE, diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index f41756b8bdb6..c8ca0c849a02 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -968,7 +968,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_CRABRAWLER] = BACK_ANIM_H_VIBRATE, [SPECIES_CRABOMINABLE] = BACK_ANIM_H_VIBRATE, [SPECIES_ORICORIO] = BACK_ANIM_H_VIBRATE, - [SPECIES_CUTIEFLY] = BACK_ANIM_H_VIBRATE, + [SPECIES_CUTIEFLY] = BACK_ANIM_CONCAVE_ARC_LARGE, [SPECIES_RIBOMBEE] = BACK_ANIM_H_VIBRATE, [SPECIES_ROCKRUFF] = BACK_ANIM_V_STRETCH, [SPECIES_LYCANROC] = BACK_ANIM_V_SHAKE, From 141aede0f9bef49e6346fcf90b200b81f14c6ef4 Mon Sep 17 00:00:00 2001 From: Kaitlyn Date: Sat, 14 Oct 2023 21:28:08 -0500 Subject: [PATCH 08/22] Ribombee GFX + Created 2 Frame Sprite using old Sprite + Gave Front and Back Animations --- graphics/pokemon/ribombee/anim_front.png | Bin 0 -> 1294 bytes graphics/pokemon/ribombee/front.png | Bin 715 -> 0 bytes src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 13 ++++++++++++- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon_animation.c | 2 +- 6 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 graphics/pokemon/ribombee/anim_front.png delete mode 100644 graphics/pokemon/ribombee/front.png diff --git a/graphics/pokemon/ribombee/anim_front.png b/graphics/pokemon/ribombee/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..fb1c5ad41ac449e10a0f6a17c9b35de58019cf32 GIT binary patch literal 1294 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 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 46a3cad40883..4b88a6181dc9 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -841,7 +841,7 @@ const u32 gMonFrontPic_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/fr const u32 gMonFrontPic_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/front.4bpp.lz"); const u32 gMonFrontPic_Oricorio[] = INCBIN_U32("graphics/pokemon/oricorio/front.4bpp.lz"); const u32 gMonFrontPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/front.4bpp.lz"); +const u32 gMonFrontPic_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/anim_front.4bpp.lz"); const u32 gMonFrontPic_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/anim_front.4bpp.lz"); const u32 gMonFrontPic_Lycanroc[] = INCBIN_U32("graphics/pokemon/lycanroc/anim_front.4bpp.lz"); const u32 gMonFrontPic_Wishiwashi[] = INCBIN_U32("graphics/pokemon/wishiwashi/front.4bpp.lz"); diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index cb3cfaf65bee..72aedb596bd4 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -8555,7 +8555,18 @@ static const union AnimCmd sAnim_Cutiefly_1[] = static const union AnimCmd sAnim_Ribombee_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), ANIMCMD_END, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 09778a3a5e3e..dd05287064e8 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -754,7 +754,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_CRABOMINABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ORICORIO] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_CUTIEFLY] = { .size = MON_COORDS_SIZE(33, 35), .y_offset = 16 }, - [SPECIES_RIBOMBEE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, + [SPECIES_RIBOMBEE] = { .size = MON_COORDS_SIZE(32, 47), .y_offset = 5 }, [SPECIES_ROCKRUFF] = { .size = MON_COORDS_SIZE(37, 39), .y_offset = 11 }, [SPECIES_LYCANROC] = { .size = MON_COORDS_SIZE(57, 53), .y_offset = 6 }, [SPECIES_WISHIWASHI] = { .size = MON_COORDS_SIZE(40, 24), .y_offset = 15 }, diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index c8ca0c849a02..60701871a2e9 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -969,7 +969,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_CRABOMINABLE] = BACK_ANIM_H_VIBRATE, [SPECIES_ORICORIO] = BACK_ANIM_H_VIBRATE, [SPECIES_CUTIEFLY] = BACK_ANIM_CONCAVE_ARC_LARGE, - [SPECIES_RIBOMBEE] = BACK_ANIM_H_VIBRATE, + [SPECIES_RIBOMBEE] = BACK_ANIM_CONVEX_DOUBLE_ARC, [SPECIES_ROCKRUFF] = BACK_ANIM_V_STRETCH, [SPECIES_LYCANROC] = BACK_ANIM_V_SHAKE, [SPECIES_WISHIWASHI] = BACK_ANIM_H_VIBRATE, From e2a77481886d3ee162a815f328389e7b872899e8 Mon Sep 17 00:00:00 2001 From: Kaitlyn Date: Sat, 14 Oct 2023 21:48:02 -0500 Subject: [PATCH 09/22] Pikipek GFX + Created 2 Frame Sprite using old Sprite + Touched up Back Sprite + Gave Front and Back Animations --- graphics/pokemon/pikipek/anim_front.png | Bin 0 -> 758 bytes graphics/pokemon/pikipek/back.png | Bin 509 -> 458 bytes graphics/pokemon/pikipek/front.png | Bin 466 -> 0 bytes src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 4 +++- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon.c | 2 +- src/pokemon_animation.c | 2 +- 8 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 graphics/pokemon/pikipek/anim_front.png delete mode 100644 graphics/pokemon/pikipek/front.png diff --git a/graphics/pokemon/pikipek/anim_front.png b/graphics/pokemon/pikipek/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..f7b765876cbb32bbff170d64100c4608b4064944 GIT binary patch literal 758 zcmVPx#Fi=cXMVQc_h#(;7I5-dx5KvG^Ffb_i`1ruMz)-N*h=7nlKsX>67ytkO00000 z0000008e5XW&i*JbV)=(RA_RY-lS*k9aBmXQy+`2u7C`d%4dHmtM*$;#ryL>7co6W!?>h$ovwK-Z^b;(fh-CBPqy>86Ah-dwR&D@^3H(Xu%)j5Il$r<-7?9Dq2(1;Z zIsn<3&)M=sk|*yb0Ik-ZHH6Sv1nB8^EIwM{X=d)GH5rW`p~HYCQ*2E@-n>48=9!Se zyPJRtA0vWn1>OS%kg4z-ERX(a@;QBVY;A;7 zr%s*v%L-cCyb?|I^j(tpr8@EkXxT+TBRuBWGP&-&{90#qQ}>7gQhLk}9>6LieR`h( zkO8pR#jp6Cpf|7%nECXGrviYM08=}~8$~<~!0$;~dQU#yXyR#r)dq(4J>sbVo*}I@ zpnwl;RDg`2EH#kL`W|hh0ni4%yz5Qc>d?mNoq(E$FY7p@ZCW3iw`l{i3SXum*HW{- z-`=SW=tF!Tc0004VQb$4nuFf3kkv=|u0Z2(iK~z|U?bS;b zgD?mMP%B`LhyCxjKoX6$CYa1xnY5F4B_DB`o_gxHi%0V~CNLt60z-o4ht^=gfDrQo zLI#juV|f)`9Yz5l&+~nQ@F=L!+dvj>5g!0D-6UiMMCCFlHZeN|wmcn-MEHaqD2+(C z1Ss+)A+S&Q0Cs|Zmw+ySPL+XW@d#glXeh8?FCb+=XbXG=P_P!(wHx3d1ctzkIZ^4z-qjH2(NtE@7H~@_2xKn)(Gu^H1`W z2-<)ff`)DL_#E$`d~J^=bR=bg8~j-GW3PVb@*ke5cU0-Xi#bu=OF fA$K(J)L+&cplK7*#>+<&00000NkvXXu0mjfP==&s delta 437 zcmV;m0ZRVL1N{S#7$yV*00013M{Ml?0004VQb$4nuFf3k00004XF*Lt006O%3;baP zkuE-e010qNS#tmY4#NNd4#NS*Z>VGd00CA>L_t(Y$L-WTPQx%10ANcIQRaIV)oF@jaC|m$3s<;G43C#~fF2{3dXlbAAkpbRVe|bOtDf^FKi8isGn*``} z3aE#81*O^)Fo_C@6dsr&S^?vIl>lbF3MILJnSna2Z;NmXbBd5S0yTt0rC|p8fP(B1 z0IEe40RV6mM2bwqw=jxGv4B~OF9ZNMiLt(q0Bm)vpJD)Dte@|$rZ@+Wb-jCw0oT;q z*UP&xoQtN}?k}&GI0qlij+Zgu8qT6!f@SeJp}Yn^Y7hx9#c2*lC18v%!bwI4m-Bjm z$5|*c?oG*Jkw-zs;|u!e?Y`O$w9S3 zpwJ!=eP&bDfdDI=3W32`i<`*(%b_NflM&YMBlbaV1=bL-9H=EgE(dHOcG{i9@4rq9 f!l(5|gRxI!o~A@aN<+#30000!lvI6-A0X`wFGcGLXP*8YbVId$O5D?&DV4(5i$BzR$4g_qt(a|u$!NEd7LIS83 z4*Zj((tsS!0*}aI1_r*vAk26?e?ZzpZ^KI|ZJELbmEJlLR`uaIxg zmcYC>-HIhWn(Is}L}eDs{bc5u>DqFRuPM0w$kP8Y`t=8@C0SpVKmPuB_xrup&zJny z$>*6dx0jLez5f#qgULouYWzPPc);#`?|H+?2dBBEHn1*LKW~`A^vCyu6O-A2>+|+M zWw7mFx>GG_vrT5h#Oe9DhZ%O4*VkTOBfrA1-skQ4^|PK#W8gbB!=GEB@UTel%F>%z zS`G{=?kAp@ROz$fpZITShJEv|CfeVf?2@&LFMRGIj_}v&E^m~wM7yu&W-|7yP$~#+ z{3^UatHX86E5YI-p^3>x`dxPvO?S8+T;sH2A47pe=c4nnVP35^6JkF%>^^P5V7NMH z+2U+14_{w*jt=`XLOZOJI)3&Ynm75MTVFBDQ5GM;X}1sdfdbak)z4*}Q$iB}u_?A% diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 4b88a6181dc9..ba20b46d37a9 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -829,7 +829,7 @@ const u32 gMonFrontPic_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/fr const u32 gMonFrontPic_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/front.4bpp.lz"); const u32 gMonFrontPic_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/front.4bpp.lz"); const u32 gMonFrontPic_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/front.4bpp.lz"); -const u32 gMonFrontPic_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/front.4bpp.lz"); +const u32 gMonFrontPic_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/anim_front.4bpp.lz"); const u32 gMonFrontPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/front.4bpp.lz"); const u32 gMonFrontPic_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/front.4bpp.lz"); const u32 gMonFrontPic_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/front.4bpp.lz"); diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 72aedb596bd4..329c372b3dc4 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -8442,7 +8442,9 @@ static const union AnimCmd sAnim_Primarina_1[] = static const union AnimCmd sAnim_Pikipek_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index dd05287064e8..0c40ccc336ea 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -742,7 +742,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_POPPLIO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_BRIONNE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_PRIMARINA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_PIKIPEK] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, + [SPECIES_PIKIPEK] = { .size = MON_COORDS_SIZE(29, 40), .y_offset = 10 }, [SPECIES_TRUMBEAK] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_TOUCANNON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_YUNGOOS] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, diff --git a/src/pokemon.c b/src/pokemon.c index 078a7d991e94..23f02252e430 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2716,7 +2716,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_POPPLIO - 1] = ANIM_V_SQUISH_AND_BOUNCE_SLOW, [SPECIES_BRIONNE - 1] = ANIM_SHRINK_GROW, [SPECIES_PRIMARINA - 1] = ANIM_SHAKE_GLOW_BLUE_SLOW, - [SPECIES_PIKIPEK - 1] = ANIM_V_JUMPS_SMALL, + [SPECIES_PIKIPEK - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_TRUMBEAK - 1] = ANIM_H_STRETCH, [SPECIES_TOUCANNON - 1] = ANIM_SHRINK_GROW_VIBRATE_FAST, [SPECIES_YUNGOOS - 1] = ANIM_V_STRETCH, diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 60701871a2e9..ea58784b36e8 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -957,7 +957,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_POPPLIO] = BACK_ANIM_H_VIBRATE, [SPECIES_BRIONNE] = BACK_ANIM_H_VIBRATE, [SPECIES_PRIMARINA] = BACK_ANIM_H_VIBRATE, - [SPECIES_PIKIPEK] = BACK_ANIM_H_VIBRATE, + [SPECIES_PIKIPEK] = BACK_ANIM_SHRINK_GROW, [SPECIES_TRUMBEAK] = BACK_ANIM_H_VIBRATE, [SPECIES_TOUCANNON] = BACK_ANIM_H_VIBRATE, [SPECIES_YUNGOOS] = BACK_ANIM_H_VIBRATE, From db81220fe9ca8064f0993317102a9cf499578ac9 Mon Sep 17 00:00:00 2001 From: Kaitlyn Date: Sat, 14 Oct 2023 22:15:07 -0500 Subject: [PATCH 10/22] Trumbeak GFX + Created 2 Frame Sprite using old Sprite + Touched up Back Sprite + Gave Front and Back Animations + Added more colour --- graphics/pokemon/trumbeak/anim_front.png | Bin 0 -> 881 bytes graphics/pokemon/trumbeak/back.png | Bin 620 -> 604 bytes graphics/pokemon/trumbeak/front.png | Bin 613 -> 0 bytes graphics/pokemon/trumbeak/normal.pal | 6 +++--- graphics/pokemon/trumbeak/shiny.pal | 4 ++-- src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 5 ++++- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon_animation.c | 2 +- 9 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 graphics/pokemon/trumbeak/anim_front.png delete mode 100644 graphics/pokemon/trumbeak/front.png diff --git a/graphics/pokemon/trumbeak/anim_front.png b/graphics/pokemon/trumbeak/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..9bb3a97840b5aedaecf6e8e6dc96aad3cedcacbf GIT binary patch literal 881 zcmV-%1CIQOP)Px#Fi=cXMVQc_C?FtUSWplU5I{IM%*@Pqcz~#=sQCE!SisDwh9~}q2po6RkpkTEsNn-Nxlg~#BYFV4oD;AY@~B6!7xJi&!CnXCadD#H4~{aB z2GcZCOr;8L{e+%Xz@nd~lo)1S0>qRc!4i@HxE`h?*4IjaC;%*SgMM9KK!gThwQ2bL z;#gDF+ZG_KIcEh(SkDpdxhw?Adb9)d{AJKND{@u+*{5B z=m;TFnwK|K*4TDJkfV8dU&{D2jRra%*> z(Bc<;G_|&UU?`1|2+qe-NyeyG0?W9sp|Q1UaPB;D5!-re%|Vlw^vx3}Nzhpakhyp= z7_?Enxg*fK3&0GK;%&g<1(e*~fTnj&p-$bKK-GB?0N%jM8@&m@o8&aE908yYMgr-V zh4#?<%_o6>jB}v;SwX)j4f;WI3Inv|1GLYeh2-Jig`CK6>l~Cc@SgsOC!YBC=%kr6Gy%r6TR$OC@T#~{F80lq?oLg7q8KoUcH}sL96}=?}z#~nbyhe zyOpGxNNV7Sq+Z#|8eTkH>LDp0mKR#?&Ra21`2K#}OV=;|)j;V1hUNfbpxgt@cl1h_ z?*IzHuUCS!rPAK*&p9~w2QI+lAAA8G|KRZt9{=F+4}OV1$W|a8cYQ>C00000NkvXX Hu0mjfH~ORZ literal 0 HcmV?d00001 diff --git a/graphics/pokemon/trumbeak/back.png b/graphics/pokemon/trumbeak/back.png index 552c32d26068375b7adcf47d4aaec105e3efb737..a9dc99ea25b3bbd1762a00acd594f3778ed5289e 100644 GIT binary patch delta 572 zcmV-C0>l061l$CW7#0Wv0001;w}I>c0004VQb$4nuFf3kkv@PPT!c>3xBh8?)Fprr@tUE+C8GdlTouj|#CVbDg;NAEpCzE| z0u@+-l^AOtzyPLyMvMqb>;P6`Krn)KK%%395hPP_UYJN5*B1J<7!YjST!fvN=h+Qd z-0~(EG2d=Czd&UXs=%yy5!@qyM(A9sAmtT6Q$z$7FLMDQ&^piT9sog`0nIN9tt%}) zKnd7qz=k4u1IP;~u^aNL1MY62Z(|2memq8msR|0HAi$u1(6_LF=Enp|bu(BG_fa9o zEgwQyf@F<|ZXw5*N;nOUW5l)O z7ld5zMA-&^!S;|pFJ~~c+h9LZ900UDc6rcK-6H_%N8p&3vG6t!2OxqdzvSNwK(^{Y zdMU$mo*e)ZY_~8RC!plD0mVr~K~zY`-ITFT!!Qtr6M5@Yhk#gf$y%w6y#W$&t_vNZZ^9!0 zQs1HrOIs#3vLU7l1_V<@-vyuD1#)g?xFNECbf5k^U+#DG-$Kd`paj|93kZNrb^ri! ze~k`8LkA&D2O)4D5!*3nG?IvZKwoOal8B6N(EtG;gA&^01V9p!5W1FWZL=YXNJzli zUxb&CP#|g(1Y*i#?T2yB5eg~nRjdLFctX_tb7yAb>lGYtaLT4JysPebOc$Pt5o&++t<&yP$++lphQ*c!rQZk=gkIH0eo06TYRfg>IyGA@r-~dW5K=x_@d15_H4+AEE98e@sKyC$UC(s6f zZkSVhPM{6A3FP3M%K=eR*vQf_P#Ovy24dS6I**{F%f60000Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_C?FtUSWplU5I{IMz`($Gcz~#=sQCE! zSisD0lrB@ zK~zY`<&-f_!!Q_y9i>yI#${rQlL;}Tb%rvM{D@8&I(1-S3I{+9D}q)YdH}dVrFQGq zj0g#dF!cy!&KaqL@Fuia5bWwJ3_U5EFEi&Zh)M24GnhE6zva2DxUdELZZ` zrI>AY8|3gd==q!Sc0Oib^*gBR9T+fQ?>lArzNt5;w{Jmfot)0fk6~B##qt>4Ps3~7 zIuoUsQ0BFf?$W-PO&?WnX>)66|4wALsuI0M1KXdDr@1bk-`EP<&+=>sG>+8vbGbC& z@#F{q&A@e@gQq`^=2k@~05YFkF#>4&h%pG7hiYHeCxAFcYQdF7zya&6CITs=Iw4(9 z%kYnhpc5GZ8xk7~{}}m>kaRmHAPq@tYXX#-hQ9%nXabahAp<}vzi!;1Ri#z6g>Uqx z(`YLPRaF&ck+ec-vgO Date: Sat, 14 Oct 2023 23:01:12 -0500 Subject: [PATCH 11/22] Toucannon GFX + Created 2 Frame Sprite using old Sprite + Revamped Back Sprite + Gave Front and Back Animations + Revamped Colours --- graphics/pokemon/toucannon/anim_front.png | Bin 0 -> 856 bytes graphics/pokemon/toucannon/back.png | Bin 629 -> 578 bytes graphics/pokemon/toucannon/front.png | Bin 747 -> 0 bytes graphics/pokemon/toucannon/normal.pal | 22 ++++++++-------- graphics/pokemon/toucannon/shiny.pal | 24 +++++++++--------- src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 3 ++- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon.c | 2 +- src/pokemon_animation.c | 2 +- 10 files changed, 29 insertions(+), 28 deletions(-) create mode 100644 graphics/pokemon/toucannon/anim_front.png delete mode 100644 graphics/pokemon/toucannon/front.png diff --git a/graphics/pokemon/toucannon/anim_front.png b/graphics/pokemon/toucannon/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..fd42f4cc3f487231f87aabb76fe22792d6b74b92 GIT binary patch literal 856 zcmV-e1E>6nP)Px#Fi=cXMVQc_5D*X`7#KJ(FnA~!B}`{nP)Oh~5Fl`<=x`vYsHpI$FmTA&xVXUR z=s@`R_(H^`egFUh)=5M`RA_7q{Z>joU4sE0k(8$Z`KPqC<45-q2Y^P#Q%eY-1E`|~@Y?vp9eo{y zxBx!${K472h{>I?fk5YPk2)|EQ;dPG?sJ4vuz+I15MZJn@Y^teI+z&HH^8HQQr5J8 zlCn}@a(y=d>`^aE?-F;nM_tfQVMDi!LMeX!HtKnd&7Vo3tW^r{YIy$uSlk56lr75; zLZXaHU<+h8P;LSOstbs3nFK3iiJxKe)61ZTUfze_!j!56bqv zJwLeCKlcBz|BwBD>^~F2;4=MV{~!DR*#9Zm?*YJ%_TTyT%>EDL2SGoaAH+7s^8+7a ijOPc*{6G1@U#owwcTM^apa@6+0000c0004VQb$4nuFf3k0000mP)t-sn9!gQ5D+0I zCNMZKO%g^JTxL*MP~aeFF@uqyNVv$*Xh1-yaLCxz)!tZm$oTm9cxIo70005NNklft00000NkvXXu0mjf DPCWM- delta 616 zcmV-u0+;>51oZ@v7=Hu<00013M{Ml?0004VQb$4nuFf3k00004XF*Lt006O%3;baP z0000mP)t-sn9!g|5MU4(7+847FeoTcSWrMfs4zG%$k1q@NVpiFFc1(B;2>!D`1o+h z*todB;~-#900009a7bBm000id000id0mpBsWB>pG&PhZ;RDVdv?bNYK!$24Z@X*B} zi`g9{5PX1O1;LkSIU-dM5ds~gNVpzY!Aa~Z1bl*mQUs}ZT`IU`m4cENP{<&NLx*_z z?yjb}OA3zSH)Q#K{O`NFB*uTKWo1>`t=U%KvMM9CgOGFElt2~pH<)@2K=xf?jWEwxbNdl(yV9T%2HN9tpR$ zjXZb;kdZY#nC?fSm_TBU{4TyC%4^Jo26Sdr-VcqeBIvsHboO(FbnJ*BBsljwd0?22 zMUbWoz@W|&V9;g2;3JzO4lo0sLqk&n5C+oU0V==&1A979G36q_AGWQXQUaU3oU{T^ zjM%dr^kH!Jagd${@NL59EW(1TQp$Pb2dKvI4Ht`3_FunoDFQyXRi)hXO0000Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_cqkYk7#Qg2KrkpMSWrmts4zG%FsP`g z=x`t)aHtRv5a2Kn`1ts6$k@2Jz%9BSg#Z8m32;bRa{vGi!vFvd!vV){sAK>D0z^qf zK~zY`z0|*J+dvct@QWaeZ@O-U4nbf7%~XV)zo7qs;gG>;Gl-~Dmw9^IERzrE2BX7ec$(-zBdfRfvF!w@1$^^y%@fZ@t&z4MH-OaMSR{E zfmi{&Lo)s$8eoU9FOkmh`s752bDUPe1IAbZ9KY8D7Fz>((O&YaUjyAEmS^PP`+MhP zR2hJA1zbBd(8c&D&+w5fw+`fh0wAOgb8G@CdROOB`cN zT-OZL2sb0T%=ds}OoAMIFakhji|PRknZ=asD-p~XGjB6H-Ip`yO#T+l6CgR20W)@G z{=OO^GbEUA>jRhtS-@HVunw$)`K$$WmYro5&|AQkP3ub1By9toCD0()B05Pb2~^9b z4PwV}oGc~Lp!q^AY>S@{<3wCg{n8pC))dq3QxOXxQXu~{n}>k%o75JRwk$#Bv~|^# dDY(M|;4eyci5tKCI0gU!002ovPDHLkV1hbDMArZS diff --git a/graphics/pokemon/toucannon/normal.pal b/graphics/pokemon/toucannon/normal.pal index eeb9ee6b6442..d2ba6f122680 100644 --- a/graphics/pokemon/toucannon/normal.pal +++ b/graphics/pokemon/toucannon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 40 24 +16 16 16 32 24 24 -232 232 64 -48 40 40 -88 80 72 -240 168 48 56 48 48 -168 168 168 -232 112 32 -32 112 168 -16 16 16 +120 40 24 +37 76 103 +88 80 72 224 48 16 -248 248 248 +32 112 168 +232 112 32 +168 168 168 +240 168 48 112 200 216 -184 184 192 +213 213 222 +232 232 64 +248 248 248 diff --git a/graphics/pokemon/toucannon/shiny.pal b/graphics/pokemon/toucannon/shiny.pal index 44b47e16b37c..e60414432f70 100644 --- a/graphics/pokemon/toucannon/shiny.pal +++ b/graphics/pokemon/toucannon/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 16 96 -16 24 24 -88 120 200 -48 40 40 -80 88 80 -64 64 168 -48 56 48 -200 208 104 -160 72 184 -24 160 48 16 16 16 +33 38 38 +48 56 48 +77 18 70 +24 92 102 +80 88 80 224 32 104 -248 248 248 +49 131 145 +160 72 184 +200 208 104 +64 64 168 112 200 216 -184 184 192 +213 213 222 +88 120 200 +248 248 248 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 9fe4cb865fa4..0bc9e8f2c4b2 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -831,7 +831,7 @@ const u32 gMonFrontPic_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/front.4b const u32 gMonFrontPic_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/front.4bpp.lz"); const u32 gMonFrontPic_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/anim_front.4bpp.lz"); const u32 gMonFrontPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/front.4bpp.lz"); +const u32 gMonFrontPic_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/front.4bpp.lz"); const u32 gMonFrontPic_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/front.4bpp.lz"); const u32 gMonFrontPic_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/anim_front.4bpp.lz"); diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 0e7b4e73ddfe..4cc215f68cd2 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -8459,7 +8459,8 @@ static const union AnimCmd sAnim_Trumbeak_1[] = static const union AnimCmd sAnim_Toucannon_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index dd301bca23be..814820364ba8 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -744,7 +744,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_PRIMARINA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_PIKIPEK] = { .size = MON_COORDS_SIZE(29, 40), .y_offset = 10 }, [SPECIES_TRUMBEAK] = { .size = MON_COORDS_SIZE(44, 53), .y_offset = 4 }, - [SPECIES_TOUCANNON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_TOUCANNON] = { .size = MON_COORDS_SIZE(59, 59), .y_offset = 2 }, [SPECIES_YUNGOOS] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, [SPECIES_GUMSHOOS] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_GRUBBIN] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 17 }, diff --git a/src/pokemon.c b/src/pokemon.c index 23f02252e430..bd656772031f 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2718,7 +2718,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_PRIMARINA - 1] = ANIM_SHAKE_GLOW_BLUE_SLOW, [SPECIES_PIKIPEK - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_TRUMBEAK - 1] = ANIM_H_STRETCH, - [SPECIES_TOUCANNON - 1] = ANIM_SHRINK_GROW_VIBRATE_FAST, + [SPECIES_TOUCANNON - 1] = ANIM_SHAKE_GLOW_RED_SLOW, [SPECIES_YUNGOOS - 1] = ANIM_V_STRETCH, [SPECIES_GUMSHOOS - 1] = ANIM_H_SHAKE, [SPECIES_GRUBBIN - 1] = ANIM_H_SLIDE, diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 17aca6be6966..51472c1593de 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -959,7 +959,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_PRIMARINA] = BACK_ANIM_H_VIBRATE, [SPECIES_PIKIPEK] = BACK_ANIM_SHRINK_GROW, [SPECIES_TRUMBEAK] = BACK_ANIM_H_STRETCH, - [SPECIES_TOUCANNON] = BACK_ANIM_H_VIBRATE, + [SPECIES_TOUCANNON] = BACK_ANIM_SHRINK_GROW_VIBRATE, [SPECIES_YUNGOOS] = BACK_ANIM_H_VIBRATE, [SPECIES_GUMSHOOS] = BACK_ANIM_H_VIBRATE, [SPECIES_GRUBBIN] = BACK_ANIM_H_VIBRATE, From cb1da031d348b9852309f45d07ef546ca7017c9d Mon Sep 17 00:00:00 2001 From: Kaitlyn Date: Sun, 15 Oct 2023 10:44:58 -0500 Subject: [PATCH 12/22] Oranguru GFX + Created 2 Frame Sprite using old Sprite + Gave Front and Back Animations --- graphics/pokemon/oranguru/anim_front.png | Bin 0 -> 1366 bytes graphics/pokemon/oranguru/front.png | Bin 977 -> 0 bytes src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 3 ++- src/pokemon.c | 2 +- src/pokemon_animation.c | 2 +- 6 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 graphics/pokemon/oranguru/anim_front.png delete mode 100644 graphics/pokemon/oranguru/front.png diff --git a/graphics/pokemon/oranguru/anim_front.png b/graphics/pokemon/oranguru/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..c3f9a59484747099b29bdb6c479054f6e68b347c GIT binary patch literal 1366 zcmV-c1*!UpP)Px#Fi=cXMVQc_5MUr^P*51iQ26-xxVXUhs1O*CKoAfRKp;?t3shn?G zgvN7*;dlJBF^=7T3No(xY3yVGd}N#v<1~%T=+Lv+DdMD`m_bFnKtw;g&zZpbY2hN4 zmnu}B03W;p1oD7jy_;z`L!kG*)Gwo4$a4Xy0{({Ux_W;ACwP0xUB#!uM82WPkgrWXLxjl(U3ecwaaHk}X@{nDdX0Pe8!D_{#CqYa?? zcYf`t1Oa%T8B4niFMwU;xdZ|%e#NAG(yt5%8L*!L#YIfji}34;?gR(~aE<_eUU4aI zg|P6hCx8PJE5MOHu6|_zt?BYAu6hA50ZGS$K=hLWW?Ic$;8Da<*9!oG4geH=I)36$_?Ok79h#tgRtYq^XS)Y+o+1z&<|YXYD+;0+}ue|049)HZ&Qol zt;(nXkh1}0Pj2&!dBhh0T`&UJ$>Mll;eym+k?-g1i5b^AfdHyc{hSYl-4-PXU}XSp ztvUdufKpDqF>eZ4QY#VsGazE2{~US-&>ca(%oafaCw(RakX0q+&kulj0TdfM7=Su8 z1F8h%IXqXuJHqtdr567JusPI)n0KWB(n(3LI>2tC4cSbn+cIGETtGT)>m_*EM}s2d zJIQ(H(eTmpSq*wx@*h>(N#tLH?PM8zmdhL7g>*$!27KC^k++FX6(6ih7@eH7PMZvM zdE&GHQ2^=oryVV;k+z2e?QtzYDnLG+S^$Pbpm(g4H6?AX1+W5S@$lS3>M7jd>BqF9 z8V$*F-=gUy05x+=E!o)zhrBIXGr(d2U`Qq4xd7PZ&~5?v_c#cED@Xve0+62<_+JZ< z2Wkaef&i=lI_(0<>B-?0z$HipC@ae5e%EIfI`rNES^|dD{!uEx9YqZcej^O0vjeRF z1rWCbP{Gla%NMD?syE7z0pA~XqkqTm`0vLTtb1MGZQWb?UhCe}cUpHHxBOx3weBXj zN2I&=f3xnY&#pPA2mRiCsOJye-hH^|51z-^>)mVl!=MQRIOYh#&H}VI6^X~1Z)oT7=-uv0RKjja1^WG|;l|RfDVLX}lGQqgz59}!4 z%zMrcuK5E$HL_=YGw(-!P~;DV`+qg>r~JU4^h@{uYTnEI07|{Nf0>LZkw`~=VDZ7p z{hR&o$q#aTP`dx#{Gf~vO7|Z-^MiPaA2OgfKfts5zS#e_{Gh}BKj#O}_Wv9C!NvZ6 zBR?qZe@A{W`?ZMCbm1QM|C}E*0ti|0F6Re_{lDY~tpI}M17MLKi2bkR2i2ZH7ba1n z+<(aKU+r&4ejotL4|o9`1n9~S43P2z_;P-b0n&^E=KR2Q<_80JJDNqy53>E29odl| zqy)n9gCl@&o%w-95IH}{0PM{VXsO8mcu6p@J3ml;$`3-y5AdJo2Lt|XelYyz2R~x` Y0i$ke0C95J7XSbN07*qoM6N<$g4s8mE&u=k literal 0 HcmV?d00001 diff --git a/graphics/pokemon/oranguru/front.png b/graphics/pokemon/oranguru/front.png deleted file mode 100644 index b0ba3510c1d0f1fed476cda7ded76e210471f3e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 977 zcmV;?11|iDP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_5MUr^P*51iQ26-xxVXUhs1O*CKoAfR zKp;?D11d>G zK~zY`<@yNDN6OyIw)eii}BO60IH)cIZw*?IeoI1l<~{G zHz2gpyA6ao^{$NafLCZ@&6~XE;1Fd&v5E0(3;++j5<+OZv<8~64V6bwhfj9K=I8$W z+i~R=KzYz_oUthU{t2eMhBffm$^m*8si7$VS(Y=v4x@QQ%N&eQ2XQ4d+3YulkdJ&0 zj>a5xGELlmW6nXa0E-^=RgX>2T7aVw z#$-5ClzBh^v`6kZ-HYC;0|1jTHmednaocYDgy*}40H&4>fLX*zE}=(PE}?F(AcB}s z#we*K50{hnTe;iq_KejcJ8PmCNM+= z@`|ROIrr}E*HJ8T zn{YBPmjcK6;zC^I!(1XIT-!zSJF3!z4|Qe(a@0(Tr2v7!VvzY%tgnNh@O2E=g@ z-i^%wv=oKSV7GiKfGZkHjak)ZKJO4Reqw<*LM+9S#-e}&MX51WozFACC>WA9t5N_u zwD%)bRYi~nWl>}UfD!y~uG(v$Z$kx(Qm8P5pBmH81IeD-6ec$nHZ+4;l^JV-rVAT} zegwd`*TBjJQXu(K;m=`kQ21-Wx(okM6be59h1bOV)s&)a00000NkvXXu0mjfIH9;> diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 0bc9e8f2c4b2..a8747161411a 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -863,7 +863,7 @@ const u32 gMonFrontPic_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/fron const u32 gMonFrontPic_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/front.4bpp.lz"); const u32 gMonFrontPic_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/front.4bpp.lz"); const u32 gMonFrontPic_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/front.4bpp.lz"); -const u32 gMonFrontPic_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/front.4bpp.lz"); +const u32 gMonFrontPic_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/anim_front.4bpp.lz"); const u32 gMonFrontPic_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/front.4bpp.lz"); const u32 gMonFrontPic_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/anim_front.4bpp.lz"); const u32 gMonFrontPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/anim_front.4bpp.lz"); diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 4cc215f68cd2..65c77881b9c3 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -8723,7 +8723,8 @@ static const union AnimCmd sAnim_Comfey_1[] = static const union AnimCmd sAnim_Oranguru_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; diff --git a/src/pokemon.c b/src/pokemon.c index bd656772031f..2982e71fccba 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2750,7 +2750,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_STEENEE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_TSAREENA - 1] = ANIM_SHRINK_GROW, [SPECIES_COMFEY - 1] = ANIM_H_SLIDE_WOBBLE, - [SPECIES_ORANGURU - 1] = ANIM_SHRINK_GROW, + [SPECIES_ORANGURU - 1] = ANIM_SHRINK_GROW_SLOW, [SPECIES_PASSIMIAN - 1] = ANIM_V_SHAKE, [SPECIES_WIMPOD - 1] = ANIM_V_SHAKE_H_SLIDE_FAST, [SPECIES_GOLISOPOD - 1] = ANIM_SHRINK_GROW_VIBRATE_FAST, diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 51472c1593de..1b8889ad56c0 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -991,7 +991,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_STEENEE] = BACK_ANIM_H_VIBRATE, [SPECIES_TSAREENA] = BACK_ANIM_H_VIBRATE, [SPECIES_COMFEY] = BACK_ANIM_H_VIBRATE, - [SPECIES_ORANGURU] = BACK_ANIM_H_VIBRATE, + [SPECIES_ORANGURU] = BACK_ANIM_H_SLIDE, [SPECIES_PASSIMIAN] = BACK_ANIM_H_VIBRATE, [SPECIES_WIMPOD] = BACK_ANIM_H_VIBRATE, [SPECIES_GOLISOPOD] = BACK_ANIM_H_VIBRATE, From 0dde430617a68412081ec7b620f87563cae5c7db Mon Sep 17 00:00:00 2001 From: Kaitlyn Date: Sun, 15 Oct 2023 10:57:00 -0500 Subject: [PATCH 13/22] Jangmo-o GFX + Created 2 Frame Sprite using old-old front Sprite + Gave Front and Back Animations --- graphics/pokemon/jangmo_o/anim_front.png | Bin 883 -> 836 bytes graphics/pokemon/jangmo_o/back.png | Bin 612 -> 623 bytes .../pokemon_graphics/back_pic_coordinates.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 5 ++--- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon_animation.c | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/graphics/pokemon/jangmo_o/anim_front.png b/graphics/pokemon/jangmo_o/anim_front.png index d462c0adb83ca9a49927a0fd8bc15f5822892045..9f3abb069677ed9e9d671c18fc33410769d5d900 100644 GIT binary patch delta 766 zcmV^xzez+vRA_?{U7(_2dp~nlF+Wzb3yFXnTx$AhCrKdnnsKm@f;xpfNm+jW{DmL zkrsKEgGdi~hrvnvD+Yf3vdjy=ioBx&i-pK_6_KOQAOH~{#u!~`6a)Tp;t)Bx^hlx( z5JjnaUl}kGcOg;K;2VEAOMt54Z?!-(YR{nvBCH?lwryY~a6AJG)C1S87`Ws$1D378 z20M~-3C#fIk_3>vJs=LqGQM_BfbIp9W8%r6ma)dUi-NRg(?fi#UmA8N(pi5on8o3_ zCQ$p3FHqy9M&~d(K7t3C}8X$TOD0s^NBX|zDl%#(YXffFWJK8#>Em>2_ zy3X!{DRCbrYwD;^e(#Cr1kw%^!8Rwry(OLl_8k(jkbfkB?A+FD0GtKL!pn=Y`|pG3 z)j@iK_?_1vi#{g+`JH+UayDu1HDC>>f!*8=A}UJIf;bKG>m{1}QiBc$F@WRdH(=q} z0GvhO!#9*CP=kMvM!xf z)9_#M$0t9z&PlpUo-+94CvW)Ud3LV`#!uexM*}@T8+3n_pSQ0~pa7!+giL;Z zU;rcO2ya^BzuV#92PtY9Gp8x;= delta 813 zcmV+|1JeA&2J;4x7-Iwj0000OV1ZP1_ zK>z@;j|==^1(7j6e*ghuOGiWihy@);0007)NklljA6vypI9xK(kAQnL8 zqSQmPBnRrkg6a=|QaQ)KLPhKWmRhpk&PKimOJM5Ii3JZ#*MSU7ZYB0A;v;Zp$F4-* zvsXZQONReX@9v&Yxu0e2>Mt$Z<*ljBgz)H`O>{1%B*28pe`&xLRdoX79tOw3vCipJ z41ypKqVGB3ix!|CjU*6@Xy7@IA_=E>?z{4`L<9NSjQ}9d!jJ$mNI2&s4WTU@ z9V8!?s}W@QK^>5gE;T^prbC*&Uw)cXhtzOA&SNPLLU9rTV4&%gNz2>%E1$@$?} z4aHC#tnu91<4Wa%^LIG~Tq;#?RVWfrS2`^&TY#Jwe`?Lg3Oz&#Sf+oE053<_{&H9+h^o(+tG=z|aqAUo5q z|Kqzae`*7iuVNH&LLj7m{tdB^kfDT$)0tKfAf6K`jh}FU#VKJJj!a`neE`a%EGIPW zjjB+e-HFXE6Ykmgu$&Swg2C`{%SsSPAe4<@;DEdp4BQT?EtW$f?10BvEg1K31!GLU{#(H)Is`*?2*x^Z r^9Lgs9_bHPjbOC-L$ULR|G0hwM%^#Wr{yVA00000NkvXXu0mjf-9ulo diff --git a/graphics/pokemon/jangmo_o/back.png b/graphics/pokemon/jangmo_o/back.png index 6416369e961f2801700974fae9118b9749632137..209011dfa70d8d8e60796bcfd03392b1aeaf849f 100644 GIT binary patch delta 552 zcmV+@0@wZI1n&fp7#0Wv0001;w}I>c0004VQb$4nuFf3kkv=|u0qsddK~z|U?bh3F zgD?yRU@&q_f%kvj`IL~RG^gE7^Q5ZM`hO%bBrMCHE&y1$rsL~oHA%pB*Nl+oXN33s zm>>%WCD1K!R)7Bi^a=NcKY<=0ORc{JriSpAc^E=dC|W-OJY97}cyB&(f!4qfvfmvISp4Zs9%LX@BiXcw|ehPWI6$Kn4%st85*(rPMj9J>>hHIOmi z`TL6lFE(m|E@B1*>jY3QP^>_@DU315I7zn*?BMUrYbkB z-nsE`<7UVlx~2ennAy&i&St_3&hzXMU?V#mHJf&L13CnLL$mh_`^3!werwYqv^TSL q)sVlX;AVon_APLAx8c8r>j(9MAp$JfJ%|7R002n`MNUMnLSTZbRrz87 delta 540 zcmV+%0^|Mf1mpye7$yV*00013M{Ml?0004VQb$4nuFf3k00004XF*Lt006O%3;baP zkuE-e010qNS#tmY4#NNd4#NS*Z>VGd00F&8L_t(Y$K{nVZo)7WhJz(G255v>AyvXa zmtb*^0%@BMb{m*}6WcQAQqmLM0O4nrNz^2WTs0`dkR4fgl}#>)_3 zGRznoD+BcXtC$st88TfXfAj#c@iE0hE$P$&7&ASLkLyyQT27S>j8PM9MZnRp z8Q?N<0esN@9WR-RrjsIdd}@?-*Wfasl*Owc@mr@?0AAEf&BCW+pK5uNse eKZL)kDEbDdW#O+pz;7l10000 Date: Sun, 15 Oct 2023 11:09:44 -0500 Subject: [PATCH 14/22] Hakamo-o GFX + Created 2 Frame Sprite using old-old front Sprite + Gave Front and Back Animations --- graphics/pokemon/hakamo_o/anim_front.png | Bin 1418 -> 1306 bytes graphics/pokemon/hakamo_o/back.png | Bin 638 -> 559 bytes .../pokemon_graphics/back_pic_coordinates.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 3 +-- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon_animation.c | 2 +- 6 files changed, 4 insertions(+), 5 deletions(-) diff --git a/graphics/pokemon/hakamo_o/anim_front.png b/graphics/pokemon/hakamo_o/anim_front.png index 2b5112a2d5b4afa61026848254817af74026e8fc..599bbe3eeb19e58acd4e08a57f115ee098bb4162 100644 GIT binary patch delta 1240 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 delta 567 zcmV-70?7TZ1pWk&7$yV*00013M{Ml?0004VQb$4nuFf3k00004XF*Lt006O%3;baP zkuE-e010qNS#tmY4#NNd4#NS*Z>VGd00GxYL_t(Y$IX<#irYXC#y2dNGT0B`BBVaB zvq*B|JcEhZRV4^nG^zpzW_QxNksCMZ@&I|BoO?ka%~g7a%vv%W-aoo3+#sYCe3k%6@4Cl0!MjU5#vKNKpo^y1bQ3AA!1;FsSdBn;pDr>1ET%kO zQiPoHD5?}dDRPqp_#$tra1nP>xkF}+tbzbXD;WdagRxbxjl99_Tg1IGXsZyAL1P+3 z%xgq*4phk%Skk2=0KbOX5Kxj-V2P%*_g`3`j}ig2LbRg!_TcN~o^*hnLc12$ct8n% z+QJaHJ{E@EZEuPcV$`82j=u~my(Ih!!0vcJi3vcrKMU$;8wKF|j|rewkOl~$&#rHa z$gipdPzp^PP|96(0@w+l2Oa5Cxke$21NjBe081A3$Q)2>6##}5+GWon_Z*m;I~U?| zWXk|Bc&xZ11d9S6XEdN8gAvf@8F?*#6F~Q##wVzcT@Vn77Xo4mSZ$)f(B)<^n*cuC zzJK@UxdUvxRm@KV(T~8{vsj;c%F`dBz^AtD`=|D=8V35a2k`b1S%c7^RmNKmeC_lT z{Y`GklvuNXN827qG<1XiPci;P2?UAt0Qu|VH3wt=0Krr|5q?ZZ1ONa407*p#PDHLk FV1nAl_J05X diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 5e89db0bac71..4ecbc526c460 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -813,7 +813,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_DRAMPA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_DHELMISE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_JANGMO_O] = { .size = MON_COORDS_SIZE(42, 56), .y_offset = 5 }, - [SPECIES_HAKAMO_O] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 5 }, + [SPECIES_HAKAMO_O] = { .size = MON_COORDS_SIZE(49, 56), .y_offset = 5 }, [SPECIES_KOMMO_O] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_TAPU_KOKO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_TAPU_LELE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 43002e29da2e..906f65218612 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -8843,9 +8843,8 @@ static const union AnimCmd sAnim_JANGMO_O_1[] = static const union AnimCmd sAnim_HAKAMO_O_1[] = { - ANIMCMD_FRAME(0, 10), ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index a18855bd2e04..67e6ca264dd7 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -794,7 +794,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_DRAMPA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DHELMISE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, [SPECIES_JANGMO_O] = { .size = MON_COORDS_SIZE(36, 43), .y_offset = 5 }, - [SPECIES_HAKAMO_O] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, + [SPECIES_HAKAMO_O] = { .size = MON_COORDS_SIZE(53, 61), .y_offset = 1 }, [SPECIES_KOMMO_O] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_TAPU_KOKO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_TAPU_LELE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index faac51ce72d9..9fcdd1a3ad99 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -1009,7 +1009,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_DRAMPA] = BACK_ANIM_H_SLIDE, [SPECIES_DHELMISE] = BACK_ANIM_H_VIBRATE, [SPECIES_JANGMO_O] = BACK_ANIM_GROW_STUTTER, - [SPECIES_HAKAMO_O] = BACK_ANIM_H_VIBRATE, + [SPECIES_HAKAMO_O] = BACK_ANIM_H_STRETCH, [SPECIES_KOMMO_O] = BACK_ANIM_H_VIBRATE, [SPECIES_TAPU_KOKO] = BACK_ANIM_H_VIBRATE, [SPECIES_TAPU_LELE] = BACK_ANIM_H_VIBRATE, From 58154b24d85b9a4b9f7cfa5a1ee543e2b2cf5c9a Mon Sep 17 00:00:00 2001 From: Kaitlyn Date: Sun, 15 Oct 2023 12:08:03 -0500 Subject: [PATCH 15/22] Kommo-o GFX + Using current animation sprite, slight modifications + Changed Front Animation + Added Back Animation --- graphics/pokemon/kommo_o/anim_front.png | Bin 1994 -> 1973 bytes .../pokemon_graphics/back_pic_coordinates.h | 2 +- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon.c | 2 +- src/pokemon_animation.c | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/pokemon/kommo_o/anim_front.png b/graphics/pokemon/kommo_o/anim_front.png index 5f1a7382ba0d2d926a0f65515d5a41127aec85fd..090ef56f0bcc2ceb413260ea361f755bc56629a4 100644 GIT binary patch delta 1912 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 Date: Sun, 15 Oct 2023 12:27:47 -0500 Subject: [PATCH 16/22] Decidueye GFX + Created 2 Frame Sprite using old Sprite + Gave Front and Back Animations --- graphics/pokemon/decidueye/anim_front.png | Bin 0 -> 1258 bytes graphics/pokemon/decidueye/front.png | Bin 925 -> 0 bytes src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/back_pic_coordinates.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 3 ++- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon.c | 2 +- src/pokemon_animation.c | 2 +- 8 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 graphics/pokemon/decidueye/anim_front.png delete mode 100644 graphics/pokemon/decidueye/front.png diff --git a/graphics/pokemon/decidueye/anim_front.png b/graphics/pokemon/decidueye/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..f0d7e46bb1927e57f0a24fdf9c17567ed358852e GIT binary patch literal 1258 zcmVPx#Fi=cXMVQc_aA;ug=-?0#5V$Zfz_6g`U^r+X7ywW>0H}Bfa8Lj+I3QSX*r<4@ zU`TK{IOYDz*Z=?oXh}ptRA_^x==EZ?)7AJlR9 z{XPVwnu%w99vXn}!M7)+zJ%a?mJkQ0UlsG?e zpomri04w3vzNLP@oAV3E}*tT_D zrvS9B+vc}*X?h*OqZR|f`sEH7CLn(tgl9b#kqJWxOuR=D9L5%UNn$`4+0fW{s7M=s zegXJK7~2b2@*VoE5j@q+Jh+$qj_?;QDM&&9B#6NPI0Sq;_7NjCmiic_Na5Eg0mES@ zazPX2bwwW6C?KLF7(NQlaB-lkjzK_T0M`O*eP{rbhHEf~+peqHzP#~4S-sJ6Qu&A$Q7jOBXK>w?WGR{&OoY114NQ~tOO+4 z%c3uU(GU_(0RZ_dWPn^MHH7#cP^O@qB>|A!_r8V@-`BR1LDi=QFzz10I{;@Ode;Fy z7>;Hngd`bot472>`7YqET|I>K1^_idj(RTF0^bpj3;?eZ;+rH=q{DEd$0;~-)c>c4 z0n^Z@5Lkcm@_0NoyzalFdxaPmT(U8=qMK|c%!~bpkw=Tvu?PB;krd$j!4nnpdrVNPZ z-d#<&8vr>FT@*gNurL&a+W$Xgp&{VBRZVvwbS4Uw(HsP&kHg-B^#62ELeqNI{-2|m zG7xV4|D1tv>;LBrg!R_{&lw24|DQAvTuYa)r z`Uk)M!9U<16u_u|Ab`7nkQ=UX|3Cor4KUO*-T~b|Pf2c4;_Gb`Q|&XzYU=0hR6~%K6qsykj6f!fRsD%4j2z1x8JFD@YMquv=5qr zkZ$_NJ%kVTL7M{V4uk+k?Sp24GzTI32gCM3H4vyd2-!a%YwU=9Pz;3ZAdu{$-0|kN zxrFdGi3I%%2Z6@ygQ9=oAPm|E;&{At5Qgo8$7=^cVIMqRItW_(;PJJ~|F`XfKL{^p UL0Q$N3jhEB07*qoM6N<$f_Jqzw*UYD literal 0 HcmV?d00001 diff --git a/graphics/pokemon/decidueye/front.png b/graphics/pokemon/decidueye/front.png deleted file mode 100644 index a13a33a2ae81d4e4dab8039ad1652c8b2c340c44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 925 zcmV;O17iG%P)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_aA;ug=-?0#5V$Zfz_6g`U^r+X7ywW> z0H}Bfa8Lj+I3QSX*r<4@U`TK{IOYDz*Z=?k32;bRa{vGi!vFvd!vV){sAK>D0`^Hn zK~zY`eUs0N(?Ar*vqZ4B&@KVN(@qWSMYcKyYJWt~B?z82abyv}LqinyB+3>&>DI+2 z2QPcDlarFmCKm-g2<>h4w0mmVV_HfO_R_5XK!P)^g>5_OJ5Bh0=KJ2f_rlFZHp?xI zEC7XN`lY+l>QY^O0hj5S=JRHAnQl2A#?2)98}{@~EO-|C1-fVAjY%_u9!X4Q!{63)W7K)JNliuq{e*MSggn>g=82 zeOE__7&wq^z?G~UsQ!`|_=imWa^3gqW-T4y&H4w!q{DK2W{&r&xvLrzfN5dfG7R(H zc%y8e(TNOhn49Js?2G|_vD8q|sk_EA4>xG9S>v)c4XB#0aRYkT zWdU%vCPMY4*NPxiLI%J?xP@R5!cjkpdMx0~6%o4P>H!HBAe^}x05%1>QlC+TVC_qq zWbNsrpbG*9kXY{|0IWSJ4o*SvcM*uK#uOkiU;==q0O`QT9CZLmIv@kE-U3f4z$k(M zLk+BZdmB{mE&xJcw?d??JNp|W3T!L_)?p;0ZRY^RT`4$a0iH4>d+&-dY1Cp7LQr&+ zP(+Up|<%s({lD Date: Sun, 15 Oct 2023 12:35:12 -0500 Subject: [PATCH 17/22] Dartrix GFX + Created 2 Frame Sprite using old Sprite + Gave Front and Back Animations --- graphics/pokemon/dartrix/anim_front.png | Bin 0 -> 1054 bytes graphics/pokemon/dartrix/front.png | Bin 692 -> 0 bytes src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/back_pic_coordinates.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 3 ++- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon.c | 2 +- src/pokemon_animation.c | 2 +- 8 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 graphics/pokemon/dartrix/anim_front.png delete mode 100644 graphics/pokemon/dartrix/front.png diff --git a/graphics/pokemon/dartrix/anim_front.png b/graphics/pokemon/dartrix/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..6adf23406597b31e02835c5156d77fe4b47914ea GIT binary patch literal 1054 zcmV+(1mXLMP)Px#Fi=cXMVQc_C}0?f$WUM?AW(=fsCYmS5D@tI__(;ZaBy&tNGOOfAn1rNz)&Cn z00000047Dg#sB~VoJmAMRA_)vFbqX;aAX_9|NrjjW-z3ymdMQ0pw%X%&DoJJ zDAt*#C!Y9M5h%WqzbHbOCA>6|W5n>r5S#;X=pzyKmsUd9EmIPh^xEivt1(0!T4*{@p3bc-#H-KJZ0_(ck06J;sZ~$Z$ zc8Xjq3K(uB1}w`3u#nycm}s{kVVU)l@q!8g0caA(0H7iSs#_MhfL55Y0YHTm2>_x8 zx|GUB1$L;HF(3gFA^1t^BdW6@0ZJijzN(efbG8DA0PXvv=@noZfdX>w<@^_G0z2Up z3^3}6z<^TdJ}5T;jesW%I%o*MqelX;K2m)K8Iq}@c2TztB24s431Rs33?L1(7anb` z7mW{4*LAD%P#baEwrbb2oI+Ll%1QvBPX`UrV+wWvAx=|XS6Ybb0DSWH$0we6;y;VO z)x3Wt_q5w*{p*Mr{Qg0&R|CQ29~|BR6=uJGu)i5#Ugp{DAB5QC6YBX;;PVeO0WANd zmwwgbA7}!-z6(S9ADW&3ocG}#*a51)x(CVPA8_B^61cbrruLuOcF{}Q*}De@05Aax z?10`q82bl!C@%!SwV&S&aJUEK?j7iajz>B?O!k0XKL&71!-t3l=-q=cfE$v+r}++W z){ln3J&6DsAzc8!oOX+L#xexIf1t}vi!j~s4@6I=@(|#Le^5k@lUQ-X`TYaY(<~G` z;lKR;L18^paL6%w{R6t)v{M8rs80WYJ3`S*QF8kS(Db!3A-eqood7!0vzO=g4~lLg zB+$x7w|`JXpK=ZSh357T+CTaGBjR2xPXB<*Zl<^KR%W8hKj1DEBtz(PGW!Q`mTOL3 z4E+PRP7wI~1HBzDqq6%4<%jhFkAHx-(??Gyra_3bEJOdG{L~Vvfe`VSa@#+^{#P7? zTmFHx{OTY${ew>f!D~QV3Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_C}0?f$WUM?AW(=fsCYmS5D@tI__(;Z zaBy&tNGOOfAn1rNz)&Cn00000047Dg#sB~S32;bRa{vGi!vFvd!vV){sAK>D0u4z- zK~zY`?b0!8+dvct@GAvD@DizYU9#!OH!xkYISB6=&Ja&(P@ZIW@}egtndQ?~DA?XZ zU3yct4z}kSqO4hhze}Fwq|oXq&^>gBcj9gcmicc@&gZAh~uOV zoDujq7|+sV5{=}6&w^GyNRr76N3N*?t89@bIK>)pyaku*t6v0~W?ub>;CKt}3IZ3Z z&j8EwIs|U94!jKr;OYg?3%nMtr~`iIf$Bksm$(CyD)^?GTxi<5Z&O57s zD8(TVfO(kG=v7Wq?BO&H!9W~hin(TnQq#C1Y_BuZ91u}9-d%S>AQv3arATz9XBh)5 z9qC;NFdb-%Naqt6)B`KiI(XlWbe3}+D4;Vh@IXho&jYc#?^<0E0f<`Q3tu!g{05B$ zfpSp;mUoNdVL^+<=7HUS>P4}+5e<6XFu?j!+yj6wmbWVw2n%+tm%g=R!E?xgFJALk agm?t4GyfECYWGF}0000 Date: Sun, 15 Oct 2023 13:05:21 -0500 Subject: [PATCH 18/22] Rowlet GFX + Created 2 Frame Sprite using old Sprite + Gave Front and Back Animations --- graphics/pokemon/rowlet/anim_front.png | Bin 0 -> 730 bytes graphics/pokemon/rowlet/front.png | Bin 539 -> 0 bytes src/data/graphics/pokemon.h | 2 +- src/data/pokemon_graphics/back_pic_coordinates.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 3 ++- src/data/pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon.c | 2 +- src/pokemon_animation.c | 2 +- 8 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 graphics/pokemon/rowlet/anim_front.png delete mode 100644 graphics/pokemon/rowlet/front.png diff --git a/graphics/pokemon/rowlet/anim_front.png b/graphics/pokemon/rowlet/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..eea15ffec133b7665ebe9b4f6d7a63da6a175e58 GIT binary patch literal 730 zcmV<00ww*4P)Px#Fi=cXMVQc_cu-LAz?iUraPau(kbscDxVR7y5O^>k@OVJ5P%s!^NHEBVD3D+P z0000003onaeEKr0vMywI`| zWajf(T3Y%Kf~NOw*Yt`p-GgEEyQgdf@Fem1d1WDh4_hq0H9OQYF{qSo6ZoCD(Ki`ce zKqf)7 zl0#W;!a0AE`0H_CiWD8S_ z7Xo5604Ab64S62b1ju=pXSm}>*37HLPoG9CWLM^^Y?_|{J2Bd83XJ|R0eI?R5t0=k zjB&wUv;!U_(-tl*EiElAeXHP41;W`Myebd??m@wdAbYw+6=Q(_K0U&cjnMot-T~GE zffHjST~d=e|Fb_*;KVR009%K_fOH0UbAcc`K&iiF=2w6ozr`JI=~+cU39R%*n@fz$ zZ3dbEXZqf_K}e%PFy#MH0Pt62DKnx8!0}xUQj+*iH*nblRevy3xA^W2gf@J;PI)v@ zRzNQj>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_cu-LAz?iUraPau(kbscDxVR7y5O^>k z@OVJ5P%s!^NHEBVD3D+P0000003onaeED0dz@3 zK~zY`?b5MQ!axuP;7b)sLl}B4g@si(M+!=gga=Tpoe8Nk60$=<=P39Bh%W$>QcLJ< zj+#c^#l3^hJz5Ldt{3q}xKwBxb!S#Vah~L0%e{c7bz1n_?P>?`O)E6kV z^EGHO0<@q=0SaH>MF2JoQ&R?Hr$Fe3f n8}Lx~LuvxHH~{S70SVk99rR5P*fFcX zoun|afawxo=>ojC8JSlWWw`|QTCV7vRo-XwOtXarxG>IiAFu(&^zPg_8(V?tlQH)s dIM*K)V?P&+i{RK+8sPu{002ovPDHLkV1nzZ Date: Sun, 15 Oct 2023 14:41:15 -0500 Subject: [PATCH 19/22] Passimian - Has proper Shiny now. Passimian did not have a finished shiny pal, likely due to how Passimian changes so much. + Completely changed the normal and shiny pal and fixed up the front sprite to apply these changes. Notes: Passimian Palette: 0: Transparent 1: Torso Dark Shade 2: Torso Mid Shade 3: Black Outline 4: Arm Colour 5: Tail 6: Main Colour Dark 7: Main Colour Mid 8: Main Colour Light 9: Leg Mid Shade 10: Leg Dark Shade 11: Iris&Forehead Colour 12: Head&Coconut Mid Shade 13: Head&Coconut Dark Shade 14: Eye Colour 15: Leaf/Pattern Colour --- graphics/pokemon/passimian/back.png | Bin 654 -> 590 bytes graphics/pokemon/passimian/front.png | Bin 920 -> 866 bytes graphics/pokemon/passimian/normal.pal | 26 ++++++++++++------------ graphics/pokemon/passimian/shiny.pal | 28 +++++++++++++------------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/graphics/pokemon/passimian/back.png b/graphics/pokemon/passimian/back.png index e27f88bb02c35dc9cd7ceade00dd3baa7dfc77ef..b43f13aa1e62f1cae5a684992637c39761b7c365 100644 GIT binary patch delta 577 zcmV-H0>1r@1c0004VQb$4nuFf3k0000mP)t-sn9!gOFN7CF zwFn3Zb8|ozMzumZC|glIaBxES`1rcIy7>6`@U0!3ZVdnb02s(np<-e#0005ZNkl~wlrr8A$?0mhJaXji9{$qg%gc4z^=45qeE(7?+{yqv zbMiM7GF;_}F>e5&)=MB5Ab9(!v3y1tz#;VYAf@mv^ndkcg2sea`5K5W05%`6$)xZ7 z5wNxE|4A66?*Xhmp|k#k0XU!!m@puKKEWv;xE8zy@GRgq&LH!<7O=QUhh_yh$3qjK zKWiJRG;V$RQCq!gH~_H`I8`B*`T1-BVDv=Ox08nwMElfZ@y+oU|1|yphaDqlblf<| P00000NkvXXu0mjff?W3q delta 641 zcmV-{0)G9@1daue7=Hu<00013M{Ml?0004VQb$4nuFf3k00004XF*Lt006O%3;baP z0000mP)t-sn9!g=Fd%SfKoAfR5D<76$WTx~Fc3iCm_QiNa3H|Apz!eM2r$_A*Z}zO z*l1utSRa@M00009a7bBm000id000id0mpBsWB>pG=Sf6CRDVdv<&)2fqd*YG4ebM@ za1TLb<`pJP0-=$RA?;=GHu^r3n|s{j93^`y7T+PnW50ytmV>a&1I$#nnek8C-k1GQ z1ncKlpJnO%t8#ai0=pF=E08n>sTF7{Q-HRJ62~T8a?=+puvX@55+IAn8bP@yih8gD zEKPTG+5u&Mdw&&+R%x=H$VfdR0-oS?!eY5jHg5+z;ca1`{d_x&S78nruNN5+^HE@1 zEi#UmEX%+f1$a>{I2M}>>dUBwk63ZU&7r;?e~ke%L|h^s@2+?}01QlKFlPjK1YGHI zSL0yftf+u`p{du?}n{zjb~_EQa5c$&SthR0AOF0^*Ur z{Dc8%Iq2br(ja<3YyjuS?jYP!8tM%y90Fx5%dSBj4}qiyFlhj3EO(X}P?gST3OFmE z+k?r{0D8(kpl+QY_ySZS(E)_qO9*_-C4eSwEq84M4tmo8F*p&kQi~P0qaq;JfUmbX zppIpfwtySUcH`BrMc0004VQb$4nuFf3k0000mP)t-sn9!g$FezD6 zOb7@F?(XjR`1m$3DN;;EYh+#c`1rcIy7IFp#ok|#qdfor02s(n7Tg($0008uNklw@AS425l@L8#dGf7?B|fY?Iq>Yv?AJ2Tdtj|4*K<$v;j8pD3l-(f!xRR0U% z5J2TI(+B;4K&w6G^)~>oLqOG!0802C04b~fYk-Ep>pEN{4(9;lIlP4c2JXQa$l)je z0o=gAJs3kmI1E56$ghzPRuVxB=kQjo>mvJ10*GG#M4BIB%rTBO>4Kk!1p)xgdoL+r z6k*s_5pe^sNr<|l+eGV5+5)0xuq+KgjOK~X=*tvT0LwaR67xLm0iA6?DRRyLOHh525~czmXLhsq3}6Vr0dbPgRX;l*9UW&AYY4$IQ0-p<;G`z{ zWQ5750Dm2DM6e;F$Daydn)Hj$05VsMJ=re8gPAdn>v}E%5>E+1k{~ai>lFn3;xoYX z7z$Ui>3@g*$`S-Dege>>dYd-;pnAERDL4YSwl17#)eyrggF&a1ITSzK7Cm-P)#I8@ z0K`vjx<~<5xiN@~eh6S6>`L0;!yAAulw5xdP-nKj`KAY;*f51UWB&S33AX*&^}}Z1 z0G912U8MkufIa~{2fizU39lcbrW!J741CZ}ihmv#`ZHRi?99|O5P5LWk*EMz0VIuI z6>SeXBv{B8*#PvQi?qOvLJ55YLU1A3+0q3lVGsnKphp03+u;fZyHqa2Q9B z3qt?UJ^&6wfShSX=@8Q4TW`{%sRz&vK)IcR?0~mr)H3TFj;!?yLau7jZ&saI3$6E# ztWaQL%B^jyNUKchtn+dq^@~j}A>duJ=;^&;NXm@6r?V8k0C36ch3R)*#^}FWsM!DY h;d}aXHX7yMwLcj1Fc8ahgy;YO002ovPDHLkV1n*Gi#7lN delta 910 zcmV;919AM~2ABts7=Hu<00013M{Ml?0004VQb$4nuFf3k00004XF*Lt006O%3;baP z0000mP)t-sn9!g&Fd$%HKoAfRC@2^h$WTZ?F!=cRc%VSI;Ap_OpzwegSWr0l*Z}zW z`1ttvv{o=?00009a7bBm000id000id0mpBsWB>pH@kvBMRDVdvwUoVX;y@69Z7mOw zT_l`vG+rdvz$OqP3Q%z8F7N;W$&s$JIAtWdC=KYUC{3(XD1{}YwAVyeL{RQ4+`HVY zjqw^1PAA<>VQFW+oxh#2@ju0+M~4B%?ZXZ@=SP15kS=~M^AWfngA5F#aPcHp&pr!-2KKFH?FmMM(4gep9n`+5K{E&00LuqK!?z!HMB0$SKZq1z21_^7J1!jsbV5SZqd zu3$CzSAPVg`~>iX5D`RB!3eT15r9P=kngA~MhL9?avvb5jRNSbIv!mQKkz`@fwV+~ zP3S?TKlJv1!qAf|d2uSG1-(kY54*tWKw@?)*L#NmOIhs$SX@WdrzZJZMFG#Z5e^$4iGqeWIKu7xYz}7%>vuu#gP>V<(ib2i}4P?m~Dqlh-Ew|L^N{~MHE2o zuu&tzPew`jITz@f)$LF`n!dle+Vu6I!_^Xx?J(2;;_E@owpu(~-=^=EJ_1O4o&wh! zJ%8QtFrO>C0+Qs+YaK9IJ4{?OOXCD+j(7%`jGret%n(SDuRGduGly4aXrImQ$D8sg zV@~#;W}|9x7R!Be9A7hS+h*DCgR@%W{O%Y5AvQG%Y<-qOwNVpfc83nKx>7X8Ybq~+ k_T0wriGJr_iedZ)l3G+KW*1fg00000Ne4wvM6N<$f?AT6T>t<8 diff --git a/graphics/pokemon/passimian/normal.pal b/graphics/pokemon/passimian/normal.pal index 26283bf52ef9..0b663aba0756 100644 --- a/graphics/pokemon/passimian/normal.pal +++ b/graphics/pokemon/passimian/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 48 32 -96 96 64 -16 16 16 -40 40 24 -24 200 80 -72 64 48 -248 248 248 -120 160 64 -184 224 104 -192 184 160 -240 128 24 -88 80 56 -248 216 0 +54 48 41 +89 83 76 +8 8 8 +238 238 238 248 248 248 +54 48 41 +82 76 70 +107 100 93 248 248 248 +186 186 186 +242 179 39 +197 222 95 +144 163 60 +255 255 0 +24 200 80 diff --git a/graphics/pokemon/passimian/shiny.pal b/graphics/pokemon/passimian/shiny.pal index 9b8f0f4a8fad..833f0df2fce3 100644 --- a/graphics/pokemon/passimian/shiny.pal +++ b/graphics/pokemon/passimian/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 48 32 -112 104 64 -16 16 16 -16 16 120 +14 47 132 +23 68 181 +8 8 8 +115 115 64 +22 70 181 +66 58 40 +91 81 61 +112 112 66 +248 248 248 +186 186 186 +248 248 248 +240 173 29 +156 110 12 +255 255 0 24 200 80 -80 64 48 -16 64 224 -152 64 24 -208 112 32 -192 184 160 -240 240 232 -8 48 216 -248 216 0 -248 240 216 -104 96 64 From 68e82d30bb58870b15e9d7e814b9cb877bdf2267 Mon Sep 17 00:00:00 2001 From: Kaitlyn Date: Sun, 15 Oct 2023 22:59:54 -0500 Subject: [PATCH 20/22] Passimian GFX + Created 2 Frame Sprite using Front Sprite + Gave Front and Back Animations --- graphics/pokemon/passimian/anim_front.png | Bin 0 -> 1498 bytes graphics/pokemon/passimian/back.png | Bin 590 -> 590 bytes graphics/pokemon/passimian/front.png | Bin 866 -> 0 bytes src/data/graphics/pokemon.h | 2 +- .../pokemon_graphics/back_pic_coordinates.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 3 ++- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/pokemon.c | 2 +- src/pokemon_animation.c | 2 +- 9 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 graphics/pokemon/passimian/anim_front.png delete mode 100644 graphics/pokemon/passimian/front.png diff --git a/graphics/pokemon/passimian/anim_front.png b/graphics/pokemon/passimian/anim_front.png new file mode 100644 index 0000000000000000000000000000000000000000..c69fd6a2e4f610a457649ba6f759bb703b6cdaeb GIT binary patch literal 1498 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 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index e306cb8fba87..fcdd15aefccc 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -864,7 +864,7 @@ const u32 gMonFrontPic_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/front.4b const u32 gMonFrontPic_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/front.4bpp.lz"); const u32 gMonFrontPic_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/front.4bpp.lz"); const u32 gMonFrontPic_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/front.4bpp.lz"); +const u32 gMonFrontPic_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/anim_front.4bpp.lz"); const u32 gMonFrontPic_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/anim_front.4bpp.lz"); const u32 gMonFrontPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/anim_front.4bpp.lz"); const u32 gMonFrontPic_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/front.4bpp.lz"); diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index bfb892530b5e..b243e4db4e97 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -796,7 +796,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_TSAREENA] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_COMFEY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 11 }, [SPECIES_ORANGURU] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 12 }, - [SPECIES_PASSIMIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, + [SPECIES_PASSIMIAN] = { .size = MON_COORDS_SIZE(51, 52), .y_offset = 7 }, [SPECIES_WIMPOD] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, [SPECIES_GOLISOPOD] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_SANDYGAST] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index d5794cb0d1c8..4d0eaf5fc95f 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -8733,7 +8733,8 @@ static const union AnimCmd sAnim_Oranguru_1[] = static const union AnimCmd sAnim_Passimian_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 922f9f1636a7..33e01fddb87b 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -777,7 +777,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_TSAREENA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_COMFEY] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_ORANGURU] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, - [SPECIES_PASSIMIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_PASSIMIAN] = { .size = MON_COORDS_SIZE(57, 60), .y_offset = 2 }, [SPECIES_WIMPOD] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_GOLISOPOD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SANDYGAST] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, diff --git a/src/pokemon.c b/src/pokemon.c index 7e1819383ca1..abb6e02c282f 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2751,7 +2751,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_TSAREENA - 1] = ANIM_SHRINK_GROW, [SPECIES_COMFEY - 1] = ANIM_H_SLIDE_WOBBLE, [SPECIES_ORANGURU - 1] = ANIM_SHRINK_GROW_SLOW, - [SPECIES_PASSIMIAN - 1] = ANIM_V_SHAKE, + [SPECIES_PASSIMIAN - 1] = ANIM_H_SHAKE, [SPECIES_WIMPOD - 1] = ANIM_V_SHAKE_H_SLIDE_FAST, [SPECIES_GOLISOPOD - 1] = ANIM_SHRINK_GROW_VIBRATE_FAST, [SPECIES_SANDYGAST - 1] = ANIM_CIRCULAR_STRETCH_TWICE, diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 0bf00373d095..74101f006339 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -992,7 +992,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_TSAREENA] = BACK_ANIM_H_VIBRATE, [SPECIES_COMFEY] = BACK_ANIM_H_VIBRATE, [SPECIES_ORANGURU] = BACK_ANIM_H_SLIDE, - [SPECIES_PASSIMIAN] = BACK_ANIM_H_VIBRATE, + [SPECIES_PASSIMIAN] = BACK_ANIM_H_SHAKE, [SPECIES_WIMPOD] = BACK_ANIM_H_VIBRATE, [SPECIES_GOLISOPOD] = BACK_ANIM_H_VIBRATE, [SPECIES_SANDYGAST] = BACK_ANIM_H_VIBRATE, From 60ade5f3f9dfe3a145e21f4302441d17ee2bb2b1 Mon Sep 17 00:00:00 2001 From: Kaitlyn Date: Fri, 27 Oct 2023 22:30:28 -0500 Subject: [PATCH 21/22] Animation List Species Name Updates --- src/pokemon_animation.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 2f75828445ca..a5e0cd8314ab 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -967,12 +967,12 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_VIKAVOLT] = BACK_ANIM_H_VIBRATE, [SPECIES_CRABRAWLER] = BACK_ANIM_H_VIBRATE, [SPECIES_CRABOMINABLE] = BACK_ANIM_H_VIBRATE, - [SPECIES_ORICORIO] = BACK_ANIM_H_VIBRATE, + [SPECIES_ORICORIO_BAILE] = BACK_ANIM_H_VIBRATE, [SPECIES_CUTIEFLY] = BACK_ANIM_CONCAVE_ARC_LARGE, [SPECIES_RIBOMBEE] = BACK_ANIM_CONVEX_DOUBLE_ARC, [SPECIES_ROCKRUFF] = BACK_ANIM_V_STRETCH, - [SPECIES_LYCANROC] = BACK_ANIM_V_SHAKE, - [SPECIES_WISHIWASHI] = BACK_ANIM_H_VIBRATE, + [SPECIES_LYCANROC_MIDDAY] = BACK_ANIM_V_SHAKE, + [SPECIES_WISHIWASHI_SOLO] = BACK_ANIM_H_VIBRATE, [SPECIES_MAREANIE] = BACK_ANIM_H_VIBRATE, [SPECIES_TOXAPEX] = BACK_ANIM_H_VIBRATE, [SPECIES_MUDBRAY] = BACK_ANIM_H_VIBRATE, @@ -999,12 +999,12 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_PALOSSAND] = BACK_ANIM_H_VIBRATE, [SPECIES_PYUKUMUKU] = BACK_ANIM_H_VIBRATE, [SPECIES_TYPE_NULL] = BACK_ANIM_H_VIBRATE, - [SPECIES_SILVALLY] = BACK_ANIM_H_VIBRATE, - [SPECIES_MINIOR] = BACK_ANIM_H_VIBRATE, + [SPECIES_SILVALLY_NORMAL] = BACK_ANIM_H_VIBRATE, + [SPECIES_MINIOR_METEOR_RED] = BACK_ANIM_H_VIBRATE, [SPECIES_KOMALA] = BACK_ANIM_H_VIBRATE, [SPECIES_TURTONATOR] = BACK_ANIM_H_VIBRATE, [SPECIES_TOGEDEMARU] = BACK_ANIM_GROW_STUTTER, - [SPECIES_MIMIKYU] = BACK_ANIM_H_VIBRATE, + [SPECIES_MIMIKYU_DISGUISED] = BACK_ANIM_H_VIBRATE, [SPECIES_BRUXISH] = BACK_ANIM_H_VIBRATE, [SPECIES_DRAMPA] = BACK_ANIM_H_SLIDE, [SPECIES_DHELMISE] = BACK_ANIM_H_VIBRATE, @@ -1077,13 +1077,13 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_ARROKUDA] = BACK_ANIM_H_VIBRATE, [SPECIES_BARRASKEWDA] = BACK_ANIM_H_VIBRATE, [SPECIES_TOXEL] = BACK_ANIM_H_VIBRATE, - [SPECIES_TOXTRICITY] = BACK_ANIM_H_VIBRATE, + [SPECIES_TOXTRICITY_AMPED] = BACK_ANIM_H_VIBRATE, [SPECIES_SIZZLIPEDE] = BACK_ANIM_H_VIBRATE, [SPECIES_CENTISKORCH] = BACK_ANIM_H_VIBRATE, [SPECIES_CLOBBOPUS] = BACK_ANIM_H_VIBRATE, [SPECIES_GRAPPLOCT] = BACK_ANIM_H_VIBRATE, - [SPECIES_SINISTEA] = BACK_ANIM_H_VIBRATE, - [SPECIES_POLTEAGEIST] = BACK_ANIM_H_VIBRATE, + [SPECIES_SINISTEA_PHONY] = BACK_ANIM_H_VIBRATE, + [SPECIES_POLTEAGEIST_PHONY] = BACK_ANIM_H_VIBRATE, [SPECIES_HATENNA] = BACK_ANIM_H_VIBRATE, [SPECIES_HATTREM] = BACK_ANIM_H_VIBRATE, [SPECIES_HATTERENE] = BACK_ANIM_H_VIBRATE, @@ -1097,15 +1097,15 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_MR_RIME] = BACK_ANIM_H_VIBRATE, [SPECIES_RUNERIGUS] = BACK_ANIM_H_VIBRATE, [SPECIES_MILCERY] = BACK_ANIM_H_VIBRATE, - [SPECIES_ALCREMIE] = BACK_ANIM_H_VIBRATE, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = BACK_ANIM_H_VIBRATE, [SPECIES_FALINKS] = BACK_ANIM_H_VIBRATE, [SPECIES_PINCURCHIN] = BACK_ANIM_H_VIBRATE, [SPECIES_SNOM] = BACK_ANIM_H_VIBRATE, [SPECIES_FROSMOTH] = BACK_ANIM_H_VIBRATE, [SPECIES_STONJOURNER] = BACK_ANIM_H_VIBRATE, - [SPECIES_EISCUE] = BACK_ANIM_H_VIBRATE, - [SPECIES_INDEEDEE] = BACK_ANIM_H_VIBRATE, - [SPECIES_MORPEKO] = BACK_ANIM_H_VIBRATE, + [SPECIES_EISCUE_ICE_FACE] = BACK_ANIM_H_VIBRATE, + [SPECIES_INDEEDEE_MALE] = BACK_ANIM_H_VIBRATE, + [SPECIES_MORPEKO_FULL_BELLY] = BACK_ANIM_H_VIBRATE, [SPECIES_CUFANT] = BACK_ANIM_H_VIBRATE, [SPECIES_COPPERAJAH] = BACK_ANIM_H_VIBRATE, [SPECIES_DRACOZOLT] = BACK_ANIM_H_VIBRATE, @@ -1116,11 +1116,11 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_DREEPY] = BACK_ANIM_H_VIBRATE, [SPECIES_DRAKLOAK] = BACK_ANIM_H_VIBRATE, [SPECIES_DRAGAPULT] = BACK_ANIM_H_VIBRATE, - [SPECIES_ZACIAN] = BACK_ANIM_H_VIBRATE, - [SPECIES_ZAMAZENTA] = BACK_ANIM_H_VIBRATE, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = BACK_ANIM_H_VIBRATE, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = BACK_ANIM_H_VIBRATE, [SPECIES_ETERNATUS] = BACK_ANIM_H_VIBRATE, [SPECIES_KUBFU] = BACK_ANIM_H_VIBRATE, - [SPECIES_URSHIFU] = BACK_ANIM_H_VIBRATE, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = BACK_ANIM_H_VIBRATE, [SPECIES_ZARUDE] = BACK_ANIM_H_VIBRATE, [SPECIES_REGIELEKI] = BACK_ANIM_H_VIBRATE, [SPECIES_REGIDRAGO] = BACK_ANIM_H_VIBRATE, @@ -1130,10 +1130,10 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_WYRDEER] = BACK_ANIM_H_VIBRATE, [SPECIES_KLEAVOR] = BACK_ANIM_H_VIBRATE, [SPECIES_URSALUNA] = BACK_ANIM_H_VIBRATE, - [SPECIES_BASCULEGION] = BACK_ANIM_H_VIBRATE, + [SPECIES_BASCULEGION_MALE] = BACK_ANIM_H_VIBRATE, [SPECIES_SNEASLER] = BACK_ANIM_H_VIBRATE, [SPECIES_OVERQWIL] = BACK_ANIM_H_VIBRATE, - [SPECIES_ENAMORUS] = BACK_ANIM_H_VIBRATE, + [SPECIES_ENAMORUS_INCARNATE] = BACK_ANIM_H_VIBRATE, // Gen 3 Forms [SPECIES_CASTFORM_SUNNY] = BACK_ANIM_SHAKE_GLOW_RED, From d9be3deffc39b84fe757947edee48b76b9a7cd2c Mon Sep 17 00:00:00 2001 From: Kaitlyn Date: Fri, 27 Oct 2023 22:41:30 -0500 Subject: [PATCH 22/22] Passimian Back Sprite Shiny --- graphics/pokemon/passimian/back.png | Bin 590 -> 590 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/pokemon/passimian/back.png b/graphics/pokemon/passimian/back.png index e03bee86fd2068e377d8659205446b86cabca4ed..93b992c84dd275c94c23abb5a36fe83038b00ac7 100644 GIT binary patch delta 60 zcmX@da*kz!r6Hewi@3{H4i1juVh1s|txi@N(Sf!F1x`PH{MfZ?7m)n0R(4Jv&;S1n Q5+?!{CMD@@%zDBI0NxrJ{Qv*} delta 60 zcmX@da*kz!rJ