From 0ffe63a23b73aee86ed89b3b014595ddaa7c381d Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Mon, 13 Apr 2020 12:58:41 -0400
Subject: [PATCH 1/3] Fix decor png dimensions

---
 graphics/decorations/decor_attract_mat.png     | Bin 307 -> 257 bytes
 graphics/decorations/decor_big_plant.png       | Bin 310 -> 276 bytes
 graphics/decorations/decor_blastoise_doll.png  | Bin 371 -> 342 bytes
 graphics/decorations/decor_blue_brick.png      | Bin 226 -> 181 bytes
 graphics/decorations/decor_blue_tent.png       | Bin 321 -> 283 bytes
 graphics/decorations/decor_breakable_door.png  | Bin 274 -> 213 bytes
 graphics/decorations/decor_brick_desk.png      | Bin 270 -> 220 bytes
 graphics/decorations/decor_camp_desk.png       | Bin 265 -> 204 bytes
 graphics/decorations/decor_charizard_doll.png  | Bin 349 -> 311 bytes
 graphics/decorations/decor_colorful_plant.png  | Bin 371 -> 345 bytes
 graphics/decorations/decor_comfort_desk.png    | Bin 320 -> 292 bytes
 graphics/decorations/decor_fire_blast_mat.png  | Bin 287 -> 236 bytes
 graphics/decorations/decor_fissure_mat.png     | Bin 290 -> 241 bytes
 graphics/decorations/decor_glass_ornament.png  | Bin 292 -> 260 bytes
 graphics/decorations/decor_gorgeous_plant.png  | Bin 332 -> 299 bytes
 graphics/decorations/decor_hard_desk.png       | Bin 325 -> 288 bytes
 graphics/decorations/decor_heavy_desk.png      | Bin 268 -> 208 bytes
 graphics/decorations/decor_lapras_doll.png     | Bin 349 -> 304 bytes
 graphics/decorations/decor_powder_snow_mat.png | Bin 302 -> 264 bytes
 graphics/decorations/decor_pretty_desk.png     | Bin 296 -> 245 bytes
 graphics/decorations/decor_pretty_flowers.png  | Bin 318 -> 266 bytes
 graphics/decorations/decor_ragged_desk.png     | Bin 257 -> 200 bytes
 graphics/decorations/decor_red_brick.png       | Bin 226 -> 181 bytes
 graphics/decorations/decor_red_plant.png       | Bin 300 -> 266 bytes
 graphics/decorations/decor_red_tent.png        | Bin 317 -> 289 bytes
 graphics/decorations/decor_regice_doll.png     | Bin 346 -> 313 bytes
 graphics/decorations/decor_regirock_doll.png   | Bin 331 -> 297 bytes
 graphics/decorations/decor_registeel_doll.png  | Bin 351 -> 314 bytes
 graphics/decorations/decor_rhydon_doll.png     | Bin 367 -> 314 bytes
 graphics/decorations/decor_sand_ornament.png   | Bin 286 -> 252 bytes
 graphics/decorations/decor_slide.png           | Bin 293 -> 245 bytes
 graphics/decorations/decor_snorlax_doll.png    | Bin 337 -> 305 bytes
 graphics/decorations/decor_solid_board.png     | Bin 221 -> 162 bytes
 graphics/decorations/decor_spikes_mat.png      | Bin 302 -> 249 bytes
 graphics/decorations/decor_stand.png           | Bin 264 -> 223 bytes
 graphics/decorations/decor_surf_mat.png        | Bin 298 -> 238 bytes
 graphics/decorations/decor_thunder_mat.png     | Bin 315 -> 270 bytes
 graphics/decorations/decor_tire.png            | Bin 303 -> 266 bytes
 graphics/decorations/decor_tropical_plant.png  | Bin 307 -> 274 bytes
 graphics/decorations/decor_venusaur_doll.png   | Bin 393 -> 352 bytes
 graphics/decorations/decor_wailmer_doll.png    | Bin 320 -> 282 bytes
 graphics/decorations/decor_yellow_brick.png    | Bin 226 -> 181 bytes
 42 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/graphics/decorations/decor_attract_mat.png b/graphics/decorations/decor_attract_mat.png
