From 1359df7f86b6a0f83ebf82621fbda1a2ac9a08e0 Mon Sep 17 00:00:00 2001
From: leo60228 <leo@60228.dev>
Date: Mon, 23 Oct 2023 17:53:25 -0400
Subject: [PATCH] new iron bundle and tinkatink sprites

---
 graphics/pokemon/iron_bundle/back.png         | Bin 726 -> 641 bytes
 graphics/pokemon/iron_bundle/front.png        | Bin 917 -> 794 bytes
 graphics/pokemon/iron_bundle/normal.pal       |  30 ++++++++--------
 graphics/pokemon/iron_bundle/shiny.pal        |  30 ++++++++--------
 graphics/pokemon/tinkatink/back.png           | Bin 431 -> 520 bytes
 graphics/pokemon/tinkatink/front.png          | Bin 613 -> 535 bytes
 graphics/pokemon/tinkatink/normal.pal         |  32 +++++++++---------
 graphics/pokemon/tinkatink/shiny.pal          |  32 +++++++++---------
 .../pokemon_graphics/back_pic_coordinates.h   |   4 +--
 9 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/graphics/pokemon/iron_bundle/back.png b/graphics/pokemon/iron_bundle/back.png
index 3c6af5ad4acc187fc1a0b8687e0069b7a224a8bd..78451dda9b8428cf6f4cfdb50f9bee77a6803e41 100644
GIT binary patch
delta 616
zcmV-u0+;>P1%U;SB!4haOjJdj(xkoi|60QT|IR_pjVXIX00000DI_VZs<g$%y<%l^
zK}1SYP*R+Ylv-U{L5;LU%&?{a000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00GuX
zL_t(oh3(ZzZo@DP1<=TLz6Oxc{cl^1Hl?^WlLB3Zi=qMipMR+#%;WK`e=6ob0@mvV
zYuigd27DoSh*+-|z~0-OuoI94&0c`B;QjDUTR*a<j|8yy0)Q<IB~`Hyq+)JFTLWq|
zg}nmcUO9nX=uJVjfL%BMuLd5#xu6C_6Y2R-s|)r%Et*I{*9!a=P?|W>MR*f<Ajgey
zQww@v$~$M@1AoZPWy>x47znnWix!yk*7lQC-Gdnrap(Y&M;P{a&Z~h=1d&g`g6C5U
z^h-SCO~iUn$h;JQxB%<A-U%ac2!KhOu-yw2unTz!3D};v0rGd4PWAzH4cP9MkO1Pd
zjYK|%?KYnPN>9^C1NrrvW~#9S(9-p<Cf{aS6A1gLFMot0--jZV-DFw1n|!>F2xDFe
zu;_XCCb4oPp+7IO<%8F?K>c~NIuz9p3pwoPHg&+NpC%e_PRr&KEsIb#FcndqE-E0r
z0{e_q2-NN_odPZ>fLKciV#tQu%NV0sO2v2vm~aimxU@2bpclY|%ltA{tluRB*@7Z(
z4xx+|31K)#mw7YykcS(BPM8*8+9L8$l0x_mm^YwrLkB8RhSYC>8D3uhk-$DBFZS_U
z-}<nA0Kn-oZ#y6vSO5S34rN$LW=%~1DgXcg2mk;800000(o>TF0000<MNUMnLSTYT
Csu=kI

delta 686
zcmV;f0#W^e1=a<SBswinOjJdf(4&x$kVsHa`1tq`5D?MP(U6dkNKjDt`1sM$(NIv3
zn7HU*kid|TkkQf6n|zXh0000Fkzo^m`QCRd0006>Nkl<ZScUCY$+F`x2z+c8S^xjN
z!zNi?663?%LMll~<!&_~z<+-~`&r$%{3L?^!D*Mu3`m9r!hH+y9f2_bEfSOsSHkZG
zWDH8PBUF^G-$+n^kl?bT>pFoL1BmQS0Eq~{U=TY}RtdH$g#iGJKp&TdAr>WnCoBix
z&znsr)FCN`(L*>04iZReLBI?^YEWZlftBu&VL_`N4InVSAV>yCcre6XHIWFgz>Pov
z-Vg+X#XaHYw3Zl14))H6Nc_=^5nm9{nLyKv*s4x|TnV&1u~#KrJrJwuwsFmi8v&M8
zB|xSM#g)KXlEz@`OjIcA3xVT*Er=Uag#k}V2)r{`D4v~Af<25d@ft}jEB!vYU{@Kl
zs1+|bt~3Zk0dEW*G%pGLz$j3~*Yb!VI?EEA!3&bPb{Ba>4R-Tls`mCI5OX;NxN&j3
zSm79cFzonZL9;d!8!rwz;Hx2YhP(>4aJbDUu1K)qVhlQBXNT776Bns}(3NbGy9YjG
z(GB7vp(o=Zk?77+dayKRJKne+B)I69CyNK}Lv&W%{3d}-BhPLQe&kYDzV}T6j*;R|
z&#90qY{wYB3V`0sI)o$1;QuURRDQ-Qatl+QIoDFkB>1Rdq6f#wUKU0w`6!{SXtJM1
z*-{2U2J>D*3(&z@#18yv=>65_Rzh2kUKl`PDo~~|ULCFy`sH+sLhlWS6GMXaxEl#~
z4k*5JBBD7A{8hqL0BwEiq7r6H(^l(U*6l2z9iVZ(E9g9%qE3XpMb=*xe)j+EAA5Ql
U7l}iBS^xk507*qoM6N<$f*30@umAu6

diff --git a/graphics/pokemon/iron_bundle/front.png b/graphics/pokemon/iron_bundle/front.png
index 1435bba07cc4a749c69c8859fdd0ff1dd6ce05eb..a98137941bd1baff96b9b4b3b1cfd553f82bb748 100644
GIT binary patch
delta 770
zcmV+d1O5D!2bu<uB!4haOjJdj(xkoi|60QT|IR_pjVXIX00000DI_V`MK}NY`i?6r
zK}1SV9v`l*wpv|UL5;MPAk<d?000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00M7G
zL_t(oh3%Hxa>F1DM6rVuL%96^-*zQ|?R4zev~Qhin#K>_!+%N$5$FEnZ$>G<1aJW1
zJ7k2)fn5n*P)r_%0D)J5K9mqf07BRSLK)Sog*_k)0T>ZXk`Ss6d87h4H$aNZVtPqq
zz(USVwCTr8bVAwb^H6tjx3KC*n^U&I3SnQvy^UV1x;)RdU`KfrP`J!<Q2+>`#5Aav
zm8XLJoGL)$7JmeQb|S(*1pqY!;0yrK<3R=()eE3P{t$vxvG8CGq=*1`@2ONVkVlIE
z3xzxkpaDfcoP%_8CZgP9xDg!ZeT?Wa0%Rh<dspKm-zGr4Nbs}B`Lj^Ut!+?sd`id>
zdP@R;s_{v0>KB6BAcKF?<8ak^ni1y+=uQ0sWt|1wzJFp$bBi+sFUiEfJVP6%>r{X{
zK}?1?G!T=>@sSjgO*80N*Jmkh>?WooLW)n-3Iloth-?Q~79mV09ypnQTVDaD!gPuq
zuyhZH0IT4O*=aL0eFMb11jt=$rY2dS-z;>(Q5B?vxozls>;b6cbhZ)Oh9YWx2lO18
zh0g%IjDKNTPc58m<eLTY$%huK8!iA*9J~Wo3wHn@r20+YEyO#3gqPF07fFK~&;XYP
zwxV;2X24QX{d5h8oZ{9+D}n9%Tu+1#D<SIADeeHWG5k^Q=s}J=J6l&ea}T%}DC!+|
z3I1Fs^apvaItf0?@wyiPZbYIONl%6qF$wExsCyd0<3{u3HS9LPJui=vo>k}y;KhT;
z?QA-w$z{(@3v@x~9(a9I40y@Ro0Y5JbuMfK(q9W6aJtkVGIjl3S$;sEU+G;>>}Lu5
z{rCddH7!Yb6tuAb000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g6siU
AEdT%j

delta 879
zcmV-#1Cach29*bpBswinOjJdf(4&x$kVsHa`1tq`5D?MP(YPo;SpXjR*Z}cdJy1}P
zn7HU*kid*f0LGU9&Ed{=0000Fkzo^m`QCRd0009BNkl<ZScUDD;d0|341^;g1IFO@
zf85&@IB9xGjC;Rs?ljXn&3Hdn0*T&k|Kslq(Ye>;#drQI*c3p648=q5UxjHv5LbK!
zDD`t0bi&iivIK>GnKJ;uf|s8FVUcfNeF_m+Sdc=D$t<}6B4OZFeP3lDZXt$$5Hcas
z^(rz~1up?CWa!s5M*Km&%vX_eT38WLX$N}7g<bGPK~U)*J!Ut-Eifb=sBlg1`{)+N
z;!c?LKLAFtZ@w7`SJwBgk)qv%h#2)(49Eg~C|-RDTfxCnx#B<<E1_=cRVZ~Uuy6rT
zii(y^OKY}h#m7qkEVv0?uUiX$`)*nk4sf_9htaKU+ZI3w)^L#bz3B!6BD0%FJwmZ@
zE#$mo3$cx1I)lRH=>Y`Gx!G?0L{X2<PU!?tw<FL(W_fSD57pFCjO?wCjB?0RLedR-
z6IJX9{6y+=W`Dm&6ea+lSPX=P$+NBa5tX0;GS>Aip+enXBLTXl|A>iy;V2Hon%@#q
z>?;sp#xC$sV?U_f?ua*lyPSIFO$NNff{cCai1@k;)b|B2N7YA=cpgYX@9oUpcnwGo
zJ?#2i_8RnkgoWcQ67lL-jr6F8(J@KYI*3E%A+p!{`}!&1Ar5d70beb=t>DntNYuDn
zqH!SdDJSia4*lW=+=8EfKb8Tt*HeI7NLH%_KXCL;0IOhYT<rwFcX5?spb)@YO?a`;
zLQv>=v_1k*TGLw45SBZ@7V}(;893oH0EoI(8`a>Ev{6?)sXrYCSX`B>SYCe*7>K6;
zQ!S;Bp7@Z~;`(Us+xR&NPvL>Ulq%HY>xsFD>p(~9gHSPJYH<U9GXU%X0XaB<2+mmo
z>^{p{J4qvrO`vZ?aRYYrFz$=<?K}#fI$`M9rH$9kDd0XAt$V-;b$!^O&bTqp0PPUk
zh~$vGXUb1AXqH2tTm4OI`;I1ox&iPh16H@;P5R9JU(^G+do)`3Pyq{EJkTlb^>3~`
z{PEs9)Qv84`>vlV4a-IZZp5GI*+uUDr}B>YBl$lWzW`HEA?g0g99sYY002ovPDHLk
FV1nfHqZt4I

diff --git a/graphics/pokemon/iron_bundle/normal.pal b/graphics/pokemon/iron_bundle/normal.pal
index 84fc377ffb..ea35b3b984 100644
--- a/graphics/pokemon/iron_bundle/normal.pal
+++ b/graphics/pokemon/iron_bundle/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 163
-144 144 144
-72 80 80
-248 248 248
-16 16 16
-209 209 209
-184 40 64
-89 0 30
-248 216 0
-241 92 61
-80 80 144
-152 184 232
-96 144 192
-140 75 0
-198 151 0
+156 210 164
+189 246 255
+90 194 255
+255 206 65
+205 141 41
+123 68 0
 0 0 0
+41 36 41
+217 69 55
+255 250 250
+142 43 43
+65 68 74
+79 30 31
+174 174 182
+90 93 90
+65 141 180
diff --git a/graphics/pokemon/iron_bundle/shiny.pal b/graphics/pokemon/iron_bundle/shiny.pal
index e08f0e802e..b27dde2a6c 100644
--- a/graphics/pokemon/iron_bundle/shiny.pal
+++ b/graphics/pokemon/iron_bundle/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 163
-144 144 144
-72 80 80
-248 248 248
-16 16 16
-209 209 209
-144 144 144
-72 80 80
-248 248 248
-209 209 209
-80 80 144
-152 184 232
-96 144 192
-144 144 144
-209 209 209
+156 210 164
+189 246 255
+90 194 255
+255 206 65
+205 141 41
+123 68 0
 0 0 0
+41 36 41
+172 170 180
+197 198 189
+98 101 115
+65 68 74
+82 80 82
+156 141 148
+90 93 90
+65 141 180
diff --git a/graphics/pokemon/tinkatink/back.png b/graphics/pokemon/tinkatink/back.png
index fee9dde3f497e91184dfb1c0ebe9e83f68cf580a..63fced4482750d73dedec5e965a81b1742afbcf1 100644
GIT binary patch
delta 462
zcmV;<0Wtos1Be8WDKwnYr1oX3_Kn5MgKWJ>a|jFwy)cW!t)ac4q;N?#lzedZ;_jSj
zPlG5@GcGIt|NqX*!5fiXAAem*L_t(oh3(bRl7k=&1yI3cWLV?>f9@uLuB;F!Jl5Ok
zOdooW(Nb8JH{TQh=Kv<^_D3=*fDL`eLyY%b$PmDNOKu#H{sqwIeUiR)vw(Fp*Qc1z
z`w19nreI9ZSG`Xkj^j8lPY5QYV|u^u-XD^ET?28oy9n;btRefc(0{$&CVbXs;L#VN
z4Xh_n>Z?KyRQj5b1GT;)_^tsI0P_Ln0A&DEU6Xe}8K6GGG!XtZQxkYjGR6VFZQkz!
z)P)ux#3Zn72z3E!zvCSUBb15y<`#h@MBqsPbpi;tTy2iE_1&>>507a54A?3FX@Cfb
zBJdl_0_od3Vj2N?gMTjy&Eo+B5Fa!S^hJ>SFAI(N6ToK?nNy&wPJr#>Nwy*&S?_!l
z^UN0^tbrzRZe_r2^ZyB$@Y0Vb%+~EQ5m!ebtse<ZAgI>yk5B|W$1H@p1j-g*wi2js
zhBt4%HNP^T8Fq!dGwuKY01jnXNoGw=04e|g00;m80000001whrlK=n!07*qoM6N<$
Eg2s`|;Q#;t

delta 372
zcmV-)0gL{K1g`^-DKrq)q{T2=2q04Ss>L}>bDVvoVr7fnc_sg8tcw&e?!%gM6iT!h
zO780J|CPo6`u``0T%3_zAAcT6L_t(oh3(cs5`!QN1<+>4Ow#*bw?PC!69S>58~@IZ
z{}HLRem?gF0K!uL%UKX0ge8Id&jPW(2~HsOqX0{N&VvA?`1`Kr9{}QPqX*aYsqEgt
zeQmdpM-LS+LzLy6LfwZ(psBuBIQqqz0<Qf@K>}t3v0oEjU{p~12Y=xQU>Qin5)h45
z01UtuEWi{@z!Gi%48pjV(GsxV-+_)`0a?%pyPpA(AoBu{*C3LO_<;dnnv&EE^;yt}
z!M-*Gj`g>5gD`}-|ND9Q(bo!SEzkXMPM(O%Xg`Ul{R=DaMI|hBh|Al6a1(Whp!&2_
zM~P5}pi4#QcZZ03pfv(m6Y6D<K0tHO*$70raz5;Q87TMR^vfQ5(RuUcw)_AGRvJJx
SpiK7w0000<MNUMnLSTa6MX^Z$

diff --git a/graphics/pokemon/tinkatink/front.png b/graphics/pokemon/tinkatink/front.png
index e7a8572718a7c16e7cd259c7227a3440b8fcd568..f263a31f20d993238f641f34edf036559a8a763d 100644
GIT binary patch
delta 477
zcmV<30V4k81eXMmDKwnYr1oX3_Kn58&gQ*Ha|jFwy)cVvU8KFCq;rj|N;r%5;_jrj
z&4VaXIZ%85|NrUDm>rQ_AAf8~L_t(oh3%Eia)lraMkNpwHTeE-+k64r?i$L>U6C2D
zZq6~}$GdGSR;*aD;_t|Lj%UhK3eJ>?CJamvOc>aB;)xWPCJiXVoFJ=Vg3p<*BWIES
z@<hjlHl$yQTI&E$msK%`Brks7x6=UrXaWu)n4!jUyA5dJbyxxrAb*D%qZx|FAc^}4
z7`&yx5r$Htr!f)&w+NvN7&IInfgo$JoWg71sCe=55IpVO{B#BHB^I}U!}FZRozL?l
za92PD=iUYVu7bUkU4NW{aJJNw-ic6=y@hi(-r^(BOdV%4uy?mmeGy5oKyVn9IB_#5
zu9qgCkO26UMi!GfeSZg|s5@-_6a<)5quIKl=Mld^?9Da8(A$XV97+IuEEUy!`!T|6
z?W*mseGRM~?iOxsnS@K#(Y2M@u$O*(vlnW`I<I3m02{A;x0*G6SfE3sFh+>m_h3}8
zq4PFKY>&gdDR6OnocVKGvEpO#1?cn)LGl0=v;Y7A4rN$LW*$vV04e|g00;m800000
T0Mb*F00000NkvXXu0mjfolV~;

delta 555
zcmV+`0@VGN1my&fDKrq)q{T2=2q04Ss>L}>bDVvoVr7e*uEqapl#3KG&Ccd?6iT!h
zO780J|CPo6`v2?^-#3w6AAi(IL_t(oh3%Ema)clZMHdz%Ld5_7+vWy}ZrgDIUpk#;
z9akUDF(eTmkN^0OUmeEW<LQ}i8S?Xa&!B=k22#NdgHb-yydZ1PjT8`cLx5N_(YmhF
z_(~f|4rXPZ;t4!DAu+C41*NT2(o878=gNx-3o#=G<qrW2;utXStABvZpn+uqgp2L@
zMbK|xthpej4pfOw0Sl1mr|3+9U-|QOuOLPG+0ZM9`+h)sOlefGp9FFphcocuMW8o2
zPTd0Un?Pi{@))S@E}R8w%Oir6+Yl8)<+}xs^7hEK*haAOsgKtb81smixEcESV#v8*
z#~k<bVlebIhWPIWlYbHq?P{FP3RCX-H%4ZKj`)=I^-&v8N5P%<6C!Kv`;~m+_;bOX
zD`Bm3*1k#O^myT;Zw6z*OS~~~1B~#&J6E?xhquDRVXp*yY{9aEs61|x3n6$pps?2q
zFr{-iyT!F^w&+8QqOekj>k1h8Fw|1i3Me0Z+{AD#z(+-D#B9v1k|hC<A#N}Te<66(
zK9^K#CQ?A;E-Q#y*Gs`kq)|E`G=344T$V1ui^zf2E-cI9y&K?bIPk!6o)QG0iykvP
tQmFJY$E#sF|7P%bHD-A+Am;Hu93NTmAu#Flt@8i?002ovPDHLkV1fj@4|D(k

diff --git a/graphics/pokemon/tinkatink/normal.pal b/graphics/pokemon/tinkatink/normal.pal
index 17c6a23415..fb5977571b 100644
--- a/graphics/pokemon/tinkatink/normal.pal
+++ b/graphics/pokemon/tinkatink/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-16 214 164
-197 48 90
-8 32 82
-246 170 197
-57 76 115
-156 125 164
-98 101 139
-156 174 197
-255 105 148
-139 20 49
-205 206 230
-115 20 74
-180 24 74
-238 234 238
-255 149 197
-255 250 255
+156 210 164
+246 101 172
+246 141 197
+189 206 230
+189 72 115
+8 12 8
+189 48 139
+106 93 164
+189 161 164
+115 141 172
+74 56 139
+246 226 238
+164 182 205
+131 40 82
+57 80 123
+255 255 255
diff --git a/graphics/pokemon/tinkatink/shiny.pal b/graphics/pokemon/tinkatink/shiny.pal
index d5b4d15c60..aa21dca4e4 100644
--- a/graphics/pokemon/tinkatink/shiny.pal
+++ b/graphics/pokemon/tinkatink/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-16 214 164
-197 48 90
-8 32 82
-246 170 197
-57 76 115
-156 125 164
-98 101 139
-221 121 37
-255 105 172
-139 20 49
-238 195 154
-115 20 74
-180 24 74
-238 234 238
-255 149 197
-255 250 255
+156 210 164
+246 101 172
+246 141 197
+203 131 108
+189 72 115
+8 12 8
+189 48 139
+196 173 161
+189 161 164
+112 73 54
+148 124 112
+246 226 238
+156 105 79
+131 40 82
+51 46 43
+255 255 255
diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h
index fd102e3366..098b7ae7a9 100644
--- a/src/data/pokemon_graphics/back_pic_coordinates.h
+++ b/src/data/pokemon_graphics/back_pic_coordinates.h
@@ -1000,7 +1000,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] =
     [SPECIES_RABSCA]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_FLITTLE]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_ESPATHRA]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  11 },
-    [SPECIES_TINKATINK]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  10 },
+    [SPECIES_TINKATINK]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  12 },
     [SPECIES_TINKATUFF]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  2 },
     [SPECIES_TINKATON]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_WIGLETT]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  14 },
@@ -1038,7 +1038,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] =
     [SPECIES_SLITHER_WING]                      = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_SANDY_SHOCKS]                      = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  10 },
     [SPECIES_IRON_TREADS]                       = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  4 },
-    [SPECIES_IRON_BUNDLE]                       = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  6 },
+    [SPECIES_IRON_BUNDLE]                       = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  9 },
     [SPECIES_IRON_HANDS]                        = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  10 },
     [SPECIES_IRON_JUGULIS]                      = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_IRON_MOTH]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  4 },