From e8c05debce270532f60d6617b3295d177f938366 Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Wed, 3 Apr 2024 13:40:45 -0500 Subject: [PATCH] Add unique icons for all of Arceus's forms (#4329) --- graphics/pokemon/arceus/bug/icon.png | Bin 0 -> 440 bytes graphics/pokemon/arceus/dark/icon.png | Bin 0 -> 430 bytes graphics/pokemon/arceus/dragon/icon.png | Bin 0 -> 441 bytes graphics/pokemon/arceus/electric/icon.png | Bin 0 -> 441 bytes graphics/pokemon/arceus/fairy/icon.png | Bin 0 -> 441 bytes graphics/pokemon/arceus/fighting/icon.png | Bin 0 -> 416 bytes graphics/pokemon/arceus/fire/icon.png | Bin 0 -> 438 bytes graphics/pokemon/arceus/flying/icon.png | Bin 0 -> 436 bytes graphics/pokemon/arceus/ghost/icon.png | Bin 0 -> 439 bytes graphics/pokemon/arceus/grass/icon.png | Bin 0 -> 440 bytes graphics/pokemon/arceus/ground/icon.png | Bin 0 -> 440 bytes graphics/pokemon/arceus/ice/icon.png | Bin 0 -> 440 bytes graphics/pokemon/arceus/poison/icon.png | Bin 0 -> 439 bytes graphics/pokemon/arceus/psychic/icon.png | Bin 0 -> 439 bytes graphics/pokemon/arceus/rock/icon.png | Bin 0 -> 427 bytes graphics/pokemon/arceus/steel/icon.png | Bin 0 -> 427 bytes graphics/pokemon/arceus/water/icon.png | Bin 0 -> 439 bytes include/config/pokemon.h | 1 + src/data/graphics/pokemon.h | 22 +++++++- .../pokemon/species_info/gen_4_families.h | 50 ++++++++++-------- 20 files changed, 51 insertions(+), 22 deletions(-) create mode 100644 graphics/pokemon/arceus/bug/icon.png create mode 100644 graphics/pokemon/arceus/dark/icon.png create mode 100644 graphics/pokemon/arceus/dragon/icon.png create mode 100644 graphics/pokemon/arceus/electric/icon.png create mode 100644 graphics/pokemon/arceus/fairy/icon.png create mode 100644 graphics/pokemon/arceus/fighting/icon.png create mode 100644 graphics/pokemon/arceus/fire/icon.png create mode 100644 graphics/pokemon/arceus/flying/icon.png create mode 100644 graphics/pokemon/arceus/ghost/icon.png create mode 100644 graphics/pokemon/arceus/grass/icon.png create mode 100644 graphics/pokemon/arceus/ground/icon.png create mode 100644 graphics/pokemon/arceus/ice/icon.png create mode 100644 graphics/pokemon/arceus/poison/icon.png create mode 100644 graphics/pokemon/arceus/psychic/icon.png create mode 100644 graphics/pokemon/arceus/rock/icon.png create mode 100644 graphics/pokemon/arceus/steel/icon.png create mode 100644 graphics/pokemon/arceus/water/icon.png diff --git a/graphics/pokemon/arceus/bug/icon.png b/graphics/pokemon/arceus/bug/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7da8ef61956508d45afe3b5402b21b88719be93c GIT binary patch literal 440 zcmV;p0Z0CcP)Px#Fi=cXMPi(Tb8~aOy}kec|9hNDoXtv<_Db$^oc5IVy`)<9<|+2}tku5#L1{UCTL1t7Hc3Q5R7i>4RPBz!FbrGLRJ~vE`@iiu*&XZJGK9F35YdnrcASqE zZ`&INfNQvvD+1v)jsuq!0g7GTOYt>95!Jmw?+}FIk&hF84CG}&=q8GRv`ScSd zo)K6jjZ&rP4Y!^Uuhjy-l|xNN%OOLfRafoiNrHZn;NA?VH3)tt2y>e{f3DQ$agP&WmtrX}<07$aMaw<3 zfdL7E#&v*432UPSM=v7#X`ni6B7ldm>mpBcyg7)Cj;)QHdW}COY>)8IiO(~TBbElz zE36D8HgaVkd(zIhV<5c2zvDk+AojX}*b4@NKQ@r*-+vg0y$xeiS@rQ4W8X0Px#Fi=cXMPi(TgM)Luy}kec|GlI^_Vy{&VnOzlDT{mmVoJ^KbDaOQq@>0FYOI`M zVp>5#L0PGgWB>pGEJ;K`R7i>4RMC#YFbrE#srTmm|KDP#JJz+`PKZ0{L;wk9H;L2W zZTp825%+K@cLc&~JPzDegz#wTQ3}=s4^>AAzaSWs>wKK>LlDY>&?(Z_#EZ`CpI%Yo z8N!S-rYgmsIC_G98iYT~g(ah=Nad&o_fAg|{EGyjl42$T&IBV+9ehj_e4`i4DG}Ex z6#{8YF$^r64Zx+AAd5{SRTAO0*I<`(4ieO$Ua%R5Zp5=gC75x`ad_06Lme2AwO#8F zO=cZa@EJR3w?TSLDm01xej;yk+?-IEv9*!2+}KwL+fVrC#OE2v5laKPx#Fi=cXMPi(TgM)Luy}kec|GlI^_Vy{&VnOzlDT{mmVoJ^KbDaOQq@>0FYOI`M zVp>5#L0PGgWB>pGH%UZ6R7i>4RPBnxFbu0581au-@Bg+ZyLW4vWF2F7aLjbDPO|)w zOxyMk1Hd(0$`yg|8pnaliU7qf@1^*fpor>TpbrQ_@yN#sKL+x$AaoPO*ThTYe1H0h z63+;%l18ag^p0Ckh}UX?-^-yUqvepH(W(1K=ZAohlV;Fk?#`u86OV!4OWA5I3+SYqW5y@9O# j;bb7Im}DoypZLQUjMf`-&DUkc00000NkvXXu0mjfhC0oQ literal 0 HcmV?d00001 diff --git a/graphics/pokemon/arceus/electric/icon.png b/graphics/pokemon/arceus/electric/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..617b1e1113dcc2830f6a7b8b49c4285776a6d9ff GIT binary patch literal 441 zcmV;q0Y?6bP)Px#Fi=cXMPi(Tb8~aOy}kec|3PY$Vw9w$#sBVeoYi7My`)<9<|+2}tku5#K>{wlk^le!H%UZ6R7i>4RPBz!FbrGLKTV~J-~VmT$?jO!mLbHQgouX3u;YBR zc-!7E09?bRToDMbaU8g;2vF?uUW%^?im2`ddWRqsk9?f)V<0aJLN`%-O}s?T&!?X# z@r=M4X_P8OZ@Be@cx@K=tsGi1Y7QA1wYh3HPZIQt1ovt{YeDccL6}?B`E#Q_AMXd| zmWW4I6f)8%F)R$q23%uWf-E+zG(-XyV+WR9&Ke{L;TAo}jC-62yA(@-85fCVD{Ahc z4h%>TG_C_YN?08wIC>G;PXoAbZl+pv}^n^VS9vsPJEt$9I-Tz zUSVY*v5_kS*^_q09RuMF{vH1r1F_c)#9lBE{IP*d|Ng^3EcY<_!^uD@ORW5%H;}bI joD5_Ylk7zJ7k~H$0>&GcS2<Px#Fi=cXMPi(TgM)Luy}kec|GlI^_Vy{&VnOzlDT{mmVoJ^KbDaOQq@>0FYOI`M zVp>5#L0PGgWB>pGH%UZ6R7i>4REvtkFbu052+RTN|Nr)6_ijy-tYhpBj+qYDNtPeU zv~B+|09?bRToDMbaU8g;2vF?uUW%^?im2`d`hXx5k9?f)V<0aJLN`%-O}s?T_otsI z@r=M4X_P8O@3{4Zcx@K=y&PIHY7QA1wYh3HPZIP-f_pWfwIKMJAk3}m{JBw|kM{#} zOT;593K?mX7#0R)1FkVGK^B`<8X|#;F4XAKgBaEl&f#yw7iU5cf^jElsw6*c!z z2L>bv8rK0HC9IAT9KDF_r-A0Mi2xqLu8Ta)@#Y{lI<_`)+BN>1usy>+CqB`6Q0fr0P_|BU~Nf!O;7Vs97-e%U~#fB#`1mU|fe;bb7j5-We`4P@;P jCj(ix@#5Eh$N|NYX00000NkvXXu0mjf>&w1( literal 0 HcmV?d00001 diff --git a/graphics/pokemon/arceus/fighting/icon.png b/graphics/pokemon/arceus/fighting/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e4ec6068b298204cd6332f392420657373ae51c4 GIT binary patch literal 416 zcmV;R0bl-!P)Px#Fi=cXMPi(Tb8~aOy}kec|9hNDoXtv<_Db$^oc5IVy`)<9<|+2}tku5#L1{UCTL1t79!W$&R7i>4lu>WPAPj_K`za5$|Np=3oyi&sB-Nxz+lqu#bRQ09 z=xy5{9GQ79o81AB*Lt41tbo*P<-;u2fF{2lmU;mQigSOy=%=Bu1<*O-&(e*1j@dgZ zy#_T0hEitw)V&9|bf+FCP{dv)S!4H5?fev=4j{rku_O?$fMD;gp+p=rqBo2#LFXFp>#{YVrnUiP?zHqIOSYJOOFC%)`K^KQ%Z9&>mqEnrdJ<)AW{e@pF`3r z8#0uDbrWf~fkn;$T6o+~)@_b2C)v^QXd^S0{Wh?@(?4f?UVxlq86bUyRe-P~cLCBi zHR2*b@PfbW|DyoO9}bY|&pidmKuiI$%7;EcF7lxdkk$C5e0Tts6&))6)s*`H0000< KMNUMnLSTZPF15)3 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/arceus/fire/icon.png b/graphics/pokemon/arceus/fire/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4c67343bb6a5134c5f7886c542fe436777d05347 GIT binary patch literal 438 zcmV;n0ZIOeP)Px#Fi=cXMPi(TgM)Luy}kec|GlI^_Vy{&VnOzlDT{mmVoJ^KbDaOQq@>0FYOI`M zVp>5#L0PGgWB>pGG)Y83R7i>4l;MuTFbsp2v`YWQ@Bg+q*}=ND3?c5M6BS5+zq&~} zylww*0l1b+xdJG!bsV~^04R2QFU8k@B2M=LeF6y0V?R#%(U6w~&~+3aQ!laS=iPUd zdalqKFg9tU_FVRf`%>qTV04K#;M0C)+zFY-3WCkHXnv9ytC*ZONKR`n~`;)-phP zhgE>YM6Lp4-?S4?0)$WSz5RCr#6AxY`yfE@%K+9N0f;IZ84wIyYXATM07*qoM6N<$g2E%a@&Et; literal 0 HcmV?d00001 diff --git a/graphics/pokemon/arceus/flying/icon.png b/graphics/pokemon/arceus/flying/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c882bc9dfbf1b67b4af0470238602831edf224c4 GIT binary patch literal 436 zcmV;l0ZaagP)Px#Fi=cXMPi(TdwYAmy|n-T|8sNAq^$O|gIeyzi^Z%d_Vy|EVp5cQ&Bdh6y(yex zVp>5#LFq)aUjP6BGD$>1R7i>4RLgF|Fbs=i`?7=h|9?AD*&4@oQxxrhp+X8YB}F~# za@+o40Jw%rxgro=<2Z0z5#ZS6qm)<^9I74#eurQbS3XYoF;J8Rp_@ow6EDj7`ScSd zo*}G}MyXQ#hS#2;*H(q!%AqC0a!6@d3-@lGB={Ez5mtfLM2IuNm}?&Vxlx}_^aFEC z#FeE&l{88W3xl(Pa7{~)#io@?M7ULUP_xTfg9Ibo)Pv1<=tNwDq`-`u7Qyvd?qO7b ziQu{p2$iVg%>hR*X8UQN1?ofq4`J6up5}OSppA~LjhuFkKPGIC@Xv|QGms;e2GT36 z3`85bGLSuKXWTIm-r(QypD~d7x`EUe3y e$xehn@rQ2=@fjiz3Vve%0000Px#Fi=cXMPi(TdwYAmy|n-T|8sNAq^$O|gIeyzi^Z%d_Vy|EVp5cQ&Bdh6y(yex zVp>5#LFq)aUjP6BHAzH4R7i>4l;Li|Fbsri=NEBgzyI6r&fRF5gd)TyO++98_vK8>bIeP#Q$c;6~tUGT6Rf?s-tc!5i8a3xo z2O@-k@^J{~5mrYFv|dE^+lc026A-wB-8b?!$0sK^(Xq6VY1jI5V0)&2&icFnIo2{j zdWThja3WU$vTxdn2LXa7_^16>0>s`A5PKs);+F$t`u86JVmXH~AEp3VwGu` h$ZAct6YwYb@C82w9D@P92)qCQ002ovPDHLkV1gzL!cYJJ literal 0 HcmV?d00001 diff --git a/graphics/pokemon/arceus/grass/icon.png b/graphics/pokemon/arceus/grass/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e2c72dd3b69ac758175322b928ad2003c523835e GIT binary patch literal 440 zcmV;p0Z0CcP)Px#Fi=cXMPi(Tb8~aOy}kec|9hNDoXtv<_Db$^oc5IVy`)<9<|+2}tku5#L1{UCTL1t7Hc3Q5R7i>4l;Li|FbsriM~;;J@V)=r?(A+fO+pc3lMoR|z`o_=|@9e7C_fgd`!K>o}YK$ zQR=xutHfwkir#eVf%sZ2^xJW$NwjP-JX&?tuAc<-i-3DGpwR~%%-XfX^7$^u-YTZ%kv8fln>F2)KhtDHRu2;~|z$gF$Z2&)uJgIO1eVJlkB zp$!Bi0FB219!FRkE!cVy*>3~YVG{se!tRT_&GE@WOmr-5Wa_p47}y@^pR+zMK#sKx zkltYxATg1v0NFR~#GL@)6a3r$GXY|+2Z+58Ao$||ng0DpfLP99%!esJR{78e$T}ZR i0kT???F9TwK70d|5gHIssBbO+0000NX literal 0 HcmV?d00001 diff --git a/graphics/pokemon/arceus/ground/icon.png b/graphics/pokemon/arceus/ground/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dd02c5c191a88f4869aed1d98d57987c0ae3498b GIT binary patch literal 440 zcmV;p0Z0CcP)Px#Fi=cXMPi(Tb8~aOy}kec|9hNDoXtv<_Db$^oc5IVy`)<9<|+2}tku5#L1{UCTL1t7Hc3Q5R7i>4l;Li|Fbsri=SQ#<`QHC+cXl_LCZPziNfQxBzT!X zqttVS)`-!n6us-#1M#(4==bB$lBn5ac+}>qT|WuvjevVKptS(}3<&pDb^hGw&zJWN zb4t`>R~%%-XfX^7$^u-YTZ%kv8fln>F2)KhtDHRu2;~+v$gF$Z2&)uJgIO1eVJm9R zp$-Hj0FB219!FRmE!cVy*>3~QVG{se!tRT_&GE@WOmr-5WZJd<9N3=epR+zMK#sKx zkltYxATg1v0NFR~#Df6g6a3TuD*Qk-=N#Jr0000lE%6K literal 0 HcmV?d00001 diff --git a/graphics/pokemon/arceus/ice/icon.png b/graphics/pokemon/arceus/ice/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7a63a218240f9ee8c0ee82028008e4e6e8487683 GIT binary patch literal 440 zcmV;p0Z0CcP)Px#Fi=cXMPi(TgM)Luy}kec|GlI^_Vy{&VnOzlDT{mmVoJ^KbDaOQq@>0FYOI`M zVp>5#L0PGgWB>pGHc3Q5R7i>4l;Li|FbsriM?(IQ_}>3*cXl_LCZPziNfQxBzT!X zqttVSR*BK76us-#1M#(5==bALlW5swc(m%OT|WuvjevVIpwR~%%-XfX^7$^u-YTZ%kv8fln>F2)KhtDHRu2;~|z$gF$Z2&)uJgIO1eVJlkB zp$!Bi0FB219!FRkE!cVy*>3~YVG{se!tRT_&GE@WOmr-5Wa_p49N3=epR+zMK#sKx zkltYxATg1v0NFR~#Df6g6a3TuD*Px#Fi=cXMPi(TdwYAmy|n-T|8sNAq^$O|gIeyzi^Z%d_Vy|EVp5cQ&Bdh6y(yex zVp>5#LFq)aUjP6BHAzH4R7i>4l;Li|Fbsri=NF0Wd;hoH+1+TGgd)TyO++98_vKa`qq~lv~swv+i*ttWqouW?dwPt*AMN zIuMWmG#&?d9AR~|VCzL>zYR2pO#pZayD#!K$0r9d(Xq6VY1jI5V0)&2&icFnIo2{j zdWThj#6+$FWZ$$C4+4Zw@K5`%1c<#KAofOp;Fkkr`u86JVmXH~AEp3VwGu` h$ZAct6YwYb@CB~P9H&SXVJiRt002ovPDHLkV1m;Yz|a5y literal 0 HcmV?d00001 diff --git a/graphics/pokemon/arceus/psychic/icon.png b/graphics/pokemon/arceus/psychic/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0c556490e32dcc420b99090d1913500e8d5c9ae9 GIT binary patch literal 439 zcmV;o0Z9IdP)Px#Fi=cXMPi(Tb8~aOy}kec|9hNDoXtv<_Db$^oc5IVy`)<9<|+2}tku5#L1{UCTL1t7HAzH4R7i>4l;Li|FbsriN0IYq_WQr>?%a*0Nhm^W5+VW#xGxvm zDYtEJxFX_OF69bB;Wd(%BZttb|8qnbBUPA8x0(0(@@nhI`t7)ANz`nT9<{k@*G~fa1;D*pL~8{63<&mCb^P4mkC*oi zV@lAuiw7AnSPTOTMFFnt79tLtMoJUvVyM8f%Gm>eKyIu-X5D!ss8TEqW?h8C)~Gp$ zIuIcQl#fF=kFYvgp!FiM-$pbKn}EP2?7oq=IX*eTiH@a>OuN<}1KT70bJpht$g!3I z(mSjIgcG?6kbTom+zAjo!N2W46Cn0_fY=KG5`P>Z)4%@+5X(7?`7i~@Dj)g)S?9wk hKvrwAoq&JIhi_~?8lLl<-%|hp002ovPDHLkV1gpU#n=D< literal 0 HcmV?d00001 diff --git a/graphics/pokemon/arceus/rock/icon.png b/graphics/pokemon/arceus/rock/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..91d52e1957562ebed11630b5bdb960f1f41cc8c4 GIT binary patch literal 427 zcmV;c0aX5pP)Px#Fi=cXMPi(TdwYAmy|n-T|8sNAq^$O|gIeyzi^Z%d_Vy|EVp5cQ&Bdh6y(yex zVp>5#LFq)aUjP6BDM>^@R7i>4lu?huFbsp2R7$0Li2wh;#qNN0Z5c0|bVmge;ID3y z4sY8ZTmY`+Qmz2XYaNGfD*%q&K1<0p;Lzz=;4c89x%T6v9}Q($09{A=*z}@3_jlh> z)7z3(iP5SQf9lZ#`dUN!^ElK-L~BwWQPaKarvd&$ATt7}RY0BrPA?lMKhRnGY#7jZ4NOI zFafT|0jVQ6kimkj7qk5~P!lu2N!{-U?Ka0J2b$C5{~rYiJ{%y^pL+_BftUhhl@EP@tn=X%AgeXmPQb6^!woPo V8bhu?t_=VH002ovPDHLkV1jvzyMO=y literal 0 HcmV?d00001 diff --git a/graphics/pokemon/arceus/steel/icon.png b/graphics/pokemon/arceus/steel/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4013495e0d47091f28c21ce5fd7aad4b4a41fd90 GIT binary patch literal 427 zcmV;c0aX5pP)Px#Fi=cXMPi(TgM)Luy}kec|GlI^_Vy{&VnOzlDT{mmVoJ^KbDaOQq@>0FYOI`M zVp>5#L0PGgWB>pGDM>^@R7i>4R6!2HFbrGLievKs-(qLLx-@J;fP^Rm!R)wkR=g}f zxZM31ZtaKwxW;|Mr6RccDsQb>O;G3V)?A+u1mdjs9ljZ|RuBe9{2F*;&Fwup3Op7u z1r1WI=>wOMz@I9_AKTq}>|v4`T}^fH69m10VAjQ*Ag(<@P|HFCB!0o?4?DWKNAwhW@++vHK zC14#Lu1|x;6sSJ9#1o$9Op!HYngL`pA(id{D0Q}1<1C_02vjk0O3TA0%R>( z8BYQPC-`pvl>m|V14P~k5dUz1O#l8ZKqTzse3$~H%7-yP>U`J*NVO)}iSU(txB`Ik V7#lwigU$c|002ovPDHLkV1l}Txc~qF literal 0 HcmV?d00001 diff --git a/graphics/pokemon/arceus/water/icon.png b/graphics/pokemon/arceus/water/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..546df7ecd10632235cf24465569c4d6e2c8b0c99 GIT binary patch literal 439 zcmV;o0Z9IdP)Px#Fi=cXMPi(TgM)Luy}kec|GlI^_Vy{&VnOzlDT{mmVoJ^KbDaOQq@>0FYOI`M zVp>5#L0PGgWB>pGHAzH4R7i>4l!1x@F$_dEDM$k)^Z$Q)lkA<_ZR?772Zu#Lo!4oS zuCs0bZ~?fMOSu9luXP-{tNdoRV;fFe%!0(}4o&0{}K`q7Y=1<-XAA5$-}=lk7v zlzOhvDluA>qIcbTAih=${eB#35-pnyk5*l^>n8!d5pZt?)Ea=F0pZ@J&Yvs&`SQMD zPKkQ#ii3<8Erx+XS%7PFOOc07BMp<##aMx5m9qx{pjC zw1I#Gpz%1s;|Ob`1zRs7`)!~)Yy!Yb*nN?=IX*dviH@a>Oug2h1KTtGbJpht$g!3I z(mSjIBqnkdAp54Bcn~0bf`8h7B|z-`0I@d$1iu_0)4%@+5X(7?`7i~@Dj)g)S?9wk hKvrwAoq#{dhc8LO8)Hu6x%&VB002ovPDHLkV1h6Pz5D= GEN_9 + const u8 gMonIcon_ArceusFighting[] = INCBIN_U8("graphics/pokemon/arceus/fighting/icon.4bpp"); + const u8 gMonIcon_ArceusFlying[] = INCBIN_U8("graphics/pokemon/arceus/flying/icon.4bpp"); + const u8 gMonIcon_ArceusPoison[] = INCBIN_U8("graphics/pokemon/arceus/poison/icon.4bpp"); + const u8 gMonIcon_ArceusGround[] = INCBIN_U8("graphics/pokemon/arceus/ground/icon.4bpp"); + const u8 gMonIcon_ArceusRock[] = INCBIN_U8("graphics/pokemon/arceus/rock/icon.4bpp"); + const u8 gMonIcon_ArceusBug[] = INCBIN_U8("graphics/pokemon/arceus/bug/icon.4bpp"); + const u8 gMonIcon_ArceusGhost[] = INCBIN_U8("graphics/pokemon/arceus/ghost/icon.4bpp"); + const u8 gMonIcon_ArceusSteel[] = INCBIN_U8("graphics/pokemon/arceus/steel/icon.4bpp"); + const u8 gMonIcon_ArceusFire[] = INCBIN_U8("graphics/pokemon/arceus/fire/icon.4bpp"); + const u8 gMonIcon_ArceusWater[] = INCBIN_U8("graphics/pokemon/arceus/water/icon.4bpp"); + const u8 gMonIcon_ArceusGrass[] = INCBIN_U8("graphics/pokemon/arceus/grass/icon.4bpp"); + const u8 gMonIcon_ArceusElectric[] = INCBIN_U8("graphics/pokemon/arceus/electric/icon.4bpp"); + const u8 gMonIcon_ArceusPsychic[] = INCBIN_U8("graphics/pokemon/arceus/psychic/icon.4bpp"); + const u8 gMonIcon_ArceusIce[] = INCBIN_U8("graphics/pokemon/arceus/ice/icon.4bpp"); + const u8 gMonIcon_ArceusDragon[] = INCBIN_U8("graphics/pokemon/arceus/dragon/icon.4bpp"); + const u8 gMonIcon_ArceusDark[] = INCBIN_U8("graphics/pokemon/arceus/dark/icon.4bpp"); + const u8 gMonIcon_ArceusFairy[] = INCBIN_U8("graphics/pokemon/arceus/fairy/icon.4bpp"); +#endif //P_ARCEUS_UNIQUE_FORM_ICONS #endif //P_FAMILY_ARCEUS #if P_FAMILY_VICTINI diff --git a/src/data/pokemon/species_info/gen_4_families.h b/src/data/pokemon/species_info/gen_4_families.h index 8cdd112e7b..d388eb13ee 100644 --- a/src/data/pokemon/species_info/gen_4_families.h +++ b/src/data/pokemon/species_info/gen_4_families.h @@ -5595,8 +5595,17 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #else #define ARCEUS_EXP_YIELD 255 #endif +#if P_ARCEUS_UNIQUE_FORM_ICONS >= GEN_9 + #define ARCEUS_ICON(typeName, iconPal) \ + .iconSprite = gMonIcon_Arceus ##typeName, \ + .iconPalIndex = iconPal, +#else + #define ARCEUS_ICON(typeName, iconPal) \ + .iconSprite = gMonIcon_ArceusNormal, \ + .iconPalIndex = 1, +#endif -#define ARCEUS_SPECIES_INFO(type, typeName) \ +#define ARCEUS_SPECIES_INFO(type, typeName, iconPal) \ { \ .baseHP = 120, \ .baseAttack = 120, \ @@ -5637,8 +5646,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_GROW_STUTTER, \ .palette = gMonPalette_Arceus ##typeName, \ .shinyPalette = gMonShinyPalette_Arceus ##typeName, \ - .iconSprite = gMonIcon_Arceus, \ - .iconPalIndex = 1, \ + ARCEUS_ICON(typeName, iconPal) \ FOOTPRINT(Arceus) \ .levelUpLearnset = sArceusLevelUpLearnset, \ .teachableLearnset = sArceusTeachableLearnset, \ @@ -5647,24 +5655,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .isMythical = TRUE, \ } - [SPECIES_ARCEUS_NORMAL] = ARCEUS_SPECIES_INFO(TYPE_NORMAL, Normal), - [SPECIES_ARCEUS_FIGHTING] = ARCEUS_SPECIES_INFO(TYPE_FIGHTING, Fighting), - [SPECIES_ARCEUS_FLYING] = ARCEUS_SPECIES_INFO(TYPE_FLYING, Flying), - [SPECIES_ARCEUS_POISON] = ARCEUS_SPECIES_INFO(TYPE_POISON, Poison), - [SPECIES_ARCEUS_GROUND] = ARCEUS_SPECIES_INFO(TYPE_GROUND, Ground), - [SPECIES_ARCEUS_ROCK] = ARCEUS_SPECIES_INFO(TYPE_ROCK, Rock), - [SPECIES_ARCEUS_BUG] = ARCEUS_SPECIES_INFO(TYPE_BUG, Bug), - [SPECIES_ARCEUS_GHOST] = ARCEUS_SPECIES_INFO(TYPE_GHOST, Ghost), - [SPECIES_ARCEUS_STEEL] = ARCEUS_SPECIES_INFO(TYPE_STEEL, Steel), - [SPECIES_ARCEUS_FIRE] = ARCEUS_SPECIES_INFO(TYPE_FIRE, Fire), - [SPECIES_ARCEUS_WATER] = ARCEUS_SPECIES_INFO(TYPE_WATER, Water), - [SPECIES_ARCEUS_GRASS] = ARCEUS_SPECIES_INFO(TYPE_GRASS, Grass), - [SPECIES_ARCEUS_ELECTRIC] = ARCEUS_SPECIES_INFO(TYPE_ELECTRIC, Electric), - [SPECIES_ARCEUS_PSYCHIC] = ARCEUS_SPECIES_INFO(TYPE_PSYCHIC, Psychic), - [SPECIES_ARCEUS_ICE] = ARCEUS_SPECIES_INFO(TYPE_ICE, Ice), - [SPECIES_ARCEUS_DRAGON] = ARCEUS_SPECIES_INFO(TYPE_DRAGON, Dragon), - [SPECIES_ARCEUS_DARK] = ARCEUS_SPECIES_INFO(TYPE_DARK, Dark), - [SPECIES_ARCEUS_FAIRY] = ARCEUS_SPECIES_INFO(TYPE_FAIRY, Fairy), + [SPECIES_ARCEUS_NORMAL] = ARCEUS_SPECIES_INFO(TYPE_NORMAL, Normal, 1), + [SPECIES_ARCEUS_FIGHTING] = ARCEUS_SPECIES_INFO(TYPE_FIGHTING, Fighting, 1), + [SPECIES_ARCEUS_FLYING] = ARCEUS_SPECIES_INFO(TYPE_FLYING, Flying, 2), + [SPECIES_ARCEUS_POISON] = ARCEUS_SPECIES_INFO(TYPE_POISON, Poison, 2), + [SPECIES_ARCEUS_GROUND] = ARCEUS_SPECIES_INFO(TYPE_GROUND, Ground, 1), + [SPECIES_ARCEUS_ROCK] = ARCEUS_SPECIES_INFO(TYPE_ROCK, Rock, 2), + [SPECIES_ARCEUS_BUG] = ARCEUS_SPECIES_INFO(TYPE_BUG, Bug, 1), + [SPECIES_ARCEUS_GHOST] = ARCEUS_SPECIES_INFO(TYPE_GHOST, Ghost, 2), + [SPECIES_ARCEUS_STEEL] = ARCEUS_SPECIES_INFO(TYPE_STEEL, Steel, 0), + [SPECIES_ARCEUS_FIRE] = ARCEUS_SPECIES_INFO(TYPE_FIRE, Fire, 0), + [SPECIES_ARCEUS_WATER] = ARCEUS_SPECIES_INFO(TYPE_WATER, Water, 0), + [SPECIES_ARCEUS_GRASS] = ARCEUS_SPECIES_INFO(TYPE_GRASS, Grass, 1), + [SPECIES_ARCEUS_ELECTRIC] = ARCEUS_SPECIES_INFO(TYPE_ELECTRIC, Electric, 3), + [SPECIES_ARCEUS_PSYCHIC] = ARCEUS_SPECIES_INFO(TYPE_PSYCHIC, Psychic, 1), + [SPECIES_ARCEUS_ICE] = ARCEUS_SPECIES_INFO(TYPE_ICE, Ice, 0), + [SPECIES_ARCEUS_DRAGON] = ARCEUS_SPECIES_INFO(TYPE_DRAGON, Dragon, 0), + [SPECIES_ARCEUS_DARK] = ARCEUS_SPECIES_INFO(TYPE_DARK, Dark, 0), + [SPECIES_ARCEUS_FAIRY] = ARCEUS_SPECIES_INFO(TYPE_FAIRY, Fairy, 0), #endif //P_FAMILY_ARCEUS #ifdef __INTELLISENSE__