index 16528d9f393ad2658efd5f61b6796e524b731885..77e077a718875b0bca526511731ce63b144cb7bc 100644
GIT binary patch
delta 204
zcmdnY)X1dR8Q|y6%O%Cdz`(%k>ERLtq$NO@g&9Z+MJk-0sAyl`<LTlUA~7{N!GT?v
zl~w(~O+`Ju#sInGj?cS~>op4Wt@tb~KK=MQCV@_My{D>r{s)4B|Hhn(z2p5S#&MU6
z&mC{0pi{9v4X-Sm=S`WuWa*UYHk~Y4g=LzB<;CTig=H*7f9~83^76WL=dXfHze)La
z9tn0&wn+Z2OpR{~b}<}P%GFrs_LaZOKkzVvH3P%nKTZl~KmNT7bRdJLtDnm{r-UW|
Dj8979

delta 254
zcmZo<+RUWb8Q|y6%O%Cdz`(%k>ERLtq&a}tgM}GLT2`*SGEvdKp0OmzFPOpM*^M-y
z;6_gu#}J9Bp%Warnhiu;j;EH3-kM#}IBEU<)eZ-IzbnZ-a9)=vZo4q@JCCp1Mym;l
zM)IF38T+c92Y<c!Ze0sY%^rsBZrdwk&%bbGx>GKwGLcotSHP9mjQ8V*8!<W}+3Rlx
zb?!U6*5qg1%V3wMM*=F}hIH9(53%ywdHvX*6=hlyXWV*j`DP~_*Zdw;#rRCF;n(Di
zkEc|JD{Y!s^i=hyr;3ua=1K3Oe+T11tiyhF*Z4&bIw^Ra%bx;tJ%gvKpUXO@geCwS
C!Dave

diff --git a/graphics/decorations/decor_big_plant.png b/graphics/decorations/decor_big_plant.png
index e5eedd85917b72d69702c596a41ab5f01e3a662c..5f5cac3b387de9536e6dbe2c929e6c592f35863d 100644
GIT binary patch
delta 223
zcmV<503iRi0+a$FiBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf1gQ2
zK~xx(jgK)7!Y~X)(;L)7D#SIK8^q0CsrFte?j0D}3KxK|b%UOg)-4ed3xE1g{|&Y=
zKLPma&SwIT=yobP@4RbD1&dhMh^-EcAp}HOCrc4yjDgmv;trQI(ytl~ixdaiG!kJZ
z)j&wYpqdh^W-4M9p?<r-T7b4KHTQd_*W<W%Q(Wiync+5$rwsR$E*~(5l+O9n0w526
Z<PC_DC>?;Ed$s@o002ovPDHLkV1mpeR!#r_

delta 257
zcmV+c0sj7!0=5DniBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc006W}L_t&-m359i4#F@Dg<o#a3_*x%G&hLJUI}MMN_q!Iw!#G<Y;4d|
zV)HW;%9HZRj_qdyKeF=7M&L+-BygNRH7QyjECP{7@WF%HmJnkkP|kVI4C_WfouWt>
zS;Iw=9fo_gXK5^~Y0(Pn1x_aoS4f0Nlu=4bV9^UHl>%pNhwJ^a!n$mMp2eQko|9}&
z&s6@==>^UECNssnj^lX4X&81m*LuLR);)~1&39ij#Xmg&<x?mf(7>bt00000NkvXX
Hu0mjfo_A(U

diff --git a/graphics/decorations/decor_blastoise_doll.png b/graphics/decorations/decor_blastoise_doll.png
index 00c55f229e4b92e8f120c578cb39af78c3fe081b..a7b0ee6e48a473847a236aa4b38feb2afdf8bafc 100644
GIT binary patch
delta 289
zcmV++0p9-e0@eZ{iBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf8j|)
zK~xx(UC_U3!!QsAaC^v*E$4sO83G;r0Opd_korW{B<_$d1`pAYA<)Tm^rmcap%A}<
z->Ri~kKS3OL%u=Z{Xh~zj`I-M^0J$abMLPJLQJkaPj3NomT@m=KLxAq!f@Mg1hj(N
z%NJtybLa%U#p{TVfC?n?1e5PwccawiZGRV}DruVcP^FBj!~;NFV#N<xl(^QqF0h&j
zmPMp}vN+Onq&-q+#va0_(@>}2@fkPIG^frpzHNbd#Ngs>J{9v}7`PY#QEZIivPg`%
nSh%!yI=D*7f7q}1tN;803LrXV`axQC00000NkvXXu0mjfgW7^*

delta 319
zcmV-F0l@y&0`mePiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc008kxL_t&-l~vHaPQx%5h2b{?1Dl;RQOZz>As2vL)=DLgSo=4WB~k`5
zFd#8SjM>80AR#rkkh=oGeek)7R5+5K$v*aH7^7u%0bCv@Lj3_=9SX;t(CvmzE61(Y
zAx83tPh)NdPFX9#Ob;-RJ2}z5f4O5deD7P~LBM;Li!Q#_LXttgH82~P3y&5ya*<7q
zrOL8<rd9RIUh9};Sr(*G8E_YsKG#ouf%T>IW%C1JmcZ8JD^imy?1}7Ik!W8A@D}pO
znOQ(!Q<zvg;@PG92Q`dPN{Ad+ecux|O~bTlWRO-LIHwrvl&e#&Y2<(16)*a%I%O#}
RToM2P002ovPDHLkV1h48g2(^>

diff --git a/graphics/decorations/decor_blue_brick.png b/graphics/decorations/decor_blue_brick.png
index 88e0587127b9041f84d2466a96cd15ea91dee8d7..cb187beb105d8fe8559e0df6c649c686bd72bb7c 100644
GIT binary patch
delta 127
zcmaFFxRp_{Gr-TCmrII^fq{Y7)59eQNK1e)3p0=uic~l~QPDos!PCVtL}F@k!U1*(
z)<%Y7f<a77j1tFB+&JOUuz{y^s^V!5X=cVA<wr~`5tffspQ=8MuuRg-)XZ$*b>L*S
bU|?92D{?7+&9=)xGZ{Qx{an^LB{Ts5*SsT_

delta 173
zcmdnW_=r)lGr-TCmrII^fq{Y7)59eQNOJ(O2MaThw5(itWul^eJ!46bUoeBivm0qZ
z!30ki#}J9B$q5c@Jqk`7;*6|K4hI&nu<*DYb93|1F=%9CDG>aj!z6r2!HMN=g-La9
zW5YpKj)Lfx%=H`{0`0;{1%`qZ5(W-Dx|;f$?E;#anwbKI28?{nf8<(jvN1BaN{d`N
U>B9FKXcvR0tDnm{W~YQE0PA@!Pyhe`

diff --git a/graphics/decorations/decor_blue_tent.png b/graphics/decorations/decor_blue_tent.png
index 575b352410675d85ddb97ad49f62c1765868765e..f94a61e368dafa96572eabe9ada8f73525167f58 100644
GIT binary patch
delta 230
zcmV<C02%+m0-FLMiBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf2K)9
zK~xx(V_?7o7zM#V0L&5Xdj|wB0>PY!ckgD-eD|&utjgov%kuJh?^;0WSUuiNH*v0f
z*Af8ah<Lm+b}uo0*Ww7|2z$J9aW8Rs*J23N;tW$}BEZ0C3^TwO!T}o%=YRl|191U_
z<JkcQQ@|Xp86bA&A}~i~6&N^yJUB)!E<lH{y0|E#b6i71L7dRg5CH~O6_|_@kP3lu
gTp>Xq03(qB0D)Um;K23ZkN^Mx07*qoM6N<$f^Z5{ZU6uP

delta 268
zcmV+n0rUQw0>J_yiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc006&9L_t&-m2J?m3c@fD2H?xkJwbf}JGp6m0o#=7R-pkOq)^-|)TNW4
zT^t<yWOd0i_+L|`i2v}Bz;Sm8(Ii5FMFUO_w>=1$IrEJ|$RXs~*3r8xpLE~GXVPh*
zr*#taN8m0@C7F!b;XXrC5i|OiVg?*)uzHY53**}lgNBiQI8!4YSFO48RsubxXX+cc
zzJSnSM`B~lNMbDoAx@MtLMgv}hY*$x{(`57u`WVWW0oV<=6s4WknmqgU-kj7Q&Zri
S&LLF*0000<MNUMnLSTZtL~O(W

diff --git a/graphics/decorations/decor_breakable_door.png b/graphics/decorations/decor_breakable_door.png
index 01ba82d28a09d169f52be1765db7262dfc46372e..b96bfe96b08437cf4a4ce05bf877c5b1872dd599 100644
GIT binary patch
delta 159
zcmbQlbd^!DGr-TCmrII^fq{Y7)59eQNK1e)3p0=uic~l~QPI9M!PCVtL}F@kf&;5;
z0K>B_ZB33WYVJC`JVJ^x6W9*&X)J%b|8)Iy`5P8z-}l^?+^=v%@O(x3AGvcYf29B6
zU--s0fGtm|>rDOQ{~VHYWIFCE$ef&+U?4cT`H`igh6A@c1Ji_{)h&((E(7gk@O1Ta
JS?83{1OUlHHZTAH

delta 221
zcmV<303!d@0g?hCiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc0059lL_t&-m2J<x4TLZZ1z@k>hSSaA6<8q>?KKf2(8Eczl-ckq(xxK#
zM+W7Di%*fUo_GK@>&kqC(?vmc-QwsK-vu5c^2iRM_O&<ev@kgFBRip7aOm9d8incq
z!%jOjWP*bZf_%LyRf3;{K2h3NGZQbr`A&|OMzjhVs%YuNV`ynazq=c0!L&JA+OOaQ
X6mn9lkc8_i00000NkvXXu0mjfIlWp{

diff --git a/graphics/decorations/decor_brick_desk.png b/graphics/decorations/decor_brick_desk.png
index 829e453497ddbd2e0b7d9ad95c5380ef81c1e4d6..c81082bf8942aec15df8d81cda1ef1c78400ed3a 100644
GIT binary patch
delta 166
zcmeBUy2Gg08Q|y6%O%Cdz`(%k>ERLtq$NO@g&9Z+MJk-0sAyl4?&;zfA~7{N;Q((1
z%fbf?6Ar&HI(nJ4h1Frs%m9XGJABOMJ$jV+vgxE_s9EZ!jZ3+&Fo^KY%ABUB&~wt!
znD?Zm#+(aF0~adrJe$+VG(lWqNqO@@w+-)?m^bZF<9)2)5yH2ap~;1b!Pd;Fq3KJw
Q9MEb8Pgg&ebxsLQ05#h=ZU6uP

delta 217
zcmcb^*vF*U8Q|y6%O%Cdz`(%k>ERLtq&a}tgM}GLT2`*SGEvdKp0OmzFPOpM*^M-y
zV2`JZV~E7m+Wy^wEe1R;*DV`m<0W0rO$}%ezSVSuHGpB`WNio6yHU@I&oD^u`Pg^u
z7sK*h0u1WL6N_totykHKXz(10S$5&Pk;#m|=W7qnVdr+4BAd3|(f@Mat1IrA8@>ff
z7|z&gYW8D#X1b`JZj07@{rN!~;~v!9uJbvg+3K`)@p}`sx`3xEQ)}O~$r~j&HF*77
RxC!Vm22WQ%mvv4FO#m>&Qs4jp

diff --git a/graphics/decorations/decor_camp_desk.png b/graphics/decorations/decor_camp_desk.png
index b40429229a2b1b6377837b0d8b768d397c482166..6a1bf68c914896dce25bb93f55926b05fe88d190 100644
GIT binary patch
delta 150
zcmeBVI>V^g8Q|y6%O%Cdz`(%k>ERLtq$NO@g&9Z+MJk-0sA!)P?&;zfA~7{N!GX22
zDM5iPY4b{n-3<!@nI;@w!ILI!&DmhFY+-@`&$E`LjgDF~m@g|EXnZl?aALes+_P}y
z!i9+onFRV)M?^&>ar7`Rk=$4)!SayBh=GA^x8@5Ck4?cqs~9|8{an^LB{Ts5A&4!W

delta 212
zcmV;_04x8@0f_=3iBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc004(cL_t&-m35E74Z|=D1L;rS_9qK86V&Jeg*ri_yqia~{|Ke*rcD5a
zfDZy8iy+Xo6yP#eAYFyHD={1K^IV03RH@(-C<UW-Uf&xCxxIn<$bh~GTeExl>xCJC
z7iENAka3>NCO-O<o(G`x3N54cDqU4)3}y@XJ$3xmGTJru>(dcsTl)aPh$-mR9PPmX
O0000<MNUMnLSTY6Yf~!#

diff --git a/graphics/decorations/decor_charizard_doll.png b/graphics/decorations/decor_charizard_doll.png
index ffc3dfcef7b512e93dd7104f91e717dbfdd76a82..cb1acc7289e411a03557696b410a2be97d91ed0c 100644
GIT binary patch
delta 258
zcmV+d0sa2n0=EJoiBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf5J&b
zK~xx(UC%KJ0x=K;(4^TqTMTx3h=3;;V<`jv2o|znlEO~V!?>M=#d<3X4<L8|v+lZz
zQ~b<>6n~WZA8oW5KrYA^LIX6I(f_M7mNS^5-3v!|U?ZW*2uwF%EbLlD5@r&gQE)9w
z<{33yDeY=OaG)j_rG0%NK-NvnSder*r$p;SEz~Xo-m46iy*jRr`FU4}hv?_Nt5cNN
zPEl4}&*#Y6{i16+!Nb}d-8Cn%Hb)O{ZS0|8QqrI6${~K|1-&FPOXRVP=>Px#07*qo
IM6N<$f^5fVC;$Ke

delta 296
zcmV+@0oVSw0^I^3iBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc007%bL_t&-m2J;4Y6CG41<<c%Yi%*4vkxK231p=-1O76&Fbk1XqzlA{
zu{#$joLi;H0Sq}nMs`e6SfGa_q^}v^{%|%YV@Lv&D8HxPc}OY>QBg2Pf~y7bMQ-s)
z&hCc!3xlC$GGel2se&OM6fSl0e&HQX+lPUd{-jrcYM1TvRg4R;Btl5Vu{A*@GuFHH
z4sSI-L9>O*DNaW5*qo}-#3RGF#N}%>!`M6dHs&;Bf5Y`H#_KIUKN1fiyy6_f92$Zk
uhfv{LbN_l9tsyLXhddj5y+QvM2K)dT*D_0Yii4T}0000<MNUMnLSTXm=5?+B

diff --git a/graphics/decorations/decor_colorful_plant.png b/graphics/decorations/decor_colorful_plant.png
index cc0efecc7461945f36207b1333691ed8fcecfb2e..fdbb43c330d8d91912fb71816f85f3f08c1ee171 100644
GIT binary patch
delta 292
zcmV+<0o(rb0@(r~iBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf8<F-
zK~xx(eULGZ!Y~j;JtbWtAp_^&1S`P}xIh{Z+A0kbmTjm!?nsf~hyx(45N%c)DJ_lV
zgCvp9z<76SrWrr~KjRq-@gg9CcvSs^Os90l(;rL~e%ePGhx14wIzMFVh`}@sIy>M#
zC>QT*hNccxm%-I+^F2#&7~IdzdOF){hIjApzH4pIHsA(#+qJ$=!T<^x4$XHSfRJsN
zQFup8=;P~}sq}YFGK%l3V^C%@O-M#du7OQya?<*!cPv#~DypI|l2?LlqF0N>(#Y~8
qAc@AS`F!~Xl5LTIn1j=cuXzHr0bt`a?I=$G0000<MNUMnLSTaU=y>4(

delta 319
zcmV-F0l@y*0`mePiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc008kxL_t&-m0gfAZo)7WhJTN2j#RmD4o*-BZombyv_ecQby~VG#ok~D
zO~e6^5Mrew5^EPL2WcXoq5o@_h&O!lv!4FX&p@w~Cd`r;=D;AgKv~zoKF0o3GN>?g
zpBDBbe8V=eBSMFZ;I1};WkO`ne@wS;Jk=Mu-FFStO0ZzO`V%QpDo5ba$*E*0<FBXC
z;2eK$IER0%q_ucI9x~)MbBHaYL+b^Mk8MiP*Op#KZ!Sw!YuRr!@=!0klKtF4%~Q6i
zegHI7@8Ql;zIEQCsEPu!$z+PzcsxbI>dkpW$J)PYl&0c;ncW6Y%ILee6<?W*VB_A%
RsgD2v002ovPDHLkV1h_ljRXJy

diff --git a/graphics/decorations/decor_comfort_desk.png b/graphics/decorations/decor_comfort_desk.png
index e7a72ff0802e6fcc47d21344965523aec93ae9bb..3e81301dfe9a9d620a625d6e162bd16a670fb6de 100644
GIT binary patch
delta 239
zcmV<L01*Gc0;B>ViBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf3HbI
zK~xx(osTgJ!!Qg*;~Q9zhGaJM02X);mAx0-?nT1)=-9DiZrkr<>CmYXwlI47)*ps{
z!g)snIdUG4F;7ON+DK^J3a1N~q~-@#IEJ37f~y)Ma|pbmBN|dMjp>S+49p6!2JEhZ
zML4o_jAKd)cJ0!7sBu@D8n<(7McVp5mYY~Hu?H}zR<l$bbWS9BM6QGx_abcUmbq^|
pZ+>^OJ#jDZ!`EJSQ(yIGd;sxpCBBw(^?3jQ002ovPDHLkV1jn9VHW@Z

delta 267
zcmV+m0rdW)0>A<xiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc006#8L_t&-m35D?3IZ_@L}&jXfm814fFF>B^oN`DLe5^Y<UcGeE$?sL
zQv{1M)hrq2%>a9k905Z<f|kOd!g1H;;R)(XMLKgqh~bZq9H4^-Qd5VJs@=6kkhB2G
zTl{rXVu}{~z_A-wb4O$jNJSfhVU`FMVWiaBht^NAL$oLY&kiwNVDa4)%Lbb5WTUli
zT+y3Nld7PD7n2WbG_KZVdcH^hcCJ|}@{otEJ?+l=`W*7?9j4I&XuV@E?*(s1CBCQc
RtJeSk002ovPDHLkV1ks4aB~0v

diff --git a/graphics/decorations/decor_fire_blast_mat.png b/graphics/decorations/decor_fire_blast_mat.png
index 510675ee62365ac87e8c4f3e242318fc9a7b7db5..df6c2bfe084c37278cd58d48d0dea9b2756177cd 100644
GIT binary patch
delta 183
zcmbQw^oCKfGr-TCmrII^fq{Y7)59eQNK1e)3p0=uic~l~QPIA>+|$J|L}F_0gp0fl
z3Op{U%s(%<uJdW&Nr?LMy!mhVgs|kGuls%#SyrXay4PiR?);tXT=Q1F1-JAfSR_)y
zB#Q4j>^^krP{W6X*Cu&8YVABD)t+i$+P#Fa(?n#(0wswD*NzKr>d`G)zteVK<LhTp
jzpL*o{m1{WlxfiwjW~r&5ndsnTNpfD{an^LB{Ts5GZ07$

delta 234
zcmV<G02Tl20iOaPiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc005myL_t&-l~s_z4TLZZ1WgC<;2K${f?NtXCE?G5{#&^92BBby)e0w!
z2D5oKKFh_}8%u-Pr?Tz2-1}`??dtus2JZ&I4fzYJK(m5WrjM-=XGD+cKSn)Rb6Eq!
z8$={qs)GUCt$7+-aR&oD$G|(%K-h{~6Hy)z2LpIoywg_PVI((M4qutSMn-ZIL%uTC
kKbX#ik=$f?KIZTF1Awq7UKCYTuK)l507*qoM6N<$f<$y$kN^Mx

diff --git a/graphics/decorations/decor_fissure_mat.png b/graphics/decorations/decor_fissure_mat.png
index 6de66ef9d6b8a03746a29b989a64a1f5e75294d7..1a0212487e01a22c47863be85fdbfffeee48c853 100644
GIT binary patch
delta 188
zcmZ3)^pR1qGr-TCmrII^fq{Y7)59eQNK1e)3p0=uic~l~QPIA>#?!?yL}F^|goB(7
z20X4`A4MMIytKoinOR~#v&PZQa(C)kqeTssBr;Ac{`=B@(;M0BP~CFbhL4MEGz5<c
zXN7+3`n2OkEz?V(oV`3(j!X$L<zzlrTocZsAuMd*-WepZ<fuz5Q=<CEAMzC$KIWhM
nOB41;UN4g~UU~Om`I|gdA+?Ixb@qio2QhfM`njxgN@xNA!v;hA

delta 237
zcmV<J022T40ipsSiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc005v#L_t&-l~s_z4Z<)CMSm}xsl)_sSRfVy;J5=6MV!ll{a3*GMQvj#
zPqDug>jgO1C(cj<H;YTjz_)00qW^pxS5)@}CgL#7wqcfgL2{o?kF5<$gI@#sY?x!3
zQ}mbWhQXu;G<Ap>Q|?WY1hYOILz6~&fHS7t>;48_5=*AsfitGuyBX1qmYXllyQ0w{
nNMD-s500V{-DtV&=6(GD_{Ju9YEVnt00000NkvXXu0mjfP~Kn+

diff --git a/graphics/decorations/decor_glass_ornament.png b/graphics/decorations/decor_glass_ornament.png
index fcc895eb9f0b622bdd5f0bf63de4ba3f4b279dca..c85ae769b2edf842c1079b4dda18e65f48265457 100644
GIT binary patch
delta 207
zcmV;=05Jcg0)zq~iBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Je~(E-
zK~xx(ZIH1F0x=ARdz+($`anX0n{d#yt_}yTH^i(89(NCV^F4z_`g@}OQ$9YDv~lhy
zlmDm}x})A4XW}hjW{H3Y%T=ZdA?u-|s)ARNzM7^HIibf5tmy^_l;wiak#cI$L&cmc
zjKr%6EZSk(PAp-K8_lf8Cx!yLCC5X>EWUwCR#Vdc1OLkRk)E>^Czbu1ZKwbM002ov
JPDHLkV1hkfRKNfL

delta 239
zcmZo+TEe8*8Q|y6%O%Cdz`(%k>ERLtq&a}tgM}GLT2`*SGEvdKp0OmzFPOpM*^M-y
z;37{K#}J9Bx%~&Z4jBlzEI04xy}~bKRw2xF_sZ(_rt5M^>$t>zFSPwGeJ8i%;wy)H
zd?$^Z8{~6&%3V_hdi~D%n9Hbrnqg!9p(b%l;r)ZIk4hslB}A8OtKTbHUp0MqduU#u
zfxO`liGaY<87p`dN}n8ct?ZMvXtgVk5lwepYcW&XzI)n_gLXTbPJ3%EjT2P0GY#@&
n5lgiQycd1!o%Gg&d#&f|Fse_L*NH6!I+wxI)z4*}Q$iB}_<&b|

diff --git a/graphics/decorations/decor_gorgeous_plant.png b/graphics/decorations/decor_gorgeous_plant.png
index dc8639c65719314c01888a632ea76484553f2fbc..ed8947ebdf44c00376744864be5bda13d5327651 100644
GIT binary patch
delta 246
zcmV<S015xh0;>WciBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf3`_P
zK~xx(WsW@#f<O>Pmm4^NL=&wTFTl)l0Nf$52NJGf1+9q$&O&UgwXxMpxgd*1U#8fX
zZ|6s;KLEbo%(HoHSxn+1GeuKCLxN-E1sNhyoDAm2yd&Il77g8!W?3BPVrO`$C2h)F
z3|R?Dr0Ya5w8Dsbe=<bFH^au1OpVs8?YO{nBRU!PNYU1XB=4=DmInpyIB4t7)tA+A
w?Sjn%;Cy%T?EBj+SBn#`0;pV%g0X&h0qVvn#^JdnH2?qr07*qoM6N<$g1Z)FT>t<8

delta 279
zcmV+y0qFj#0?Yy-iBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc007EKL_t&-m1U4YN<%RahQHh(g9Qa$HD17(yaUvv;QqDHYq)B+1xs_5
z;>NXZ-0G#AKo{-vhxzy?1Nk$7e+nHp-Kf`W^k%U0OvKAfFc-;8&n~I*tm$!jS?qY~
zNZk$#r;UCPtS$*DSHfH!mJ*>@ZGl;7J-7B32;(>mEDxI%wY5rqc`KC7A=6x}kGnP8
zzQU?nq!x9gc|_IQY&p{M0&35dINkE$8sTCt$DQzTx4-8{<elHs>5ESnTahjO8>U-+
dU*j?i{s7odDaQUjcbWhI002ovPDHLkV1lQRdSn0q

diff --git a/graphics/decorations/decor_hard_desk.png b/graphics/decorations/decor_hard_desk.png
index aa0c7feeacea2b5796fb4adb9e3876d9c0625b8f..b85b098f98af55e49981a59dd69f968441c02a2d 100644
GIT binary patch
delta 235
zcmV<H02Kel0-ypRiBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf2&DE
zK~xx(eUD8Jf<O#~XBN7K7&t%)?&S^P00VK0z~B~4h6|wgw{#@B@-3Qt{dsMb`Xe33
zX{+W);6y}jp^Fp>07S^PlFm>87DWIHYha3r;h4R+5BCp1l(!6r4l8)<EY=U0wX!>`
z=u1=qx^ipla}^9MV6eLxSvu|KL9oI(Jw4qOR0<5Wb3;=%@<ZbM;zu_Mq~px*`C0ZP
l3+J@I1&~}CKu6#Bqc;#QB;pV22+05d002ovPDHLkV1h;;TmJw6

delta 272
zcmV+r0q_2x0>uI$iBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc006^DL_t&-m0gd)4uUWcM2CZ(B}P7=MDH>sd;l1)Di*I|0zZKMzq6GC
zv4@x0?sj$xEKZUNTPIOa$RlcCoqrZnX?6je3nNJ9P?0rQd#WTCbNxneM}fH{3&9sp
z;9-!dhF3Rx@rsy)TRAr(EJie)X2=SDs<fyr=dva}d|YlL+$$9im{A$py_L4@2aAEE
zwGZAK$z2e#&eUk=t-blBe}^*>!u^C{96I!AnnA4uf5(-&ZB9byguy(9tNC6RZukNU
W{3PPt$u!RZ0000<MNUMnLSTYdk!wBx

diff --git a/graphics/decorations/decor_heavy_desk.png b/graphics/decorations/decor_heavy_desk.png
index 141bcd83176b40d0bb3349c4aa74e94853a6b56e..3e9e74683c25f560b38158d083ebeadd3d19ae6d 100644
GIT binary patch
delta 154
zcmeBSy1=N|8Q|y6%O%Cdz`(%k>ERLtq$NO@g&9Z+MJk-0sAyjh?djqeA~7{NL4nzT
z>rf*D^Wu-2ObkvKu@#C*H#drQJWk?a)pPI@>)G7n!`F3DW15yOFKe@gs>1Ux----Y
z+*3YqKw-1=qceBe9nXCeW7u8S&A{d^aHuih2m^yuwf4l22X}u1tz+<X^>bP0l+XkK
D))_H|

delta 215
zcmcb>*u$jQ8Q|y6%O%Cdz`(%k>ERLtq&a}tgM}GLT2`*SGEvdKp0OmzFPOpM*^M-y
zV3((hV~E7m<b(rE60EGOk`lesmoj!9J;u|cckI}WDTW+PSC%p|HX8~!aLBx3k+`&}
zhgG6ytwYPkZU*LLu>iv`rX1B9MN5}1^iWGyJ}|AFiE+Yi9|mj2O+q=98B>HV+`D}H
zw4_8z88_43m%0qf4ey+FnV&i^d{n3lh}-Ml;8^h8ae-nqO9IQXLWW}v+7pF8*%<(x
O#o+1c=d#Wzp$Py~;zt|+

diff --git a/graphics/decorations/decor_lapras_doll.png b/graphics/decorations/decor_lapras_doll.png
index 517553a4a9fdda370ac01ffc620164080ff1fddb..8a98a6cf43ed2d4b94c7445ccb368119e0562f9b 100644
GIT binary patch
delta 251
zcmV<X00jTt0<Z!hiBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf4fOU
zK~xx(ZIH1F!Y~kqlii_#*h%^rjzaO0y)-F^OM|3Oq{HE=1+zPKv4e~CC0u+CNfRB4
zH~k;S{d^oDlVLR_CJC8><SFD4WL_5X3zb+4Swye^AWSTndx!-j;{e%T7_K0?TLe0E
zUH?-s&%TbaF>lwtnmX8IOV_S=Q62<J>(09>C@^jDV2dQ`Z1Je0P6``D6?`ZtMBJ;f
zfGfBlo<R8(2mNsFuE0a8&5SLmtvpaRo-#Ih(+AdTGi)a|tC9c!002ovPDHLkV1mN@
BVj=(l

delta 296
zcmV+@0oVSp0^I^3iBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc007%bL_t&-l~s?iiUKhZhX3s?46Ij)k6|f@lkFF?3x~}v5}!zm!S+tL
z^j6!P#Wm_nT;p>%vx%aCd<>aC^Zx^+W8`L}C=|8AYh$FCL{XEWMUj6H=F75xUDyId
zWFvB-q#G*cPn3%G*%&6vUVKqxevcHJR#Qwgz*0k1ap;k3hfCL;&|XgsZsG8cX*kT_
z!}l7VcRmjN#oO65f?Oli8ljBF{aUhu7&&P>sdB31sZw*3(ye%3;gi{cnYZ|1{=zwg
uKMc$`d-3SkviixX5jiOx34ARuCduydn=@<*jx$yO0000<MNUMnLSTZV9D#!X

diff --git a/graphics/decorations/decor_powder_snow_mat.png b/graphics/decorations/decor_powder_snow_mat.png
index 82dbbfa668a651dde56af7e89fa09088815347ef..22be19f9d4aed746e6539e311f7eac1d55f5e42c 100644
GIT binary patch
delta 211
zcmV;^04)Em0*C@3iBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf0Ic>
zK~xx(b&$&qgFp;K;m9pWRIpYW@L=V<f;5orAgKVsg)Wj4?PkYBkv1Qn{4`_lc&qBO
z9&LMn_scj=FRB*+{j@`e5Q6jv7ls4{ED|<_g(Kv|sm_4w4T-*HhR~*1If9h8!4L_`
zKFba!gv$>9Y|U(3mF3mb2;Wi9DYI!}0`mm**=-WPQkVA>mzIC<yPn=XDnkq}_&xvt
N002ovPDHLkV1iaYRMr3h

delta 249
zcmV<V00#ev0<HofiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc0068>L_t&-m35Fo4uUWcMTaFjNqT}dUZ9`GH32VRZ=fe=VB;-t#dZBt
zs+NV5@X}$L`8-7Gdhux%!hnY{ifo=I6Hw+|x5_e2NdWX>t#twqNU&!J?hjPURz*_u
zCn5}lyYOw)zMbJ1fk-f;8AIK+PqRiEl=V#egFMw-k0&$05U02)er?pL&)>0mYBg6B
z%iTAdA8I$!^}D6|X7l_Hs(WhWhL2_Xnjh;8=!q&r|2}nx00000NkvXXu0mjftS)8;

diff --git a/graphics/decorations/decor_pretty_desk.png b/graphics/decorations/decor_pretty_desk.png
index 5be05ebcbfb8e625a5b9a0f97281a7265f12b91e..69d439cfeb617782bb928daaa70929ead4bc5c06 100644
GIT binary patch
delta 192
zcmZ3%^p#PuGr-TCmrII^fq{Y7)59eQNK1e)3p0=uic~l~QPIA>!PCVtL}F@kf&;5K
z>p=&xBhPBndD!0TF<ADTzvL4WGw1RrmIE@z;tC#ZMVAgR9IAZt?Z%B8dPn)rR6b(6
zH2IOc8T(Nak?IRE4NuHwtag;Scl_A<h66YFp0KhV-0krG<ULWA-&4Nx1Ta39+`w}9
s?Pi5f=i&_9pD8q@B#1an@DO8QIH~Vcr7@f39net>p00i_>zopr01dxM!~g&Q

delta 243
zcmV<P01W^20jL5YiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc005>*L_t&-m2HqQ4gxU@1UC<el<VOYMwDrYuH+M-l>Cr_{*a)CtAZ%=
zhFd$LAh5;AvMt+dpy@sUz6#*pS+V^@Wh7o>>l!Esg-uF3Bnp{A5s59=`qqTh8<0-{
zI4CSSM#Y|JLwne^uM2Ew2is<QN$mp5+0Y&_{9FL1E`1R_b0+*mJg&s*qUF#mn9EA>
tHMGO5!#_!7Ng}Pzd?6+Vc%J)dSO9EjLV7;A6#W1I002ovPDHLkV1kq}U&;Ug

diff --git a/graphics/decorations/decor_pretty_flowers.png b/graphics/decorations/decor_pretty_flowers.png
index b9fc0f5de24e131df4f635e4bf2d3d4f01b3a0f2..6b7b8565f08d8cac075fa1435fb77b149c4e03fc 100644
GIT binary patch
delta 213
zcmV;`04o2!0*V45iBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf0ao@
zK~xx(V_-l7i~@oPj@-lD0tn9gy9f^B|33(o()Zt;gR7LibN<YKm`cWTZ}y)52-9@#
z{oV8LU}o_A|8wU*Oc~GwDVS*zvUmPVc0oCkjgo>L6QQa)Iy*XMbU^el&gcX|r~#4_
zK@jFP(L(V+xKl++!yVzS4l8j_D}~80hNh*3!j*}Jh6W;hCn$*UDpmjhg7Yy^JY1hY
P00000NkvXXu0mjf>T6Z=

delta 265
zcmV+k0rvii0=@zviBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc006v6L_t&-m2Hnb4uU`wgooZ@H__-y@Ge%?6ssqY-b4>zw`)hYcQM|;
zzy%<L-azb0Rvz-_&lF$YY~IYv0<9dvsz+m8g4bJs@f!J+0cBdlRt`f}L^+c9ZV^3h
zG5(2CpcE*D=g&e@zaR*5ieTP0Un<iW6I&&4vtkJ^u>xno6|_<Y+GvANgaQRMTh?8>
z5JG~YH_bXbe5RWQJJ#$l_c1-~*4Q35d&nS=m`Ulw;hc^3*yqH)ds@8!eI_wctkT&`
P00000NkvXXu0mjfTgqzV

diff --git a/graphics/decorations/decor_ragged_desk.png b/graphics/decorations/decor_ragged_desk.png
index 953c1862fe2ee90edd627a560563e8f29950c609..1bb800267f76c3700cd904a51277d7903e1c0cd4 100644
GIT binary patch
delta 146
zcmZo<I>D&e8Q|y6%O%Cdz`(%k>ERLtq$NO@g&9Z+MJk-0sA!)N?CIhdA~7{NL4lp)
z5F<15;!bW63vL4gEotY*i40p)4_#WIu(hGlP=t?5;zn@dn+;5CZALRTl`L>RdRp<E
tjy_9~#AQ~8zH}Yo0}nWyECjlMRz!2CryDSEX9KNa@O1TaS?83{1OR0OC&>T+

