From 7178aa8b99a78d08726110aa954c951095e2f78c Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Sat, 8 Oct 2022 20:44:08 -0400
Subject: [PATCH] Set unused tiles to transparent, document adjacent files

---
 graphics/item_pc/{unk_8E85458.bin => bg.bin}  | Bin
 graphics/item_pc/{unk_8E85408.pal => bg.pal}  |   0
 graphics/item_pc/bg.png                       | Bin 0 -> 807 bytes
 graphics/item_pc/unk_8E85090.png              | Bin 746 -> 0 bytes
 graphics/ss_anne/smoke.png                    | Bin 0 -> 315 bytes
 graphics/ss_anne/unk_8479838.png              | Bin 188 -> 0 bytes
 graphics/ss_anne/unk_8479A38.png              | Bin 271 -> 0 bytes
 graphics/ss_anne/wake.png                     | Bin 0 -> 244 bytes
 graphics/teachy_tv/tiles.png                  | Bin 1761 -> 1760 bytes
 .../tm_case/{unk_8E84D90.png => disc.png}     | Bin
 .../{unk_8E84F20.pal => disc_types_1.pal}     |   0
 .../{unk_8E85068.pal => disc_types_2.pal}     |   0
 graphics/tm_case/{unk_8E99118.png => hm.png}  | Bin
 .../tm_case/{unk_8E84A24.bin => menu.bin}     | Bin
 .../{unk_8E84D20.pal => menu_female.pal}      |   0
 .../{unk_8E84CB0.pal => menu_male.pal}        |   0
 .../tm_case/{unk_8E84B70.bin => tm_case.bin}  | Bin
 graphics/tm_case/tm_case.png                  | Bin 0 -> 1012 bytes
 graphics/tm_case/unk_8E845D8.png              | Bin 951 -> 0 bytes
 graphics_file_rules.mk                        | 250 +++++++++---------
 include/graphics.h                            |  18 +-
 src/graphics.c                                |  24 +-
 src/ss_anne.c                                 |   4 +-
 src/tm_case.c                                 |  37 +--
 tileset_rules.mk                              | 134 +++++-----
 25 files changed, 235 insertions(+), 232 deletions(-)
 rename graphics/item_pc/{unk_8E85458.bin => bg.bin} (100%)
 rename graphics/item_pc/{unk_8E85408.pal => bg.pal} (100%)
 create mode 100644 graphics/item_pc/bg.png
 delete mode 100644 graphics/item_pc/unk_8E85090.png
 create mode 100644 graphics/ss_anne/smoke.png
 delete mode 100644 graphics/ss_anne/unk_8479838.png
 delete mode 100644 graphics/ss_anne/unk_8479A38.png
 create mode 100644 graphics/ss_anne/wake.png
 rename graphics/tm_case/{unk_8E84D90.png => disc.png} (100%)
 rename graphics/tm_case/{unk_8E84F20.pal => disc_types_1.pal} (100%)
 rename graphics/tm_case/{unk_8E85068.pal => disc_types_2.pal} (100%)
 rename graphics/tm_case/{unk_8E99118.png => hm.png} (100%)
 rename graphics/tm_case/{unk_8E84A24.bin => menu.bin} (100%)
 rename graphics/tm_case/{unk_8E84D20.pal => menu_female.pal} (100%)
 rename graphics/tm_case/{unk_8E84CB0.pal => menu_male.pal} (100%)
 rename graphics/tm_case/{unk_8E84B70.bin => tm_case.bin} (100%)
 create mode 100644 graphics/tm_case/tm_case.png
 delete mode 100644 graphics/tm_case/unk_8E845D8.png

