From 8053f4ab1e3d53e6b5fa40458925fdf59407fc13 Mon Sep 17 00:00:00 2001 From: Cafei <46283144+Cafeei@users.noreply.github.com> Date: Thu, 29 Aug 2024 20:14:46 +0400 Subject: [PATCH] Enable female Indeedee follower and improve shiny Indeedees (#5285) Enable Indeedee female follower sprite. Shiny improvements. Fix front Indeedee male shading. --- graphics/pokemon/indeedee/back.png | Bin 599 -> 530 bytes graphics/pokemon/indeedee/female/back.png | Bin 549 -> 494 bytes .../pokemon/indeedee/female/overworld.png | Bin 561 -> 568 bytes .../indeedee/female/overworld_shiny.pal | 18 +++++++++--------- graphics/pokemon/indeedee/female/shiny.pal | 14 +++++++------- graphics/pokemon/indeedee/front.png | Bin 638 -> 592 bytes graphics/pokemon/indeedee/shiny.pal | 14 +++++++------- spritesheet_rules.mk | 3 +++ .../pokemon/species_info/gen_8_families.h | 8 ++++++++ 9 files changed, 34 insertions(+), 23 deletions(-) diff --git a/graphics/pokemon/indeedee/back.png b/graphics/pokemon/indeedee/back.png index 9fcfda9f9b9124e6603b5646f3f479af4b934077..8008cd6fb4d239ed37bcd7afdbcf0c83003b12da 100644 GIT binary patch delta 516 zcmV+f0{i{f1d;@h7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!ggFhG%i z#}E(@R7rYZkf6c7wEq6?Kwx-;Rd{JMTPU#LVPRD;Ku`bx00000Nk~5b0004yNklU_qApbD*CGPz|SQD1sBk0G0vWfKaBb1gV)TJj?=9 z;JO{2&tc1o=O36E+BrkFk$+iT#bbEZ?Yg*iC;KAPj+c<|&r0YgaKYqj2xJomgP73L z95L<;f#8Wq3V)n9?EM0e1a1qk=ZRW)SAaB$?6D#U?Vn{VVK`}80YNbA^I{hk1&jt< z2o?oM1IX94Zsb}(*pxZ&$Oc_d4HG^!!QhKv(!*@91pHb9 zPWgB%gDLQcD?BMof&R~SSOR)kKuZ0eAutUV9}dHd0)4|^^Sa>~KA$FNv&VB0aJ9Kv zq8;JEa1FUP@MyRP!4^N%@UzQ{688DNgun0y`at?5SbWy$JWwEsSb(%`2uNV#=YeN| zb&rgEJdIa6f6-uGWs+w>`9ATngdIcXn_T>Q?5*OP|CL`DjV0i)WJetU00004kPr|MP)KNCkf6x0!1(z1Kwx-~U|4W4FetF#fM|d)Ku`bx z00000j!%i~00009a7bBm000id000id0mpBsWB>pGut`KgRDVdv-IGmD!!QtqUHJkr zL?~MV2T0X`ykJo$z5uF%y00)Cf(0l_vGYE^d3GH1r)oh6 z$(V5ytFv$yBmjCFyA1&NngjR3~bj=&6CKp222a&5e9bw_>6V2D11KtyWvv@%%;7jXIDFcLVj~gI# zBOU=DNkbhM;(0Fw%~Aj@#8y5CdY>}rc0004VQb$4nuFf3k0000mP)t-sn9!ggFhG%i z$5csrV342?5D?gK;K9DM{{HTSRd_&Pcxg0SVPRD;Ku`bx00000F7(lL0004ONklR5Y#$wSAfcQ$^e1jdL`2hVfkkOZdw>L&;Y!`0%iYa1@!VC z8|VO57|meV0)K{iA^H)hTOc=333d^u0CS+J2MqGEK@s*S9gp!4*a%37c^>9w5P`De zx&@?Zxqxz-^Q93W7GOUhq+T2uDC88Ngf9X0^3njs-y`8%cc8NbVTYqV1)NRfvzT^~ zMuORRb(Yhduv`l!5B)404dI+$yj5454>#3sM13WE-&r2I_BTQwzGuC{qp95ykHX#n zu6)zO)0?ka@aJs{-{cM8S^u2ZQ-HVyhy^yM0I|D(%_oGjTmj+|ntT+*zYcf(Q@sHE WZz-iK+o(nW00004kWffyV342?5D?gK;K;DR`1tscU|2w4cyKTpGen~_@RDVdv?UF%i!!QssO15 z$8}K@L4xx=eK$L(LPS#(IT0HGDE*WKKoMMN04>j>QHOl2l@0`~Q#vjntBqO^+G3Zk z?w6yf<5UW=$bT0N=#$>o5gXG*k=_|d98DQ<0z=Fetv0}$EC9Rx{6r`-AE?p=Akhcl z)dG5Ud;wr<0cinxLkNIlu*XHl3@lqf9K;jAWt351x^L14?6kKt(64|)vz(Or)oY;M zb_%KT+aNt4)u)iVgfaqDM{D3Yj0S)xfGI5z0c{wdEq{6lkc9<=Ojh+lZ@L|&0=CB_ z^8pni-55A))(QHm`B^$kvU`ic-0a-aOGS1#aMH~n>D)?o1h@o{F##}JS;2glK z+E{~K&bO7pd5i0u_iWPVTPM`lDCf&FR1F|wbI)JOmt&Z;16Dhjc#_`c9$sT^%Ae%2 pvUmqu%@2iK%^dIZ10DXEegLv49BRT7OZ5N%002ovPDHLkV1oS0S7!hK delta 180 zcmV;l089V41hE8=F##%(GA;00FhJZZ83UY03x~R8Hk}&TFzt+rv9=9z)45 zn5}%lO1|8*B&0{#eoyJ_K{hz=X)2%eJ>2J1+Tw)u{As%=qVl400WdfR@TxY}V3+f4 zWpLi&I_Eu`^!e5a^)<@*@(fi2$k^QTm-6KpChdUL4kn(Yx4DPcn49t^xvVVS!B+D_ iAy@Mo`}{zMf2JS8lN@d0f>4D30000c0004VQb$4nuFf3kkv=|u0nSN8K~z|U?UiA3 z!ypKTLojGs^Z)@13Jf>flzspw`_b>feBM4I@ ze*Rw5Fo9kHK>}7&I-Ov79Ab#zi?JP@r>HT;0p>yrKds-Be-j>h?7FD|@tBMNT<(Z< zoIvk-5CVWDz3WeZg!AS8VC-4&0&r|fBLG}rN+elKD%l2@QX9$yww2k1(EErk31_qFi|O?UC7h0}D?^B=;9t}O-M{yA zsJ9aBDRzKojwo&ufM<)J;fnq`;FWNM^N5cpeH;M7aeT`s^hQ8yfmr7BN)S2dz)L>~ zu(o>GOMe02VGd00GxYL_t(Y$L*7`PQx$|hFyh`A*m?MTGIze zWoQ|~P{<2Z=xEleBI!^DRFMOz3#tIW0TMg`&%lI`=#qtvrSHNep%PMk-jVpF*ir7w ze`otF{+eo@SB)+cugkq+lCotc>arbFv+Of}1{FXSZIea4bu8CF%QF~Aa&{|{lDI}d z?iCBEQ(U$TB^I9>0A7hQ0L6(Y-ZpcTzC|1cW?*Y=08p^iihs+YZTJCpC?0JB{hfY# z4v=Orh@!}_5&KaeGdM#UI$m_L2{=&$5r&9Y(1|uPkksxj0hyP@fl|Vx#$ywP&6jI` z9SE};PtWJCPZr?d1~a^QOj)3dc)3JG7I0E*j%b++!AYg`KaK+y5aCCXzgyzMNk|Nk z=QPy1Niy=xz!FEU@I#!xX*02nR|D7YAzmMX@oIhK2!jHcEPOC5bURrh!0iKVQx0%y zs6V7*UUcp;Cnpmi9Hms?YwRtFWVeEUfH8GU%mFp6v)&wI#T#g?!kOZZlMG0ULwamL z30Z-=m;=fhv<6^Xss!#VK&=8|w&$F$GKJ=w@@Q37!8e_=8u@y{8<0ivd7s$;C%I_i z*a{>)oLPYGl#bhWF~TVwxAo?za6YpE1!9l?%P1kf0c^UXJ-g!ZE&u=k07*p#PDHLk FV1n?P@@xPA diff --git a/graphics/pokemon/indeedee/shiny.pal b/graphics/pokemon/indeedee/shiny.pal index 6bb5eca576..2b0aa6197b 100644 --- a/graphics/pokemon/indeedee/shiny.pal +++ b/graphics/pokemon/indeedee/shiny.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 32 48 64 -120 112 144 +145 127 199 16 16 16 -80 72 104 +84 73 122 96 144 160 -200 176 192 -248 248 248 +193 190 180 +254 254 238 64 96 120 -144 96 88 -112 48 48 +132 85 120 +105 52 91 40 176 224 -128 104 128 +97 97 85 48 64 80 0 0 0 0 0 0 diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 649995a5cb..3dfea83037 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -3474,6 +3474,9 @@ $(POKEMONGFXDIR)/eiscue/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/indeedee/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 +$(POKEMONGFXDIR)/indeedee/female/overworld.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + $(POKEMONGFXDIR)/morpeko/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h index bb878e1fed..ed5e89407c 100644 --- a/src/data/pokemon/species_info/gen_8_families.h +++ b/src/data/pokemon/species_info/gen_8_families.h @@ -5280,6 +5280,14 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_IndeedeeFemale, .iconPalIndex = 2, FOOTPRINT(Indeedee) + OVERWORLD( + sPicTable_IndeedeeFemale, + SIZE_32x32, + SHADOW_SIZE_M, + TRACKS_FOOT, + gOverworldPalette_IndeedeeFemale, + gShinyOverworldPalette_IndeedeeFemale + ) .levelUpLearnset = sIndeedeeFemaleLevelUpLearnset, .teachableLearnset = sIndeedeeFemaleTeachableLearnset, .eggMoveLearnset = sIndeedeeFemaleEggMoveLearnset,