delta 204
zcmX@X*vO>V8Q|y6%O%Cdz`(%k>ERLtq&a}tgM}GLT2`*SGEvdKp0OmzFPOpM*^M-y
zV7;e{V~E7m+Wx(~tp+?T`d72xb}`;#YvDb?mB{SF&AaBjs$iE$-8zf8Pd=+lS4>)U
zh*$Bz-@W=TmoDQFu?f8--FG?g#_Od^yz(xmu!$!h$zK*)G`YvgXK&8bJ1UzieW#{e
z=6Vz3T>e36`-xPow`V2iE6M+vcJmN>fA54?z1@%f{*|hy|J*oj8qh5ap00i_>zopr
E0Bg}tYybcN

diff --git a/graphics/decorations/decor_red_brick.png b/graphics/decorations/decor_red_brick.png
index 3481044ddeca9ad4ae0660ce7ac760dd2097dd07..249ad8f7ae3fe2944e6dd8b05785926ad462a9c3 100644
GIT binary patch
delta 127
zcmaFFxRp_{Gr-TCmrII^fq{Y7)59eQNK1e)3p0=uic~l~QPDos!PCVtL}F@k!U1*(
z)<%Y7f<a77j1tFB+&JOUuz{y^s^V!5X=cVA<wr~`5tffspQ=8MuuRg-)XZ$*b>L*S
bU|?92D{?7+&9=)xGZ{Qx{an^LB{Ts5*SsT_

delta 173
zcmdnW_=r)lGr-TCmrII^fq{Y7)59eQNOJ(O2MaThw5(itWul^eJ!46bUoeBivm0qZ
z!30ki#}J9B$q5c@Jqk`7;*6|K4hI&nu<*DYb93|1F=%9CDG>aj!z6r2!HMN=g-La9
zW5YpKj)Lfx%=H`{0`0;{1%`qZ5(W-Dx|;f$?E;#anwbKI28?{nf8<(jvN1BaN{d`N
U>B9FKXcvR0tDnm{W~YQE0PA@!Pyhe`

diff --git a/graphics/decorations/decor_red_plant.png b/graphics/decorations/decor_red_plant.png
index c12e656f7a498b3dd961c1273e20ee21aa212723..7f3792c97cf4fd05f339491853df85c2fa654c64 100644
GIT binary patch
delta 213
zcmZ3()WxLO8Q|y6%O%Cdz`(%k>ERLtq$NO@g&9Z+MJk-0sAyk5)zif>L}F@k!U2Y+
zCXXEDREz$=n>UYmFdPdsDhz8XbeZEj$5&>djN$|%R}J?YE;moy6j*lL^Qb55vUbNK
zrbk5c&R#LDW?Cp_IIaAc%-le}Q1wW|^z`2@GZ>Al@=Ff!Owf4$LL<LLQo(TVCc$Sx
z$C|}cQy=i{-CX@Wa>vpp?eh0ZHR{#R&bYEX|02iI9vC37j@6oh;hTW66aSewE1*jm
NJYD@<);T3K0RVCZOvC^H

delta 247
zcmV<T00{qz0;~cdiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc0062<L_t&-m1AJQ0E}=#1Vjjd2w|w4pdb(%DGM?vJDV6WD494bF*utz
zn?SfG%0|xUh6%t4M-ZV1A`Fo&f*1?pm4jH4a0v;Bgp-Ps3WJDih%3X?GkXFVI%AH`
zV5pe0vz=i^?~P7|@{W#j28rpFO^pyc;D#}jgZLBSmN&vBP&|kS9K0wi!*FN!?z0Sn
xckc=^$euZKkwNzKo{J2Of`S4_>JT2p3jmARBSOIC6XXB@002ovPDHLkV1hmNS{?uZ

diff --git a/graphics/decorations/decor_red_tent.png b/graphics/decorations/decor_red_tent.png
index 22e435691ce33c3c507181063a2833dec72d321e..a70d9bc0a8448f8e33d64bea3160fc35d3e97aad 100644
GIT binary patch
delta 236
zcmdnXw2(=$Gr-TCmrII^fq{Y7)59eQNK1e)3p0=uic~l~QPIABji-xah{V+7gagbH
ztOp$!&IrD(W@pi7Iyk4J{C(QFn(ymG*PMEM_w=VvmG7e*UPaj6^EEGAS94v6;Ymlu
z9^*27!@BE_IG%7+?<p?SFRZ+t#Bt>jPjH&jfdd&l#s?%0F-r43Z(x|hT*%n+_$DJ;
z@Bx{%k_u(dl?>cdMI|g6oh;nc)+wmBS!g#~=n3?3cRZGo;(FB5*2ZD5Vby_@IZO^J
kQyz11G6}GYaTG8xsGbgr{92Y~4fFtmr>mdKI;Vst03r8N&j0`b

delta 264
zcmV+j0r&o)0=)tuiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc006s5L_t&-m5tCb3c@fH2H=;WdxLrcJGp6k0o#=7R-pk8QYh{%#HEv<
zT^t;Hvby99{;vTkPX5D39)$me5X~YaSasm+Fdaa^ESYa4LJlF<_m19m{iJ)GUP$GY
zn%@h-cml3vnvf}&J>~^UMarmOUOI5JVDliISK8N4i>8%+Ib#uzYqs1Rhd|948G8fQ
z7Z55MNbKSaXpk90L4*^PjF8g5en9At3<*lhbPY5xrsPvn_&Pa#0`dVulTumFmJ0&_
O0000<MNUMnLSTZa8)mQo

diff --git a/graphics/decorations/decor_regice_doll.png b/graphics/decorations/decor_regice_doll.png
index 88a28df6ddea203dffeb5ed6beb6c31aacb3cab3..e7c118659f77a0c98ad7fb5cc6d9216a1f760b73 100644
GIT binary patch
delta 260
zcmV+f0sH>i0=WVqiBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf5b^d
zK~xx(U68>FgD?z+_2SuJ+xL)k-ixXCg7NIo_60WZh30!M5ii>hg?xm3ZBteMS?{B%
zhZ>sxD$8mf-DrJVq`3_?c<Q4=fjryI6K2B#O>#&y4zTD@*N*}LTd5nIh|hT%2NnCB
zm}lBmzDILPK9)qVvx&@1b`~%TT17sYCKiKBG9p7^5wOo2vUb2JEZ_uc#4NC(syp<7
zIT7j;y5k*6dD8JxLCy*>tH73=0Dy}^&3ap9Iq4Swu0=rmyQME7u{KJnk0wC?0000<
KMNUMnLSTY37HXpa

delta 293
zcmV+=0owk#0@?y0iBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc007uYL_t&-l~s^UZiFxlM!#%WCmO;%MoHNt40|NZIwMFf&`NWm;hz0c
zDoyLflNJ9wIl$jAKuImI_a4YA(JUR`Z}+R7DthA@eB4HlA<7+llz<>IVyt-g{mevL
z5~eOB<W>`Uw*f=2tTbV!Fdo1$dr^5P(QX2C3*jF%a~(v_mCzL@1Cy!}r$TG?#ys|b
z9F)GiB#2*$SuNIKtH>6c>nJuM@SqTh=NCme6NNC`0yuY_kn7Sxb-_@|<HF)twf}w$
rd!SMRPm<@S#gr-1LU@kCxZn0~?1nZ<wpyaS00000NkvXXu0mjf_WgK&

diff --git a/graphics/decorations/decor_regirock_doll.png b/graphics/decorations/decor_regirock_doll.png
index 16372281c12fed3f6d8f593e97034d186cfd629c..6bf5205737e8efae30716938e111d09a744c3b0d 100644
GIT binary patch
delta 244
zcmV<Q01N-i0;vKaiBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf3!(N
zK~xx(eT+d0!yphv;|((4gycBFn7!b*55z!@kzHJ76Y4$e{W>-+?V|KA)W`R~ruiQQ
zpI57?g^P#VX4&kwwiapEo_wD+fj;e6=q{I3eLj%LLQVpM{3@mRp^ntXB(dhGw$5^)
zV#Cuma`rUxXauxha}F`iRx0hfN_<8Rzyhev5+gg(0^lujh)Axg*&(mX#ICAgHX)xh
uRds{xyG1j<fC2Cqs5({GUJUK~_|5~sr8M<=Tw%ok0000<MNUMnLSTX>cx#9N

delta 278
zcmV+x0qOp!0?Ps+iBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc007BJL_t&-m0gcP3WG2ZMSpIPKqB=x!o<ChabKuHkKs<2-IV4Y>HYen
zv`}a9$T0K&`~c@Nj%Z(eY%6ftkss#`>&0S;+QBDD2u0oqBJu3zs@wXq)oI!7EL`5$
zx2vbsqMSFBnVv77?!?dl!FLp=Y=~4!fv})O3UZPjIgb<ab5hI`5tMCec_elW8b`Wo
zPyKX@7Nb*(LA+(YffJ)c&2=M!{=w*;_y`{KKBF7+6RDX!)VXkgY6JWG;I-PxwVu>}
c>}S4<A4|kE^~*6c^Z)<=07*qoM6N<$f+uo)p8x;=

diff --git a/graphics/decorations/decor_registeel_doll.png b/graphics/decorations/decor_registeel_doll.png
index f06de37ab150de32abee58c8ae4970eaad292a3b..bfe01d75c8d0e826a458aa0bfd870aa5d1542ec7 100644
GIT binary patch
delta 261
zcmV+g0s8*m0=fbriBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf5k~e
zK~xx(U5`x)!Y~kp+l_7=nx^NF6kLZ4<O2Sz#X4CP46Vt^Yu4*H6BWcq81gZBFEds3
zuT`wm_rAVt!GsS?W*3aPy&KLXnv5?{qd;#9wCKk%AZ{e8r9gbHTI_o7m*t7ah9eZ*
zPuw|x;&-aC9ecnD)M?%loqLM%Tg@13qUcANA<=X0a+??80399^K=a7N9>^J3U5*j}
zFgt@0pbTm(r@7sG1H>*XbY%xc0|N~*Xr+k&xD=@A{3#;Xe9Nz1T|YI?L~get00000
LNkvXXu0mjf<-%zf

delta 299
zcmV+`0o4Aw0^b55iBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc007-dL_t&-l}(S$ii1E9gv(3zYNL+N5hjqc%z!VjKWEu&dkQF;nNwcV
zyv|lfc1a&T8oH?J0$%6Mu-FoaA`%U8Xmr0H<|5(yC?5Vi5=oaG{q;IxR2^T;p1Yq6
zJ#p%Y7)wBZoW;0zpq3j^@l>Rhf3b8y(g)ziJ0Llu-?j(7%(=CUqw0Vz>5R3_4Hl6K
z!a@A3CVWU;LIQE3f?v@tZ#v<gwM3g|rWX`5$=eH7u(oc_P&`}8{{0$!L}zKS%{49t
x6>%6SMET!xHoI`PZh>9(Vg=POnAxB37r#F>&ueVywg3PC07*qoM6N<$0fJlEepLVf

diff --git a/graphics/decorations/decor_rhydon_doll.png b/graphics/decorations/decor_rhydon_doll.png
index ac4714c355746f8810b510e7a692f1e0392bf4d1..2937d372f2c4c56bacd890c51ab4274ed09769ee 100644
GIT binary patch
delta 261
zcmV+g0s8*$0=fbriBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf5k~e
zK~xx(Wsb25f>0EOy_2hk(gQT~06l@X-=c=#l1FDjZ8gcHrL`KH!Z9c)pEA40i0BMI
z=i?kce#7`1@m<$e&$4sgO{hQx)9y#b@M6_LiaGq4!2upOz|v4kJa5uxgSptuu<rye
z+DFIdH*<+38Ap7v!;)yL^hJPHTUC_?o;FW1A__C@b`x1P_X4Sg<!E?33`X<@5oS?+
z2{SHN$ldW&$eeAM))zqAgil^`Z9@Z*s?Tk3H|kfFOWaM^pZJ*<3*9mK3cvn=00000
LNkvXXu0mjfwmNRI

delta 315
zcmV-B0mS~g0`CGLiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc008YtL_t&-l}(VbZo)7WMX#r<Nk!BTVCV<%1qshZFjR`j3v;9dR*0HL
zEL}^-PAFp~Dz$uN-whyP$w&6Hb<eYb`?0ebh{0t<Z5VOerq>J3X7~_B$nq>lDM<-g
zh==^11oC%E@4~jkj9?f_LPCQde@+m*7-Gf;OG8vxyr>zU*H*7ADqc?TI+u5ALPn6P
znxa*G!=~$MsA_@s{L|p+@G-uKJmXh`lB+y1tm%~6Fi{p=Vex2E+Dz`eDV-{NAzXCn
ze$^if><^y}X8lo+oWDJ?{!8)Lb@A;h7|+M0e38(m16Uhm(d{$-0jc3J5&6*J>jMA)
N002ovPDHLkV1modi2DEl

diff --git a/graphics/decorations/decor_sand_ornament.png b/graphics/decorations/decor_sand_ornament.png
index 9eafc86440ec95cce0fa4ce905fe3550ff5d210b..d94673c96aac608df3e5089ec646a84df321a174 100644
GIT binary patch
delta 199
zcmbQo^oLQgGr-TCmrII^fq{Y7)59eQNK1e)3p0=uic~l~QPIA>-P6S}L}F@k!U2ZN
zPNo90X!mS|Ig>963UW<O^3ToX6>TZ%x_tQZVb_I0CnZxeMGg82T&t_t=RCf5@!|`v
z$2+E|b{(=jr>Cc9(C4AS;b7URP^K_t@+1unjTu~<kBfRn8U^e(KGTr$Tp)Qz=1IkK
x=M)S2x;JyiM0#n=Vl1$g&1q6-kTmjOU~u2767KgqyBO#;22WQ%mvv4FO#s|)M4<ox

delta 233
zcmV<F02crJ0iFUOiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc005jxL_t&-m2J*F4udcZ1>iT)m8j(;?G0?y8HtFl5#?vEgjhQua_sU7
zB~anvlVe4G29E1QUZf=FWn8-$ksmU&{$WuKgGEy`1=_Ce(T|P)-xCu<l6c2&Y2ZQ}
zd9Jx7?%uzlol7993Om(|GsYlgKR3+<DVGK;$w;+6(<Qgu6Vjs1;gVk!xkwI`o6M2Q
j3k-8Z9p!$z?I+*^y4oaH%6?=q00000NkvXXu0mjfR^436

diff --git a/graphics/decorations/decor_slide.png b/graphics/decorations/decor_slide.png
index 8a5dbada5b0a905c0efc85f4eee3bdfaa6c73b51..ebfc24cad3fe9efb7eb612f1bf3a67a5c2db1697 100644
GIT binary patch
delta 192
zcmZ3=^p#PuGr-TCmrII^fq{Y7)59eQNK1e)3p0=uic~l~QPIA>!PCVtL}F@kf&;Tn
zx&y;0%kO+Fd=4sdyBQikOLIKu^mxSC^Et%RQ}kTrmv?uSS)Om?j*+~vp*)~({=EAy
zLszREN)?c?wYRlsFMM`p=B0vjZ|+(z-FW(pWwFq~LPlnHj^j6uc%D3ZLqKiun>9?+
s3kw4a3y*0vFKKra;9<GYB*w{*R~PW$tV7ThpraT(UHx3vIVCg!0Mq(MRsaA1

delta 240
zcmV<M01yB50i^;ViBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc005&&L_t&-m4%Qo4#F@DMa|xU%-u>^BUR-BG?{ZZ#t2T38z2@|M8zS}
zvZ0)T@5WR@fcV4Hi)Gnzh$IE$#xgL*Par))2_cJQyI0kkVoH(XV3YJQ(it!hVEh6M
z<>tc8rh$cL>}NaV9ok(33~(CoM!pPmI+kMn1xP$J?EV5nEu;Nmr1A;Vft#+fWLKuf
qvlg3b3X#4o&^9kK&09?^<$IqMicsLHrpLSh0000<MNUMnLSTZguV8Ed

diff --git a/graphics/decorations/decor_snorlax_doll.png b/graphics/decorations/decor_snorlax_doll.png
index 6ff891c13674fac1bcf1df2debc864ca6c90a1fe..48f9248acab1a4168e9d26e188ec0d45df1274c1 100644
GIT binary patch
delta 252
zcmV<Y00aNg0<i)iiBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf4oUV
zK~xx(U5`Bq0x=MUlfpg&8)U`HEW}y^4y?!U5DVi^v&Dj8D?1Ahpv1;b*z0%zXR;B&
z*Svhpyf;LtKk1cH6O*A>0IaJF*0FrvLUN99+|xA>K{JA_X@8-{e}R<&aES4NkRon&
zB^u7oq$^(5Y`SEz5-3nYb~zV#QoaQ=gcH#&fMo0@By}<YDCOOPbWdr^vyP1;Qi~|{
zM(JaG39vC7!cBmUp$~TfHtsHCs{ssKI-0(f?WYeF2uMP}r&XT-0000<MNUMnLSTZW
CVPO0K

delta 284
zcmV+%0ptF$0?`5?iBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc007TPL_t&-m0gcL3Iah4h2IqR6WB!*FC)y>y5N8w!$S!1r`bYqu(Gr8
z0Lt3f30}to_~QBl`-+cA2wyV5C(e)=a;u_YYSj<S80er7nIJIG5EP;+(A80)Of%;V
zLqlnZRxjQtzW{_gT<CLa!A2fAa-WX|>`CHlMu_zAsOu|Es*gth$4+&L#59OP<sooM
zKA|a#bl#ps686%TuS#sDt8+LLxJ`YBTc<PJK3#xbUD<Nqd|{T-mPb+3f|KvaJEpUP
iJgD=a&VxGN(!BsTlSo3>?#u)L0000<MNUMnLSTZUIC&ue

diff --git a/graphics/decorations/decor_solid_board.png b/graphics/decorations/decor_solid_board.png
index d0251d847b8f45c6380cdd03fc20e91dffc70c83..1eef712e2704cd806ce9abd77b0db81e96575ebe 100644
GIT binary patch
delta 108
zcmcc1xQJ1)Gr-TCmrII^fq{Y7)59eQNK1e)3p0=uic~l~QPJK>*VDx@L}F@kf&+6;
zlLEujjvY%F7BaLb%S_^FG3fI&65vzj+w?qOPp^<d0RzM2M+)W{KMoiJ4Pfwe^>bP0
Hl+XkKWF8$X

delta 167
zcmZ3)c$ZPJGr-TCmrII^fq{Y7)59eQNOJ(O2MaThw5(itWul^eEn`WLUoeBivm0qZ
z!Dvqx#}J9B$q5ZiZUTx-N-c$gJUmSf2Odm%H0hAQB$-KP5+>y|IXYZv<Pc|65M)yF
z*&y&k$4PC&&Bmz*QUy7`bsb=CVq7ho;NQHLpO2%%N~f&BmiOB}1)U1UzdIDnd4HSk
Q0b0Z0>FVdQ&MBb@0Cdtcj{pDw

diff --git a/graphics/decorations/decor_spikes_mat.png b/graphics/decorations/decor_spikes_mat.png
index 67f023a0a5c8ef20efdcf2f906ecae0e611b272c..a69b003e7b07e971119274b76d97d9f0c2c1fe24 100644
GIT binary patch
delta 196
zcmZ3-^pjDsGr-TCmrII^fq{Y7)59eQNK1e)3p0=uic~l~QPIA>#nZ(xL}F@kf&)7@
zE35c{n~HjRjRA7W9UC`p^i*h3PI{A*^Cm}$VOl|%Sy`c3Ss6>=v{@{>OSf3I&(LF7
zZS+!OeTE_1%Ew$~-)7vqXm|LgCD)Rp7K<0{S)_FHhTsvy%>4O=d-t-QV{8)BG4iMi
v@NwSAew9@t&$-ZaReeB>RF@Rn4Mv90JgZZ!ZgUO;9me44>gTe~DWM4f-1bC*

delta 249
zcmV<V00#g00j>feiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc0068>L_t&-l~s^24#F@H1ecbINc`l?1JGHBHi|1+8h#KzAj1AZQig(m
za$X~dSMti<lWsKzwtCsw1+$~rMHP6vp}gF8-gPU2_dP@`QxS!D6<qRDk;gb~maWD5
zV(wt3XR~m!RLXll=+!FZVdhd}PnL1Y-Z`fQaf}gZnG=$!-k5R9Uez0L7b}@sW5y|a
zD-qd9S$Rp`h(u(ol!ce%{DZ$pL^f{kf8?z`<S{zRYBU};00000NkvXXu0mjfLa}C<