diff --git a/graphics/item_pc/unk_8E85458.bin b/graphics/item_pc/bg.bin
similarity index 100%
rename from graphics/item_pc/unk_8E85458.bin
rename to graphics/item_pc/bg.bin
diff --git a/graphics/item_pc/unk_8E85408.pal b/graphics/item_pc/bg.pal
similarity index 100%
rename from graphics/item_pc/unk_8E85408.pal
rename to graphics/item_pc/bg.pal
diff --git a/graphics/item_pc/bg.png b/graphics/item_pc/bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..4db6a6bcbc7f4407b8eed2ff5d7aef89e2c28d91
GIT binary patch
literal 807
zcmV+?1K9kDP)<h;3K|Lk000e1NJLTq002M$003A70{{R3x5Dfj0000mP)t-s0001#
zz4mIX=I-|P-sa~2y-MbTDXdBeoTRLCdyAz1i;M1RbKX*7%{k`g?*IS)NJ0!-0008A
zNkl<ZNQteLKW^JF6o+|*j2)$+sAp&J)*&9cWpa7~J10og7D1;B>S7??v}7${13iH4
z6V&z%tjvntXe!VSMO41W_vlB8vWDab*p$hSpZHI*QaUH0T#Yc$uHr=GbB2i>;A&uV
z5e7y!mtRYa2V7oLd(r^38QzLPj)R87AU}ReF&40DYB0Zu_JG?;2Y(EC&Mt7))nNgD
zOQ2%I5Zi&caDXlw&`n^_Kmxo_d`n>%f`Gpi&q)}t4Mzw7_oUvYdSsB(e*a8yPwEYT
zZXH4~fV#TDuEAgcb#;RP!Ul1Rut5wmWN@bF7=HKr=l&w0K`txUPQ>wp9Z+&(z!tke
zqU6?sA-+zWD0w*0kobT&UTAoiI#Kd~qM;7h<u!&lj_A|5FN?7~FgRo|_&@@4H+cgU
zWs!E_1A#h~q_$UwfC@eks8jlZ>Uw}RAdnU<hH=qiD8q(xGDHA`47X&6!iJLG5ddJN
zu7%_}l@|g`T7k8WuKNeud=mnw?&nnJ`w`#^08<7!*&z+Uq;nJy`yT}Xufl1BLvj>=
z+rA8dsr!JlNFm@4T;5P)2(W>TYXwrh3HCoTP4%f5?=)Fvx|}Z-Q0^BB7kUy$A2fad
z_A>&O%Iv}<I(2~Ef`FBJyw@Z7mPHi<Gov=Zucb1lA-j9ez+3|RH35%zY?!fOi3R|6
z(;sD#bqSc$=oc#iXd)xSY(~J64Xd@eSZ|<wg7rfiJXt+mswD&40{}Ky&A)o_)S7@z
zz)(nFo7WAg05+SvZothVV4K$s&jNVb<aI+&8gdCd8v{(DR5aL<ZfQ&Xx)}3`g26%$
ztl`q0NxvtT^3XaxU(dj=gn*&v0)9_;9fF$Q844HYq0CfM0C><x?g(HGZ3~b!1N`7L
l0{rMT0{rkc0(QO)`44ek9vqoVSDF9-002ovPDHLkV1if@XI=mR

literal 0
HcmV?d00001

diff --git a/graphics/item_pc/unk_8E85090.png b/graphics/item_pc/unk_8E85090.png
deleted file mode 100644
index 6c67486835d22f6729cd5f01afda732b24513efb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq002M$003A700000rFTR100089Nkl<ZNQteL
zv2NQi5QZ=4&;p&5+R+^O4P^HTY(GE&8|a!vn*(^MhD=4!R>>2@euBnRwhqqF%|kr9
z=pc<9^9m{Nct;;4$_9%5fJ}+}_=zGZ8D31DL%Cg00D-bl`I=Em54c^q+=qdM%iZUQ
zQUmU8xV>lrjv0QdLC%AQ{UE=8%P9_UYHqMsOxJ)bFrka3JhKlxZcRiWzZw8BEU6ud
zdk@%(f!quR4J@D&kXtIl5(V-D@=VG=Z8Smzq$l^b)eDO}t=EqrJ-Igmrge$MiYglh
zHwUW~)-??Z2piNb!Ui?SkimOI&+vA=erQY*Mo%l+p4Ill6#%_3Xe)i70KK$mC~pcc
zpf?8@iaMaS7a4x#UO;b9GBg1<z1C2c6(75cD4x3wLqkSG9VqbGZT?_I6z5w!Fjxmg
z?t1MQ06Z{Q2j+#^)&OT9Adin2=J63j6gE7tp~8!h;ff7a*bwnI0s*QtwV1>N>al>$
zQJ`;Ps$StTUxxs$dOtP!cmVi<z*K-;woeN%+Z_bd`d2}qR^c_`COHVmZT}sRN7t3!
zB!z%CczVr^A;1L}?kJF(MF9Dm%yY9V=3PTZnJLGk5tf}1&_vJ5>W9JiKxe|h5bP?<
zswWTVju;rg*@YR&r>p`2CRS~McSEqdA-nu3z*qyFJ_Bc$Vwi|wNCpJD(+^RcZ5bHz
z=tlzu7$RfCWWvBu41>Ns>8Dtp;{1^f->i)(VJJXv51<Wa^R<~g=rfQ846z1!Nz;%k
zAWf5|ffkE_UeYw2DBv_rnud)wBpNue27HJJc(4)Q(v{|OF_#^c=k|nZq;z|--cw4w
zX}zBR&)_}@O~b|q>OJvuh-&xEpvgIpGH43|=Vr?t0C>|L2C{a*y*O==SFaV2m$wzD
ceIpzB3qTndJYBc9ZU6uP07*qoM6N<$f|f@?mjD0&

diff --git a/graphics/ss_anne/smoke.png b/graphics/ss_anne/smoke.png
new file mode 100644
index 0000000000000000000000000000000000000000..5560247873a1899b9b9b78babc2202a244d7e808
GIT binary patch
literal 315
zcmV-B0mS}^P)<h;3K|Lk000e1NJLTq000mG002k?0{{R34FG7!0000mP)t-sIdilz
zgT+BXQj2OiAX1CHS|Hw>G4{<$tdv?(Qfk%J?rLg_gNv-qw0r;m{}2!urC*hD0002S
zNkl<ZD3OhkF%rZe3<IfE<o~5>6@F7{3f^#%4L5VeO+o_}wpJu#yjzUkuf;yB`8~|O
zyK?mbdAiA$_7CuFgIq)jVul&HvJ@x<O@)NQL&BOpogIk5&I%}EIYykQ{}+gYj?Emh
z1B@`k_$w3bG;dZnE^So1RNbfvzDQ70B-LklWM(*yg4xkZr04bId7BnA$T6zgg`DAk
zqHH5HKPs9dxUgD9%atC#Z|c|ge)`J1aAnc57AmtL#}GTlc>H*8*9T96fETQ&YGMEY
N002ovPDHLkV1jDsg_-~W

literal 0
HcmV?d00001

diff --git a/graphics/ss_anne/unk_8479838.png b/graphics/ss_anne/unk_8479838.png
deleted file mode 100644
index e7d0d8c44e47da28b5eac793aab7f3a89d432ecd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*0wfqdKXdg4Qq7(&jv*Qo=T6wo+hD-s5_zyS
zJ8jX9Tfg}yNIiN|Bh)paA;f>8{rf$0Yi_GIC~%1BavWf>|Krj$b9>y31OunzO#MtY
z|L@$k4A9=P#Y9EzYQ5)u2c7hfnHOu9g<J7oW_)QElp-a!uv*yR!{WY#h=lk9tGTyZ
mK1k8k?G>85>WS!c*Kgc^f7)x9>uq`oa+as7pUXO@geCygiASXX

diff --git a/graphics/ss_anne/unk_8479A38.png b/graphics/ss_anne/unk_8479A38.png
deleted file mode 100644
index 98fbc8d9710804158618579484e2b5f24a6a1a6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 271
zcmV+q0r38bP)<h;3K|Lk000e1NJLTq000mG002k?00000AGOCO0002iNkl<ZD3PU6
zIc@|o4AU1}xZXFZV9o!RQ?Q<p@@#+<Ie@q^L79i(x}Q@&1Mq-r;efS2!R8tDIzSCR
zD*W#J2QW4U>IDVBnWRCl9!72fry4YRfQhx|F?ty95M6xaisMYatA3v@XhQGFOsF%J
zh-5gvu5QJt?)^eumo8r*%d96*DT5ZQ0^oP$aCSG%$i>9Nu;qqcdB2#3E-Ix)et;>T
z+p7GDyA`dE((*7$mLfccR?Ze*_R;{J5${KyBxEne_{e=UofGml)Keo&Tyy>hJ^;%N
Vo!X^08+8Bx002ovPDHLkV1l$eb8`Ry

diff --git a/graphics/ss_anne/wake.png b/graphics/ss_anne/wake.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7ce6763fba36308c99e366a5f17afb583fd7951
GIT binary patch
literal 244
zcmV<Q01N+#P)<h;3K|Lk000e1NJLTq000mG002M)0{{R3;Zy3R0000mP)t-sIdilz
zgT+BXQj2OiAX1CHS|Hw>G4{<$tdv?(Qfk%J?rLg_gNv-qw0r;m{}2!urC*hD0001g
zNkl<ZD3P_0F%H8p3<EXi{}1rYA#duefp2IWlMI5OKvAHY4z?_wT=i2SFa#Xi5MbT1
z_dXj*_BI<2ASgJ{(8GYwC->(Xn23a0BVtkgUpeZ^YFQNJRdWLfPWSRQYr*Ng0D|8A
u3B&_l4`{!_Z4NX!q1LciR3o2tzNk0o3%=<}y$lxs0000<MNUMnLSTYoK4KLB

literal 0
HcmV?d00001

diff --git a/graphics/teachy_tv/tiles.png b/graphics/teachy_tv/tiles.png
index e867de82b6606e9614906d18690588285b3f131e..fdf32ca305c9aeab9be89e10177f4cef11a6ef7e 100644
GIT binary patch
delta 1708
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
C<`pFX

delta 1709
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
DlGYF4

diff --git a/graphics/tm_case/unk_8E84D90.png b/graphics/tm_case/disc.png
similarity index 100%
rename from graphics/tm_case/unk_8E84D90.png
rename to graphics/tm_case/disc.png
diff --git a/graphics/tm_case/unk_8E84F20.pal b/graphics/tm_case/disc_types_1.pal
similarity index 100%
rename from graphics/tm_case/unk_8E84F20.pal
rename to graphics/tm_case/disc_types_1.pal
diff --git a/graphics/tm_case/unk_8E85068.pal b/graphics/tm_case/disc_types_2.pal
similarity index 100%
rename from graphics/tm_case/unk_8E85068.pal
rename to graphics/tm_case/disc_types_2.pal
diff --git a/graphics/tm_case/unk_8E99118.png b/graphics/tm_case/hm.png
similarity index 100%
rename from graphics/tm_case/unk_8E99118.png
rename to graphics/tm_case/hm.png
diff --git a/graphics/tm_case/unk_8E84A24.bin b/graphics/tm_case/menu.bin
similarity index 100%
rename from graphics/tm_case/unk_8E84A24.bin
rename to graphics/tm_case/menu.bin
diff --git a/graphics/tm_case/unk_8E84D20.pal b/graphics/tm_case/menu_female.pal
similarity index 100%
rename from graphics/tm_case/unk_8E84D20.pal
rename to graphics/tm_case/menu_female.pal
diff --git a/graphics/tm_case/unk_8E84CB0.pal b/graphics/tm_case/menu_male.pal
similarity index 100%
rename from graphics/tm_case/unk_8E84CB0.pal
rename to graphics/tm_case/menu_male.pal
diff --git a/graphics/tm_case/unk_8E84B70.bin b/graphics/tm_case/tm_case.bin
similarity index 100%
rename from graphics/tm_case/unk_8E84B70.bin
rename to graphics/tm_case/tm_case.bin
diff --git a/graphics/tm_case/tm_case.png b/graphics/tm_case/tm_case.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce013967e2ae10760838705505a6634d187cbb1a
GIT binary patch
literal 1012
zcmV<Q0}K3#P)<h;3K|Lk000e1NJLTq002M$003YF0{{R3U+Zbx0000mP)t-s&7|&X
zq~20{#iXo*YR$#&?(SMzL349jy}hJCw4~mg0PeI9_SHH6_Iv;T{{R30$+YJp000Aj
zNkl<ZNQuRky=&V*7>Dm4Fh+)sEmU2*v|W?UduTv(%NS3lqfLioted54HF+$Y?RYF$
zg;2U#XS}x(okB^Ws)j&nl16<$?#_}dB@haIC)s-Lx%YQDUrq?9pj17qgYQ0;s0Ys0
zK(DI)8<0@d0|ymAS!q7L8w}n&gW3QxtczX`pZB3e@0Fyg0@xsnK#cYEL(XsmP-(zX
z-GZUi1CH7*7;-5v+J*sXGn$_Da>cqtHwSbXpt3-PflBEr81}p0vT|ud!U?u30G>BF
z<F31A>Nv};Xeu^n1*||0nA7@b1MigmTxA)rpjeO4ODg4*XTKHDQ<%J)zy$;AKxIJ3
zycK{1%PJtzCE$z0D!~4+%CTwzzozUI?V1AM{qjbGiDQSn#82n+SXc)$qBFpH>kqTl
z5TAs}tH*Z+uW1_`UMIhP(|#~<?05zaPCf5M0np<INAT=8PLg<@=Q#IcVNa2YqIZ<F
zrqFqdp)*(;D1S<ilphT{5ObvsI=^UUX%n9i^<gE%IU6?er(`(lYr|%KHpsqMqM;)H
z5)Ics`t<HNQp$DR(*%aQ?qjvoeIX>EpW~kZIL?F9Js7@=fbPoxlbC@$4-~uB&>55g
z4;9t`VK)F&SVI|j;y4~ETJDxM9Q6ypCj>y@B0vUN1U@^?Jy1M%UBw1i0|NX%U-|}u
zMt}n5ky2B%z&p`4K=_dwc?c^8eX1#15U_@DjPtZwEf?ERtD-?pqHv^8fd-f%JTDkz
zJXwSi51OZ15EcwFj>eIijftT56vP^2yjaYY26Rn*Hb^wYQ4|5db8t}$Xov-6rriU5
zC<UOBYt?)uC^PN9h`t|(!OW_{X<J}Ry#E#ijNpPH4Ix*)z|6FR+gGR$X8{oeOIS{^
zr2*eZAPj;L6Lgwk63ooM!yTMI2xdggq#T{lYAWs#3_~@i!Au0f$;xK~&49nrOVmr_
z(C3s8&3K|Sr!Zg`%#fiurWx(-Cg+FD^h?k9y;T6f`ISrsUm%z`(dQn_PWd4-^?{B{
zNT@rYU)UA>@0sc|3H!(&yzq5XVP;;<inAI4m@yS=L-DMJx(xK$RAUg$LiXIns{#LX
z`BYnHPt7TZS0xJwn_Y-%Kyda{e==949012-me~`w3fQQ|zXKY%yHhP`>TZB&tgl9Q
i1VqDLjqVEETz>%(Gcw2;GSzng0000<MNUMnLSTZZ0?WMs

literal 0
HcmV?d00001

diff --git a/graphics/tm_case/unk_8E845D8.png b/graphics/tm_case/unk_8E845D8.png
deleted file mode 100644
index 2729ac568c00a627399512663d9011085854800a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 951
zcmV;o14#UdP)<h;3K|Lk000e1NJLTq002M$003YF00000O<u+|000AiNkl<ZNQuRk
zy>HV%7{;%(3Y9t-BT=DDl?{88b2fx3;Yf^Wl9L!SnU$r4u^mt{qD<-74OuGco~>Ph
zg%u;gh!iWzKVaUE^TnU7sE~N3i~W0_d!Lj2#v%dv1x-<>j{}sb2lh9>v`YUCuu1j6
zX$4TUOn<%}kKcX<l>mX-olbFm1`^Zvic|%#gUSOA>dDKD!wo>C16Iv)4uu}D>MG}u
zNrBNy4oIifwARPvXo*<{m@z;yK!pQIYULcxW(T4qcCb0YRRzHN+WXw~%rSe5ZQ6<*
zv;~|%2I$cFXa{~$&N32$Pf%<s^pPsn<IQgc^cE&>3D{*|qasjJ4FCyRRe-G};KE52
zV45$+ss(}?nJpGI0^n8aMu$|U<OBZN<La!^iuoAzCK!pv2v;VruAh(J(PMD3Wk0x2
z&qEr=)H86}48xB(K-Z6tVI9Y@ZHHkP$G;rfJE;++z`{BJJ#TTCk2emK-=Zb1$l(%V
zHnfAzpR9zn!WE(coCKX2-7n;~$l-XR9m@IHK}|#p9V+s-&|&M*MBu$6SIQ`gnl_Y2
z(Kp%BeIX>EpQDEW#PQGOIh0=@p!-UJzQe$I2o@K{VLmPbAzBy*2wMWs!Z;LxuW=lr
z#WK3q4#$%m@EifKh!7wLl?R^1@o%vB6h)F9;0y=|?meBP5Htc5FyE!@p$ps-ixlu)
zP$NI!#Gp^vLl*>$gEzo^mdj;?ZOBI6LG@j4DA58PU<Yq6=b)T^+fz7bzGwq4=b#*S
z;L7fR2)a)}jDvF8?T*xdRxe-&g$|DEx&ZJVENTHA96_1s>483^1W>AtRi_~+Gd+JU
zT_1RU*I0SIg}|2h`D+s}gbxgr5~>jh%uG-4VjJzfu1^HP3XW4;Yaj>^@O*#B1Whx1
zH!(B6hnKj&?{|slDm6UBC<yfUJsimn6*J-chmC+8Xa{_gchFv?9_gG)R!(1MwxD3-
zcafnzdid%C!1*C_LKS@9SOCEJrLqzpj7%Krxd(HA@<V3o18a8he`GJ6v<OgUJ(IAH
z?BE4pB{4IfX2q;V0Cu#JjYED`!}T3s&!!rOWR=UF`S4o9pDs<aOm-`sa`>rafW%}^
zl4>B~?3Ny&>8DZ#fbl5OWi?RJ`riTT%(qkJU-~-pX>>OrSszqh{|g{lXFiSY25eMy
Z{|~29B7fdUcNzcy002ovPDHLkV1h#Lu$TY<

diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 0aa81586d..d9ac26cfa 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -100,13 +100,13 @@ graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
 	$(GFX) $< $@ -num_colors 224
 
 graphics/pokemon_jump/bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 63
+	$(GFX) $< $@ -num_tiles 63 -Wnum_tiles
 
 $(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 29
+	$(GFX) $< $@ -num_tiles 29 -Wnum_tiles
 
 $(MISCGFXDIR)/markings2.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 25
+	$(GFX) $< $@ -num_tiles 25 -Wnum_tiles
 
 $(INTERFACEGFXDIR)/menu.gbapal: $(INTERFACEGFXDIR)/menu_0.gbapal \
 						$(INTERFACEGFXDIR)/menu_1.gbapal
@@ -150,13 +150,13 @@ $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 353
+	$(GFX) $< $@ -num_tiles 353 -Wnum_tiles
 
 $(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 5
+	$(GFX) $< $@ -num_tiles 5 -Wnum_tiles
 
 $(BATINTGFXDIR)/level_up_banner.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 36
+	$(GFX) $< $@ -num_tiles 36 -Wnum_tiles
 
 $(BATINTGFXDIR)/window.gbapal: $(BATINTGFXDIR)/window1.gbapal $(BATINTGFXDIR)/window2.gbapal
 	cat $^ > $@
@@ -175,7 +175,7 @@ $(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \
 	@cat $^ >$@
 
 $(UNKNOWNGFXDIR)/unknown_D196E4.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 36
+	$(GFX) $< $@ -num_tiles 36 -Wnum_tiles
 
 $(BTLANMSPRGFXDIR)/ice_crystals.4bpp: $(BTLANMSPRGFXDIR)/ice_crystals_0.4bpp \
 						  $(BTLANMSPRGFXDIR)/ice_crystals_1.4bpp \
@@ -197,13 +197,13 @@ $(BTLANMSPRGFXDIR)/spark.4bpp: $(BTLANMSPRGFXDIR)/spark_0.4bpp \
 	@cat $^ >$@
 
 $(MASKSGFXDIR)/unknown_D2EC24.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 14
+	$(GFX) $< $@ -num_tiles 14 -Wnum_tiles
 
 $(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 16
+	$(GFX) $< $@ -num_tiles 16 -Wnum_tiles
 
 $(INTERFACEGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 62
+	$(GFX) $< $@ -num_tiles 62 -Wnum_tiles
 
 $(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp)
 	@cat $^ >$@
@@ -214,29 +214,29 @@ $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \
 	@cat $^ >$@
 
 $(INTERFACEGFXDIR)/bag_screen.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/rayquaza.8bpp: %.8bpp: %.png
-	$(GFX) $< $@ -num_tiles 227
+	$(GFX) $< $@ -num_tiles 227 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/overcast.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 313
+	$(GFX) $< $@ -num_tiles 313 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/rayquaza_fly1.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 124
+	$(GFX) $< $@ -num_tiles 124 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/rayquaza_tail.4bpp
 	cp $< $@
 	head -c 12 /dev/zero >> $@
 
 $(RAYQUAZAGFXDIR)/chase_streaks.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 19
+	$(GFX) $< $@ -num_tiles 19 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/rayquaza_chase.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 155
+	$(GFX) $< $@ -num_tiles 155 -Wnum_tiles
 
 graphics/picture_frame/frame5.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 86
+	$(GFX) $< $@ -num_tiles 86 -Wnum_tiles
 
 $(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \
 									  $(ROULETTEGFXDIR)/tailow.4bpp
@@ -249,10 +249,10 @@ $(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \
 	@cat $^ >$@
 
 $(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 
 $(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 938
+	$(GFX) $< $@ -num_tiles 938 -Wnum_tiles
 
 $(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
 										 $(BATTRANSGFXDIR)/frontier_squares_1.4bpp
@@ -275,16 +275,16 @@ $(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 822
+	$(GFX) $< $@ -num_tiles 822 -Wnum_tiles
 
 $(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 55
+	$(GFX) $< $@ -num_tiles 55 -Wnum_tiles
 
 $(PSSGFXDIR)/forest.4bpp: $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/city_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 52
+	$(GFX) $< $@ -num_tiles 52 -Wnum_tiles
 
 $(PSSGFXDIR)/city.4bpp: $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp
 	@cat $^ >$@
@@ -293,97 +293,97 @@ $(PSSGFXDIR)/desert.4bpp: $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.
 	@cat $^ >$@
 
 $(PSSGFXDIR)/savanna_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 45
+	$(GFX) $< $@ -num_tiles 45 -Wnum_tiles
 
 $(PSSGFXDIR)/savanna_bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 23
+	$(GFX) $< $@ -num_tiles 23 -Wnum_tiles
 
 $(PSSGFXDIR)/savanna.4bpp: $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/crag_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 49
+	$(GFX) $< $@ -num_tiles 49 -Wnum_tiles
 
 $(PSSGFXDIR)/crag.4bpp: $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/volcano_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 56
+	$(GFX) $< $@ -num_tiles 56 -Wnum_tiles
 
 $(PSSGFXDIR)/volcano.4bpp: $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/snow_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 57
+	$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
 
 $(PSSGFXDIR)/snow.4bpp: $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/cave_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 55
+	$(GFX) $< $@ -num_tiles 55 -Wnum_tiles
 
 $(PSSGFXDIR)/cave.4bpp: $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/beach_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 46
+	$(GFX) $< $@ -num_tiles 46 -Wnum_tiles
 
 $(PSSGFXDIR)/beach_bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 23
+	$(GFX) $< $@ -num_tiles 23 -Wnum_tiles
 
 $(PSSGFXDIR)/beach.4bpp: $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/seafloor_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 54
+	$(GFX) $< $@ -num_tiles 54 -Wnum_tiles
 
 $(PSSGFXDIR)/seafloor.4bpp: $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/river_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 51
+	$(GFX) $< $@ -num_tiles 51 -Wnum_tiles
 
 $(PSSGFXDIR)/river_bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 11
+	$(GFX) $< $@ -num_tiles 11 -Wnum_tiles
 
 $(PSSGFXDIR)/river.4bpp: $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/sky_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 45
+	$(GFX) $< $@ -num_tiles 45 -Wnum_tiles
 
 $(PSSGFXDIR)/sky.4bpp: $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/polkadot_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 54
+	$(GFX) $< $@ -num_tiles 54 -Wnum_tiles
 
 $(PSSGFXDIR)/polkadot.4bpp: $(PSSGFXDIR)/polkadot_frame.4bpp $(PSSGFXDIR)/polkadot_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/pokecenter_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 35
+	$(GFX) $< $@ -num_tiles 35 -Wnum_tiles
 
 $(PSSGFXDIR)/pokecenter.4bpp: $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/machine_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 33
+	$(GFX) $< $@ -num_tiles 33 -Wnum_tiles
 
 $(PSSGFXDIR)/machine.4bpp: $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/plain_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 18
+	$(GFX) $< $@ -num_tiles 18 -Wnum_tiles
 
 $(PSSGFXDIR)/plain.4bpp: $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/friends_frame1.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 57
+	$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
 
 $(PSSGFXDIR)/friends_frame2.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 57
+	$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
 
 $(PSSGFXDIR)/zigzagoon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/zigzagoon_bg.4bpp
 	@cat $^ >$@
@@ -449,70 +449,70 @@ $(FIELDEFFECTSGFXDIR)/pics/tree_disguise.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 8
+	$(GFX) $< $@ -num_tiles 8 -Wnum_tiles
 	
 $(BATTRANSGFXDIR)/frontier_transition.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 43
+	$(GFX) $< $@ -num_tiles 43 -Wnum_tiles
 
-graphics/tm_case/unk_8E845D8.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 91
+graphics/tm_case/tm_case.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 91 -Wnum_tiles
 
 $(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 
 $(PKNAVGFXDIR)/outline.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 	
 $(PKNAVGFXDIR)/ui_matchcall.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 13
+	$(GFX) $< $@ -num_tiles 13 -Wnum_tiles
 
 $(INTERFACEGFXDIR)/region_map.8bpp: %.8bpp: %.png
-	$(GFX) $< $@ -num_tiles 232
+	$(GFX) $< $@ -num_tiles 232 -Wnum_tiles
 
 $(INTERFACEGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
-	$(GFX) $< $@ -num_tiles 233
+	$(GFX) $< $@ -num_tiles 233 -Wnum_tiles
 
 $(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp
 	@cat $^ >$@
 	
 $(FAMECHECKERGFXDIR)/spinning_pokeball.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 15
+	$(GFX) $< $@ -num_tiles 15 -Wnum_tiles
 
 $(FAMECHECKERGFXDIR)/bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 165
+	$(GFX) $< $@ -num_tiles 165 -Wnum_tiles
 
 graphics/seagallop/water.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 41
+	$(GFX) $< $@ -num_tiles 41 -Wnum_tiles
 
 graphics/link/321start.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
 $(TEXTWINDOWGFXDIR)/unk_8470B0C.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 19
+	$(GFX) $< $@ -num_tiles 19 -Wnum_tiles
 
 $(SLOTMACHINEGFXDIR)/unk_8466620.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 66
+	$(GFX) $< $@ -num_tiles 66 -Wnum_tiles
 
 $(SLOTMACHINEGFXDIR)/unk_84659d0.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 138
+	$(GFX) $< $@ -num_tiles 138 -Wnum_tiles
 
 $(TEACHYTVGFXDIR)/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 233
+	$(GFX) $< $@ -num_tiles 233 -Wnum_tiles
 
-$(SSANNEGFXDIR)/unk_8479A38.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 17
+$(SSANNEGFXDIR)/smoke.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 17 -Wnum_tiles
 
-$(ITEMPCGFXDIR)/unk_8E85090.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 82
+$(ITEMPCGFXDIR)/bg.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 82 -Wnum_tiles
 
 $(TITLESCREENGFXDIR)/firered/box_art_mon.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 135
+	$(GFX) $< $@ -num_tiles 135 -Wnum_tiles
 
 $(TITLESCREENGFXDIR)/leafgreen/box_art_mon.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 123
+	$(GFX) $< $@ -num_tiles 123 -Wnum_tiles
 
 $(CREDITSGFXDIR)/unk_8EAE548.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 77
+	$(GFX) $< $@ -num_tiles 77 -Wnum_tiles
 
 POKEDEXAREAMARKERSDATADIR := graphics/pokedex/area_markers
 
@@ -535,188 +535,188 @@ graphics/misc/emoticons.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
 $(ITEMMENUGFXDIR)/bag_tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 55
+	$(GFX) $< $@ -num_tiles 55 -Wnum_tiles
 
 $(INTROGFXDIR)/scene_1/grass.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 397
+	$(GFX) $< $@ -num_tiles 397 -Wnum_tiles
 
 $(INTROGFXDIR)/scene_2/plants.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 17
+	$(GFX) $< $@ -num_tiles 17 -Wnum_tiles
 
 $(INTROGFXDIR)/scene_2/nidorino_close.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 170
+	$(GFX) $< $@ -num_tiles 170 -Wnum_tiles
 
 $(INTROGFXDIR)/scene_2/gengar_close.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 114
+	$(GFX) $< $@ -num_tiles 114 -Wnum_tiles
 
 $(INTROGFXDIR)/scene_3/gengar_anim.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 348
+	$(GFX) $< $@ -num_tiles 348 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/building/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 77
+	$(GFX) $< $@ -num_tiles 77 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/cave/anim.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 106
+	$(GFX) $< $@ -num_tiles 106 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/cave/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 84
+	$(GFX) $< $@ -num_tiles 84 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/grass/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 98
+	$(GFX) $< $@ -num_tiles 98 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/indoor/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 77
+	$(GFX) $< $@ -num_tiles 77 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/longgrass/anim.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 133
+	$(GFX) $< $@ -num_tiles 133 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/longgrass/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 98
+	$(GFX) $< $@ -num_tiles 98 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/mountain/anim.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 47
+	$(GFX) $< $@ -num_tiles 47 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/pond/anim.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 36
+	$(GFX) $< $@ -num_tiles 36 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/pond/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 75
+	$(GFX) $< $@ -num_tiles 75 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/sand/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 83
+	$(GFX) $< $@ -num_tiles 83 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/underwater/anim.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 26
+	$(GFX) $< $@ -num_tiles 26 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/underwater/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 85
+	$(GFX) $< $@ -num_tiles 85 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/water/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 81
+	$(GFX) $< $@ -num_tiles 81 -Wnum_tiles
 
 $(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 52
+	$(GFX) $< $@ -num_tiles 52 -Wnum_tiles
 
 $(HALLOFFAMEGFXDIR)/hall_of_fame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 29
+	$(GFX) $< $@ -num_tiles 29 -Wnum_tiles
 
 $(TILESETGFXDIR)/primary/general/anim/water_current_landwatersedge/7.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 47
+	$(GFX) $< $@ -num_tiles 47 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/altering_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 391
+	$(GFX) $< $@ -num_tiles 391 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/berry_forest/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 395
+	$(GFX) $< $@ -num_tiles 395 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/digletts_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 398
+	$(GFX) $< $@ -num_tiles 398 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/dotted_hole/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 317
+	$(GFX) $< $@ -num_tiles 317 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/icefall_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 399
+	$(GFX) $< $@ -num_tiles 399 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/lost_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 404
+	$(GFX) $< $@ -num_tiles 404 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/monean_chamber/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 326
+	$(GFX) $< $@ -num_tiles 326 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/mt_ember/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 355
+	$(GFX) $< $@ -num_tiles 355 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/mt_moon/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 364
+	$(GFX) $< $@ -num_tiles 364 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/pokemon_mansion/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 388
+	$(GFX) $< $@ -num_tiles 388 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/pokemon_tower/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 290
+	$(GFX) $< $@ -num_tiles 290 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/power_plant/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 368
+	$(GFX) $< $@ -num_tiles 368 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/rock_tunnel/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 407
+	$(GFX) $< $@ -num_tiles 407 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/rocket_hideout/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 194
+	$(GFX) $< $@ -num_tiles 194 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/rocket_warehouse/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 234
+	$(GFX) $< $@ -num_tiles 234 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/safari_zone/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 330
+	$(GFX) $< $@ -num_tiles 330 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/seafoam_islands/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 408
+	$(GFX) $< $@ -num_tiles 408 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/silph_co/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 355
+	$(GFX) $< $@ -num_tiles 355 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/victory_road/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 375
+	$(GFX) $< $@ -num_tiles 375 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/viridian_forest/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 389
+	$(GFX) $< $@ -num_tiles 389 -Wnum_tiles
 
 $(NAMINGGFXDIR)/cursor.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 5
+	$(GFX) $< $@ -num_tiles 5 -Wnum_tiles
 
 $(NAMINGGFXDIR)/cursor_squished.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 5
+	$(GFX) $< $@ -num_tiles 5 -Wnum_tiles
 
 $(NAMINGGFXDIR)/cursor_filled.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 5
+	$(GFX) $< $@ -num_tiles 5 -Wnum_tiles
 
 
 $(WALLPAPERGFXDIR)/beach/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 60
+	$(GFX) $< $@ -num_tiles 60 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 61
+	$(GFX) $< $@ -num_tiles 61 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 40
+	$(GFX) $< $@ -num_tiles 40 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/crag/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 54
+	$(GFX) $< $@ -num_tiles 54 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/desert/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 52
+	$(GFX) $< $@ -num_tiles 52 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/forest/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/pokecenter/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 57
+	$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/river/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 63
+	$(GFX) $< $@ -num_tiles 63 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/savanna/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 45
+	$(GFX) $< $@ -num_tiles 45 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/seafloor/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/simple/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 25
+	$(GFX) $< $@ -num_tiles 25 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/sky/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 52
+	$(GFX) $< $@ -num_tiles 52 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/snow/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 51
+	$(GFX) $< $@ -num_tiles 51 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/stars/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 37
+	$(GFX) $< $@ -num_tiles 37 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/tiles/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 31
+	$(GFX) $< $@ -num_tiles 31 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/volcano/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 57
+	$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
diff --git a/include/graphics.h b/include/graphics.h
index c486aa058..5efc885bc 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2866,15 +2866,15 @@ extern const u16 gFameCheckerBg3Tilemap[0x400];
 extern const u16 gFameCheckerBg2Tilemap[0x400];
 
 // tm_case
-extern const u32 gUnknown_8E845D8[];
-extern const u32 gUnknown_8E84A24[];
-extern const u32 gUnknown_8E84B70[];
-extern const u32 gUnknown_8E84CB0[];
-extern const u32 gUnknown_8E84D20[];
-extern const u32 gTMCase_TMSpriteGfx[];
-extern const u32 gUnknown_8E84F20[];
-extern const u32 gUnknown_8E85068[];
-extern const u8 gUnknown_8E99118[];
+extern const u32 gTMCase_Gfx[];
+extern const u32 gTMCaseMenu_Tilemap[];
+extern const u32 gTMCase_Tilemap[];
+extern const u32 gTMCaseMenu_Male_Pal[];
+extern const u32 gTMCaseMenu_Female_Pal[];
+extern const u32 gTMCaseDisc_Gfx[];
+extern const u32 gTMCaseDiscTypes1_Pal[];
+extern const u32 gTMCaseDiscTypes2_Pal[];
+extern const u8 gTMCaseHM_Gfx[];
 extern const u16 gTMCaseMainWindowPalette[];
 
 // egg_hatch
diff --git a/src/graphics.c b/src/graphics.c
index 440083539..b4ab91a60 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1123,18 +1123,18 @@ const u32 gBag_Pal[] = INCBIN_U32("graphics/interface/bag.gbapal.lz");
 const u32 gSwapLine_Gfx[] = INCBIN_U32("graphics/interface/bag_swap.4bpp.lz");
 const u32 gSwapLine_Pal[] = INCBIN_U32("graphics/interface/bag_swap.gbapal.lz");
 
-const u32 gUnknown_8E845D8[] = INCBIN_U32("graphics/tm_case/unk_8E845D8.4bpp.lz");
-const u32 gUnknown_8E84A24[] = INCBIN_U32("graphics/tm_case/unk_8E84A24.bin.lz");
-const u32 gUnknown_8E84B70[] = INCBIN_U32("graphics/tm_case/unk_8E84B70.bin.lz");
-const u32 gUnknown_8E84CB0[] = INCBIN_U32("graphics/tm_case/unk_8E84CB0.gbapal.lz");
-const u32 gUnknown_8E84D20[] = INCBIN_U32("graphics/tm_case/unk_8E84D20.gbapal.lz");
-const u32 gTMCase_TMSpriteGfx[] = INCBIN_U32("graphics/tm_case/unk_8E84D90.4bpp.lz");
-const u32 gUnknown_8E84F20[] = INCBIN_U32("graphics/tm_case/unk_8E84F20.gbapal.lz");
-const u32 gUnknown_8E85068[] = INCBIN_U32("graphics/tm_case/unk_8E85068.gbapal.lz");
+const u32 gTMCase_Gfx[] = INCBIN_U32("graphics/tm_case/tm_case.4bpp.lz");
+const u32 gTMCaseMenu_Tilemap[] = INCBIN_U32("graphics/tm_case/menu.bin.lz");
+const u32 gTMCase_Tilemap[] = INCBIN_U32("graphics/tm_case/tm_case.bin.lz");
+const u32 gTMCaseMenu_Male_Pal[] = INCBIN_U32("graphics/tm_case/menu_male.gbapal.lz");
+const u32 gTMCaseMenu_Female_Pal[] = INCBIN_U32("graphics/tm_case/menu_female.gbapal.lz");
+const u32 gTMCaseDisc_Gfx[] = INCBIN_U32("graphics/tm_case/disc.4bpp.lz");
+const u32 gTMCaseDiscTypes1_Pal[] = INCBIN_U32("graphics/tm_case/disc_types_1.gbapal.lz");
+const u32 gTMCaseDiscTypes2_Pal[] = INCBIN_U32("graphics/tm_case/disc_types_2.gbapal.lz");
 
-const u8 gItemPcTiles[] = INCBIN_U8("graphics/item_pc/unk_8E85090.4bpp.lz");
-const u32 gItemPcBgPals[] = INCBIN_U32("graphics/item_pc/unk_8E85408.gbapal.lz");
-const u8 gItemPcTilemap[] = INCBIN_U8("graphics/item_pc/unk_8E85458.bin.lz");
+const u8 gItemPcTiles[] = INCBIN_U8("graphics/item_pc/bg.4bpp.lz");
+const u32 gItemPcBgPals[] = INCBIN_U32("graphics/item_pc/bg.gbapal.lz");
+const u8 gItemPcTilemap[] = INCBIN_U8("graphics/item_pc/bg.bin.lz");
 
 const u32 gBerryPouchSpriteTiles[] = INCBIN_U32("graphics/berry_pouch/berry_pouch.4bpp.lz");
 const u8 gBerryPouchBgGfx[] = INCBIN_U8("graphics/berry_pouch/background.4bpp.lz");
@@ -1212,7 +1212,7 @@ const u32 gNamingScreenPageSwapButton_Gfx[] = INCBIN_U32("graphics/naming_screen
 const u32 gNamingScreenInputArrow_Gfx[]     = INCBIN_U32("graphics/naming_screen/input_arrow.4bpp");
 const u32 gNamingScreenUnderscore_Gfx[]     = INCBIN_U32("graphics/naming_screen/underscore.4bpp");
 
-const u8 gUnknown_8E99118[] = INCBIN_U8("graphics/tm_case/unk_8E99118.4bpp");
+const u8 gTMCaseHM_Gfx[] = INCBIN_U8("graphics/tm_case/hm.4bpp");
 
 const u16 gKantoTrainerCard_Pal[] = INCBIN_U16("graphics/trainer_card/0star.gbapal");
 const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card.4bpp.lz");
diff --git a/src/ss_anne.c b/src/ss_anne.c
index ce46bc6f6..71335915a 100644
--- a/src/ss_anne.c
+++ b/src/ss_anne.c
@@ -18,8 +18,8 @@ static void WakeSpriteCallback(struct Sprite *sprite);
 static void CreateSmokeSprite(void);
 static void SmokeSpriteCallback(struct Sprite *sprite);
 
-static const u16 sWakeTiles[] = INCBIN_U16("graphics/ss_anne/unk_8479838.4bpp");
-static const u16 sSmokeTiles[] = INCBIN_U16("graphics/ss_anne/unk_8479A38.4bpp");
+static const u16 sWakeTiles[] = INCBIN_U16("graphics/ss_anne/wake.4bpp");
+static const u16 sSmokeTiles[] = INCBIN_U16("graphics/ss_anne/smoke.4bpp");
 
 static const struct SpriteSheet sSpriteSheets[] = {
     {(const void *)sWakeTiles, sizeof(sWakeTiles), SPRITE_TAG_WAKE},
diff --git a/src/tm_case.c b/src/tm_case.c
index 73807c670..8ef9e7fbb 100644
--- a/src/tm_case.c
+++ b/src/tm_case.c
@@ -226,7 +226,7 @@ static const union AnimCmd *const sTMSpriteAnims[] = {
 };
 
 static const struct CompressedSpriteSheet sTMSpriteSheet = {
-    (const void *)gTMCase_TMSpriteGfx,
+    (const void *)gTMCaseDisc_Gfx,
     0x400,
     TM_CASE_TM_TAG
 };
@@ -241,7 +241,7 @@ static const struct SpriteTemplate sTMSpriteTemplate = {
     SpriteCallbackDummy
 };
 
-static const u16 sTMSpritePaletteOffsetByType[] = {
+static const u16 sTMSpritePaletteOffsetByType[NUMBER_OF_MON_TYPES] = {
     [TYPE_NORMAL]   = 0x000,
     [TYPE_FIRE]     = 0x010,
     [TYPE_WATER]    = 0x020,
@@ -440,25 +440,25 @@ static bool8 HandleLoadTMCaseGraphicsAndPalettes(void)
     {
     case 0:
         ResetTempTileDataBuffers();
-        DecompressAndCopyTileDataToVram(1, gUnknown_8E845D8, 0, 0, 0);
+        DecompressAndCopyTileDataToVram(1, gTMCase_Gfx, 0, 0, 0);
         sTMCaseDynamicResources->seqId++;
         break;
     case 1:
         if (FreeTempTileDataBuffersIfPossible() != TRUE)
         {
-            LZDecompressWram(gUnknown_8E84A24, sTilemapBuffer);
+            LZDecompressWram(gTMCaseMenu_Tilemap, sTilemapBuffer);
             sTMCaseDynamicResources->seqId++;
         }
         break;
     case 2:
-        LZDecompressWram(gUnknown_8E84B70, GetBgTilemapBuffer(1));
+        LZDecompressWram(gTMCase_Tilemap, GetBgTilemapBuffer(1));
         sTMCaseDynamicResources->seqId++;
         break;
     case 3:
         if (gSaveBlock2Ptr->playerGender == MALE)
-            LoadCompressedPalette(gUnknown_8E84CB0, 0, 0x80);
+            LoadCompressedPalette(gTMCaseMenu_Male_Pal, 0, 0x80);
         else
-            LoadCompressedPalette(gUnknown_8E84D20, 0, 0x80);
+            LoadCompressedPalette(gTMCaseMenu_Female_Pal, 0, 0x80);
         sTMCaseDynamicResources->seqId++;
         break;
     case 4:
@@ -1387,7 +1387,7 @@ static void TMCase_MoveCursor_UpdatePrintedTMInfo(u16 itemId)
 
 static void PlaceHMTileInWindow(u8 windowId, u8 x, u8 y)
 {
-    BlitBitmapToWindow(windowId, gUnknown_8E99118, x, y, 16, 12);
+    BlitBitmapToWindow(windowId, gTMCaseHM_Gfx, x, y, 16, 12);
 }
 
 static void HandlePrintMoneyOnHand(void)
@@ -1423,7 +1423,7 @@ static void RemoveTMContextMenu(u8 * a0)
 static u8 CreateTMSprite(u16 itemId)
 {
     u8 spriteId = CreateSprite(&sTMSpriteTemplate, 0x29, 0x2E, 0);
-    u8 r5;
+    u8 tmIdx;
     if (itemId == ITEM_NONE)
     {
         UpdateTMSpritePosition(&gSprites[spriteId], 0xFF);
@@ -1431,17 +1431,17 @@ static u8 CreateTMSprite(u16 itemId)
     }
     else
     {
-        r5 = itemId - 33;
-        SetTMSpriteAnim(&gSprites[spriteId], r5);
+        tmIdx = itemId - ITEM_TM01;
+        SetTMSpriteAnim(&gSprites[spriteId], tmIdx);
         TintTMSpriteByType(gBattleMoves[ItemIdToBattleMoveId(itemId)].type);
-        UpdateTMSpritePosition(&gSprites[spriteId], r5);
+        UpdateTMSpritePosition(&gSprites[spriteId], tmIdx);
         return spriteId;
     }
 }
 
 static void SetTMSpriteAnim(struct Sprite *sprite, u8 idx)
 {
-    if (idx >= 50)
+    if (idx >= NUM_TECHNICAL_MACHINES)
         StartSpriteAnim(sprite, 1);
     else
         StartSpriteAnim(sprite, 0);
@@ -1517,14 +1517,17 @@ static void SpriteCB_MoveTMSpriteInCase(struct Sprite *sprite)
     }
 }
 
+// - 1 excludes TYPE_MYSTERY
+#define NUM_TM_COLORS ((NUMBER_OF_MON_TYPES - 1) * 16)
+
 static void LoadTMTypePalettes(void)
 {
     struct SpritePalette spritePalette;
 
-    sTMSpritePaletteBuffer = Alloc(0x110 * sizeof(u16));
-    LZDecompressWram(gUnknown_8E84F20, sTMSpritePaletteBuffer);
-    LZDecompressWram(gUnknown_8E85068, sTMSpritePaletteBuffer + 0x100);
-    spritePalette.data = sTMSpritePaletteBuffer + 0x110;
+    sTMSpritePaletteBuffer = Alloc(NUM_TM_COLORS * sizeof(u16));
+    LZDecompressWram(gTMCaseDiscTypes1_Pal, sTMSpritePaletteBuffer); // Decompress the first 16
+    LZDecompressWram(gTMCaseDiscTypes2_Pal, sTMSpritePaletteBuffer + 0x100); // Decompress the rest (Only 17 total, this is just Dragon type)
+    spritePalette.data = sTMSpritePaletteBuffer + NUM_TM_COLORS;
     spritePalette.tag = TM_CASE_TM_TAG;
     LoadSpritePalette(&spritePalette);
 }
diff --git a/tileset_rules.mk b/tileset_rules.mk
index 707bceb8d..a868248cf 100644
--- a/tileset_rules.mk
+++ b/tileset_rules.mk
@@ -1,202 +1,202 @@
 TILESETGFXDIR := data/tilesets
 
 $(TILESETGFXDIR)/primary/building/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 640
+	$(GFX) $< $@ -num_tiles 640 -Wnum_tiles
 
 $(TILESETGFXDIR)/primary/general/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 640
+	$(GFX) $< $@ -num_tiles 640 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pallet_town/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 76
+	$(GFX) $< $@ -num_tiles 76 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/lavender_town/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 256
+	$(GFX) $< $@ -num_tiles 256 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cinnabar_island/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 128
+	$(GFX) $< $@ -num_tiles 128 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 376
+	$(GFX) $< $@ -num_tiles 376 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cable_club/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 632
+	$(GFX) $< $@ -num_tiles 632 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/fuchsia_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 92
+	$(GFX) $< $@ -num_tiles 92 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pewter_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 207
+	$(GFX) $< $@ -num_tiles 207 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/saffron_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 82
+	$(GFX) $< $@ -num_tiles 82 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/viridian_forest/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 101
+	$(GFX) $< $@ -num_tiles 101 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/seafoam_islands/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 318
+	$(GFX) $< $@ -num_tiles 318 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/generic_building_2/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 152
+	$(GFX) $< $@ -num_tiles 152 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/underground_path/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 50
+	$(GFX) $< $@ -num_tiles 50 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/restaurant_hotel/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 76
+	$(GFX) $< $@ -num_tiles 76 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/burgled_house/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 172
+	$(GFX) $< $@ -num_tiles 172 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/berry_forest/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 101
+	$(GFX) $< $@ -num_tiles 101 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/sevii_islands_45/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 374
+	$(GFX) $< $@ -num_tiles 374 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pokemon_league/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 340
+	$(GFX) $< $@ -num_tiles 340 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/viridian_city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 112
+	$(GFX) $< $@ -num_tiles 112 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/vermilion_city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 140
+	$(GFX) $< $@ -num_tiles 140 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/indigo_plateau/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 247
+	$(GFX) $< $@ -num_tiles 247 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 256
+	$(GFX) $< $@ -num_tiles 256 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/bike_shop/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 60
+	$(GFX) $< $@ -num_tiles 60 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/viridian_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 90
+	$(GFX) $< $@ -num_tiles 90 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cerulean_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 119
+	$(GFX) $< $@ -num_tiles 119 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cinnabar_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 146
+	$(GFX) $< $@ -num_tiles 146 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/unused_gatehouse_1/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 144
+	$(GFX) $< $@ -num_tiles 144 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/unused_gatehouse_2/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 144
+	$(GFX) $< $@ -num_tiles 144 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/power_plant/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 80
+	$(GFX) $< $@ -num_tiles 80 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pokemon_tower/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 128
+	$(GFX) $< $@ -num_tiles 128 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/school/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 50
+	$(GFX) $< $@ -num_tiles 50 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/dummy_3/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 2
+	$(GFX) $< $@ -num_tiles 2 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 282
+	$(GFX) $< $@ -num_tiles 282 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/sevii_islands_67/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 374
+	$(GFX) $< $@ -num_tiles 374 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/hall_of_fame/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 208
+	$(GFX) $< $@ -num_tiles 208 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pewter_city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 280
+	$(GFX) $< $@ -num_tiles 280 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/celadon_city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 244
+	$(GFX) $< $@ -num_tiles 244 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/saffron_city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 262
+	$(GFX) $< $@ -num_tiles 262 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/dummy_1/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 2
+	$(GFX) $< $@ -num_tiles 2 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/generic_building_1/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 63
+	$(GFX) $< $@ -num_tiles 63 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/hoenn_building/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 383
+	$(GFX) $< $@ -num_tiles 383 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/vermilion_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 247
+	$(GFX) $< $@ -num_tiles 247 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/ss_anne/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 245
+	$(GFX) $< $@ -num_tiles 245 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/rock_tunnel/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 256
+	$(GFX) $< $@ -num_tiles 256 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cerulean_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 246
+	$(GFX) $< $@ -num_tiles 246 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/sea_cottage/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 68
+	$(GFX) $< $@ -num_tiles 68 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/safari_zone_building/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 90
+	$(GFX) $< $@ -num_tiles 90 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/fan_club_daycare/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 85
+	$(GFX) $< $@ -num_tiles 85 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/dummy_4/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 2
+	$(GFX) $< $@ -num_tiles 2 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/tanoby_ruins/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 74
+	$(GFX) $< $@ -num_tiles 74 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/trainer_tower/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 343
+	$(GFX) $< $@ -num_tiles 343 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cerulean_city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 158
+	$(GFX) $< $@ -num_tiles 158 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/fuchsia_city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 191
+	$(GFX) $< $@ -num_tiles 191 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/mart/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 36
+	$(GFX) $< $@ -num_tiles 36 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/museum/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 137
+	$(GFX) $< $@ -num_tiles 137 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/lab/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 102
+	$(GFX) $< $@ -num_tiles 102 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/game_corner/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 171
+	$(GFX) $< $@ -num_tiles 171 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/celadon_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 103
+	$(GFX) $< $@ -num_tiles 103 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/dummy_2/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 2
+	$(GFX) $< $@ -num_tiles 2 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/digletts_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 248
+	$(GFX) $< $@ -num_tiles 248 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/department_store/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 201
+	$(GFX) $< $@ -num_tiles 201 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pokemon_mansion/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 350
+	$(GFX) $< $@ -num_tiles 350 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/condominiums/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 384
+	$(GFX) $< $@ -num_tiles 384 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/mt_ember/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 288
+	$(GFX) $< $@ -num_tiles 288 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/sevii_islands_123/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 374
+	$(GFX) $< $@ -num_tiles 374 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 165
+	$(GFX) $< $@ -num_tiles 165 -Wnum_tiles