From 1f694ae7ed851e821c1b981af7aca81aa619cfbe Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 22 Feb 2023 20:41:01 +0100 Subject: [PATCH] missing pla sprites --- graphics/pokemon/basculegion/back.png | Bin 0 -> 625 bytes graphics/pokemon/basculegion/front.png | Bin 0 -> 960 bytes graphics/pokemon/basculegion/normal.pal | 19 +++++++ graphics/pokemon/basculegion/shiny.pal | 19 +++++++ graphics/pokemon/decidueye/hisuian/back.png | Bin 0 -> 850 bytes graphics/pokemon/decidueye/hisuian/front.png | Bin 0 -> 966 bytes graphics/pokemon/decidueye/hisuian/icon.png | Bin graphics/pokemon/decidueye/hisuian/normal.pal | 19 +++++++ graphics/pokemon/decidueye/hisuian/shiny.pal | 19 +++++++ graphics/pokemon/enamorus/back.png | Bin 0 -> 841 bytes graphics/pokemon/enamorus/front.png | Bin 0 -> 896 bytes graphics/pokemon/enamorus/normal.pal | 19 +++++++ graphics/pokemon/enamorus/shiny.pal | 19 +++++++ graphics/pokemon/enamorus/therian/back.png | Bin 0 -> 844 bytes graphics/pokemon/enamorus/therian/front.png | Bin 0 -> 999 bytes graphics/pokemon/enamorus/therian/normal.pal | 19 +++++++ graphics/pokemon/enamorus/therian/shiny.pal | 19 +++++++ graphics/pokemon/samurott/hisuian/back.png | Bin 0 -> 912 bytes graphics/pokemon/samurott/hisuian/front.png | Bin 0 -> 930 bytes graphics/pokemon/samurott/hisuian/normal.pal | 19 +++++++ graphics/pokemon/samurott/hisuian/shiny.pal | 19 +++++++ graphics/pokemon/samurott/shiny.pal | 0 graphics/pokemon/sneasler/back.png | Bin 0 -> 821 bytes graphics/pokemon/sneasler/front.png | Bin 0 -> 913 bytes graphics/pokemon/sneasler/normal.pal | 19 +++++++ graphics/pokemon/sneasler/shiny.pal | 19 +++++++ graphics/pokemon/wyrdeer/back.png | Bin 0 -> 854 bytes graphics/pokemon/wyrdeer/front.png | Bin 0 -> 1094 bytes graphics/pokemon/wyrdeer/normal.pal | 19 +++++++ graphics/pokemon/wyrdeer/shiny.pal | 19 +++++++ include/graphics.h | 48 +++++++++--------- src/battle_ai_util.c | 2 +- src/data/graphics/pokemon.h | 48 +++++++++--------- src/data/pokemon_graphics/back_pic_table.h | 12 ++--- src/data/pokemon_graphics/front_pic_table.h | 12 ++--- src/data/pokemon_graphics/palette_table.h | 12 ++--- .../pokemon_graphics/shiny_palette_table.h | 14 ++--- src/data/trainer_parties.h | 2 +- 38 files changed, 341 insertions(+), 75 deletions(-) create mode 100755 graphics/pokemon/basculegion/back.png create mode 100755 graphics/pokemon/basculegion/front.png create mode 100755 graphics/pokemon/basculegion/normal.pal create mode 100755 graphics/pokemon/basculegion/shiny.pal create mode 100755 graphics/pokemon/decidueye/hisuian/back.png create mode 100755 graphics/pokemon/decidueye/hisuian/front.png mode change 100644 => 100755 graphics/pokemon/decidueye/hisuian/icon.png create mode 100755 graphics/pokemon/decidueye/hisuian/normal.pal create mode 100755 graphics/pokemon/decidueye/hisuian/shiny.pal create mode 100755 graphics/pokemon/enamorus/back.png create mode 100755 graphics/pokemon/enamorus/front.png create mode 100755 graphics/pokemon/enamorus/normal.pal create mode 100644 graphics/pokemon/enamorus/shiny.pal create mode 100755 graphics/pokemon/enamorus/therian/back.png create mode 100755 graphics/pokemon/enamorus/therian/front.png create mode 100755 graphics/pokemon/enamorus/therian/normal.pal create mode 100644 graphics/pokemon/enamorus/therian/shiny.pal create mode 100755 graphics/pokemon/samurott/hisuian/back.png create mode 100755 graphics/pokemon/samurott/hisuian/front.png create mode 100755 graphics/pokemon/samurott/hisuian/normal.pal create mode 100755 graphics/pokemon/samurott/hisuian/shiny.pal mode change 100644 => 100755 graphics/pokemon/samurott/shiny.pal create mode 100755 graphics/pokemon/sneasler/back.png create mode 100755 graphics/pokemon/sneasler/front.png create mode 100755 graphics/pokemon/sneasler/normal.pal create mode 100755 graphics/pokemon/sneasler/shiny.pal create mode 100755 graphics/pokemon/wyrdeer/back.png create mode 100755 graphics/pokemon/wyrdeer/front.png create mode 100755 graphics/pokemon/wyrdeer/normal.pal create mode 100755 graphics/pokemon/wyrdeer/shiny.pal diff --git a/graphics/pokemon/basculegion/back.png b/graphics/pokemon/basculegion/back.png new file mode 100755 index 0000000000000000000000000000000000000000..cb4e0c0883e7391e103718b619a7d7c593117371 GIT binary patch literal 625 zcmV-%0*?KOP)D7 z5hx!8maw4!000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yPxq@WN$AP^7` zco-P?q{v`ADB$GaKu}O1FgPG!IQUR_U|?W4R7k7>n$iFO00Cl4M?{!*(FQ&M00EUr zL_t(|ob8f5OT$nUhJ#Qjbvng>LkB&y5Tu#9*y2zrF5-|PS*kxqoi4Nm!6^kHw021r z>1Y-!?IM{nb-Dk=bM8%B`+b+{=&!+hmp$rHkOFi z6I$KqBjAjq4Sc{?#eGmI?us&*?dPhfCFs}{hz}VG zF{-@@5pVAx&h#w8?|M?ciJ`f}RYF<4_Fl^|fU}?5SZaCR1t_7g!vjnJX03ApVEQEZ zDR-BAB2Ve=tS=wU&NB%OZRCR00vZ5NwB^ENP^b@-&{;3w0dP!$qXp03T|ff%6D`!d zfp6qKHWvWcBB?k9EqDXtZZ$wJAVDS-*LAeujn@NGj#8rQ-hWbi76!jx0a0XbxouEF zos7o1VUa0u?72{Kj9fj#PyoxQGy|rEwMh00000 LNkvXXu0mjfr*!_m literal 0 HcmV?d00001 diff --git a/graphics/pokemon/basculegion/front.png b/graphics/pokemon/basculegion/front.png new file mode 100755 index 0000000000000000000000000000000000000000..4d46e3cbc637fe4110e0a8df7495e2d4da6db96a GIT binary patch literal 960 zcmV;x13&zUP)D7 z5hw_TMKxvs000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yPxq@WN$AP^7` zco-P?q{v`ADB$GaKu}O1FgPG!IQUR_U|?W4R7k7>n$iFO00Cl4M@0Xn2lB-L00QJm zL_t(|ob8f7Yui8=#*b2qK#AcBHWci^2hx&i5(#7p1k$a89Op_5k#R(=4&jz8ojL}* z2M4rd=#W8>FW^8S!S19&eIS)UUoaR$y#)FV`krF>kDM>i(i_B~=l8zPd(Ryq|JUET z@^-rO)MtGKn52LPO|40Oe9t!U?Qsgk!hQ;9bjbJ-0I<;_LrnZhC%>6&g&CBhu)1_U<8!=w6srTA~P)!%#$F&9ZhK;POP+YcF_&fAA)g=!Do5%4dEWVGl&NRG7I?Zaw_4Z>dCMsQ;?rOH$KMfy-qBQscLnRlkv>TTfan11%L* z$G0Lx3qumJ i|3ux=daCh1wf+FDY-@nhW|Kq!0000AP_kztSKoVgJKw3K`ALQtcz+&N?L(z#+|?v~PqJf6vfZUe5(U5Cz4z|vOvry;JO2W^n`CQs zRM{lEMWwg~6p3Ec*MZVD-{-4=vR&EdoNunF0Q<}9Kv^wwRn=DapqEuu-C74Yr1-o# zPL%8C*A}gxuZq`SQp=*RYG_ z-doli;k&S$9B8@16aY*C%XNcnih?WV%NK6j&L)6QAqD=0hbi2amQK*dC=;R~gvXFM z8GxU8u$v087lWXY0;YJJ><$5haWO9qJQGu6(CdUrvQ!OIGcmQ-=`j3_aSBjkQi!p= z4*VbpS*8Y|O6Xw<+UYoxAYU6n2JN17UMBcr0vl z324RuqAm-ZAa@K!*a?6ryv=36HU2w<1x$tK65Qh=QLZvI^f6mKGy?b{uDSq zrL?sQm@vy{Qp$0z#s-UfWFo-0l)0BZZXMfku{6~R*0h8bcL?0!gtG)%rN@ZWk3$9W8oW;N~3=igLI9FtW=@ub1+ICc#MS_lX*lM(^01;F?q;6130PZb|yyM1#mCtDW*j> zh6{li97eYf;3+1M`jLcb%`-*O+vq$22A*K_=ScQT3(d-?ULPkwkt5hxK~SA`8F%{b c{$3;GFKMiIKa1T==l}o!07*qoM6N<$f(o5<0RR91 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/decidueye/hisuian/front.png b/graphics/pokemon/decidueye/hisuian/front.png new file mode 100755 index 0000000000000000000000000000000000000000..f3c4d93af1fb2cf6727504961a4dc89d3626f676 GIT binary patch literal 966 zcmV;%13CPOP)(*zQ0S&1zE4{XN3gbrLI-aRw9BKRnGOyw$H6To6c3rg={~v5Rq>PkN5=2z`@R47 zJ-tu1rWJJMigs07ph~M%Y14&(Z+PA!z`gI9WKoXI;Lak0Z$i|g`SEZwKt1^J@tkhWoMu0-j#e-5{8G+@gMV$6aGQ`6-_&Gqp0$Tylex~)?8Kf@q-b|Mee-aiwt+3j{8pv8%ll6{)ZAa9DFHm-LN z*pHsxmWTIdfkUy^F+CdC0O<;o^7f3y+55pBeZo1lAfeK~E9KFJcqZR2LE5jat>bgp z$Msl7(c&`B1@!tp%bP!Wic>j0`cwoyyvL=KF>K8wx4;w^l7w3#fkA__9sJ%!;DeNB z1wcQQLV(rqnTtT5j^)u;^cSyRuvi7!PS{l zC;@X23}=+DF}G$g1aL~U3vwoUMryp~@j7c~=2fNd@m-;s$vxBS*Er>5HvWa;+_Td< z=WFwRO)+NUp&~a2FtH=j-Ivt`fTyQBDRSjSi$Bx`C9g0EnCq^b0fXKke6dqqr{Z>i_@%07*qoM6N<$f@P=AI{*Lx literal 0 HcmV?d00001 diff --git a/graphics/pokemon/decidueye/hisuian/icon.png b/graphics/pokemon/decidueye/hisuian/icon.png old mode 100644 new mode 100755 diff --git a/graphics/pokemon/decidueye/hisuian/normal.pal b/graphics/pokemon/decidueye/hisuian/normal.pal new file mode 100755 index 0000000000..a5a61bafe0 --- /dev/null +++ b/graphics/pokemon/decidueye/hisuian/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 213 164 +115 106 106 +16 16 16 +238 238 238 +189 189 189 +238 156 57 +65 41 32 +106 24 41 +189 106 41 +205 49 41 +148 32 41 +41 41 49 +213 148 98 +74 74 90 +172 106 74 +115 65 57 diff --git a/graphics/pokemon/decidueye/hisuian/shiny.pal b/graphics/pokemon/decidueye/hisuian/shiny.pal new file mode 100755 index 0000000000..5dd5e9e8f6 --- /dev/null +++ b/graphics/pokemon/decidueye/hisuian/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 213 164 +115 106 106 +16 16 16 +238 238 238 +189 189 189 +238 82 57 +65 41 32 +16 57 41 +172 41 41 +32 131 98 +24 90 65 +41 41 49 +172 139 106 +74 74 90 +131 106 90 +90 65 57 diff --git a/graphics/pokemon/enamorus/back.png b/graphics/pokemon/enamorus/back.png new file mode 100755 index 0000000000000000000000000000000000000000..1b2b00e218f9f00d05f649ab21fd56845f8afffc GIT binary patch literal 841 zcmV-P1GfB$P)D7 z5D71?693r%000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yP^3p!LMeSoHyF@vN&frW4IVDB0G0ScK7DR}525QO_4 z3Iyb#1qBMe50!T(xg^%RJmX0}|L?t%eDb`pz&GEy=c-vE<})F#o#49=SA`J56){WV zLM&20iCuut84ofqZ~?|M3ySm|5a;iLFL}s9bPj+&-DVyzSAfTw0(Qv21uE5W*swGY z9RW%yh#?0dXi*`kAqZo$m!EEFuq*RL3nb2zhi(VfY~TG1KE8g zfbTal;AYCt^6?`v#$m6TVH>30kRUR*GsX-A#1h^rGPfh=L8_lU3g8?y_5lS35SQ&7 z^#Rvu0E+~yQp-Iq<45W)qrfVxYD}ncoQI!Oz#(cXA0I13G{E=%BXnRH;5G4#tfRwUyG+_YnP_{%D27Cb4nUf51;`M2|C!Z)UPYK5#x7p~`k+7p Txv2ET00000NkvXXu0mjfD7 z4i6~@lXDON000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yPS6X|3#AjbR$egk)H1r>g`@nkuc-k0~z=hGcR|1&hpyt^s#F7@Qi zR|!llY+}z63@#uN3!Y~pysQEy()?%gp#}n-nhzv+qy)aX;QGF6Vg*2fsf%HH$X1L2 z1r7?4Uem~u0_emNv!vNXIa2|#UC$vpNTjEoLDfI++$@42+r zVeAkt5f9?Q8LcuALm+Lm;*4PBe?sxZ7w_fh?MF^nHIEe=- zUhW@N`ZXZ0RWFi@B(qoAVSNz>S(aVRPgh#T2<)Ieo@d$jIj*7|7@(&=v#aMnM1hZE zr~}eowC7)6Wlvf=qY(^#HP61KSJ7}|40k}KA*CzV$6Ng|{3SHL_>SaJ=Phr*1?s#X zMOK-8;NS=(uvm|m*-;73BZJGY#MpsqJ#`MFqY8hxZLtGbtT8K!qW7}PF$mUsT;y1V zmk(iJSQ7Mjf3&TbDDj?Rwec`qSAd=HCT97kngZl+CX>(kY%_;}kza32CX;+N+?;_x z&!Zc#-rk+UEncSWgb(sYnkdGgr?ccTNp~+pIFC?cmZr&h+E(R}EBg99Wd{rWnHXeCmU{lxE`4696|?sSj=F*rSwIzBF-F{1T^FfXeXbZ9u@Kf5Qg= z#`gdrwF0o|y%N4ttPl|5-fL0ZZ3VbXQX*QYfPVuB1awEXAfmdcPnJSdn5%%?g#^SY z9&LZXZHRtW0od}dw|SSY{#!y1NGLAiNM@6gUO2h*P+kG46Ok2%ieljj6Drpv7{3AU W4&fabTMu^t0000 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/enamorus/normal.pal b/graphics/pokemon/enamorus/normal.pal new file mode 100755 index 0000000000..08f6e5ebf1 --- /dev/null +++ b/graphics/pokemon/enamorus/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +74 74 74 +180 180 189 +252 252 252 +16 16 16 +118 50 58 +147 33 30 +224 116 156 +243 46 46 +174 74 87 +199 46 41 +243 84 143 +187 62 94 +255 197 60 +239 228 176 +0 0 0 diff --git a/graphics/pokemon/enamorus/shiny.pal b/graphics/pokemon/enamorus/shiny.pal new file mode 100644 index 0000000000..180ae687e5 --- /dev/null +++ b/graphics/pokemon/enamorus/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +74 74 74 +180 180 189 +255 255 255 +0 0 0 +131 57 82 +164 24 24 +230 131 164 +255 90 0 +189 82 106 +222 74 41 +255 139 238 +205 98 189 +255 197 32 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/enamorus/therian/back.png b/graphics/pokemon/enamorus/therian/back.png new file mode 100755 index 0000000000000000000000000000000000000000..8ef80407f583e2838b0e46e9a2e69fd4503d1f6d GIT binary patch literal 844 zcmV-S1GD^zP)D7 z4izI;Yhcv?000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yPgqq$|2WS||<0Ds*Ulsl zWQCOX-n4*Gem?Hu=)jXa#Y7#D`-WBEqxa*n_oxGepBuA~wnSJ2o(x~N_JJ5uTE-?xFN6G-_X#l2*6*#*Dq!Lbg2>0Sq5BlT9xcN)r}+yz!C zLO3a9~i8-U|A0|r~M0YaTY zC$38{1o{RbirpF3B}5T&t#!#)NOwUsuQk_Dk*vv9rVY?_q#UQp5=T|11?UDyN2e>J zv#d&0LYfA6(`(w~Bd#}s>(XX?-Ug1gKTW#PV7*a-9^&meC2qYGn}$$2UGF5Ngd;%L z)Z!`K2Gp$pb?g%C*WM=RD7 z4h{t@P%g3n000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yP0PS4v7s z^DZv@{QR`Ey^|px^Hh(=E-AY{UjM~B@8qxm006*=;>-X500Cl4M@0Xn2lB-L00Rq2 zL_t(|oVC@xYui8+0Pr(Hq~59|ZK3s25$_6Drw+}OD!Uu|EK#zhKCqjip@{R?VuX%P zDFIRADHs=eWG)1E2_Y^xw{nzkga>uXu@ zoUZE|Mg~{~P+SJ;huIa1Gy^ERw*f-nQ3(Oji#3u0gt3asobY0c)N6amCLv}yD}cfj z^p%ED3RF~Qg+u`1&F85OEJ$t*5sCq-!0+mX^33IqH0hGXI5U?6XZJ-yr{ur`ryP%RF-|DgtXDZCqb)s)*8pg>kx=kvCxZju@ z1)@)!c{i5e^%rseQ}k&q025K9wb*jykNolXUqWmJp*n5s2cS`%gPiD%e*h>kLiWN8 z!N)CCrr@Cv134C-`;0M6tLCIc!z{bA1VVT(g&4J-daPYyPfW58J(xDH%o3b?j*zl- z<}qfmwg;7DlZzi^WDes)6yQgn-N(Vk$;m?p&lrbR*5R6ofaYJEFdy%)E6r!mBBe z8-Bx4TY>0cSq8czjTn&jG`$NE04|ntek5+>RaifGs@@C%bYu(^U`od*bIjr1*%^Kn z0~dB+Ee0+X11T7lI}&dfMpX0-Wr*i3(4(vHm4Yva7r(~<(6in!2IfC}y@kua?$IZz#%gfJp3Ez8UcV;Gmxh-U|=Nz#_a2tZ#HS-%UTel#I^5tlfS*O zl3{`+K-oUrUI5MbwE~|hex0Yjp8)9rpqmY#DSDCt{G|ZD7 z5I8ZCK*b0E000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yP4I|bCe0WH}DVBG^RA6jLwFqU1@a6IZ2-mer`WdW$8!BPRO@#Uz%J{tg(X&g6A zbB@5QRUlWuha!*z(LoPg%w!KuGCb@eP_xE2JO&m4*u#sOAa=R}>j)Hy5m1IVfpAgR zBHknLrGUo)bop%unE6WNBYBg324L3%P;}bJ(z0Gj{*k1TXQq`sUT?bkuvPS(=w~em zMuAe8qlgO)M00kppTEBSup*aC^M9dN*{Q*~1ISfaY1?`Lu+QE_WH4Z7tpfC(=L#GV zoC4S_I|Edp0G*EQrO33;ZDU&{h$s^Hdp%WD=Kg>keiK>Ns1k%_8i4AQdhhkfV85-k z2=#~rSvU~%B1{PEDV4Y!p)fTTa^%fmp4uD`JuRa?ABVT!P}(LD$hW2svz;+HyG=k z-AM}`L?t4PXc;IHVjL-8w0~Qrh0||40*{$L=QOR z$GlW0v`%BdHZBY-<{3X#b@vq}%nng^YiR;7Av^-eFag+Z+M~fekXY_5FtNB*cMjd1 mM3t&*7n1-sy9(=c&G8o`RmGQTvojz70000D7 z5I8xUn@u_Z000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yP*YurE(hP92cn?uvgSu*}_*=9%(30$=*(zv=yz+g4TdvJw1-;zd+^05$b zm1a4(Cg9>ARcx@i-;i1Ptkaz~uF_;Gp?P@U+1b%3ivEv)?c=K;fbsLwK^+8yY=J7Q z;UyZMtYRbt$c@V106~BrIIvX~1R^BzF8DG4wzkq%aUd@wP%JDpAp-!$f+TJL3P^xA zftsj(=Ox55B04NrQBy{DziX7-mcd4O3!I?`>bnOkkxd@ssN3NvI?QE8lzmqZwkb0J zWHo)k&v{;Xfr0Y?c7U8@yJ>2PGs565|cM&QP11|T)!gQhx4W7|vK5dCUAmGoPGKJW$FokY4Qo`yK)r;P6Mt z8k0QI3K}MDQ&`$;*Vm z%n@V&&_$H`O%Nv7&7;PM*B`CekN&(48WwzNCv5D4*Q1Zkv5zZDw1Xt8A=<&DwVWc6&AA z`Ko2NQxJCn3NQUloX}-QJOos568tN)7Jdi5Wbv=#58-ov&or~g1poj507*qoM6N<$ Ef~sAU6951J literal 0 HcmV?d00001 diff --git a/graphics/pokemon/samurott/hisuian/normal.pal b/graphics/pokemon/samurott/hisuian/normal.pal new file mode 100755 index 0000000000..65d979af94 --- /dev/null +++ b/graphics/pokemon/samurott/hisuian/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +16 16 16 +112 96 64 +208 192 120 +240 224 168 +160 144 96 +72 64 80 +248 248 248 +128 168 176 +32 64 104 +40 96 168 +190 54 54 +192 184 200 +96 120 120 +32 48 72 +0 0 0 diff --git a/graphics/pokemon/samurott/hisuian/shiny.pal b/graphics/pokemon/samurott/hisuian/shiny.pal new file mode 100755 index 0000000000..f7c51115a3 --- /dev/null +++ b/graphics/pokemon/samurott/hisuian/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +16 16 16 +112 96 64 +208 192 120 +240 224 168 +213 82 98 +222 218 220 +248 248 248 +128 168 176 +36 49 94 +32 69 155 +162 145 134 +192 184 200 +96 120 120 +32 48 72 +0 0 0 diff --git a/graphics/pokemon/samurott/shiny.pal b/graphics/pokemon/samurott/shiny.pal old mode 100644 new mode 100755 diff --git a/graphics/pokemon/sneasler/back.png b/graphics/pokemon/sneasler/back.png new file mode 100755 index 0000000000000000000000000000000000000000..b39320894ca8d955bbf59954d6a2701e1b60fcdd GIT binary patch literal 821 zcmV-51Iqk~P)D7 z5d|gVurvGs000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yPhCjzQ4l1z~=q} zvAe=XQV8h}<**TU{|4VoCc7aC_QDNhGn@C}`@Zw?UI=+u59@zi8GZE6I19tzG2Zj# zeB5^8;~@~Ky-wzVB0e6Ehlty2>CS2tN3~iZKvvZZv2ZjXfO{ZU)rlq+D1HfNQauf#y z@?IhTd_8_I1zOM^ac!D!H*eGNDFy&E`OTLxU=IP{&%WNCLM)vEo7+Fvr#M!40yNE& zrkB2B+q={NZZFU@O`l>L6m5vX#dc5!3^(SOcFW>`M!4Gz3kBcb8Q?hzFu|0UAB0%m z$pq`-i#B>0Xb*(_9Jt&xrVJNhanJ5A)W2*;%Mx_X5`7<7KD zDvK;vcPzNxvd<8Pbtm8=z&zcLC}2iwCHI#SM7Q^(@03tV-B6G$I{_(c-eoJLeD4T> z4*=9bDi_Nt!^;}XfozbRrie*($`WvbJ&6GD{;gvd(P*s!cw-AtTe+{3bOzu!6DXnx z@W~iJ4_u7|ih!)o-;#U`pvbze&#heoWg1W|ZJxd6_3{k7q8Y`!D9|5_lsP9u1r5Le z$VoZ`IHg@bCF7YgDHvsDs^;SOmCbsD7 z5d|)EV(N4N000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yPEe<_1(SX6BIHQ(nP~8 zol555CG7|38puHix0It}yM%s^KIyIn+wxp3HhMq)|M&EsM96XDh(}U5}&3{PBLiav=VXCO`*o?uC#`ho6>S5E}lC+W|MA zp~QX~;Fk>$vU>Oo2+K$y}R;A|FwNN{8UFH8NNw>yB_8hEFFHBj@|1eg#5xcUzpR|A;db`Suh%*a$d9KNRkfkwG;KnW{= zD__lhErrn@Y_EXP!Ndaev~VbJr1G)l>N^L!OQ0Ky<7y4W^LLGdSl2+rV^%!{y70LHut`FD@Jv>L?@wMYb@W$_d4(hD_}vS$M*>&N<`RMWYM>4WyM1H2rT`nhfOpy@Cr`=hUq53N~BvUag7C9bs+ n0V&%7wCR`aVPivEGqA2dM@rwYmKAmH00000NkvXXu0mjf59)ut literal 0 HcmV?d00001 diff --git a/graphics/pokemon/sneasler/normal.pal b/graphics/pokemon/sneasler/normal.pal new file mode 100755 index 0000000000..5cc13df592 --- /dev/null +++ b/graphics/pokemon/sneasler/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 213 164 +49 41 49 +74 74 98 +74 57 82 +123 139 180 +16 16 16 +164 189 222 +164 123 57 +123 98 189 +238 197 49 +255 255 255 +255 32 65 +90 65 131 +255 41 41 +189 41 41 +139 24 24 diff --git a/graphics/pokemon/sneasler/shiny.pal b/graphics/pokemon/sneasler/shiny.pal new file mode 100755 index 0000000000..b3bc5103e3 --- /dev/null +++ b/graphics/pokemon/sneasler/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 213 164 +49 41 49 +106 90 41 +74 57 82 +156 148 82 +16 16 16 +238 213 131 +74 148 156 +106 74 98 +123 213 230 +255 255 255 +90 172 32 +74 49 74 +246 189 8 +213 148 24 +213 148 24 diff --git a/graphics/pokemon/wyrdeer/back.png b/graphics/pokemon/wyrdeer/back.png new file mode 100755 index 0000000000000000000000000000000000000000..00f1ba932de55c027c83d07b22b389a1da1c01a9 GIT binary patch literal 854 zcmV-c1F8IpP)D7 z5epGqhw8@w000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yPYgfB*mh zNJvQFm{_2wsCamIaDa&L@bJLM&^SOqSXfvtvk9f!#M}KVC6Hx76bt@{Zj>ozSGwqL(OvNo zFh8pIOrq79NolW&kn_!*bMA}=fv<${KK>&sHTkk z>Eqtih?Jzn+BW6%kCPj~jTq8pfU+<^D6AA&VO9x=!=OYw*n{HEykvyaU_jjtstbt; z3L%MvOfxopGbj^sDnx9a!3N^F5pMDFj3$E`$6^Jul;blmZn)cZN)>>B@4fspzt=nO(m)&Z;Ewy$V1h2|cU#cv9 zCWGh-csA%={3}pT<7(>1Sb>#px7~aSQnZaM)^V0cV!^V|Hj5*e)H5 z2L}2O{BEoZVTN!?X_&88hC`RKTaSA70Y}rlbLj#{0Qwr^9@t|!#!y3S@UlH}0$4DB gnUo)Bt~op4H#IbZS=}eo@&Et;07*qoM6N<$f{6NiHvj+t literal 0 HcmV?d00001 diff --git a/graphics/pokemon/wyrdeer/front.png b/graphics/pokemon/wyrdeer/front.png new file mode 100755 index 0000000000000000000000000000000000000000..9e5bffce51c892308229b0856acf0c06e7b636d4 GIT binary patch literal 1094 zcmV-M1iAZ(P)D7 z5epeoTw?VA000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yPYgfB*mh zNJvQFm{_2wsCamIaDa&L@bJLM&^SOqSXfvq^5IwX$^kPKh`3djGycrvcS(BAwl$~#9XV<$1NSk#AyHc=22D#qQ>JbP=V4VOR5riYlIcr^w7cQIv z_kj`&x|6wUIVZq%FcP&cbR18(om0T6iaVzZCFfeS8{I;jmd@>rfb*s9oB$vw&iyU= ztrkv9DunYy zh)Jkt_+6_pzInTSqMBb`_f+9_NkIMU(>xhaS_{3|0UL3&LR8ar>|@qh(cI?y8HD%{ zM7VhfF&0^Z7mi1{w^GLK47YNLaW26j1Hc%+eL^YsB`B4G*Bp?a+fs%Mo}r=;JqG9= zfnPF=G{&J?@}`l94n`3Axf09Bc+CGFbgPaG;) zew`#^nYK{Mr`@*hLBar|41{9_!vlb2LLi|xcE6>;YRMp%0D#Uc0mPWrrxa2p^6BV` z(V0ki^#rIo^ccWoverwrittenAbilities[battlerId]) return gBattleStruct->overwrittenAbilities[battlerId]; - + // The AI knows its own ability. if (IsBattlerAIControlled(battlerId)) return knownAbility; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 385460228b..38d8138e89 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -919,14 +919,14 @@ const u32 gMonFrontPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/fron const u32 gMonFrontPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/front.4bpp.lz"); const u32 gMonFrontPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/front.4bpp.lz"); const u32 gMonFrontPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/front.4bpp.lz"); -//const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4bpp.lz"); +const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4bpp.lz"); const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/front.4bpp.lz"); const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/front.4bpp.lz"); -//const u32 gMonFrontPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz"); +const u32 gMonFrontPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz"); //const u32 gMonFrontPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/frontf.4bpp.lz"); -//const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz"); +const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz"); const u32 gMonFrontPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/front.4bpp.lz"); -//const u32 gMonFrontPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz"); +const u32 gMonFrontPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz"); #endif const u32 gMonFrontPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/front.4bpp.lz"); const u32 gMonFrontPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/front.4bpp.lz"); @@ -1031,7 +1031,7 @@ const u32 gMonFrontPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlo const u32 gMonFrontPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/front.4bpp.lz"); #if P_GEN_5_POKEMON == TRUE -//const u32 gMonFrontPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/front.4bpp.lz"); +const u32 gMonFrontPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/front.4bpp.lz"); @@ -1043,7 +1043,7 @@ const u32 gMonFrontPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/his const u32 gMonFrontPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/front.4bpp.lz"); #endif #if P_GEN_7_POKEMON == TRUE -//const u32 gMonFrontPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/front.4bpp.lz"); +const u32 gMonFrontPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/front.4bpp.lz"); #endif const u32 gMonFrontPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/front.4bpp.lz"); const u32 gMonFrontPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/front.4bpp.lz"); @@ -2131,14 +2131,14 @@ const u32 gMonBackPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/back. const u32 gMonBackPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/back.4bpp.lz"); const u32 gMonBackPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/back.4bpp.lz"); const u32 gMonBackPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/back.4bpp.lz"); -//const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/back.4bpp.lz"); +const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/back.4bpp.lz"); const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/back.4bpp.lz"); const u32 gMonBackPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/back.4bpp.lz"); -//const u32 gMonBackPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz"); +const u32 gMonBackPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz"); //const u32 gMonBackPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/backf.4bpp.lz"); -//const u32 gMonBackPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/back.4bpp.lz"); +const u32 gMonBackPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/back.4bpp.lz"); const u32 gMonBackPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/back.4bpp.lz"); -//const u32 gMonBackPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz"); +const u32 gMonBackPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz"); #endif const u32 gMonBackPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/back.4bpp.lz"); const u32 gMonBackPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/back.4bpp.lz"); @@ -2243,7 +2243,7 @@ const u32 gMonBackPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlos const u32 gMonBackPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/back.4bpp.lz"); const u32 gMonBackPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/back.4bpp.lz"); #if P_GEN_5_POKEMON == TRUE -//const u32 gMonBackPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/back.4bpp.lz"); +const u32 gMonBackPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/back.4bpp.lz"); const u32 gMonBackPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/back.4bpp.lz"); const u32 gMonBackPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/back.4bpp.lz"); const u32 gMonBackPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/back.4bpp.lz"); @@ -2255,7 +2255,7 @@ const u32 gMonBackPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisu const u32 gMonBackPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/back.4bpp.lz"); #endif #if P_GEN_7_POKEMON == TRUE -//const u32 gMonBackPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/back.4bpp.lz"); +const u32 gMonBackPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/back.4bpp.lz"); #endif const u32 gMonBackPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/back.4bpp.lz"); const u32 gMonBackPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/back.4bpp.lz"); @@ -3337,14 +3337,14 @@ const u32 gMonPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/norma const u32 gMonPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/normal.gbapal.lz"); const u32 gMonPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/normal.gbapal.lz"); const u32 gMonPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/normal.gbapal.lz"); -//const u32 gMonPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/normal.gbapal.lz"); +const u32 gMonPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/normal.gbapal.lz"); const u32 gMonPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/normal.gbapal.lz"); const u32 gMonPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/normal.gbapal.lz"); -//const u32 gMonPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/normal.gbapal.lz"); +const u32 gMonPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/normal.gbapal.lz"); //const u32 gMonPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/normalf.gbapal.lz"); -//const u32 gMonPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/normal.gbapal.lz"); +const u32 gMonPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/normal.gbapal.lz"); const u32 gMonPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/normal.gbapal.lz"); -//const u32 gMonPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz"); +const u32 gMonPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz"); #endif const u32 gMonPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/normal.gbapal.lz"); const u32 gMonPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/normal.gbapal.lz"); @@ -3449,7 +3449,7 @@ const u32 gMonPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlos const u32 gMonPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/normal.gbapal.lz"); const u32 gMonPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/normal.gbapal.lz"); #if P_GEN_5_POKEMON == TRUE -//const u32 gMonPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/normal.gbapal.lz"); +const u32 gMonPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/normal.gbapal.lz"); const u32 gMonPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/normal.gbapal.lz"); const u32 gMonPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/normal.gbapal.lz"); const u32 gMonPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/normal.gbapal.lz"); @@ -3461,7 +3461,7 @@ const u32 gMonPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisu const u32 gMonPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/normal.gbapal.lz"); #endif #if P_GEN_7_POKEMON == TRUE -//const u32 gMonPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/normal.gbapal.lz"); +const u32 gMonPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/normal.gbapal.lz"); #endif const u32 gMonPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/normal.gbapal.lz"); const u32 gMonPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/normal.gbapal.lz"); @@ -4570,14 +4570,14 @@ const u32 gMonShinyPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/ const u32 gMonShinyPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/shiny.gbapal.lz"); const u32 gMonShinyPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/shiny.gbapal.lz"); const u32 gMonShinyPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/shiny.gbapal.lz"); -//const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/shiny.gbapal.lz"); const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/shiny.gbapal.lz"); const u32 gMonShinyPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/shiny.gbapal.lz"); -//const u32 gMonShinyPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz"); //const u32 gMonShinyPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/shinyf.gbapal.lz"); -//const u32 gMonShinyPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/shiny.gbapal.lz"); const u32 gMonShinyPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/shiny.gbapal.lz"); -//const u32 gMonShinyPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz"); #endif const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/shiny.gbapal.lz"); const u32 gMonShinyPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/shiny.gbapal.lz"); @@ -4682,7 +4682,7 @@ const u32 gMonShinyPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/ty const u32 gMonShinyPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/shiny.gbapal.lz"); #if P_GEN_5_POKEMON == TRUE -//const u32 gMonShinyPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/shiny.gbapal.lz"); +const u32 gMonShinyPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/shiny.gbapal.lz"); @@ -4694,7 +4694,7 @@ const u32 gMonShinyPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra const u32 gMonShinyPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/shiny.gbapal.lz"); #endif #if P_GEN_7_POKEMON == TRUE -//const u32 gMonShinyPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/shiny.gbapal.lz"); +const u32 gMonShinyPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/shiny.gbapal.lz"); #endif const u32 gMonShinyPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/shiny.gbapal.lz"); const u32 gMonShinyPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/shiny.gbapal.lz"); diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index ebe0c316f8..0cb20daaf4 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -908,13 +908,13 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(GLASTRIER, gMonBackPic_Glastrier), SPECIES_SPRITE(SPECTRIER, gMonBackPic_Spectrier), SPECIES_SPRITE(CALYREX, gMonBackPic_Calyrex), - SPECIES_SPRITE(WYRDEER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Wyrdeer), + SPECIES_SPRITE(WYRDEER, gMonBackPic_Wyrdeer), SPECIES_SPRITE(KLEAVOR, gMonBackPic_Kleavor), SPECIES_SPRITE(URSALUNA, gMonBackPic_Ursaluna), - SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_Basculegion), - SPECIES_SPRITE(SNEASLER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Sneasler), + SPECIES_SPRITE(BASCULEGION, gMonBackPic_Basculegion), + SPECIES_SPRITE(SNEASLER, gMonBackPic_Sneasler), SPECIES_SPRITE(OVERQWIL, gMonBackPic_Overqwil), - SPECIES_SPRITE(ENAMORUS, gMonBackPic_CircledQuestionMark), //gMonBackPic_Enamorus), + SPECIES_SPRITE(ENAMORUS, gMonBackPic_Enamorus), #endif SPECIES_SPRITE(VENUSAUR_MEGA, gMonBackPic_VenusaurMega), @@ -1024,7 +1024,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(QWILFISH_HISUIAN, gMonBackPic_QwilfishHisuian), SPECIES_SPRITE(SNEASEL_HISUIAN, gMonBackPic_SneaselHisuian), #if P_GEN_5_POKEMON == TRUE - SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_SamurottHisuian), + SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonBackPic_SamurottHisuian), SPECIES_SPRITE(LILLIGANT_HISUIAN, gMonBackPic_LilligantHisuian), SPECIES_SPRITE(ZORUA_HISUIAN, gMonBackPic_ZoruaHisuian), SPECIES_SPRITE(ZOROARK_HISUIAN, gMonBackPic_ZoroarkHisuian), @@ -1036,7 +1036,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(AVALUGG_HISUIAN, gMonBackPic_AvaluggHisuian), #endif #if P_GEN_8_POKEMON == TRUE - SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_DecidueyeHisuian), + SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonBackPic_DecidueyeHisuian), #endif SPECIES_SPRITE(PIKACHU_COSPLAY, gMonBackPic_PikachuCosplay), diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 24ebc78f38..4da64827a1 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -908,13 +908,13 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(GLASTRIER, gMonFrontPic_Glastrier), SPECIES_SPRITE(SPECTRIER, gMonFrontPic_Spectrier), SPECIES_SPRITE(CALYREX, gMonFrontPic_Calyrex), - SPECIES_SPRITE(WYRDEER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Wyrdeer), + SPECIES_SPRITE(WYRDEER, gMonFrontPic_Wyrdeer), SPECIES_SPRITE(KLEAVOR, gMonFrontPic_Kleavor), SPECIES_SPRITE(URSALUNA, gMonFrontPic_Ursaluna), - SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Basculegion), - SPECIES_SPRITE(SNEASLER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Sneasler), + SPECIES_SPRITE(BASCULEGION, gMonFrontPic_Basculegion), + SPECIES_SPRITE(SNEASLER, gMonFrontPic_Sneasler), SPECIES_SPRITE(OVERQWIL, gMonFrontPic_Overqwil), - SPECIES_SPRITE(ENAMORUS, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Enamorus), + SPECIES_SPRITE(ENAMORUS, gMonFrontPic_Enamorus), #endif SPECIES_SPRITE(VENUSAUR_MEGA, gMonFrontPic_VenusaurMega), SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonFrontPic_CharizardMegaX), @@ -1023,7 +1023,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(QWILFISH_HISUIAN, gMonFrontPic_QwilfishHisuian), SPECIES_SPRITE(SNEASEL_HISUIAN, gMonFrontPic_SneaselHisuian), #if P_GEN_5_POKEMON == TRUE - SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_SamurottHisuian), + SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonFrontPic_SamurottHisuian), SPECIES_SPRITE(LILLIGANT_HISUIAN, gMonFrontPic_LilligantHisuian), SPECIES_SPRITE(ZORUA_HISUIAN, gMonFrontPic_ZoruaHisuian), SPECIES_SPRITE(ZOROARK_HISUIAN, gMonFrontPic_ZoroarkHisuian), @@ -1035,7 +1035,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(AVALUGG_HISUIAN, gMonFrontPic_AvaluggHisuian), #endif #if P_GEN_7_POKEMON == TRUE - SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_DecidueyeHisuian), + SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonFrontPic_DecidueyeHisuian), #endif SPECIES_SPRITE(PIKACHU_COSPLAY, gMonFrontPic_PikachuCosplay), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index a8c986d795..a85829be29 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -908,13 +908,13 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(GLASTRIER, gMonPalette_Glastrier), SPECIES_PAL(SPECTRIER, gMonPalette_Spectrier), SPECIES_PAL(CALYREX, gMonPalette_Calyrex), - SPECIES_PAL(WYRDEER, gMonPalette_CircledQuestionMark), // gMonPalette_Wyrdeer), + SPECIES_PAL(WYRDEER, gMonPalette_Wyrdeer), SPECIES_PAL(KLEAVOR, gMonPalette_Kleavor), SPECIES_PAL(URSALUNA, gMonPalette_Ursaluna), - SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_Basculegion), - SPECIES_PAL(SNEASLER, gMonPalette_CircledQuestionMark), // gMonPalette_Sneasler), + SPECIES_PAL(BASCULEGION, gMonPalette_Basculegion), + SPECIES_PAL(SNEASLER, gMonPalette_Sneasler), SPECIES_PAL(OVERQWIL, gMonPalette_Overqwil), - SPECIES_PAL(ENAMORUS, gMonPalette_CircledQuestionMark), // gMonPalette_Enamorus), + SPECIES_PAL(ENAMORUS, gMonPalette_Enamorus), #endif SPECIES_PAL(VENUSAUR_MEGA, gMonPalette_VenusaurMega), SPECIES_PAL(CHARIZARD_MEGA_X, gMonPalette_CharizardMegaX), @@ -1023,7 +1023,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(QWILFISH_HISUIAN, gMonPalette_QwilfishHisuian), #if P_GEN_5_POKEMON == TRUE SPECIES_PAL(SNEASEL_HISUIAN, gMonPalette_SneaselHisuian), - SPECIES_PAL(SAMUROTT_HISUIAN, gMonPalette_CircledQuestionMark), //gMonPalette_SamurottHisuian), + SPECIES_PAL(SAMUROTT_HISUIAN, gMonPalette_SamurottHisuian), SPECIES_PAL(LILLIGANT_HISUIAN, gMonPalette_LilligantHisuian), SPECIES_PAL(ZORUA_HISUIAN, gMonPalette_ZoruaHisuian), SPECIES_PAL(ZOROARK_HISUIAN, gMonPalette_ZoroarkHisuian), @@ -1035,7 +1035,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(AVALUGG_HISUIAN, gMonPalette_AvaluggHisuian), #endif #if P_GEN_7_POKEMON == TRUE - SPECIES_PAL(DECIDUEYE_HISUIAN, gMonPalette_CircledQuestionMark), //gMonPalette_DecidueyeHisuian), + SPECIES_PAL(DECIDUEYE_HISUIAN, gMonPalette_DecidueyeHisuian), #endif SPECIES_PAL(PIKACHU_COSPLAY, gMonPalette_PikachuCosplay), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 012a95cf1f..fdc5b9d405 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -908,13 +908,13 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(GLASTRIER, gMonShinyPalette_Glastrier), SPECIES_SHINY_PAL(SPECTRIER, gMonShinyPalette_Spectrier), SPECIES_SHINY_PAL(CALYREX, gMonShinyPalette_Calyrex), - SPECIES_SHINY_PAL(WYRDEER, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Wyrdeer), + SPECIES_SHINY_PAL(WYRDEER, gMonShinyPalette_Wyrdeer), SPECIES_SHINY_PAL(KLEAVOR, gMonShinyPalette_Kleavor), SPECIES_SHINY_PAL(URSALUNA, gMonShinyPalette_Ursaluna), - SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Basculegion), - SPECIES_SHINY_PAL(SNEASLER, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Sneasler), + SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_Basculegion), + SPECIES_SHINY_PAL(SNEASLER, gMonShinyPalette_Sneasler), SPECIES_SHINY_PAL(OVERQWIL, gMonShinyPalette_Overqwil), - SPECIES_SHINY_PAL(ENAMORUS, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Enamorus), + SPECIES_SHINY_PAL(ENAMORUS, gMonShinyPalette_Enamorus), #endif SPECIES_SHINY_PAL(VENUSAUR_MEGA, gMonShinyPalette_VenusaurMega), @@ -1024,7 +1024,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(QWILFISH_HISUIAN, gMonShinyPalette_QwilfishHisuian), SPECIES_SHINY_PAL(SNEASEL_HISUIAN, gMonShinyPalette_SneaselHisuian), #if P_GEN_5_POKEMON == TRUE - SPECIES_SHINY_PAL(SAMUROTT_HISUIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_SamurottHisuian), + SPECIES_SHINY_PAL(SAMUROTT_HISUIAN, gMonShinyPalette_SamurottHisuian), SPECIES_SHINY_PAL(LILLIGANT_HISUIAN, gMonShinyPalette_LilligantHisuian), SPECIES_SHINY_PAL(ZORUA_HISUIAN, gMonShinyPalette_ZoruaHisuian), SPECIES_SHINY_PAL(ZOROARK_HISUIAN, gMonShinyPalette_ZoroarkHisuian), @@ -1036,7 +1036,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(AVALUGG_HISUIAN, gMonShinyPalette_AvaluggHisuian), #endif #if P_GEN_7_POKEMON == TRUE - SPECIES_SHINY_PAL(DECIDUEYE_HISUIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_DecidueyeHisuian), + SPECIES_SHINY_PAL(DECIDUEYE_HISUIAN, gMonShinyPalette_DecidueyeHisuian), #endif SPECIES_SHINY_PAL(PIKACHU_COSPLAY, gMonShinyPalette_PikachuCosplay), @@ -1328,7 +1328,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(CALYREX_ICE_RIDER, gMonShinyPalette_CalyrexIceRider), SPECIES_SHINY_PAL(CALYREX_SHADOW_RIDER, gMonShinyPalette_CalyrexShadowRider), - + SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_EnamorusTherian), #endif SPECIES_SHINY_PAL(EGG, gMonPalette_Egg), diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index 1759120b7f..e3f1fb303c 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -6873,7 +6873,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Torchic[] { .iv = 0, .lvl = 5, - .species = SPECIES_MUDKIP, + .species = SPECIES_WYRDEER, } };