diff --git a/graphics/decorations/decor_stand.png b/graphics/decorations/decor_stand.png
index 86b1e4d1fea56b15a539b02b2bb4cef01a293da1..09e4d26bd981cda7916cadab3eaa8c9dee9c3506 100644
GIT binary patch
delta 169
zcmeBRy3eTC8Q|y6%O%Cdz`(%k>ERLtq$NO@g&9Z+MJk-0sAylG<>}%WA~7{NL4m#C
zeOnW+!?}Is0Ux9^KAyYrZlfW`{@Vu*{EhIJRLT2tg6~A-_aAqylOLDAe`An3;p?8}
zW?r5iSy@@*Mg|W~1B0^n_cm64J9pQ?i$P~|*0oci1(J>m4JQ~RnRpDk(ij+wCI^1L
T>lR@Sw4K4z)z4*}Q$iB}F~2^4

delta 211
zcmV;^04)FC0f+)2iBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc004$bL_t&-m5q%t3IZ_{1t)cycm{h5)8~8vPoSP)w@Rr5Jd7!Ye+J*~
zA}o?3Q$5IJKJ@Ul!pjVAG2z?k*ww1Q1TD&2SKlk>^@BVsoZqRa+-xgvH<rIH=Zw45
z$8K4S_J89lsP|`OzD+X+fu&!0DZL@Bph!TGuv>1C2MFLsJmtcG_67TrQS%Ze1X%z8
N002ovPDHLkV1hCxQxgCH

diff --git a/graphics/decorations/decor_surf_mat.png b/graphics/decorations/decor_surf_mat.png
index d74cb97bb951238e731ba18577f5230c92fdbd93..f85498e66279fc45b1e6aaba68c357f3d2fc7baa 100644
GIT binary patch
delta 185
zcmZ3*^o~)nGr-TCmrII^fq{Y7)59eQNK1e)3p0=uic~l~QPIA>($mE;L}F@kf&+U~
zQxj7`S!7g{;*{eN)4m^hAF0@)ob_FTV}9dOiQr~mM+3nlg8kK8ZRZ_>l==^zlAFzF
z*>hCwT*8Ymj!Tc27}q)Y_Gkw5ao72287*hYnw70M%a-R+orj)7p>(svq}7i9Dy7&z
j^LP0N9%is+VAy`hZb}CKq+L6Ju3_+W^>bP0l+XkK(D^=+

delta 245
zcmV<R01E%^0jdHaiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc005{-L_t&-m2Hqg3c@fHM5i}sK<z~mm)SIR*-iHWLAxvjr5CPAui@ld
zwM7RqO!7m97ho;LRgAQ~Ww>@g<s-10>@ruX#Mt)%!=p`@EC;4D9em_H*?v`K3)xbR
z=1lW5<8-7IH(j&BITV+z$=RJ#OX<}$lcWBcOr=+!Smhd)IQMJ12}>`kHZE*9*f+0`
vZzM#*CeIJirx&^W!RlTn5;ma>AM&l9^6);CXzXv-00000NkvXXu0mjf1g>PY

diff --git a/graphics/decorations/decor_thunder_mat.png b/graphics/decorations/decor_thunder_mat.png
index 1c5c56e332eb5f415a253384250666829a8fddfe..82a1787f69ab36c484b30388d012589bc7f42bab 100644
GIT binary patch
delta 217
zcmV;~04D#t0*(S9iBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf0;={
zK~xx(ZICez!ypVr)3IA~ft<#XI6#qDGt{CBr?3%YyYzk;urhIm0!b^m>YsS}eDlpP
z{OUQ5kMB8@vK({@f>@RvCh_R8T)L5wBgfm?;3Zpjb`xo-36q7{#Zd2^gU<<ow{Wi!
zVQV0<jcWscHALXB0}@n4JRG3(FLBr=GIP(gX#{4UrryyFR5#UH@1r)=fAC*#t-x79
TB-5~M00000NkvXXu0mjf@=sWo

delta 262
zcmV+h0r~!p0=ohsiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc006m3L_t&-l~s^24udcZML%P=a)F-4NF1O@tPHi%C8tQDjCAS!IuJ2&
zhMG@l%a`)x*ix();6D#Ll{Z|96_WzbGTTk_XI|GM{IU!vstcStMNBba>bn`8H2vRW
z<BDO$ayHyvhElAXyxmXUO{hxjTnz4N(6Cq5<CJ@|NJJ~y5Q0D~kdOsAv<-r^aoaol
zJJ2Ot(yJlqUa`k1_ijdXqvhsH^FwGvH(Jt{=KO<SXhb(!4qx+Q-o4;iL98?rpa1{>
M07*qoM6N<$f=^Cun*aa+

diff --git a/graphics/decorations/decor_tire.png b/graphics/decorations/decor_tire.png
index e394ebbd401f02ba167b8d4e970bd9c1d01898fb..5625323561d822df16c575f89a2f1c3cbcaf9bb1 100644
GIT binary patch
delta 213
zcmV;`04o2l0*V45iBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf0ao@
zK~xx(jgLVN0wD}V;ReituxH}|2zmj>Jz<Ima47512-g=1qpplUUHq5dr2UNj6rU#X
z_NtUk>>jHIDU4bN+$hLNTd#9!5yyKpCLB=E*27qDPPC`+8IQMc9gw^+HV?o8P_RQl
zQY46%=GV{@sI&qlJkGGx33N2WD;et02Tb<F^{-`1+}=Shv-`CBYWjy>Lr*Q!1c7{C
P00000NkvXXu0mjf1yoc=

delta 250
zcmV<W00sYw0<QugiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc006B?L_t&-m2Hnf3WG2ZMaLV&g=C*i4-jlGV7eDG=>clu+Lk8Q@BD~R
zv>)<#5ctC<I;FwW0-Z$iB1o^_|F%`6OIayNC>j&U^pl}zZ8(-GU<K1E$cyMDsoMSq
zKEMLVH64I>hp}9Wj%+_!iq~hLP|4b!3Uk@+R@_sXiM?aGq5lD7AXP-c90UyW0e71$
z&D1$)x9>e?U>>&SYMpoEw)_yrB0q|aYTx@OUqfFl(}wNgw*UYD07*qoM6N<$g32vt
ABLDyZ

diff --git a/graphics/decorations/decor_tropical_plant.png b/graphics/decorations/decor_tropical_plant.png
index 12e43df476dc0d249ce1cbd3d78d5bcbe2b17c2c..f674d6418b1a12f3bfffedef5de37ea5e10ffe56 100644
GIT binary patch
delta 221
zcmdnYG>J*EGr-TCmrII^fq{Y7)59eQNK1e)3p0=uic~l~QPIABuBVG*h{V+71PAse
z=^d;OWjb$KODE<W3pGyH6KN<aD>)Zsxmfzpvw4QX99HHIA!lFBxOj7;(4xLVS9XCC
zN7J`&=3KN)HoL-bGSb*8+^?l*hx)lWnmZZO`VXAD*<(;GA+cz?(oWqQqVLSy!qcY<
z%rJ7hEO0$RqW!9h$rVcm<7Ijgo+m}}8Zt684izi8x%CzBE#72w$dApjMe7X%L#3*^
V7srI9RX`Urc)I$ztaD0e0syd;PI3SM

delta 254
zcmV<a00IA!0<!`kiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc006N`L_t&-m5q-*4uU`sg&&0#&2FNJv~U9=2Ovmq0$X_+yIrm5_NTHF
zD;g8Ioiia41C1})FPWXmn>WBp5#voSwp@9}V`|AEme_~!f~RwL7~fks60|iMnzS?%
zj2puYgr4iGn0g~4VZ`&^MT`i>R2mC!O^?pG1Y!)-IKL=MQ%ls<u|?6=4FZpMjA7op
zi1Gc~tZ!cHpj3q>O$+RllGx^Xi73m+L(1Q|(?4dw2heRNN=~1k+5i9m07*qoM6N<$
Ef)eg!p#T5?

diff --git a/graphics/decorations/decor_venusaur_doll.png b/graphics/decorations/decor_venusaur_doll.png
index 57fbdd93acacecd590c2d36b5a209c2e23ff5171..ca6bbea76100d2ce84113c15cb4b80ced91fdb22 100644
GIT binary patch
delta 300
zcmV+{0n`481K<K7iBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf9pv^
zK~xx(Wsorn!axv3H<g7=2E^bhp27==qYKuC)Pk(7LSjl=Q`%*cYQZL{v`py%yn&4u
z(9%ww6~)5e%zw=P%Q8az3E=DM;Lyf}z4cB-G9g2`%g~}UKeVfaw!EMXWu0Te!xc`!
znbTQPnsKh85;{jHDd&zXA>FnTe<%%irjSxrPy$WvXjzbvlo@RSr0HIy0Skb!zFu{V
zz^_fmOzd|}A!`0i2djCcmA??RK;ck@6AYs_JVuDKn+4&i=N)nV443=^ZxV-yDjr&B
yL>%H^(6`X{eAcpI!RhsYH5j<RYy58V(F>75QEd`Ph-v@;002ovPDHLk0$_rq8iE7>

delta 341
zcmV-b0jmDs0*M15iBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc009R{L_t&-l}(SaYQsPfL`Rj2G`C=Ed@=b7|A6t@g47nO4d&9?AVp<b
zsdT56s)ICAm6R&|0r`V8`2nX)7iR^AXo|-zH_R}=Kz9TLod7c_5lAiwnnKS`+M9!V
zhvWvf5Rdx(zC$%XH}D^y7BoN8e;|$C6jB?YkdwZ0F_5w{Xr<O4+Y*8uX_2#yf-C~!
z4A?y~M$z736o-uRG%FxgBM@%|{^85QT`mrpa~b02rxfcj*@9ZHMKm#}yfg5m$e0ZH
zbpp6BI)Ib((1-p4)9|X;YTGzv#d4~<7K_`$UK{2;ewbg7Fo)p%h7qaMD?r1Q-+kyc
nIRe>Q!SNC}juoqw`A@?i`R-9|*b;F300000NkvXXu0mjfow$)l

diff --git a/graphics/decorations/decor_wailmer_doll.png b/graphics/decorations/decor_wailmer_doll.png
index ceedfa6fb097f30c6519a15a6a893d082aa5524e..b5d723bc83de4658b21620bc5721c9428ff67895 100644
GIT binary patch
delta 229
zcmV<B02=?m0-6FLiBL{Q4GJ0x0000DNk~Le0000O0000O1Oos701{as%aI{Jf2B!8
zK~xx(V_+a2FbWC^z}aOkF6jaYHk>Dx0^+zOg4pb7E?|&W09OT7CkB*BaRbVL)QO})
z^rSfgRRJlmmJ}BO2F4KgG$1c6t;7|`aRG8bpadl2=AI^&mX?@Sk^<zUhP#HPrKN_H
zh5<RH<q+qTgDeu1{Fh!{UiN;XJ0QqCJLmrU_x}CO*<goq&z$@B{>_;iAbyaZ2?QHq
fz7qrj{9yqA-fuciDFy5+00000NkvXXu0mjfGBsBX

delta 267
zcmV+m0rdWw0>A<xiBL{Q4GJ0x0000DNk~Le000080000;1Oos706BT7)R7@Se*tt-
zPE!Ct=GbNc006#8L_t&-m2HqQ3IZ_@MSm&_n*>A<Pa}-+0;2UooU|71?l~+M@eW#g
zl&w6%p1{RFi^ZaT$Rm@?{Fwy!FK4SF<_Van{M?7&QHf*-HNro6LpH{O5Iqj=OrD$b
zOcR_$h1+fjF+{^*zy3I<IPRe$VG5;KuLX9h2Z;F#BSc*Rn#4m-Ys0Wh9@}!~;mVrN
z3X7g2Jg&sFvFVoIGY^e&&E&rCI$U4R77c|!jq-BM#@(4m?S)};BksRn@CKEyI!@Aw
Rw_X4M002ovPDHLkV1g$hZqxt(

diff --git a/graphics/decorations/decor_yellow_brick.png b/graphics/decorations/decor_yellow_brick.png
index cb865760ca9c5d2c013db4008a76d769a7dd1fde..33b41be22a7f7cd3f17fed0def851851df1d0aa4 100644
GIT binary patch
delta 127
zcmaFFxRp_{Gr-TCmrII^fq{Y7)59eQNK1e)3p0=uic~l~QPDos!PCVtL}F@k!U1*(
z)<%Y7f<a77j1tFB+&JOUuz{y^s^V!5X=cVA<wr~`5tffspQ=8MuuRg-)XZ$*b>L*S
bU|?92D{?7+&9=)xGZ{Qx{an^LB{Ts5*SsT_

delta 173
zcmdnW_=r)lGr-TCmrII^fq{Y7)59eQNOJ(O2MaThw5(itWul^eJ!46bUoeBivm0qZ
z!30ki#}J9B$q5c@Jqk`7;*6|K4hI&nu<*DYb93|1F=%9CDG>aj!z6r2!HMN=g-La9
zW5YpKj)Lfx%=H`{0`0;{1%`qZ5(W-Dx|;f$?E;#anwbKI28?{nf8<(jvN1BaN{d`N
U>B9FKXcvR0tDnm{W~YQE0PA@!Pyhe`


From 96958ba5e9a6c4248ecc7a0b4913555aac448729 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Mon, 13 Apr 2020 13:04:22 -0400
Subject: [PATCH 2/3] Drop unnecessary decor prefix

---
 ...{decor_attract_mat.png => attract_mat.png} | Bin
 .../{decor_big_plant.png => big_plant.png}    | Bin
 ..._blastoise_doll.png => blastoise_doll.png} | Bin
 .../{decor_blue_brick.png => blue_brick.png}  | Bin
 .../{decor_blue_tent.png => blue_tent.png}    | Bin
 ..._breakable_door.png => breakable_door.png} | Bin
 .../{decor_brick_desk.png => brick_desk.png}  | Bin
 .../{decor_camp_desk.png => camp_desk.png}    | Bin
 ..._charizard_doll.png => charizard_doll.png} | Bin
 ..._colorful_plant.png => colorful_plant.png} | Bin
 ...ecor_comfort_desk.png => comfort_desk.png} | Bin
 ..._fire_blast_mat.png => fire_blast_mat.png} | Bin
 ...{decor_fissure_mat.png => fissure_mat.png} | Bin
 ..._glass_ornament.png => glass_ornament.png} | Bin
 ..._gorgeous_plant.png => gorgeous_plant.png} | Bin
 .../{decor_hard_desk.png => hard_desk.png}    | Bin
 .../{decor_heavy_desk.png => heavy_desk.png}  | Bin
 ...{decor_lapras_doll.png => lapras_doll.png} | Bin
 ...owder_snow_mat.png => powder_snow_mat.png} | Bin
 ...{decor_pretty_desk.png => pretty_desk.png} | Bin
 ..._pretty_flowers.png => pretty_flowers.png} | Bin
 ...{decor_ragged_desk.png => ragged_desk.png} | Bin
 .../{decor_red_brick.png => red_brick.png}    | Bin
 .../{decor_red_plant.png => red_plant.png}    | Bin
 .../{decor_red_tent.png => red_tent.png}      | Bin
 ...{decor_regice_doll.png => regice_doll.png} | Bin
 ...or_regirock_doll.png => regirock_doll.png} | Bin
 ..._registeel_doll.png => registeel_doll.png} | Bin
 ...{decor_rhydon_doll.png => rhydon_doll.png} | Bin
 ...or_sand_ornament.png => sand_ornament.png} | Bin
 .../{decor_slide.png => slide.png}            | Bin
 ...ecor_snorlax_doll.png => snorlax_doll.png} | Bin
 ...{decor_solid_board.png => solid_board.png} | Bin
 .../{decor_spikes_mat.png => spikes_mat.png}  | Bin
 .../{decor_stand.png => stand.png}            | Bin
 .../{decor_surf_mat.png => surf_mat.png}      | Bin
 ...{decor_thunder_mat.png => thunder_mat.png} | Bin
 .../decorations/{decor_tire.png => tire.png}  | Bin
 ..._tropical_plant.png => tropical_plant.png} | Bin
 ...or_venusaur_doll.png => venusaur_doll.png} | Bin
 ...ecor_wailmer_doll.png => wailmer_doll.png} | Bin
 ...ecor_yellow_brick.png => yellow_brick.png} | Bin
 src/data/graphics/decorations.h               | 168 +++++++++---------
 43 files changed, 84 insertions(+), 84 deletions(-)
 rename graphics/decorations/{decor_attract_mat.png => attract_mat.png} (100%)
 rename graphics/decorations/{decor_big_plant.png => big_plant.png} (100%)
 rename graphics/decorations/{decor_blastoise_doll.png => blastoise_doll.png} (100%)
 rename graphics/decorations/{decor_blue_brick.png => blue_brick.png} (100%)
 rename graphics/decorations/{decor_blue_tent.png => blue_tent.png} (100%)
 rename graphics/decorations/{decor_breakable_door.png => breakable_door.png} (100%)
 rename graphics/decorations/{decor_brick_desk.png => brick_desk.png} (100%)
 rename graphics/decorations/{decor_camp_desk.png => camp_desk.png} (100%)
 rename graphics/decorations/{decor_charizard_doll.png => charizard_doll.png} (100%)
 rename graphics/decorations/{decor_colorful_plant.png => colorful_plant.png} (100%)
 rename graphics/decorations/{decor_comfort_desk.png => comfort_desk.png} (100%)
 rename graphics/decorations/{decor_fire_blast_mat.png => fire_blast_mat.png} (100%)
 rename graphics/decorations/{decor_fissure_mat.png => fissure_mat.png} (100%)
 rename graphics/decorations/{decor_glass_ornament.png => glass_ornament.png} (100%)
 rename graphics/decorations/{decor_gorgeous_plant.png => gorgeous_plant.png} (100%)
 rename graphics/decorations/{decor_hard_desk.png => hard_desk.png} (100%)
 rename graphics/decorations/{decor_heavy_desk.png => heavy_desk.png} (100%)
 rename graphics/decorations/{decor_lapras_doll.png => lapras_doll.png} (100%)
 rename graphics/decorations/{decor_powder_snow_mat.png => powder_snow_mat.png} (100%)
 rename graphics/decorations/{decor_pretty_desk.png => pretty_desk.png} (100%)
 rename graphics/decorations/{decor_pretty_flowers.png => pretty_flowers.png} (100%)
 rename graphics/decorations/{decor_ragged_desk.png => ragged_desk.png} (100%)
 rename graphics/decorations/{decor_red_brick.png => red_brick.png} (100%)
 rename graphics/decorations/{decor_red_plant.png => red_plant.png} (100%)
 rename graphics/decorations/{decor_red_tent.png => red_tent.png} (100%)
 rename graphics/decorations/{decor_regice_doll.png => regice_doll.png} (100%)
 rename graphics/decorations/{decor_regirock_doll.png => regirock_doll.png} (100%)
 rename graphics/decorations/{decor_registeel_doll.png => registeel_doll.png} (100%)
 rename graphics/decorations/{decor_rhydon_doll.png => rhydon_doll.png} (100%)
 rename graphics/decorations/{decor_sand_ornament.png => sand_ornament.png} (100%)
 rename graphics/decorations/{decor_slide.png => slide.png} (100%)
 rename graphics/decorations/{decor_snorlax_doll.png => snorlax_doll.png} (100%)
 rename graphics/decorations/{decor_solid_board.png => solid_board.png} (100%)
 rename graphics/decorations/{decor_spikes_mat.png => spikes_mat.png} (100%)
 rename graphics/decorations/{decor_stand.png => stand.png} (100%)
 rename graphics/decorations/{decor_surf_mat.png => surf_mat.png} (100%)
 rename graphics/decorations/{decor_thunder_mat.png => thunder_mat.png} (100%)
 rename graphics/decorations/{decor_tire.png => tire.png} (100%)
 rename graphics/decorations/{decor_tropical_plant.png => tropical_plant.png} (100%)
 rename graphics/decorations/{decor_venusaur_doll.png => venusaur_doll.png} (100%)
 rename graphics/decorations/{decor_wailmer_doll.png => wailmer_doll.png} (100%)
 rename graphics/decorations/{decor_yellow_brick.png => yellow_brick.png} (100%)

diff --git a/graphics/decorations/decor_attract_mat.png b/graphics/decorations/attract_mat.png
similarity index 100%
rename from graphics/decorations/decor_attract_mat.png
rename to graphics/decorations/attract_mat.png
diff --git a/graphics/decorations/decor_big_plant.png b/graphics/decorations/big_plant.png
similarity index 100%
rename from graphics/decorations/decor_big_plant.png
rename to graphics/decorations/big_plant.png
diff --git a/graphics/decorations/decor_blastoise_doll.png b/graphics/decorations/blastoise_doll.png
similarity index 100%
rename from graphics/decorations/decor_blastoise_doll.png
rename to graphics/decorations/blastoise_doll.png
diff --git a/graphics/decorations/decor_blue_brick.png b/graphics/decorations/blue_brick.png
similarity index 100%
rename from graphics/decorations/decor_blue_brick.png
rename to graphics/decorations/blue_brick.png
diff --git a/graphics/decorations/decor_blue_tent.png b/graphics/decorations/blue_tent.png
similarity index 100%
rename from graphics/decorations/decor_blue_tent.png
rename to graphics/decorations/blue_tent.png
diff --git a/graphics/decorations/decor_breakable_door.png b/graphics/decorations/breakable_door.png
similarity index 100%
rename from graphics/decorations/decor_breakable_door.png
rename to graphics/decorations/breakable_door.png
diff --git a/graphics/decorations/decor_brick_desk.png b/graphics/decorations/brick_desk.png
similarity index 100%
rename from graphics/decorations/decor_brick_desk.png
rename to graphics/decorations/brick_desk.png
diff --git a/graphics/decorations/decor_camp_desk.png b/graphics/decorations/camp_desk.png
similarity index 100%
rename from graphics/decorations/decor_camp_desk.png
rename to graphics/decorations/camp_desk.png
diff --git a/graphics/decorations/decor_charizard_doll.png b/graphics/decorations/charizard_doll.png
similarity index 100%
rename from graphics/decorations/decor_charizard_doll.png
rename to graphics/decorations/charizard_doll.png
diff --git a/graphics/decorations/decor_colorful_plant.png b/graphics/decorations/colorful_plant.png
similarity index 100%
rename from graphics/decorations/decor_colorful_plant.png
rename to graphics/decorations/colorful_plant.png
diff --git a/graphics/decorations/decor_comfort_desk.png b/graphics/decorations/comfort_desk.png
similarity index 100%
rename from graphics/decorations/decor_comfort_desk.png
rename to graphics/decorations/comfort_desk.png
diff --git a/graphics/decorations/decor_fire_blast_mat.png b/graphics/decorations/fire_blast_mat.png
similarity index 100%
rename from graphics/decorations/decor_fire_blast_mat.png
rename to graphics/decorations/fire_blast_mat.png
diff --git a/graphics/decorations/decor_fissure_mat.png b/graphics/decorations/fissure_mat.png
similarity index 100%
rename from graphics/decorations/decor_fissure_mat.png
rename to graphics/decorations/fissure_mat.png
diff --git a/graphics/decorations/decor_glass_ornament.png b/graphics/decorations/glass_ornament.png
similarity index 100%
rename from graphics/decorations/decor_glass_ornament.png
rename to graphics/decorations/glass_ornament.png
diff --git a/graphics/decorations/decor_gorgeous_plant.png b/graphics/decorations/gorgeous_plant.png
similarity index 100%
rename from graphics/decorations/decor_gorgeous_plant.png
rename to graphics/decorations/gorgeous_plant.png
diff --git a/graphics/decorations/decor_hard_desk.png b/graphics/decorations/hard_desk.png
similarity index 100%
rename from graphics/decorations/decor_hard_desk.png
rename to graphics/decorations/hard_desk.png
diff --git a/graphics/decorations/decor_heavy_desk.png b/graphics/decorations/heavy_desk.png
similarity index 100%
rename from graphics/decorations/decor_heavy_desk.png
rename to graphics/decorations/heavy_desk.png
diff --git a/graphics/decorations/decor_lapras_doll.png b/graphics/decorations/lapras_doll.png
similarity index 100%
rename from graphics/decorations/decor_lapras_doll.png
rename to graphics/decorations/lapras_doll.png
diff --git a/graphics/decorations/decor_powder_snow_mat.png b/graphics/decorations/powder_snow_mat.png
similarity index 100%
rename from graphics/decorations/decor_powder_snow_mat.png
rename to graphics/decorations/powder_snow_mat.png
diff --git a/graphics/decorations/decor_pretty_desk.png b/graphics/decorations/pretty_desk.png
similarity index 100%
rename from graphics/decorations/decor_pretty_desk.png
rename to graphics/decorations/pretty_desk.png
diff --git a/graphics/decorations/decor_pretty_flowers.png b/graphics/decorations/pretty_flowers.png
similarity index 100%
rename from graphics/decorations/decor_pretty_flowers.png
rename to graphics/decorations/pretty_flowers.png
diff --git a/graphics/decorations/decor_ragged_desk.png b/graphics/decorations/ragged_desk.png
similarity index 100%
rename from graphics/decorations/decor_ragged_desk.png
rename to graphics/decorations/ragged_desk.png
diff --git a/graphics/decorations/decor_red_brick.png b/graphics/decorations/red_brick.png
similarity index 100%
rename from graphics/decorations/decor_red_brick.png
rename to graphics/decorations/red_brick.png
diff --git a/graphics/decorations/decor_red_plant.png b/graphics/decorations/red_plant.png
similarity index 100%
rename from graphics/decorations/decor_red_plant.png
rename to graphics/decorations/red_plant.png
diff --git a/graphics/decorations/decor_red_tent.png b/graphics/decorations/red_tent.png
similarity index 100%
rename from graphics/decorations/decor_red_tent.png
rename to graphics/decorations/red_tent.png
diff --git a/graphics/decorations/decor_regice_doll.png b/graphics/decorations/regice_doll.png
similarity index 100%
rename from graphics/decorations/decor_regice_doll.png
rename to graphics/decorations/regice_doll.png
diff --git a/graphics/decorations/decor_regirock_doll.png b/graphics/decorations/regirock_doll.png
similarity index 100%
rename from graphics/decorations/decor_regirock_doll.png
rename to graphics/decorations/regirock_doll.png
diff --git a/graphics/decorations/decor_registeel_doll.png b/graphics/decorations/registeel_doll.png
similarity index 100%
rename from graphics/decorations/decor_registeel_doll.png
rename to graphics/decorations/registeel_doll.png
diff --git a/graphics/decorations/decor_rhydon_doll.png b/graphics/decorations/rhydon_doll.png
similarity index 100%
rename from graphics/decorations/decor_rhydon_doll.png
rename to graphics/decorations/rhydon_doll.png
diff --git a/graphics/decorations/decor_sand_ornament.png b/graphics/decorations/sand_ornament.png
similarity index 100%
rename from graphics/decorations/decor_sand_ornament.png
rename to graphics/decorations/sand_ornament.png
diff --git a/graphics/decorations/decor_slide.png b/graphics/decorations/slide.png
similarity index 100%
rename from graphics/decorations/decor_slide.png
rename to graphics/decorations/slide.png
diff --git a/graphics/decorations/decor_snorlax_doll.png b/graphics/decorations/snorlax_doll.png
similarity index 100%
rename from graphics/decorations/decor_snorlax_doll.png
rename to graphics/decorations/snorlax_doll.png
diff --git a/graphics/decorations/decor_solid_board.png b/graphics/decorations/solid_board.png
similarity index 100%
rename from graphics/decorations/decor_solid_board.png
rename to graphics/decorations/solid_board.png
diff --git a/graphics/decorations/decor_spikes_mat.png b/graphics/decorations/spikes_mat.png
similarity index 100%
rename from graphics/decorations/decor_spikes_mat.png
rename to graphics/decorations/spikes_mat.png
diff --git a/graphics/decorations/decor_stand.png b/graphics/decorations/stand.png
similarity index 100%
rename from graphics/decorations/decor_stand.png
rename to graphics/decorations/stand.png
diff --git a/graphics/decorations/decor_surf_mat.png b/graphics/decorations/surf_mat.png
similarity index 100%
rename from graphics/decorations/decor_surf_mat.png
rename to graphics/decorations/surf_mat.png
diff --git a/graphics/decorations/decor_thunder_mat.png b/graphics/decorations/thunder_mat.png
similarity index 100%
rename from graphics/decorations/decor_thunder_mat.png
rename to graphics/decorations/thunder_mat.png
diff --git a/graphics/decorations/decor_tire.png b/graphics/decorations/tire.png
similarity index 100%
rename from graphics/decorations/decor_tire.png
rename to graphics/decorations/tire.png
diff --git a/graphics/decorations/decor_tropical_plant.png b/graphics/decorations/tropical_plant.png
similarity index 100%
rename from graphics/decorations/decor_tropical_plant.png
rename to graphics/decorations/tropical_plant.png
diff --git a/graphics/decorations/decor_venusaur_doll.png b/graphics/decorations/venusaur_doll.png
similarity index 100%
rename from graphics/decorations/decor_venusaur_doll.png
rename to graphics/decorations/venusaur_doll.png
diff --git a/graphics/decorations/decor_wailmer_doll.png b/graphics/decorations/wailmer_doll.png
similarity index 100%
rename from graphics/decorations/decor_wailmer_doll.png
rename to graphics/decorations/wailmer_doll.png
diff --git a/graphics/decorations/decor_yellow_brick.png b/graphics/decorations/yellow_brick.png
similarity index 100%
rename from graphics/decorations/decor_yellow_brick.png
rename to graphics/decorations/yellow_brick.png
diff --git a/src/data/graphics/decorations.h b/src/data/graphics/decorations.h
index d8b865fcf..b18c87348 100644
--- a/src/data/graphics/decorations.h
+++ b/src/data/graphics/decorations.h
@@ -1,125 +1,125 @@
-const u32 gDecorIcon_HeavyDesk[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.4bpp.lz");
-const u32 gDecorIconPalette_HeavyDesk[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.gbapal.lz");
+const u32 gDecorIcon_HeavyDesk[] = INCBIN_U32("graphics/decorations/heavy_desk.4bpp.lz");
+const u32 gDecorIconPalette_HeavyDesk[] = INCBIN_U32("graphics/decorations/heavy_desk.gbapal.lz");
 
-const u32 gDecorIcon_RaggedDesk[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.4bpp.lz");
-const u32 gDecorIconPalette_RaggedDesk[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.gbapal.lz");
+const u32 gDecorIcon_RaggedDesk[] = INCBIN_U32("graphics/decorations/ragged_desk.4bpp.lz");
+const u32 gDecorIconPalette_RaggedDesk[] = INCBIN_U32("graphics/decorations/ragged_desk.gbapal.lz");
 
-const u32 gDecorIcon_ComfortDesk[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.4bpp.lz");
-const u32 gDecorIconPalette_ComfortDesk[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.gbapal.lz");
+const u32 gDecorIcon_ComfortDesk[] = INCBIN_U32("graphics/decorations/comfort_desk.4bpp.lz");
+const u32 gDecorIconPalette_ComfortDesk[] = INCBIN_U32("graphics/decorations/comfort_desk.gbapal.lz");
 
-const u32 gDecorIcon_PrettyDesk[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.4bpp.lz");
-const u32 gDecorIconPalette_PrettyDesk[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.gbapal.lz");
+const u32 gDecorIcon_PrettyDesk[] = INCBIN_U32("graphics/decorations/pretty_desk.4bpp.lz");
+const u32 gDecorIconPalette_PrettyDesk[] = INCBIN_U32("graphics/decorations/pretty_desk.gbapal.lz");
 
-const u32 gDecorIcon_BrickDesk[] = INCBIN_U32("graphics/decorations/decor_brick_desk.4bpp.lz");
-const u32 gDecorIconPalette_BrickDesk[] = INCBIN_U32("graphics/decorations/decor_brick_desk.gbapal.lz");
+const u32 gDecorIcon_BrickDesk[] = INCBIN_U32("graphics/decorations/brick_desk.4bpp.lz");
+const u32 gDecorIconPalette_BrickDesk[] = INCBIN_U32("graphics/decorations/brick_desk.gbapal.lz");
 
-const u32 gDecorIcon_CampDesk[] = INCBIN_U32("graphics/decorations/decor_camp_desk.4bpp.lz");
-const u32 gDecorIconPalette_CampDesk[] = INCBIN_U32("graphics/decorations/decor_camp_desk.gbapal.lz");
+const u32 gDecorIcon_CampDesk[] = INCBIN_U32("graphics/decorations/camp_desk.4bpp.lz");
+const u32 gDecorIconPalette_CampDesk[] = INCBIN_U32("graphics/decorations/camp_desk.gbapal.lz");
 
-const u32 gDecorIcon_HardDesk[] = INCBIN_U32("graphics/decorations/decor_hard_desk.4bpp.lz");
-const u32 gDecorIconPalette_HardDesk[] = INCBIN_U32("graphics/decorations/decor_hard_desk.gbapal.lz");
+const u32 gDecorIcon_HardDesk[] = INCBIN_U32("graphics/decorations/hard_desk.4bpp.lz");
+const u32 gDecorIconPalette_HardDesk[] = INCBIN_U32("graphics/decorations/hard_desk.gbapal.lz");
 
-const u32 gDecorIcon_RedPlant[] = INCBIN_U32("graphics/decorations/decor_red_plant.4bpp.lz");
-const u32 gDecorIconPalette_RedPlant[] = INCBIN_U32("graphics/decorations/decor_red_plant.gbapal.lz");
+const u32 gDecorIcon_RedPlant[] = INCBIN_U32("graphics/decorations/red_plant.4bpp.lz");
+const u32 gDecorIconPalette_RedPlant[] = INCBIN_U32("graphics/decorations/red_plant.gbapal.lz");
 
-const u32 gDecorIcon_TropicalPlant[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.4bpp.lz");
-const u32 gDecorIconPalette_TropicalPlant[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.gbapal.lz");
+const u32 gDecorIcon_TropicalPlant[] = INCBIN_U32("graphics/decorations/tropical_plant.4bpp.lz");
+const u32 gDecorIconPalette_TropicalPlant[] = INCBIN_U32("graphics/decorations/tropical_plant.gbapal.lz");
 
-const u32 gDecorIcon_PrettyFlowers[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.4bpp.lz");
-const u32 gDecorIconPalette_PrettyFlowers[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.gbapal.lz");
+const u32 gDecorIcon_PrettyFlowers[] = INCBIN_U32("graphics/decorations/pretty_flowers.4bpp.lz");
+const u32 gDecorIconPalette_PrettyFlowers[] = INCBIN_U32("graphics/decorations/pretty_flowers.gbapal.lz");
 
-const u32 gDecorIcon_ColorfulPlant[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.4bpp.lz");
-const u32 gDecorIconPalette_ColorfulPlant[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.gbapal.lz");
+const u32 gDecorIcon_ColorfulPlant[] = INCBIN_U32("graphics/decorations/colorful_plant.4bpp.lz");
+const u32 gDecorIconPalette_ColorfulPlant[] = INCBIN_U32("graphics/decorations/colorful_plant.gbapal.lz");
 
-const u32 gDecorIcon_BigPlant[] = INCBIN_U32("graphics/decorations/decor_big_plant.4bpp.lz");
-const u32 gDecorIconPalette_BigPlant[] = INCBIN_U32("graphics/decorations/decor_big_plant.gbapal.lz");
+const u32 gDecorIcon_BigPlant[] = INCBIN_U32("graphics/decorations/big_plant.4bpp.lz");
+const u32 gDecorIconPalette_BigPlant[] = INCBIN_U32("graphics/decorations/big_plant.gbapal.lz");
 
-const u32 gDecorIcon_GorgeousPlant[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.4bpp.lz");
-const u32 gDecorIconPalette_GorgeousPlant[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.gbapal.lz");
+const u32 gDecorIcon_GorgeousPlant[] = INCBIN_U32("graphics/decorations/gorgeous_plant.4bpp.lz");
+const u32 gDecorIconPalette_GorgeousPlant[] = INCBIN_U32("graphics/decorations/gorgeous_plant.gbapal.lz");
 
-const u32 gDecorIcon_RedBrick[] = INCBIN_U32("graphics/decorations/decor_red_brick.4bpp.lz");
-const u32 gDecorIconPalette_RedBrick[] = INCBIN_U32("graphics/decorations/decor_red_brick.gbapal.lz");
+const u32 gDecorIcon_RedBrick[] = INCBIN_U32("graphics/decorations/red_brick.4bpp.lz");
+const u32 gDecorIconPalette_RedBrick[] = INCBIN_U32("graphics/decorations/red_brick.gbapal.lz");
 
-const u32 gDecorIcon_YellowBrick[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.4bpp.lz");
-const u32 gDecorIconPalette_YellowBrick[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.gbapal.lz");
+const u32 gDecorIcon_YellowBrick[] = INCBIN_U32("graphics/decorations/yellow_brick.4bpp.lz");
+const u32 gDecorIconPalette_YellowBrick[] = INCBIN_U32("graphics/decorations/yellow_brick.gbapal.lz");
 
-const u32 gDecorIcon_BlueBrick[] = INCBIN_U32("graphics/decorations/decor_blue_brick.4bpp.lz");
-const u32 gDecorIconPalette_BlueBrick[] = INCBIN_U32("graphics/decorations/decor_blue_brick.gbapal.lz");
+const u32 gDecorIcon_BlueBrick[] = INCBIN_U32("graphics/decorations/blue_brick.4bpp.lz");
+const u32 gDecorIconPalette_BlueBrick[] = INCBIN_U32("graphics/decorations/blue_brick.gbapal.lz");
 
-const u32 gDecorIcon_RedTent[] = INCBIN_U32("graphics/decorations/decor_red_tent.4bpp.lz");
-const u32 gDecorIconPalette_RedTent[] = INCBIN_U32("graphics/decorations/decor_red_tent.gbapal.lz");
+const u32 gDecorIcon_RedTent[] = INCBIN_U32("graphics/decorations/red_tent.4bpp.lz");
+const u32 gDecorIconPalette_RedTent[] = INCBIN_U32("graphics/decorations/red_tent.gbapal.lz");
 
-const u32 gDecorIcon_BlueTent[] = INCBIN_U32("graphics/decorations/decor_blue_tent.4bpp.lz");
-const u32 gDecorIconPalette_BlueTent[] = INCBIN_U32("graphics/decorations/decor_blue_tent.gbapal.lz");
+const u32 gDecorIcon_BlueTent[] = INCBIN_U32("graphics/decorations/blue_tent.4bpp.lz");
+const u32 gDecorIconPalette_BlueTent[] = INCBIN_U32("graphics/decorations/blue_tent.gbapal.lz");
 
-const u32 gDecorIcon_SolidBoard[] = INCBIN_U32("graphics/decorations/decor_solid_board.4bpp.lz");
-const u32 gDecorIconPalette_SolidBoard[] = INCBIN_U32("graphics/decorations/decor_solid_board.gbapal.lz");
+const u32 gDecorIcon_SolidBoard[] = INCBIN_U32("graphics/decorations/solid_board.4bpp.lz");
+const u32 gDecorIconPalette_SolidBoard[] = INCBIN_U32("graphics/decorations/solid_board.gbapal.lz");
 
-const u32 gDecorIcon_Slide[] = INCBIN_U32("graphics/decorations/decor_slide.4bpp.lz");
-const u32 gDecorIconPalette_Slide[] = INCBIN_U32("graphics/decorations/decor_slide.gbapal.lz");
+const u32 gDecorIcon_Slide[] = INCBIN_U32("graphics/decorations/slide.4bpp.lz");
+const u32 gDecorIconPalette_Slide[] = INCBIN_U32("graphics/decorations/slide.gbapal.lz");
 
-const u32 gDecorIcon_Tire[] = INCBIN_U32("graphics/decorations/decor_tire.4bpp.lz");
-const u32 gDecorIconPalette_Tire[] = INCBIN_U32("graphics/decorations/decor_tire.gbapal.lz");
+const u32 gDecorIcon_Tire[] = INCBIN_U32("graphics/decorations/tire.4bpp.lz");
+const u32 gDecorIconPalette_Tire[] = INCBIN_U32("graphics/decorations/tire.gbapal.lz");
 
-const u32 gDecorIcon_Stand[] = INCBIN_U32("graphics/decorations/decor_stand.4bpp.lz");
-const u32 gDecorIconPalette_Stand[] = INCBIN_U32("graphics/decorations/decor_stand.gbapal.lz");
+const u32 gDecorIcon_Stand[] = INCBIN_U32("graphics/decorations/stand.4bpp.lz");
+const u32 gDecorIconPalette_Stand[] = INCBIN_U32("graphics/decorations/stand.gbapal.lz");
 
-const u32 gDecorIcon_BreakableDoor[] = INCBIN_U32("graphics/decorations/decor_breakable_door.4bpp.lz");
-const u32 gDecorIconPalette_BreakableDoor[] = INCBIN_U32("graphics/decorations/decor_breakable_door.gbapal.lz");
+const u32 gDecorIcon_BreakableDoor[] = INCBIN_U32("graphics/decorations/breakable_door.4bpp.lz");
+const u32 gDecorIconPalette_BreakableDoor[] = INCBIN_U32("graphics/decorations/breakable_door.gbapal.lz");
 
-const u32 gDecorIcon_SandOrnament[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.4bpp.lz");
-const u32 gDecorIconPalette_SandOrnament[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.gbapal.lz");
+const u32 gDecorIcon_SandOrnament[] = INCBIN_U32("graphics/decorations/sand_ornament.4bpp.lz");
+const u32 gDecorIconPalette_SandOrnament[] = INCBIN_U32("graphics/decorations/sand_ornament.gbapal.lz");
 
-const u32 gDecorIcon_GlassOrnament[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.4bpp.lz");
-const u32 gDecorIconPalette_GlassOrnament[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.gbapal.lz");
+const u32 gDecorIcon_GlassOrnament[] = INCBIN_U32("graphics/decorations/glass_ornament.4bpp.lz");
+const u32 gDecorIconPalette_GlassOrnament[] = INCBIN_U32("graphics/decorations/glass_ornament.gbapal.lz");
 
-const u32 gDecorIcon_SurfMat[] = INCBIN_U32("graphics/decorations/decor_surf_mat.4bpp.lz");
-const u32 gDecorIconPalette_SurfMat[] = INCBIN_U32("graphics/decorations/decor_surf_mat.gbapal.lz");
+const u32 gDecorIcon_SurfMat[] = INCBIN_U32("graphics/decorations/surf_mat.4bpp.lz");
+const u32 gDecorIconPalette_SurfMat[] = INCBIN_U32("graphics/decorations/surf_mat.gbapal.lz");
 
-const u32 gDecorIcon_ThunderMat[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.4bpp.lz");
-const u32 gDecorIconPalette_ThunderMat[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.gbapal.lz");
+const u32 gDecorIcon_ThunderMat[] = INCBIN_U32("graphics/decorations/thunder_mat.4bpp.lz");
+const u32 gDecorIconPalette_ThunderMat[] = INCBIN_U32("graphics/decorations/thunder_mat.gbapal.lz");
 
-const u32 gDecorIcon_FireBlastMat[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.4bpp.lz");
-const u32 gDecorIconPalette_FireBlastMat[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.gbapal.lz");
+const u32 gDecorIcon_FireBlastMat[] = INCBIN_U32("graphics/decorations/fire_blast_mat.4bpp.lz");
+const u32 gDecorIconPalette_FireBlastMat[] = INCBIN_U32("graphics/decorations/fire_blast_mat.gbapal.lz");
 
-const u32 gDecorIcon_PowderSnowMat[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.4bpp.lz");
-const u32 gDecorIconPalette_PowderSnowMat[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.gbapal.lz");
+const u32 gDecorIcon_PowderSnowMat[] = INCBIN_U32("graphics/decorations/powder_snow_mat.4bpp.lz");
+const u32 gDecorIconPalette_PowderSnowMat[] = INCBIN_U32("graphics/decorations/powder_snow_mat.gbapal.lz");
 
-const u32 gDecorIcon_AttractMat[] = INCBIN_U32("graphics/decorations/decor_attract_mat.4bpp.lz");
-const u32 gDecorIconPalette_AttractMat[] = INCBIN_U32("graphics/decorations/decor_attract_mat.gbapal.lz");
+const u32 gDecorIcon_AttractMat[] = INCBIN_U32("graphics/decorations/attract_mat.4bpp.lz");
+const u32 gDecorIconPalette_AttractMat[] = INCBIN_U32("graphics/decorations/attract_mat.gbapal.lz");
 
-const u32 gDecorIcon_FissureMat[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.4bpp.lz");
-const u32 gDecorIconPalette_FissureMat[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.gbapal.lz");
+const u32 gDecorIcon_FissureMat[] = INCBIN_U32("graphics/decorations/fissure_mat.4bpp.lz");
+const u32 gDecorIconPalette_FissureMat[] = INCBIN_U32("graphics/decorations/fissure_mat.gbapal.lz");
 
-const u32 gDecorIcon_SpikesMat[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.4bpp.lz");
-const u32 gDecorIconPalette_SpikesMat[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.gbapal.lz");
+const u32 gDecorIcon_SpikesMat[] = INCBIN_U32("graphics/decorations/spikes_mat.4bpp.lz");
+const u32 gDecorIconPalette_SpikesMat[] = INCBIN_U32("graphics/decorations/spikes_mat.gbapal.lz");
 
-const u32 gDecorIcon_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.4bpp.lz");
-const u32 gDecorIconPalette_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.gbapal.lz");
+const u32 gDecorIcon_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/snorlax_doll.4bpp.lz");
+const u32 gDecorIconPalette_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/snorlax_doll.gbapal.lz");
 
-const u32 gDecorIcon_RhydonDoll[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.4bpp.lz");
-const u32 gDecorIconPalette_RhydonDoll[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.gbapal.lz");
+const u32 gDecorIcon_RhydonDoll[] = INCBIN_U32("graphics/decorations/rhydon_doll.4bpp.lz");
+const u32 gDecorIconPalette_RhydonDoll[] = INCBIN_U32("graphics/decorations/rhydon_doll.gbapal.lz");
 
-const u32 gDecorIcon_LaprasDoll[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.4bpp.lz");
-const u32 gDecorIconPalette_LaprasDoll[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.gbapal.lz");
+const u32 gDecorIcon_LaprasDoll[] = INCBIN_U32("graphics/decorations/lapras_doll.4bpp.lz");
+const u32 gDecorIconPalette_LaprasDoll[] = INCBIN_U32("graphics/decorations/lapras_doll.gbapal.lz");
 
-const u32 gDecorIcon_VenusaurDoll[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.4bpp.lz");
-const u32 gDecorIconPalette_VenusaurDoll[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.gbapal.lz");
+const u32 gDecorIcon_VenusaurDoll[] = INCBIN_U32("graphics/decorations/venusaur_doll.4bpp.lz");
+const u32 gDecorIconPalette_VenusaurDoll[] = INCBIN_U32("graphics/decorations/venusaur_doll.gbapal.lz");
 
-const u32 gDecorIcon_CharizardDoll[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.4bpp.lz");
-const u32 gDecorIconPalette_CharizardDoll[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.gbapal.lz");
+const u32 gDecorIcon_CharizardDoll[] = INCBIN_U32("graphics/decorations/charizard_doll.4bpp.lz");
+const u32 gDecorIconPalette_CharizardDoll[] = INCBIN_U32("graphics/decorations/charizard_doll.gbapal.lz");
 
-const u32 gDecorIcon_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.4bpp.lz");
-const u32 gDecorIconPalette_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.gbapal.lz");
+const u32 gDecorIcon_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/blastoise_doll.4bpp.lz");
+const u32 gDecorIconPalette_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/blastoise_doll.gbapal.lz");
 
-const u32 gDecorIcon_WailmerDoll[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.4bpp.lz");
-const u32 gDecorIconPalette_WailmerDoll[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.gbapal.lz");
+const u32 gDecorIcon_WailmerDoll[] = INCBIN_U32("graphics/decorations/wailmer_doll.4bpp.lz");
+const u32 gDecorIconPalette_WailmerDoll[] = INCBIN_U32("graphics/decorations/wailmer_doll.gbapal.lz");
 
-const u32 gDecorIcon_RegiceDoll[] = INCBIN_U32("graphics/decorations/decor_regice_doll.4bpp.lz");
-const u32 gDecorIconPalette_RegiceDoll[] = INCBIN_U32("graphics/decorations/decor_regice_doll.gbapal.lz");
+const u32 gDecorIcon_RegiceDoll[] = INCBIN_U32("graphics/decorations/regice_doll.4bpp.lz");
+const u32 gDecorIconPalette_RegiceDoll[] = INCBIN_U32("graphics/decorations/regice_doll.gbapal.lz");
 
-const u32 gDecorIcon_RegirockDoll[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.4bpp.lz");
-const u32 gDecorIconPalette_RegirockDoll[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.gbapal.lz");
+const u32 gDecorIcon_RegirockDoll[] = INCBIN_U32("graphics/decorations/regirock_doll.4bpp.lz");
+const u32 gDecorIconPalette_RegirockDoll[] = INCBIN_U32("graphics/decorations/regirock_doll.gbapal.lz");
 
-const u32 gDecorIcon_RegisteelDoll[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.4bpp.lz");
-const u32 gDecorIconPalette_RegisteelDoll[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.gbapal.lz");
+const u32 gDecorIcon_RegisteelDoll[] = INCBIN_U32("graphics/decorations/registeel_doll.4bpp.lz");
+const u32 gDecorIconPalette_RegisteelDoll[] = INCBIN_U32("graphics/decorations/registeel_doll.gbapal.lz");

From 8d3b7bd0b1ea64855595b4ebd95c38b615901ffa Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Mon, 13 Apr 2020 14:43:50 -0400
Subject: [PATCH 3/3] Use metatile labels for decor gfx

---
 include/constants/metatile_labels.h | 148 ++++++++-
 src/data/decoration/tiles.h         | 476 ++++++++++++++--------------
 src/fldeff_misc.c                   |   4 +-
 src/secret_base.c                   |  22 +-
 4 files changed, 384 insertions(+), 266 deletions(-)

diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index 4bcf47ea8..586107687 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -524,33 +524,64 @@
 #define METATILE_SecretBase_MudBall                     0x228
 #define METATILE_SecretBase_Fence_Horizontal            0x22C
 #define METATILE_SecretBase_Fence_Vertical              0x233
-#define METATILE_SecretBase_Board_Top                   0x234
-#define METATILE_SecretBase_Board_Bottom                0x23C
+#define METATILE_SecretBase_SolidBoard_Top              0x234
+#define METATILE_SecretBase_SolidBoard_Bottom           0x23C
+#define METATILE_SecretBase_RedTent_TopLeft             0x230
+#define METATILE_SecretBase_RedTent_TopMid              0x231
+#define METATILE_SecretBase_RedTent_TopRight            0x232
+#define METATILE_SecretBase_RedTent_MidLeft             0x238
 #define METATILE_SecretBase_RedTent_DoorTop             0x239
+#define METATILE_SecretBase_RedTent_MidRight            0x23A
+#define METATILE_SecretBase_RedTent_BottomLeft          0x240
 #define METATILE_SecretBase_RedTent_Door                0x241
+#define METATILE_SecretBase_RedTent_BottomRight         0x23B
+#define METATILE_SecretBase_BlueTent_TopLeft            0x248
+#define METATILE_SecretBase_BlueTent_TopMid             0x249
+#define METATILE_SecretBase_BlueTent_TopRight           0x268
+#define METATILE_SecretBase_BlueTent_MidLeft            0x250
 #define METATILE_SecretBase_BlueTent_DoorTop            0x251
+#define METATILE_SecretBase_BlueTent_MidRight           0x270
+#define METATILE_SecretBase_BlueTent_BottomLeft         0x258
 #define METATILE_SecretBase_BlueTent_Door               0x259
-#define METATILE_SecretBase_Slide_Stairs                0x23D
-#define METATILE_SecretBase_Slide                       0x23E
-#define METATILE_SecretBase_Stand_LeftCorner            0x26A
-#define METATILE_SecretBase_Stand_RightCorner           0x26D
+#define METATILE_SecretBase_BlueTent_BottomRight        0x269
+#define METATILE_SecretBase_Slide_TopLeft               0x235
+#define METATILE_SecretBase_Slide_TopRight              0x236
+#define METATILE_SecretBase_Slide_StairLanding          0x23D
+#define METATILE_SecretBase_Slide_SlideTop              0x23E
+#define METATILE_SecretBase_Slide_Stairs                0x263
+#define METATILE_SecretBase_Slide_SlideBottom           0x264
+#define METATILE_SecretBase_Slide_MatLeft               0x26F
+#define METATILE_SecretBase_Slide_MatRight              0x277
+#define METATILE_SecretBase_Stand_CornerLeft            0x26A
+#define METATILE_SecretBase_Stand_MidLeft               0x26B
+#define METATILE_SecretBase_Stand_MidRight              0x26C
+#define METATILE_SecretBase_Stand_CornerRight           0x26D
+#define METATILE_SecretBase_Stand_StairsLeft            0x272
+#define METATILE_SecretBase_Stand_BaseLeft              0x273
+#define METATILE_SecretBase_Stand_BaseRight             0x274
+#define METATILE_SecretBase_Stand_StairsRight           0x275
 #define METATILE_SecretBase_BreakableDoor_TopClosed     0x237
 #define METATILE_SecretBase_BreakableDoor_BottomClosed  0x23F
 #define METATILE_SecretBase_BreakableDoor_TopOpen       0x26E
 #define METATILE_SecretBase_BreakableDoor_BottomOpen    0x276
-#define METATILE_SecretBase_NoteMat_C                   0x278
+#define METATILE_SecretBase_GlitterMat                  0x260
+#define METATILE_SecretBase_JumpMat                     0x261
+#define METATILE_SecretBase_SpinMat                     0x262
+#define METATILE_SecretBase_NoteMat_C_Low               0x278
 #define METATILE_SecretBase_NoteMat_D                   0x279
 #define METATILE_SecretBase_NoteMat_E                   0x27A
 #define METATILE_SecretBase_NoteMat_F                   0x27B
 #define METATILE_SecretBase_NoteMat_G                   0x27C
 #define METATILE_SecretBase_NoteMat_A                   0x27D
 #define METATILE_SecretBase_NoteMat_B                   0x27E
-#define METATILE_SecretBase_NoteMat_C_Sharp             0x2B3
+#define METATILE_SecretBase_NoteMat_C_High              0x2B3
 #define METATILE_SecretBase_Tire_TopLeft                0x280
 #define METATILE_SecretBase_Tire_TopRight               0x281
 #define METATILE_SecretBase_Tire_BottomLeft             0x288
 #define METATILE_SecretBase_Tire_BottomRight            0x289
+#define METATILE_SecretBase_GlassOrnament_Top           0x282
 #define METATILE_SecretBase_GlassOrnament_Base1         0x28A
+#define METATILE_SecretBase_GlassOrnament_TopWall       0x283
 #define METATILE_SecretBase_GlassOrnament_Base2         0x28B
 #define METATILE_SecretBase_SandOrnament_BrokenTop      0x284
 #define METATILE_SecretBase_SandOrnament_BrokenBase     0x28C
@@ -622,23 +653,41 @@
 #define METATILE_SecretBase_RaggedChair                 0x2C2
 #define METATILE_SecretBase_BrickChair                  0x2C8
 #define METATILE_SecretBase_CampChair                   0x2C9
-#define METATILE_SecretBase_HardChair                   0x2Ca
+#define METATILE_SecretBase_HardChair                   0x2CA
+#define METATILE_SecretBase_RedPlant_Top                0x2D0
 #define METATILE_SecretBase_RedPlant_Base1              0x2D8
+#define METATILE_SecretBase_RedPlant_TopWall            0x2D1
 #define METATILE_SecretBase_RedPlant_Base2              0x2D9
+#define METATILE_SecretBase_TropicalPlant_Top           0x2D2
 #define METATILE_SecretBase_TropicalPlant_Base1         0x2DA
+#define METATILE_SecretBase_TropicalPlant_TopWall       0x2D3
 #define METATILE_SecretBase_TropicalPlant_Base2         0x2DB
-#define METATILE_SecretBase_PrettyFlower_Base1          0x2DC
-#define METATILE_SecretBase_PrettyFlower_Base2          0x2DD
-#define METATILE_SecretBase_ColorfulFlowers_BaseLeft1   0x2E8
-#define METATILE_SecretBase_ColorfulFlowers_BaseRight1  0x2E9
-#define METATILE_SecretBase_ColorfulFlowers_BaseLeft2   0x2EA
-#define METATILE_SecretBase_ColorfulFlowers_BaseRight2  0x2EB
+#define METATILE_SecretBase_PrettyFlowers_Top           0x2D4
+#define METATILE_SecretBase_PrettyFlowers_Base1         0x2DC
+#define METATILE_SecretBase_PrettyFlowers_TopWall       0x2D5
+#define METATILE_SecretBase_PrettyFlowers_Base2         0x2DD
+#define METATILE_SecretBase_ColorfulPlant_TopLeft       0x2E0
+#define METATILE_SecretBase_ColorfulPlant_TopRight      0x2E2
+#define METATILE_SecretBase_ColorfulPlant_BaseLeft1     0x2E8
+#define METATILE_SecretBase_ColorfulPlant_BaseRight1    0x2E9
+#define METATILE_SecretBase_ColorfulPlant_TopLeftWall   0x2E1
+#define METATILE_SecretBase_ColorfulPlant_TopRightWall  0x2E3
+#define METATILE_SecretBase_ColorfulPlant_BaseLeft2     0x2EA
+#define METATILE_SecretBase_ColorfulPlant_BaseRight2    0x2EB
+#define METATILE_SecretBase_BigPlant_TopLeft            0x2E4
+#define METATILE_SecretBase_BigPlant_TopRight           0x2E6
 #define METATILE_SecretBase_BigPlant_BaseLeft1          0x2EC
 #define METATILE_SecretBase_BigPlant_BaseRight1         0x2ED
+#define METATILE_SecretBase_BigPlant_TopLeftWall        0x2E5
+#define METATILE_SecretBase_BigPlant_TopRightWall       0x2E6
 #define METATILE_SecretBase_BigPlant_BaseLeft2          0x2EE
 #define METATILE_SecretBase_BigPlant_BaseRight2         0x2EF
+#define METATILE_SecretBase_GorgeousPlant_TopLeft       0x2F0
+#define METATILE_SecretBase_GorgeousPlant_TopRight      0x2F2
 #define METATILE_SecretBase_GorgeousPlant_BaseLeft1     0x2F8
 #define METATILE_SecretBase_GorgeousPlant_BaseRight1    0x2F9
+#define METATILE_SecretBase_GorgeousPlant_TopLeftWall   0x2F1
+#define METATILE_SecretBase_GorgeousPlant_TopRightWall  0x2F3
 #define METATILE_SecretBase_GorgeousPlant_BaseLeft2     0x2FA
 #define METATILE_SecretBase_GorgeousPlant_BaseRight2    0x2FB
 #define METATILE_SecretBase_TV                          0x2F4
@@ -659,12 +708,79 @@
 #define METATILE_SecretBase_RedPoster                   0x332
 #define METATILE_SecretBase_BluePoster                  0x333
 #define METATILE_SecretBase_CutePoster                  0x334
+#define METATILE_SecretBase_SilverShield_Top            0x2D6
 #define METATILE_SecretBase_SilverShield_Base1          0x2DE
+#define METATILE_SecretBase_SilverShield_TopWall        0x2D7
 #define METATILE_SecretBase_SilverShield_Base2          0x2DF
+#define METATILE_SecretBase_GoldShield_Top              0x32E
 #define METATILE_SecretBase_GoldShield_Base1            0x336
+#define METATILE_SecretBase_GoldShield_TopWall          0x32F
 #define METATILE_SecretBase_GoldShield_Base2            0x337
 #define METATILE_SecretBase_RedBalloon                  0x338
-#define METATILE_SecretBase_BlueBalloon                 0x33c
+#define METATILE_SecretBase_BlueBalloon                 0x33C
 #define METATILE_SecretBase_YellowBalloon               0x340
+#define METATILE_SecretBase_SurfMat_TopLeft             0x242
+#define METATILE_SecretBase_SurfMat_TopMid              0x243
+#define METATILE_SecretBase_SurfMat_TopRight            0x244
+#define METATILE_SecretBase_SurfMat_MidLeft             0x24A
+#define METATILE_SecretBase_SurfMat_Center              0x24B
+#define METATILE_SecretBase_SurfMat_MidRight            0x24C
+#define METATILE_SecretBase_SurfMat_BottomLeft          0x252
+#define METATILE_SecretBase_SurfMat_BottomMid           0x253
+#define METATILE_SecretBase_SurfMat_BottomRight         0x254
+#define METATILE_SecretBase_ThunderMat_TopLeft          0x245
+#define METATILE_SecretBase_ThunderMat_TopMid           0x246
+#define METATILE_SecretBase_ThunderMat_TopRight         0x247
+#define METATILE_SecretBase_ThunderMat_MidLeft          0x24D
+#define METATILE_SecretBase_ThunderMat_Center           0x24E
+#define METATILE_SecretBase_ThunderMat_MidRight         0x24F
+#define METATILE_SecretBase_ThunderMat_BottomLeft       0x255
+#define METATILE_SecretBase_ThunderMat_BottomMid        0x256
+#define METATILE_SecretBase_ThunderMat_BottomRight      0x257
+#define METATILE_SecretBase_FireBlastMat_TopLeft        0x25A
+#define METATILE_SecretBase_FireBlastMat_TopMid         0x25B
+#define METATILE_SecretBase_FireBlastMat_TopRight       0x25C
+#define METATILE_SecretBase_FireBlastMat_MidLeft        0x25D
+#define METATILE_SecretBase_FireBlastMat_Center         0x25E
+#define METATILE_SecretBase_FireBlastMat_MidRight       0x25F
+#define METATILE_SecretBase_FireBlastMat_BottomLeft     0x265
+#define METATILE_SecretBase_FireBlastMat_BottomMid      0x266
+#define METATILE_SecretBase_FireBlastMat_BottomRight    0x267
+#define METATILE_SecretBase_PowderSnowMat_TopLeft       0x300
+#define METATILE_SecretBase_PowderSnowMat_TopMid        0x301
+#define METATILE_SecretBase_PowderSnowMat_TopRight      0x302
+#define METATILE_SecretBase_PowderSnowMat_MidLeft       0x308
+#define METATILE_SecretBase_PowderSnowMat_Center        0x309
+#define METATILE_SecretBase_PowderSnowMat_MidRight      0x30A
+#define METATILE_SecretBase_PowderSnowMat_BottomLeft    0x310
+#define METATILE_SecretBase_PowderSnowMat_BottomMid     0x311
+#define METATILE_SecretBase_PowderSnowMat_BottomRight   0x312
+#define METATILE_SecretBase_AttractMat_TopLeft          0x303
+#define METATILE_SecretBase_AttractMat_TopMid           0x304
+#define METATILE_SecretBase_AttractMat_TopRight         0x305
+#define METATILE_SecretBase_AttractMat_MidLeft          0x30B
+#define METATILE_SecretBase_AttractMat_Center           0x30C
+#define METATILE_SecretBase_AttractMat_MidRight         0x30D
+#define METATILE_SecretBase_AttractMat_BottomLeft       0x313
+#define METATILE_SecretBase_AttractMat_BottomMid        0x314
+#define METATILE_SecretBase_AttractMat_BottomRight      0x315
+#define METATILE_SecretBase_FissureMat_TopLeft          0x306
+#define METATILE_SecretBase_FissureMat_TopMid           0x307
+#define METATILE_SecretBase_FissureMat_TopRight         0x318
+#define METATILE_SecretBase_FissureMat_MidLeft          0x30E
+#define METATILE_SecretBase_FissureMat_Center           0x30F
+#define METATILE_SecretBase_FissureMat_MidRight         0x320
+#define METATILE_SecretBase_FissureMat_BottomLeft       0x316
+#define METATILE_SecretBase_FissureMat_BottomMid        0x317
+#define METATILE_SecretBase_FissureMat_BottomRight      0x328
+#define METATILE_SecretBase_SpikesMat_TopLeft           0x319
+#define METATILE_SecretBase_SpikesMat_TopMid            0x31A
+#define METATILE_SecretBase_SpikesMat_TopRight          0x31B
+#define METATILE_SecretBase_SpikesMat_MidLeft           0x321
+#define METATILE_SecretBase_SpikesMat_Center            0x322
+#define METATILE_SecretBase_SpikesMat_MidRight          0x323
+#define METATILE_SecretBase_SpikesMat_BottomLeft        0x329
+#define METATILE_SecretBase_SpikesMat_BottomMid         0x32A
+#define METATILE_SecretBase_SpikesMat_BottomRight       0x32B
 
 #endif // GUARD_METATILE_LABELS_H
diff --git a/src/data/decoration/tiles.h b/src/data/decoration/tiles.h
index f11520511..de5c43575 100644
--- a/src/data/decoration/tiles.h
+++ b/src/data/decoration/tiles.h
@@ -1,463 +1,465 @@
+#define DECOR_TILE(name) (METATILE_SecretBase_##name - 0x200)
+
 const u16 DecorGfx_SMALL_DESK[] = {
-    0x87
+    DECOR_TILE(SmallDesk)
 };
 
 const u16 DecorGfx_POKEMON_DESK[] = {
-    0x8F
+    DECOR_TILE(PokemonDesk)
 };
 
 const u16 DecorGfx_HEAVY_DESK[] = {
-    0x90,
-    0x91,
-    0x92,
-    0x98,
-    0x99,
-    0x9A
+    DECOR_TILE(HeavyDesk_TopLeft),
+    DECOR_TILE(HeavyDesk_TopMid),
+    DECOR_TILE(HeavyDesk_TopRight),
+    DECOR_TILE(HeavyDesk_BottomLeft),
+    DECOR_TILE(HeavyDesk_BottomMid),
+    DECOR_TILE(HeavyDesk_BottomRight)
 };
 
 const u16 DecorGfx_RAGGED_DESK[] = {
-    0x93,
-    0x94,
-    0x95,
-    0x9B,
-    0x9C,
-    0x9D
+    DECOR_TILE(RaggedDesk_TopLeft),
+    DECOR_TILE(RaggedDesk_TopMid),
+    DECOR_TILE(RaggedDesk_TopRight),
+    DECOR_TILE(RaggedDesk_BottomLeft),
+    DECOR_TILE(RaggedDesk_BottomMid),
+    DECOR_TILE(RaggedDesk_BottomRight)
 };
 
 const u16 DecorGfx_COMFORT_DESK[] = {
-    0x96,
-    0x97,
-    0xA3,
-    0x9E,
-    0x9F,
-    0xAB
+    DECOR_TILE(ComfortDesk_TopLeft),
+    DECOR_TILE(ComfortDesk_TopMid),
+    DECOR_TILE(ComfortDesk_TopRight),
+    DECOR_TILE(ComfortDesk_BottomLeft),
+    DECOR_TILE(ComfortDesk_BottomMid),
+    DECOR_TILE(ComfortDesk_BottomRight)
 };
 
 const u16 DecorGfx_PRETTY_DESK[] = {
-    0xBD,
-    0xBE,
-    0xBF,
-    0xC5,
-    0xC6,
-    0xC7,
-    0xCD,
-    0xCE,
-    0xCF
+    DECOR_TILE(PrettyDesk_TopLeft),
+    DECOR_TILE(PrettyDesk_TopMid),
+    DECOR_TILE(PrettyDesk_TopRight),
+    DECOR_TILE(PrettyDesk_MidLeft),
+    DECOR_TILE(PrettyDesk_Center),
+    DECOR_TILE(PrettyDesk_MidRight),
+    DECOR_TILE(PrettyDesk_BottomLeft),
+    DECOR_TILE(PrettyDesk_BottomMid),
+    DECOR_TILE(PrettyDesk_BottomRight)
 };
 
 const u16 DecorGfx_BRICK_DESK[] = {
-    0xA0,
-    0xA1,
-    0xA2,
-    0xA8,
-    0xA9,
-    0xAA,
-    0xB0,
-    0xB1,
-    0xB2
+    DECOR_TILE(BrickDesk_TopLeft),
+    DECOR_TILE(BrickDesk_TopMid),
+    DECOR_TILE(BrickDesk_TopRight),
+    DECOR_TILE(BrickDesk_MidLeft),
+    DECOR_TILE(BrickDesk_Center),
+    DECOR_TILE(BrickDesk_MidRight),
+    DECOR_TILE(BrickDesk_BottomLeft),
+    DECOR_TILE(BrickDesk_BottomMid),
+    DECOR_TILE(BrickDesk_BottomRight)
 };
 
 const u16 DecorGfx_CAMP_DESK[] = {
-    0xA4,
-    0xA5,
-    0xA6,
-    0xAC,
-    0xAD,
-    0xAE,
-    0xB4,
-    0xB5,
-    0xB6
+    DECOR_TILE(CampDesk_TopLeft),
+    DECOR_TILE(CampDesk_TopMid),
+    DECOR_TILE(CampDesk_TopRight),
+    DECOR_TILE(CampDesk_MidLeft),
+    DECOR_TILE(CampDesk_Center),
+    DECOR_TILE(CampDesk_MidRight),
+    DECOR_TILE(CampDesk_BottomLeft),
+    DECOR_TILE(CampDesk_BottomMid),
+    DECOR_TILE(CampDesk_BottomRight)
 };
 
 const u16 DecorGfx_HARD_DESK[] = {
-    0xA7,
-    0xBB,
-    0xBC,
-    0xAF,
-    0xC3,
-    0xC4,
-    0xB7,
-    0xCB,
-    0xCC
+    DECOR_TILE(HardDesk_TopLeft),
+    DECOR_TILE(HardDesk_TopMid),
+    DECOR_TILE(HardDesk_TopRight),
+    DECOR_TILE(HardDesk_MidLeft),
+    DECOR_TILE(HardDesk_Center),
+    DECOR_TILE(HardDesk_MidRight),
+    DECOR_TILE(HardDesk_BottomLeft),
+    DECOR_TILE(HardDesk_BottomMid),
+    DECOR_TILE(HardDesk_BottomRight)
 };
 
 const u16 DecorGfx_SMALL_CHAIR[] = {
-    0xB8
+    DECOR_TILE(SmallChair)
 };
 
 const u16 DecorGfx_POKEMON_CHAIR[] = {
-    0xB9
+    DECOR_TILE(PokemonChair)
 };
 
 const u16 DecorGfx_HEAVY_CHAIR[] = {
-    0xBA
+    DECOR_TILE(HeavyChair)
 };
 
 const u16 DecorGfx_PRETTY_CHAIR[] = {
-    0xC0
+    DECOR_TILE(PrettyChair)
 };
 
 const u16 DecorGfx_COMFORT_CHAIR[] = {
-    0xC1
+    DECOR_TILE(ComfortChair)
 };
 
 const u16 DecorGfx_RAGGED_CHAIR[] = {
-    0xC2
+    DECOR_TILE(RaggedChair)
 };
 
 const u16 DecorGfx_BRICK_CHAIR[] = {
-    0xC8
+    DECOR_TILE(BrickChair)
 };
 
 const u16 DecorGfx_CAMP_CHAIR[] = {
-    0xC9
+    DECOR_TILE(CampChair)
 };
 
 const u16 DecorGfx_HARD_CHAIR[] = {
-    0xCA
+    DECOR_TILE(HardChair)
 };
 
 const u16 DecorGfx_RED_PLANT[] = {
-    0xD0,
-    0xD8
+    DECOR_TILE(RedPlant_Top),
+    DECOR_TILE(RedPlant_Base1)
 };
 
 const u16 DecorGfx_TROPICAL_PLANT[] = {
-    0xD2,
-    0xDA
+    DECOR_TILE(TropicalPlant_Top),
+    DECOR_TILE(TropicalPlant_Base1)
 };
 
 const u16 DecorGfx_PRETTY_FLOWERS[] = {
-    0xD4,
-    0xDC
+    DECOR_TILE(PrettyFlowers_Top),
+    DECOR_TILE(PrettyFlowers_Base1)
 };
 
 const u16 DecorGfx_COLORFUL_PLANT[] = {
-    0xE0,
-    0xE2,
-    0xE8,
-    0xE9
+    DECOR_TILE(ColorfulPlant_TopLeft),
+    DECOR_TILE(ColorfulPlant_TopRight),
+    DECOR_TILE(ColorfulPlant_BaseLeft1),
+    DECOR_TILE(ColorfulPlant_BaseRight1)
 };
 
 const u16 DecorGfx_BIG_PLANT[] = {
-    0xE4,
-    0xE6,
-    0xEC,
-    0xED
+    DECOR_TILE(BigPlant_TopLeft),
+    DECOR_TILE(BigPlant_TopRight),
+    DECOR_TILE(BigPlant_BaseLeft1),
+    DECOR_TILE(BigPlant_BaseRight1)
 };
 
 const u16 DecorGfx_GORGEOUS_PLANT[] = {
-    0xF0,
-    0xF2,
-    0xF8,
-    0xF9
+    DECOR_TILE(GorgeousPlant_TopLeft),
+    DECOR_TILE(GorgeousPlant_TopRight),
+    DECOR_TILE(GorgeousPlant_BaseLeft1),
+    DECOR_TILE(GorgeousPlant_BaseRight1)
 };
 
 const u16 DecorGfx_RED_BRICK[] = {
-    0x25,
-    0x2D
+    DECOR_TILE(RedBrick_Top),
+    DECOR_TILE(RedBrick_Bottom)
 };
 
 const u16 DecorGfx_YELLOW_BRICK[] = {
-    0x26,
-    0x2E
+    DECOR_TILE(YellowBrick_Top),
+    DECOR_TILE(YellowBrick_Bottom)
 };
 
 const u16 DecorGfx_BLUE_BRICK[] = {
-    0x27,
-    0x2F
+    DECOR_TILE(BlueBrick_Top),
+    DECOR_TILE(BlueBrick_Bottom)
 };
 
 const u16 DecorGfx_RED_BALLOON[] = {
-    0x138
+    DECOR_TILE(RedBalloon)
 };
 
 const u16 DecorGfx_BLUE_BALLOON[] = {
-    0x13C
+    DECOR_TILE(BlueBalloon)
 };
 
 const u16 DecorGfx_YELLOW_BALLOON[] = {
-    0x140
+    DECOR_TILE(YellowBalloon)
 };
 
 const u16 DecorGfx_RED_TENT[] = {
-    0x30,
-    0x31,
-    0x32,
-    0x38,
-    0x39,
-    0x3A,
-    0x40,
-    0x41,
-    0x3B
+    DECOR_TILE(RedTent_TopLeft),
+    DECOR_TILE(RedTent_TopMid),
+    DECOR_TILE(RedTent_TopRight),
+    DECOR_TILE(RedTent_MidLeft),
+    DECOR_TILE(RedTent_DoorTop),
+    DECOR_TILE(RedTent_MidRight),
+    DECOR_TILE(RedTent_BottomLeft),
+    DECOR_TILE(RedTent_Door),
+    DECOR_TILE(RedTent_BottomRight)
 };
 
 const u16 DecorGfx_BLUE_TENT[] = {
-    0x48,
-    0x49,
-    0x68,
-    0x50,
-    0x51,
-    0x70,
-    0x58,
-    0x59,
-    0x69
+    DECOR_TILE(BlueTent_TopLeft),
+    DECOR_TILE(BlueTent_TopMid),
+    DECOR_TILE(BlueTent_TopRight),
+    DECOR_TILE(BlueTent_MidLeft),
+    DECOR_TILE(BlueTent_DoorTop),
+    DECOR_TILE(BlueTent_MidRight),
+    DECOR_TILE(BlueTent_BottomLeft),
+    DECOR_TILE(BlueTent_Door),
+    DECOR_TILE(BlueTent_BottomRight)
 };
 
 const u16 DecorGfx_SOLID_BOARD[] = {
-    0x34,
-    0x3C
+    DECOR_TILE(SolidBoard_Top),
+    DECOR_TILE(SolidBoard_Bottom)
 };
 
 const u16 DecorGfx_SLIDE[] = {
-    0x35,
-    0x36,
-    0x3D,
-    0x3E,
-    0x63,
-    0x64,
-    0x6F,
-    0x77
+    DECOR_TILE(Slide_TopLeft),
+    DECOR_TILE(Slide_TopRight),
+    DECOR_TILE(Slide_StairLanding),
+    DECOR_TILE(Slide_SlideTop),
+    DECOR_TILE(Slide_Stairs),
+    DECOR_TILE(Slide_SlideBottom),
+    DECOR_TILE(Slide_MatLeft),
+    DECOR_TILE(Slide_MatRight)
 };
 
 const u16 DecorGfx_FENCE_LENGTH[] = {
-    0x33
+    DECOR_TILE(Fence_Vertical)
 };
 
 const u16 DecorGfx_FENCE_WIDTH[] = {
-    0x2C
+    DECOR_TILE(Fence_Horizontal)
 };
 
 const u16 DecorGfx_TIRE[] = {
-    0x80,
-    0x81,
-    0x88,
-    0x89
+    DECOR_TILE(Tire_TopLeft),
+    DECOR_TILE(Tire_TopRight),
+    DECOR_TILE(Tire_BottomLeft),
+    DECOR_TILE(Tire_BottomRight)
 };
 
 const u16 DecorGfx_STAND[] = {
-    0x6A,
-    0x6B,
-    0x6C,
-    0x6D,
-    0x72,
-    0x73,
-    0x74,
-    0x75
+    DECOR_TILE(Stand_CornerLeft),
+    DECOR_TILE(Stand_MidLeft),
+    DECOR_TILE(Stand_MidRight),
+    DECOR_TILE(Stand_CornerRight),
+    DECOR_TILE(Stand_StairsLeft),
+    DECOR_TILE(Stand_BaseLeft),
+    DECOR_TILE(Stand_BaseRight),
+    DECOR_TILE(Stand_StairsRight)
 };
 
 const u16 DecorGfx_MUD_BALL[] = {
-    0x28
+    DECOR_TILE(MudBall)
 };
 
 const u16 DecorGfx_BREAKABLE_DOOR[] = {
-    0x37,
-    0x3F
+    DECOR_TILE(BreakableDoor_TopClosed),
+    DECOR_TILE(BreakableDoor_BottomClosed)
 };
 
 const u16 DecorGfx_SAND_ORNAMENT[] = {
-    0x85,
-    0x8D
+    DECOR_TILE(SandOrnament_Top),
+    DECOR_TILE(SandOrnament_Base1)
 };
 
 const u16 DecorGfx_SILVER_SHIELD[] = {
-    0xD6,
-    0xDE
+    DECOR_TILE(SilverShield_Top),
+    DECOR_TILE(SilverShield_Base1)
 };
 
 const u16 DecorGfx_GOLD_SHIELD[] = {
-    0x12E,
-    0x136
+    DECOR_TILE(GoldShield_Top),
+    DECOR_TILE(GoldShield_Base1)
 };
 
 const u16 DecorGfx_GLASS_ORNAMENT[] = {
-    0x82,
-    0x8A
+    DECOR_TILE(GlassOrnament_Top),
+    DECOR_TILE(GlassOrnament_Base1)
 };
 
 const u16 DecorGfx_TV[] = {
-    0xF4
+    DECOR_TILE(TV)
 };
 
 const u16 DecorGfx_ROUND_TV[] = {
-    0xF5
+    DECOR_TILE(RoundTV)
 };
 
 const u16 DecorGfx_CUTE_TV[] = {
-    0xF6
+    DECOR_TILE(CuteTV)
 };
 
 const u16 DecorGfx_GLITTER_MAT[] = {
-    0x60
+    DECOR_TILE(GlitterMat)
 };
 
 const u16 DecorGfx_JUMP_MAT[] = {
-    0x61
+    DECOR_TILE(JumpMat)
 };
 
 const u16 DecorGfx_SPIN_MAT[] = {
-    0x62
+    DECOR_TILE(SpinMat)
 };
 
 const u16 DecorGfx_C_LOW_NOTE_MAT[] = {
-    0x78
+    DECOR_TILE(NoteMat_C_Low)
 };
 
 const u16 DecorGfx_D_NOTE_MAT[] = {
-    0x79
+    DECOR_TILE(NoteMat_D)
 };
 
 const u16 DecorGfx_E_NOTE_MAT[] = {
-    0x7A
+    DECOR_TILE(NoteMat_E)
 };
 
 const u16 DecorGfx_F_NOTE_MAT[] = {
-    0x7B
+    DECOR_TILE(NoteMat_F)
 };
 
 const u16 DecorGfx_G_NOTE_MAT[] = {
-    0x7C
+    DECOR_TILE(NoteMat_G)
 };
 
 const u16 DecorGfx_A_NOTE_MAT[] = {
-    0x7D
+    DECOR_TILE(NoteMat_A)
 };
 
 const u16 DecorGfx_B_NOTE_MAT[] = {
-    0x7E
+    DECOR_TILE(NoteMat_B)
 };
 
 const u16 DecorGfx_C_HIGH_NOTE_MAT[] = {
-    0xB3
+    DECOR_TILE(NoteMat_C_High)
 };
 
 const u16 DecorGfx_SURF_MAT[] = {
-    0x42,
-    0x43,
-    0x44,
-    0x4A,
-    0x4B,
-    0x4C,
-    0x52,
-    0x53,
-    0x54
+    DECOR_TILE(SurfMat_TopLeft),
+    DECOR_TILE(SurfMat_TopMid),
+    DECOR_TILE(SurfMat_TopRight),
+    DECOR_TILE(SurfMat_MidLeft),
+    DECOR_TILE(SurfMat_Center),
+    DECOR_TILE(SurfMat_MidRight),
+    DECOR_TILE(SurfMat_BottomLeft),
+    DECOR_TILE(SurfMat_BottomMid),
+    DECOR_TILE(SurfMat_BottomRight)
 };
 
 const u16 DecorGfx_THUNDER_MAT[] = {
-    0x45,
-    0x46,
-    0x47,
-    0x4D,
-    0x4E,
-    0x4F,
-    0x55,
-    0x56,
-    0x57
+    DECOR_TILE(ThunderMat_TopLeft),
+    DECOR_TILE(ThunderMat_TopMid),
+    DECOR_TILE(ThunderMat_TopRight),
+    DECOR_TILE(ThunderMat_MidLeft),
+    DECOR_TILE(ThunderMat_Center),
+    DECOR_TILE(ThunderMat_MidRight),
+    DECOR_TILE(ThunderMat_BottomLeft),
+    DECOR_TILE(ThunderMat_BottomMid),
+    DECOR_TILE(ThunderMat_BottomRight)
 };
 
 const u16 DecorGfx_FIRE_BLAST_MAT[] = {
-    0x5A,
-    0x5B,
-    0x5C,
-    0x5D,
-    0x5E,
-    0x5F,
-    0x65,
-    0x66,
-    0x67
+    DECOR_TILE(FireBlastMat_TopLeft),
+    DECOR_TILE(FireBlastMat_TopMid),
+    DECOR_TILE(FireBlastMat_TopRight),
+    DECOR_TILE(FireBlastMat_MidLeft),
+    DECOR_TILE(FireBlastMat_Center),
+    DECOR_TILE(FireBlastMat_MidRight),
+    DECOR_TILE(FireBlastMat_BottomLeft),
+    DECOR_TILE(FireBlastMat_BottomMid),
+    DECOR_TILE(FireBlastMat_BottomRight)
 };
 
 const u16 DecorGfx_POWDER_SNOW_MAT[] = {
-    0x100,
-    0x101,
-    0x102,
-    0x108,
-    0x109,
-    0x10A,
-    0x110,
-    0x111,
-    0x112
+    DECOR_TILE(PowderSnowMat_TopLeft),
+    DECOR_TILE(PowderSnowMat_TopMid),
+    DECOR_TILE(PowderSnowMat_TopRight),
+    DECOR_TILE(PowderSnowMat_MidLeft),
+    DECOR_TILE(PowderSnowMat_Center),
+    DECOR_TILE(PowderSnowMat_MidRight),
+    DECOR_TILE(PowderSnowMat_BottomLeft),
+    DECOR_TILE(PowderSnowMat_BottomMid),
+    DECOR_TILE(PowderSnowMat_BottomRight)
 };
 
 const u16 DecorGfx_ATTRACT_MAT[] = {
-    0x103,
-    0x104,
-    0x105,
-    0x10B,
-    0x10C,
-    0x10D,
-    0x113,
-    0x114,
-    0x115
+    DECOR_TILE(AttractMat_TopLeft),
+    DECOR_TILE(AttractMat_TopMid),
+    DECOR_TILE(AttractMat_TopRight),
+    DECOR_TILE(AttractMat_MidLeft),
+    DECOR_TILE(AttractMat_Center),
+    DECOR_TILE(AttractMat_MidRight),
+    DECOR_TILE(AttractMat_BottomLeft),
+    DECOR_TILE(AttractMat_BottomMid),
+    DECOR_TILE(AttractMat_BottomRight)
 };
 
 const u16 DecorGfx_FISSURE_MAT[] = {
-    0x106,
-    0x107,
-    0x118,
-    0x10E,
-    0x10F,
-    0x120,
-    0x116,
-    0x117,
-    0x128
+    DECOR_TILE(FissureMat_TopLeft),
+    DECOR_TILE(FissureMat_TopMid),
+    DECOR_TILE(FissureMat_TopRight),
+    DECOR_TILE(FissureMat_MidLeft),
+    DECOR_TILE(FissureMat_Center),
+    DECOR_TILE(FissureMat_MidRight),
+    DECOR_TILE(FissureMat_BottomLeft),
+    DECOR_TILE(FissureMat_BottomMid),
+    DECOR_TILE(FissureMat_BottomRight)
 };
 
 const u16 DecorGfx_SPIKES_MAT[] = {
-    0x119,
-    0x11A,
-    0x11B,
-    0x121,
-    0x122,
-    0x123,
-    0x129,
-    0x12A,
-    0x12B
+    DECOR_TILE(SpikesMat_TopLeft),
+    DECOR_TILE(SpikesMat_TopMid),
+    DECOR_TILE(SpikesMat_TopRight),
+    DECOR_TILE(SpikesMat_MidLeft),
+    DECOR_TILE(SpikesMat_Center),
+    DECOR_TILE(SpikesMat_MidRight),
+    DECOR_TILE(SpikesMat_BottomLeft),
+    DECOR_TILE(SpikesMat_BottomMid),
+    DECOR_TILE(SpikesMat_BottomRight)
 };
 
 const u16 DecorGfx_BALL_POSTER[] = {
-    0x130
+    DECOR_TILE(BallPoster)
 };
 
 const u16 DecorGfx_GREEN_POSTER[] = {
-    0x131
+    DECOR_TILE(GreenPoster)
 };
 
 const u16 DecorGfx_RED_POSTER[] = {
-    0x132
+    DECOR_TILE(RedPoster)
 };
 
 const u16 DecorGfx_BLUE_POSTER[] = {
-    0x133
+    DECOR_TILE(BluePoster)
 };
 
 const u16 DecorGfx_CUTE_POSTER[] = {
-    0x134
+    DECOR_TILE(CutePoster)
 };
 
 const u16 DecorGfx_PIKA_POSTER[] = {
-    0x11C,
-    0x11D
+    DECOR_TILE(PikaPoster_Left),
+    DECOR_TILE(PikaPoster_Right)
 };
 
 const u16 DecorGfx_LONG_POSTER[] = {
-    0x11E,
-    0x11F
+    DECOR_TILE(LongPoster_Left),
+    DECOR_TILE(LongPoster_Right)
 };
 
 const u16 DecorGfx_SEA_POSTER[] = {
-    0x124,
-    0x125
+    DECOR_TILE(SeaPoster_Left),
+    DECOR_TILE(SeaPoster_Right)
 };
 
 const u16 DecorGfx_SKY_POSTER[] = {
-    0x126,
-    0x127
+    DECOR_TILE(SkyPoster_Left),
+    DECOR_TILE(SkyPoster_Right)
 };
 
 const u16 DecorGfx_KISS_POSTER[] = {
-    0x12C,
-    0x12D
+    DECOR_TILE(KissPoster_Left),
+    DECOR_TILE(KissPoster_Right)
 };
 
 const u16 DecorGfx_PICHU_DOLL[] = {
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c
index def86ab1b..9574ac563 100644
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -948,7 +948,7 @@ static void Task_SecretBaseMusicNoteMatSound(u8 taskId)
     {
         switch (gTasks[taskId].tMetatileID)
         {
-        case METATILE_SecretBase_NoteMat_C:
+        case METATILE_SecretBase_NoteMat_C_Low:
             PlaySE(SE_TOY_C);
             break;
         case METATILE_SecretBase_NoteMat_D:
@@ -969,7 +969,7 @@ static void Task_SecretBaseMusicNoteMatSound(u8 taskId)
         case METATILE_SecretBase_NoteMat_B:
             PlaySE(SE_TOY_B);
             break;
-        case METATILE_SecretBase_NoteMat_C_Sharp:
+        case METATILE_SecretBase_NoteMat_C_High:
             PlaySE(SE_TOY_C1);
             break;
         }
diff --git a/src/secret_base.c b/src/secret_base.c
index ec48e9b51..24644d0ec 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1176,7 +1176,7 @@ void SecretBasePerStepCallback(u8 taskId)
             VarSet(VAR_SECRET_BASE_STEP_COUNTER, VarGet(VAR_SECRET_BASE_STEP_COUNTER) + 1);
             behavior = MapGridGetMetatileBehaviorAt(x, y);
             tileId = MapGridGetMetatileIdAt(x, y);
-            if (tileId == METATILE_SecretBase_Board_Top || tileId == METATILE_SecretBase_Board_Bottom)
+            if (tileId == METATILE_SecretBase_SolidBoard_Top || tileId == METATILE_SecretBase_SolidBoard_Bottom)
             {
                 if (sInFriendSecretBase == TRUE)
                 {
@@ -1204,13 +1204,13 @@ void SecretBasePerStepCallback(u8 taskId)
                 if (sInFriendSecretBase == TRUE)
                     VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | SECRET_BASE_USED_TENT);
             }
-            else if ((behavior == MB_IMPASSABLE_NORTHEAST && tileId == METATILE_SecretBase_Stand_RightCorner) 
-                  || (behavior == MB_IMPASSABLE_NORTHWEST && MapGridGetMetatileIdAt(x, y) == METATILE_SecretBase_Stand_LeftCorner))
+            else if ((behavior == MB_IMPASSABLE_NORTHEAST && tileId == METATILE_SecretBase_Stand_CornerRight) 
+                  || (behavior == MB_IMPASSABLE_NORTHWEST && MapGridGetMetatileIdAt(x, y) == METATILE_SecretBase_Stand_CornerLeft))
             {
                 if (sInFriendSecretBase == TRUE)
                     VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | SECRET_BASE_USED_STAND);
             }
-            else if (behavior == MB_IMPASSABLE_WEST_AND_EAST && tileId == METATILE_SecretBase_Slide_Stairs)
+            else if (behavior == MB_IMPASSABLE_WEST_AND_EAST && tileId == METATILE_SecretBase_Slide_StairLanding)
             {
                 if (sInFriendSecretBase == TRUE)
                 {
@@ -1218,7 +1218,7 @@ void SecretBasePerStepCallback(u8 taskId)
                     VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | SECRET_BASE_DECLINED_SLIDE);
                 }
             }
-            else if (behavior == MB_SLIDE_SOUTH && tileId == METATILE_SecretBase_Slide)
+            else if (behavior == MB_SLIDE_SOUTH && tileId == METATILE_SecretBase_Slide_SlideTop)
             {
                 if (sInFriendSecretBase == TRUE)
                 {
@@ -1846,12 +1846,12 @@ void CheckInteractedWithFriendsFurnitureBottom(void)
         case METATILE_SecretBase_RedPlant_Base2:
         case METATILE_SecretBase_TropicalPlant_Base1:
         case METATILE_SecretBase_TropicalPlant_Base2:
-        case METATILE_SecretBase_PrettyFlower_Base1:
-        case METATILE_SecretBase_PrettyFlower_Base2:
-        case METATILE_SecretBase_ColorfulFlowers_BaseLeft1:
-        case METATILE_SecretBase_ColorfulFlowers_BaseRight1:
-        case METATILE_SecretBase_ColorfulFlowers_BaseLeft2:
-        case METATILE_SecretBase_ColorfulFlowers_BaseRight2:
+        case METATILE_SecretBase_PrettyFlowers_Base1:
+        case METATILE_SecretBase_PrettyFlowers_Base2:
+        case METATILE_SecretBase_ColorfulPlant_BaseLeft1:
+        case METATILE_SecretBase_ColorfulPlant_BaseRight1:
+        case METATILE_SecretBase_ColorfulPlant_BaseLeft2:
+        case METATILE_SecretBase_ColorfulPlant_BaseRight2:
         case METATILE_SecretBase_BigPlant_BaseLeft1:
         case METATILE_SecretBase_BigPlant_BaseRight1:
         case METATILE_SecretBase_BigPlant_BaseLeft2: