From 8a106a2c6124ce4782584d3c369b0f16ea463103 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Thu, 3 Apr 2014 22:27:59 -0400
Subject: [PATCH] Name the tilesets and give them constants.

Also clean up the tileset macro and remove placeholders/redundant files.
---
 constants.asm                                 |   2 +
 constants/tilesets.asm                        |  25 +
 gfx/blocksets/04.bst                          | Bin 304 -> 0 bytes
 gfx/blocksets/06.bst                          | Bin 592 -> 0 bytes
 gfx/blocksets/07.bst                          | Bin 1856 -> 0 bytes
 gfx/blocksets/0a.bst                          | Bin 2048 -> 0 bytes
 gfx/blocksets/0c.bst                          | Bin 2048 -> 0 bytes
 gfx/blocksets/{11.bst => cavern.bst}          | Bin
 gfx/blocksets/{0f.bst => cemetery.bst}        | Bin
 gfx/blocksets/{15.bst => club.bst}            | Bin
 gfx/blocksets/{16.bst => facility.bst}        | Bin
 gfx/blocksets/{03.bst => forest.bst}          | Bin
 gfx/blocksets/{09.bst => gate.bst}            | Bin
 gfx/blocksets/{05.bst => gym.bst}             | Bin
 gfx/blocksets/{08.bst => house.bst}           | Bin
 gfx/blocksets/{10.bst => interior.bst}        | Bin
 gfx/blocksets/{14.bst => lab.bst}             | Bin
 gfx/blocksets/{12.bst => lobby.bst}           | Bin
 gfx/blocksets/{13.bst => mansion.bst}         | Bin
 gfx/blocksets/{00.bst => overworld.bst}       | Bin
 gfx/blocksets/{17.bst => plateau.bst}         | Bin
 gfx/blocksets/{02.bst => pokecenter.bst}      | Bin
 gfx/blocksets/{01.bst => reds_house.bst}      | Bin
 gfx/blocksets/{0d.bst => ship.bst}            | Bin
 gfx/blocksets/{0e.bst => ship_port.bst}       | Bin
 gfx/blocksets/{0b.bst => underground.bst}     | Bin
 gfx/tilesets/00.png                           | Bin 1325 -> 0 bytes
 gfx/tilesets/01.png                           | Bin 903 -> 0 bytes
 gfx/tilesets/02.png                           | Bin 1212 -> 0 bytes
 gfx/tilesets/03.png                           | Bin 1422 -> 0 bytes
 gfx/tilesets/04.png                           | Bin 903 -> 0 bytes
 gfx/tilesets/05.png                           | Bin 1161 -> 0 bytes
 gfx/tilesets/06.png                           | Bin 1212 -> 0 bytes
 gfx/tilesets/07.png                           | Bin 1161 -> 0 bytes
 gfx/tilesets/08.png                           | Bin 1261 -> 0 bytes
 gfx/tilesets/09.png                           | Bin 1125 -> 0 bytes
 gfx/tilesets/0a.png                           | Bin 1125 -> 0 bytes
 gfx/tilesets/0b.png                           | Bin 269 -> 0 bytes
 gfx/tilesets/0c.png                           | Bin 1125 -> 0 bytes
 gfx/tilesets/0d.png                           | Bin 861 -> 0 bytes
 gfx/tilesets/0e.png                           | Bin 1140 -> 0 bytes
 gfx/tilesets/0f.png                           | Bin 967 -> 0 bytes
 gfx/tilesets/10.png                           | Bin 1177 -> 0 bytes
 gfx/tilesets/11.png                           | Bin 1018 -> 0 bytes
 gfx/tilesets/12.png                           | Bin 1026 -> 0 bytes
 gfx/tilesets/13.png                           | Bin 1012 -> 0 bytes
 gfx/tilesets/14.png                           | Bin 1136 -> 0 bytes
 gfx/tilesets/15.png                           | Bin 911 -> 0 bytes
 gfx/tilesets/16.png                           | Bin 1088 -> 0 bytes
 gfx/tilesets/17.png                           | Bin 1013 -> 0 bytes
 gfx/tilesets/{11.2bpp => cavern.2bpp}         | Bin
 gfx/tilesets/{11.tilecoll => cavern.tilecoll} |   0
 gfx/tilesets/{0f.2bpp => cemetery.2bpp}       | Bin
 .../{0f.tilecoll => cemetery.tilecoll}        |   0
 gfx/tilesets/{15.2bpp => club.2bpp}           | Bin
 gfx/tilesets/{15.tilecoll => club.tilecoll}   |   0
 gfx/tilesets/{16.2bpp => facility.2bpp}       | Bin
 .../{16.tilecoll => facility.tilecoll}        |   0
 gfx/tilesets/{03.2bpp => forest.2bpp}         | Bin
 gfx/tilesets/{03.tilecoll => forest.tilecoll} |   0
 gfx/tilesets/{09.2bpp => gate.2bpp}           | Bin
 gfx/tilesets/{09.tilecoll => gate.tilecoll}   |   0
 gfx/tilesets/{05.2bpp => gym.2bpp}            | Bin
 gfx/tilesets/{05.tilecoll => gym.tilecoll}    |   0
 gfx/tilesets/{08.2bpp => house.2bpp}          | Bin
 gfx/tilesets/{08.tilecoll => house.tilecoll}  |   0
 gfx/tilesets/{10.2bpp => interior.2bpp}       | Bin
 .../{10.tilecoll => interior.tilecoll}        |   0
 gfx/tilesets/{14.2bpp => lab.2bpp}            | Bin
 gfx/tilesets/{14.tilecoll => lab.tilecoll}    |   0
 gfx/tilesets/{12.2bpp => lobby.2bpp}          | Bin
 gfx/tilesets/{12.tilecoll => lobby.tilecoll}  |   0
 gfx/tilesets/{13.2bpp => mansion.2bpp}        | Bin
 .../{13.tilecoll => mansion.tilecoll}         |   0
 gfx/tilesets/{00.2bpp => overworld.2bpp}      | Bin
 .../{00.tilecoll => overworld.tilecoll}       | Bin
 gfx/tilesets/{17.2bpp => plateau.2bpp}        | Bin
 .../{17.tilecoll => plateau.tilecoll}         |   0
 gfx/tilesets/{02.2bpp => pokecenter.2bpp}     | Bin
 .../{02.tilecoll => pokecenter.tilecoll}      |   0
 gfx/tilesets/{01.2bpp => reds_house.2bpp}     | Bin
 .../{01.tilecoll => reds_house.tilecoll}      |   0
 gfx/tilesets/{0d.2bpp => ship.2bpp}           | Bin
 gfx/tilesets/{0d.tilecoll => ship.tilecoll}   |   0
 gfx/tilesets/{0e.2bpp => ship_port.2bpp}      | Bin
 .../{0e.tilecoll => ship_port.tilecoll}       |   0
 gfx/tilesets/{0b.2bpp => underground.2bpp}    | Bin
 .../{0b.tilecoll => underground.tilecoll}     |   0
 macros.asm                                    |  14 +-
 main.asm                                      | 821 +++++++++---------
 90 files changed, 455 insertions(+), 407 deletions(-)
 create mode 100644 constants/tilesets.asm
 delete mode 100755 gfx/blocksets/04.bst
 delete mode 100755 gfx/blocksets/06.bst
 delete mode 100755 gfx/blocksets/07.bst
 delete mode 100755 gfx/blocksets/0a.bst
 delete mode 100755 gfx/blocksets/0c.bst
 rename gfx/blocksets/{11.bst => cavern.bst} (100%)
 rename gfx/blocksets/{0f.bst => cemetery.bst} (100%)
 rename gfx/blocksets/{15.bst => club.bst} (100%)
 rename gfx/blocksets/{16.bst => facility.bst} (100%)
 rename gfx/blocksets/{03.bst => forest.bst} (100%)
 rename gfx/blocksets/{09.bst => gate.bst} (100%)
 rename gfx/blocksets/{05.bst => gym.bst} (100%)
 rename gfx/blocksets/{08.bst => house.bst} (100%)
 rename gfx/blocksets/{10.bst => interior.bst} (100%)
 rename gfx/blocksets/{14.bst => lab.bst} (100%)
 rename gfx/blocksets/{12.bst => lobby.bst} (100%)
 rename gfx/blocksets/{13.bst => mansion.bst} (100%)
 rename gfx/blocksets/{00.bst => overworld.bst} (100%)
 rename gfx/blocksets/{17.bst => plateau.bst} (100%)
 rename gfx/blocksets/{02.bst => pokecenter.bst} (100%)
 rename gfx/blocksets/{01.bst => reds_house.bst} (100%)
 rename gfx/blocksets/{0d.bst => ship.bst} (100%)
 rename gfx/blocksets/{0e.bst => ship_port.bst} (100%)
 rename gfx/blocksets/{0b.bst => underground.bst} (100%)
 delete mode 100755 gfx/tilesets/00.png
 delete mode 100755 gfx/tilesets/01.png
 delete mode 100755 gfx/tilesets/02.png
 delete mode 100755 gfx/tilesets/03.png
 delete mode 100755 gfx/tilesets/04.png
 delete mode 100755 gfx/tilesets/05.png
 delete mode 100755 gfx/tilesets/06.png
 delete mode 100755 gfx/tilesets/07.png
 delete mode 100755 gfx/tilesets/08.png
 delete mode 100755 gfx/tilesets/09.png
 delete mode 100755 gfx/tilesets/0a.png
 delete mode 100755 gfx/tilesets/0b.png
 delete mode 100755 gfx/tilesets/0c.png
 delete mode 100755 gfx/tilesets/0d.png
 delete mode 100755 gfx/tilesets/0e.png
 delete mode 100755 gfx/tilesets/0f.png
 delete mode 100755 gfx/tilesets/10.png
 delete mode 100755 gfx/tilesets/11.png
 delete mode 100755 gfx/tilesets/12.png
 delete mode 100755 gfx/tilesets/13.png
 delete mode 100755 gfx/tilesets/14.png
 delete mode 100755 gfx/tilesets/15.png
 delete mode 100755 gfx/tilesets/16.png
 delete mode 100755 gfx/tilesets/17.png
 rename gfx/tilesets/{11.2bpp => cavern.2bpp} (100%)
 rename gfx/tilesets/{11.tilecoll => cavern.tilecoll} (100%)
 rename gfx/tilesets/{0f.2bpp => cemetery.2bpp} (100%)
 rename gfx/tilesets/{0f.tilecoll => cemetery.tilecoll} (100%)
 rename gfx/tilesets/{15.2bpp => club.2bpp} (100%)
 rename gfx/tilesets/{15.tilecoll => club.tilecoll} (100%)
 rename gfx/tilesets/{16.2bpp => facility.2bpp} (100%)
 rename gfx/tilesets/{16.tilecoll => facility.tilecoll} (100%)
 rename gfx/tilesets/{03.2bpp => forest.2bpp} (100%)
 rename gfx/tilesets/{03.tilecoll => forest.tilecoll} (100%)
 rename gfx/tilesets/{09.2bpp => gate.2bpp} (100%)
 rename gfx/tilesets/{09.tilecoll => gate.tilecoll} (100%)
 rename gfx/tilesets/{05.2bpp => gym.2bpp} (100%)
 rename gfx/tilesets/{05.tilecoll => gym.tilecoll} (100%)
 rename gfx/tilesets/{08.2bpp => house.2bpp} (100%)
 rename gfx/tilesets/{08.tilecoll => house.tilecoll} (100%)
 rename gfx/tilesets/{10.2bpp => interior.2bpp} (100%)
 rename gfx/tilesets/{10.tilecoll => interior.tilecoll} (100%)
 rename gfx/tilesets/{14.2bpp => lab.2bpp} (100%)
 rename gfx/tilesets/{14.tilecoll => lab.tilecoll} (100%)
 rename gfx/tilesets/{12.2bpp => lobby.2bpp} (100%)
 rename gfx/tilesets/{12.tilecoll => lobby.tilecoll} (100%)
 rename gfx/tilesets/{13.2bpp => mansion.2bpp} (100%)
 rename gfx/tilesets/{13.tilecoll => mansion.tilecoll} (100%)
 rename gfx/tilesets/{00.2bpp => overworld.2bpp} (100%)
 rename gfx/tilesets/{00.tilecoll => overworld.tilecoll} (100%)
 rename gfx/tilesets/{17.2bpp => plateau.2bpp} (100%)
 rename gfx/tilesets/{17.tilecoll => plateau.tilecoll} (100%)
 rename gfx/tilesets/{02.2bpp => pokecenter.2bpp} (100%)
 rename gfx/tilesets/{02.tilecoll => pokecenter.tilecoll} (100%)
 rename gfx/tilesets/{01.2bpp => reds_house.2bpp} (100%)
 rename gfx/tilesets/{01.tilecoll => reds_house.tilecoll} (100%)
 rename gfx/tilesets/{0d.2bpp => ship.2bpp} (100%)
 rename gfx/tilesets/{0d.tilecoll => ship.tilecoll} (100%)
 rename gfx/tilesets/{0e.2bpp => ship_port.2bpp} (100%)
 rename gfx/tilesets/{0e.tilecoll => ship_port.tilecoll} (100%)
 rename gfx/tilesets/{0b.2bpp => underground.2bpp} (100%)
 rename gfx/tilesets/{0b.tilecoll => underground.tilecoll} (100%)

diff --git a/constants.asm b/constants.asm
index 85990c48..9c386c81 100644
--- a/constants.asm
+++ b/constants.asm
@@ -27,3 +27,5 @@ INCLUDE "constants/map_dimensions.asm"
 INCLUDE "constants/connection_constants.asm"
 INCLUDE "constants/credits_constants.asm"
 INCLUDE "constants/music_constants.asm"
+INCLUDE "constants/tilesets.asm"
+
diff --git a/constants/tilesets.asm b/constants/tilesets.asm
new file mode 100644
index 00000000..e364db76
--- /dev/null
+++ b/constants/tilesets.asm
@@ -0,0 +1,25 @@
+OVERWORLD    EQU 0
+REDS_HOUSE_1 EQU 1
+MART         EQU 2
+FOREST       EQU 3
+REDS_HOUSE_2 EQU 4
+DOJO         EQU 5
+POKECENTER   EQU 6
+GYM          EQU 7
+HOUSE        EQU 8
+FOREST_GATE  EQU 9
+MUSEUM       EQU 10
+UNDERGROUND  EQU 11
+GATE         EQU 12
+SHIP         EQU 13
+SHIP_PORT    EQU 14
+CEMETERY     EQU 15
+INTERIOR     EQU 16
+CAVERN       EQU 17
+LOBBY        EQU 18
+MANSION      EQU 19
+LAB          EQU 20
+CLUB         EQU 21
+FACILITY     EQU 22
+PLATEAU      EQU 23
+
diff --git a/gfx/blocksets/04.bst b/gfx/blocksets/04.bst
deleted file mode 100755
index 6c9f4749ff35108e2df6e6c22094fa71cb8f168b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 304
zcmZXP3r~YU5QKN`jIC8$b7!pYwxHlqtUOvDfPL7i{}uiL{JBElLZV-?nM@|Ln@zJc
z%Zt278)e+Gg?xQu+;xOZq9?`p`-hOul<_DQk{ZxpDNA|2=NqPB24N5qJv<W47di*}
z1K@t7eVd=00=IXq?;QizH?2SH02jlvKj=LNCFdp2GvISs&+4U0>z=;LI3T2M{nzz|
iXgsm(udV9@VG>pE*^0=S0#OX?zJcx$@be2?UIBZPogWJT

diff --git a/gfx/blocksets/06.bst b/gfx/blocksets/06.bst
deleted file mode 100755
index a82460f5b8dc0b749045a9d0e9150eb6a227cc8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 592
zcmZ8fiBiHa5TyzjP1RNlq)kx{k5swQPCW)hMGLebDju!J|Nn&vx>IRpc6Q$G=4Ib*
z5{bpL%oJ;zn}iihrHaMQFBlt+nCtliH=P|wSi&k*DR_j?8qtX!;be;FS_ZJg3l{T>
zcyIp<pPXLOgF_o19UGMKGoFkmp6~g&d@c_>5|(9^nkHabmau86^LlXy;vb)keSJr`
zP%IQ1%|^3SE|pvDRvYTTb9GB2#<u(w8)w&zxh{k2v$;;;<NX9-5LT*{YOP+Yce<S}
z@LctJHxJY4(`~<h|2&($LL7J??;yqE<025}{O^p<+r}H42Hn|(c-%+&SKngu|C{gi
zok|~H;GK9MqHpcroCFry#D=*I70dOwrIRTKX_;uBK`3FJMEedxgmfbEzwg2C0lpu9
Cj7cy6

diff --git a/gfx/blocksets/07.bst b/gfx/blocksets/07.bst
deleted file mode 100755
index 48889bfaf319d141c9559de84f280c43f2f4a4e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1856
zcmah~iE`RN3{9N4Ku!dnLQWttcz}eXjaxH7oVyn^SDTie|Nj@2B3^b)J5zZ!+V`HM
z-PIarZZ2sqTb7Nc=FQmpj3MqB+jBPHS?@%tbS_^gf={KLs8G!1Q|VN?P%IQvX(Ca9
zWhRWl$W#yhe|bjN`lt)Pw@>uqrCs}PMpV=>k;<T7nWfCq#^%OmX36t5Ha!pC%nW0<
z)Z}Tt6V1=(@<iB$=Q)w*<?^1lx9@por;BV-hiGw;NW6|D5>?~o*<|m~6&W3S!g+v^
zhjY*J<x08I>2|u%FRxtpfz9B0<Kba-ZFyyNZEJgH7d+AO3ena!uoDr<xs55~*J`yY
zzjGJv<<%#y%P?RV@;YxAeqk-NM`>!Nj?TcBN<{WZqEZR_K>vx7%tBLafgkk;hX;qP
zcB>8lNb{eA!)CM97G!3EzD_3J^gYr0MjoPok!P@EgB7pqo}4zDH@Aj2v!sG}ts+q;
zr>*wQt?5%76WIgGU_dk)5y2}z80y3K6WIN?=V#gMF{((MjpKMQlrhWuf$LVoY_=K_
z$#7jiFsK^(f%4Fal8n}aDqhX-Gx1ivv&Y@q`q}XlT2JmD>&goM%EP+wvOb^dcsL{)
zk2(9PAAXH1WaD_q{SZa(06IMQ8t>P1m2YMo$1<=Ee!u3v?0VJE=*o}AelQxNUwRU$
zrK<6$PxN$xY3EeIzEJ=BkDtF@z5e_gxZdwKKK6RoN9RZ9clUSqs8?^)8>?&j?ChHF
z1IPC{zK6JegQ#~+B)=bU;_>~&{~y*Tww{a@MQ_xvt%veHzJ2Eh??2%D*84I&ofDNS
SxqPRK??JiZM4hhrLjM78<Iar$

diff --git a/gfx/blocksets/0a.bst b/gfx/blocksets/0a.bst
deleted file mode 100755
index e4c820a45b66c3e461398bd6c97ab12c261e64a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2048
zcmb7F2X|CO6n>ZN?%M^Dc*8acWjBo!$ierL>}C@}QAtjYqK1yJhu%?Cuz=D*5$p;U
zz)tT?6s0RglwMW*E6zCkoq79!<8k)w-gocZ`R<+X&fH~U5)X?fBV%!5%VttC7H6_-
zVn`!1;Gak)6V7k@4osa3HJ;aJ7@@FXl$J5o))5<qvM`mF5!co+MWV!!D5QQ<mIqt|
zaXn%L#b7c6GGC8}DHtRU_`N>M4uyg5^_hWC*s>8n;8*)$@_2}YL8&`4P<YNP6fb7R
z5AlVcU*)ah!>;kwx>(%wTXs=#EM8PBrRm3;lHfHKkHsz9$-B~JCX#>Pt8Aqo@Ri^F
zaPIa)9Ms#De;^Q0d8m2!emdsH;$6C0w$Ate;UG^iTvbt3(NNh?i8G}0HUG^6eprWd
zsjDXA=jAhX>#oi%Q(iuCx9*BJbzJql)bsKU1M?bR@e&aAaqeH#FN=><s#l-Plj<WB
z@iYm&Nm!eN-jt<?Nv4t#;+h(!`g(cKN=le&YKZIW!CSi=;(|`tx0dZY5O*&0`j|pt
zVw~T0IZOqe^m%9zqg4#7gWj+IfQO%as;v$BBabo-8A?2C_=u6t{W0|@C+<Cv>7ho+
zU%42~sno#1eH$C4AL2nOJlqD!9`*qor2_~2Lc$*ihzmR7Lf3Vcx74ynJ$<kH0Q5-I
z^qc;oV*NqhkdHmiG<uAazd=tp`9oZB4YKOa)G?R1OV{!TnVNeNH}=fVL%553uJ5IJ
z*Lqb?-~%Vae>HfJyj7=C)!;$;RXgIj<D$O6#eIVAo_Fi;Lp>yu&VJ*zo1(u)qM>jk
zT3Tk=vVVJh#G$b1FD;8iYwIG>?EafhGbNM6$s|)cEqRx}Qj^wn8tq;86IJJALU<&E
zXGZFNn-J>~Nq1gM$_`xgEge_&IoNd`%8oqUeF*%(-qKQ4(c0Qj2|M<W|C@=ECQq3&
z_r;f%Eno5ahaat3J9XOh885#wZ~hxA-(2<aC!c=i*2j(;KVkNB&%dx}@sg$QzW4qI
z|FwSRtY@Bm^|b{HSHJc4JL}eO`2346zxsOjp1u2y9Y1mM;-$-1zWH|Jru_#Fes}8U
xUrt}WcKycYEnBx8`u>N*XU?Ac_2#YHe{A2ebJveQ9XWdbx8E=P`PZGl{{bNJAaDQx

diff --git a/gfx/blocksets/0c.bst b/gfx/blocksets/0c.bst
deleted file mode 100755
index e4c820a45b66c3e461398bd6c97ab12c261e64a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2048
zcmb7F2X|CO6n>ZN?%M^Dc*8acWjBo!$ierL>}C@}QAtjYqK1yJhu%?Cuz=D*5$p;U
zz)tT?6s0RglwMW*E6zCkoq79!<8k)w-gocZ`R<+X&fH~U5)X?fBV%!5%VttC7H6_-
zVn`!1;Gak)6V7k@4osa3HJ;aJ7@@FXl$J5o))5<qvM`mF5!co+MWV!!D5QQ<mIqt|
zaXn%L#b7c6GGC8}DHtRU_`N>M4uyg5^_hWC*s>8n;8*)$@_2}YL8&`4P<YNP6fb7R
z5AlVcU*)ah!>;kwx>(%wTXs=#EM8PBrRm3;lHfHKkHsz9$-B~JCX#>Pt8Aqo@Ri^F
zaPIa)9Ms#De;^Q0d8m2!emdsH;$6C0w$Ate;UG^iTvbt3(NNh?i8G}0HUG^6eprWd
zsjDXA=jAhX>#oi%Q(iuCx9*BJbzJql)bsKU1M?bR@e&aAaqeH#FN=><s#l-Plj<WB
z@iYm&Nm!eN-jt<?Nv4t#;+h(!`g(cKN=le&YKZIW!CSi=;(|`tx0dZY5O*&0`j|pt
zVw~T0IZOqe^m%9zqg4#7gWj+IfQO%as;v$BBabo-8A?2C_=u6t{W0|@C+<Cv>7ho+
zU%42~sno#1eH$C4AL2nOJlqD!9`*qor2_~2Lc$*ihzmR7Lf3Vcx74ynJ$<kH0Q5-I
z^qc;oV*NqhkdHmiG<uAazd=tp`9oZB4YKOa)G?R1OV{!TnVNeNH}=fVL%553uJ5IJ
z*Lqb?-~%Vae>HfJyj7=C)!;$;RXgIj<D$O6#eIVAo_Fi;Lp>yu&VJ*zo1(u)qM>jk
zT3Tk=vVVJh#G$b1FD;8iYwIG>?EafhGbNM6$s|)cEqRx}Qj^wn8tq;86IJJALU<&E
zXGZFNn-J>~Nq1gM$_`xgEge_&IoNd`%8oqUeF*%(-qKQ4(c0Qj2|M<W|C@=ECQq3&
z_r;f%Eno5ahaat3J9XOh885#wZ~hxA-(2<aC!c=i*2j(;KVkNB&%dx}@sg$QzW4qI
z|FwSRtY@Bm^|b{HSHJc4JL}eO`2346zxsOjp1u2y9Y1mM;-$-1zWH|Jru_#Fes}8U
xUrt}WcKycYEnBx8`u>N*XU?Ac_2#YHe{A2ebJveQ9XWdbx8E=P`PZGl{{bNJAaDQx

diff --git a/gfx/blocksets/11.bst b/gfx/blocksets/cavern.bst
similarity index 100%
rename from gfx/blocksets/11.bst
rename to gfx/blocksets/cavern.bst
diff --git a/gfx/blocksets/0f.bst b/gfx/blocksets/cemetery.bst
similarity index 100%
rename from gfx/blocksets/0f.bst
rename to gfx/blocksets/cemetery.bst
diff --git a/gfx/blocksets/15.bst b/gfx/blocksets/club.bst
similarity index 100%
rename from gfx/blocksets/15.bst
rename to gfx/blocksets/club.bst
diff --git a/gfx/blocksets/16.bst b/gfx/blocksets/facility.bst
similarity index 100%
rename from gfx/blocksets/16.bst
rename to gfx/blocksets/facility.bst
diff --git a/gfx/blocksets/03.bst b/gfx/blocksets/forest.bst
similarity index 100%
rename from gfx/blocksets/03.bst
rename to gfx/blocksets/forest.bst
diff --git a/gfx/blocksets/09.bst b/gfx/blocksets/gate.bst
similarity index 100%
rename from gfx/blocksets/09.bst
rename to gfx/blocksets/gate.bst
diff --git a/gfx/blocksets/05.bst b/gfx/blocksets/gym.bst
similarity index 100%
rename from gfx/blocksets/05.bst
rename to gfx/blocksets/gym.bst
diff --git a/gfx/blocksets/08.bst b/gfx/blocksets/house.bst
similarity index 100%
rename from gfx/blocksets/08.bst
rename to gfx/blocksets/house.bst
diff --git a/gfx/blocksets/10.bst b/gfx/blocksets/interior.bst
similarity index 100%
rename from gfx/blocksets/10.bst
rename to gfx/blocksets/interior.bst
diff --git a/gfx/blocksets/14.bst b/gfx/blocksets/lab.bst
similarity index 100%
rename from gfx/blocksets/14.bst
rename to gfx/blocksets/lab.bst
diff --git a/gfx/blocksets/12.bst b/gfx/blocksets/lobby.bst
similarity index 100%
rename from gfx/blocksets/12.bst
rename to gfx/blocksets/lobby.bst
diff --git a/gfx/blocksets/13.bst b/gfx/blocksets/mansion.bst
similarity index 100%
rename from gfx/blocksets/13.bst
rename to gfx/blocksets/mansion.bst
diff --git a/gfx/blocksets/00.bst b/gfx/blocksets/overworld.bst
similarity index 100%
rename from gfx/blocksets/00.bst
rename to gfx/blocksets/overworld.bst
diff --git a/gfx/blocksets/17.bst b/gfx/blocksets/plateau.bst
similarity index 100%
rename from gfx/blocksets/17.bst
rename to gfx/blocksets/plateau.bst
diff --git a/gfx/blocksets/02.bst b/gfx/blocksets/pokecenter.bst
similarity index 100%
rename from gfx/blocksets/02.bst
rename to gfx/blocksets/pokecenter.bst
diff --git a/gfx/blocksets/01.bst b/gfx/blocksets/reds_house.bst
similarity index 100%
rename from gfx/blocksets/01.bst
rename to gfx/blocksets/reds_house.bst
diff --git a/gfx/blocksets/0d.bst b/gfx/blocksets/ship.bst
similarity index 100%
rename from gfx/blocksets/0d.bst
rename to gfx/blocksets/ship.bst
diff --git a/gfx/blocksets/0e.bst b/gfx/blocksets/ship_port.bst
similarity index 100%
rename from gfx/blocksets/0e.bst
rename to gfx/blocksets/ship_port.bst
diff --git a/gfx/blocksets/0b.bst b/gfx/blocksets/underground.bst
similarity index 100%
rename from gfx/blocksets/0b.bst
rename to gfx/blocksets/underground.bst
diff --git a/gfx/tilesets/00.png b/gfx/tilesets/00.png
deleted file mode 100755
index f264d943e1f4cd7fdbb897ee4cacc250bc0a5974..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1325
zcmV+|1=9M7P)<h;3K|Lk000e1NJLTq000O800Qs=00000#fo#Q000E^Nkl<Zc-nQ9
zZERCz6vuyTtBi_t4Vz)2GLTj6l4Y?U{J=<GsE`FVX15B%puCI{ry)XO_5sXjwnfmy
zfrexqVisS<xD!M$5U8=810rrPAY#x2h@vJmP{>9?Lb_d_bK9;Pj+=i@{`chE^E}W0
zJm*|=ok^jd3(pb`b4a5hgcd*x(V^kgvFNyTyiR-;ylr@%Be#X{>)h_*SRKFBv0*<O
z-k@VE|HSe8jU+L`Cx!Q%M2m@?uv`MYmxPVpP?{GDw{0L4B4Akcs7Or{s60uc8T(nJ
zQ}3j%nLs^tDn1}~e0~+vY{Z0`C66;P0rqZj1~k^dT0d)*b*5pLQ!@>J1yqnoqr1Y$
zJj$I&dX*o=-bt^Ra56l|;4poC{5+FiYKXN>jxQHa4kgj&HwkMG>)&vIjxM@7IM5(a
zM7=7fX&(h!*xiiH%#MDt4>IEjCEws*f&V>GOkss#R~yzApfEIv4UE%VY&!ur?fDZl
zS5S}gh;D(5<^dyvCqRCo)Iz@fpH<%`B}&#YnMCo;uvytX1{Cr0E|}Fqm1vc`W<U{t
zB|L%FDVOT@HTIq$9v41l<^BwzXOl2<x1YX)oHukB>X{s4$5C5Sn=!elHi@Ux%m<g4
zb5HR66{fABxmTQH`%fO>QSCE^m-1NV!jpw-2flfDTksS~zlhrH*xby@XNre>J5f8j
z6Su)V8g{j@2t7IxBaitO=9Bz%1BaRO{gfP{beNJK2zuzwM+>5LGphCzlWVEsmD(!5
zr=I*-1YHu-tu#@oq9p7LMd;TB=OYZpgs7(O)Op}UZxcKi<l8|ZkJ35m|MX=}RZ&pG
zDHl`VR1QZMkW+=V2Co-p;;kY$mG;t<R#69*VWyX1DJNPko~@0HUPX@(9}zxshpkOq
z9g$ijr;x7|-%i$_W&JtcZ=yJl3J<<qYUffrA779PE5%+4YH9Vcwt|(#<juv?Lav*+
z`OGU~z{`<5>Rb3dk3bH!L9&Y3QcYzo9v`lq_-uGvQ*|l5Mb>e0uTfgaiyJ9Y_ql+T
z+p*PiZVBH%L%oeFt*kRqy^E}Fx$~jWBvz)usGLhrR&X>mAI?NL-N5Npf{UxT_Y@;8
z^vgV0&ezM?lf)c$HDS_uQ-9?AJZj?hMfM&geuHoo@!5pk#DAqGOjVqZ!h9U(&oEzY
z!hM`4<0<_I5)70v9m)p;$`d}!tr>h$!e58jv6M6O35Mjb3&KR>e7AsqOKD%qD^={C
zir15A7B$%%4ze9M6)b80FpfbS*;pJnEI9fy@y>FlD`%Mz@5uP?MkP<#uvi80ScpP_
zU*`70`z&k}lJt{}zgBvD^)^-~ge2>7Y&-RE1)1U1k~rnh+NT&4gURsbN}kIrQdg_y
zv>-bweJ$<WBT%GA6DSf>ugEY@!Jgsh8Q$&8@Ysjx*{;Y=1D(V)zDN%oMb;TG8_Stq
zCC`uBDjjq<kH4pIVlnY*tg3f>SRcn#1+#H&Vs|5^xa{isbs8IaYd?Q%q$5DrDsI00
z@c(h_zmW3|y+<fJ%Q72J7qaLKEt|1^CcmWdxU__Oa~Nq7wUdIY5)8G8KD7ms`TjN<
zw~64Y1mpchNaSHd`3uTgS?R@Wg&deFvzo_5e5(oX8mupj6LTWewnz08<gSjUFkW-v
jsvMfw@tP}+${_YXN$Dq7JoVzk00000NkvXXu0mjfJDz)^

diff --git a/gfx/tilesets/01.png b/gfx/tilesets/01.png
deleted file mode 100755
index 0b7c3a210b40138cd52f7eca80a1657776e96e14..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 903
zcmV;219<$2P)<h;3K|Lk000e1NJLTq000O800Kw?00000GZW&o0009{Nkl<Zc-nQ8
zOK)366o9|jsc5Q*nABdB1qv>z9J5I2V^bp8KoAv`NK1Vy!~#`_Ry1p*Y)$J{RslKP
zAeK>l7tWLw{Q-6p7plaHmuwO2BBVULDas|oIpd4%UOA&r$Kzvp9^cFvjKT9l2K#l(
zj^)5|D6!7Y4)p`<VKo0YJh61Pqj_eqn>^maT5jL&4}QlX9ceimMcOWG85(fOC@GHw
zOs>KNrV4RPP4NmaiZ{pFkGyq*jW3!0im?QlDW13J1U$Hhm*LbkPW{B_62~*dPqV(x
zh}TD346?+Q-LCT#GQ7V`c8V34k|_$h{*VCMAQ-1srbgIrv>1n000Du}P!E5=Z<b$g
z(1f<-hgFS|pRruAd@Qlf<_?<&Y#wq{>(Bc#Pqz7Mn~r7Qun&Kx_~i_{(>!h~wvDMk
zg+hg|zoYi5+t(e(|3@IlVV!E-(aT7i{6}rS=7os-REj*RdJvIc5I-aA71>)L_<|r$
z@HzGkH6!E4=2@M`%Q2GESg^$1`o-;X*R4;oM?pvPd*ty)DVCTkQE+aPLWATu$refH
zr!U_fljo3j-&6lDj2_29ynk=6OpxhN{f3Evi)&nboA$fx9&!$c;T<oGv+ib6QjEko
zjoxL*sG`@6yO3ojzvpC&#Bu#9N#m=Nl@gt%B7H%U;#}-qu4^pU`+doaJ^QAM>3+ZA
zX7679LAqB${uLpTziXJy^81EXimX-_5Wx&V?}k4F@9L112*+IQ^cE&Xnv#z?WA3Z@
zS&`<sqmesqZbtLH^9l<*&E$Db3TYB)&2$SqQ&MJ|N>{1cuJysmFQPwX{XROKuhkuK
z-h1B$oe$=R?pLU-Q#(ubTdMK`Tw+!D1annYi}2V6i4FWL{sNB{IA(_XG;U$t*RLD9
z{=4<4TaI(>I<YD%RhHvnUKGi#c=jP%MYbN&IHCEOBd{-q6Fo17G*NinhO8Jq6=xT;
zBIH%H&qB;YsVmfSS*tI;$T^Smi&`%UH=6oSve>|D@^8~s&8XW>Okb+!Io9qmUFPX$
zobh;?ccs)OIL+D;=>oUjBU$6b2PAXuA(CC}VPgazVaM2ih5ZrcEfuS=XnB<5re&!@
dzH-z%`5%%nDt)2o^4kCa002ovPDHLkV1kB~yzc-2

diff --git a/gfx/tilesets/02.png b/gfx/tilesets/02.png
deleted file mode 100755
index 970e457b40147168e27eac4378a3d0dcec9ecd8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1212
zcmV;t1Vj6YP)<h;3K|Lk000e1NJLTq002M$003YD00000!X7h~000DoNkl<Zc-l>r
zUuau(6vt1KR=b$l)aEjn&ein~^=9jm8wZj`ZeUq$HPCh5pO%8ow@IGHe8__jjceK!
zt)^2P>^|u%;pRtSWxn)5Nangwx?*KmL0D152N}X`n+nt1-k<0EVmf~zxi_EtJ?H$+
z`JHnCpj2YG09P1Hju+dW5Moak!U@CSB7$0NVykVht|<57#dXyy_pKhr#=`K+YY0Rs
zedx#H|A9TB7<&YCu`!I`W-YBdQlawA3Po|%{EqYiut6q48A*uE)fm4#4?=h|LfAHA
z8wj482gWpJw3JGysKj_jH-c#9>}^+|VmQXb%cS5be+|Kr)tAAa1I`2R@go~S!WYRz
zbEr_*xvxqOG2y`|i*%zR3zkn{6gUvggu5ZeZ9&<}jrqer5OAp;br3NS+^k(}+dBB4
z0uTs0+_n|316>d(T@($4$`QExK7<2gQmawb32;kc6vc-9l?9-uCZ~-Z^hYzNy0IQY
zm_-6gD#BvjQaE0qT)-dwK*4&9^)PNywsdk0kfwTYE5cYE6pJo;qN9X5C=_G|7*avY
zG;JFd9;x`IRJ&LD_VrqJV9^_z<_oZP^3N{Y&fERp1E>|g1a~GU7i-%irO*sOXo?wd
zV&&Ka*OL`$xuF=laN2qGsvgQhT>9u|K}#HXmlQ%OZYO-Fcb=TfD~Wg&o<Ifk1@)b#
zL|!ewB9uW?aL(uPW`Wu=8U{ZWNP?vRKy&1-0u8Vbd8?X=PW4fl5hMU2=QmT@M}0HW
z2Pn+YO1EaUECOkQsfV3k@gV)yK8RNFs96T24|LHK-DIgStgpf4Ytxh4S<gr)r;Bv@
zvp?YYPj4UJP8Ubi%7?qA`MCx6E<O9c^A6KPQzK9)pyI^uM;`1ZnvSX!9g0O%JQZl3
z+Z|^|L(}nQPCoiNTl@Zc-Z-yTvZI`QtR$Pd{!TPaD1%nZcwr9Ux6ZY7d*e+TtF>qr
zuNpvei}~=woUzCuJ%wAhZN!RM#4+f1XAun4-VoyMcmct{KLnn3y+V|^iNJnHpsjR+
z^C>lrqon(&rn-F&U}_kBP+bw6ta)@N+lxM^@&sHhX3d!B1H04%OW=4N*lN?MsdQ9)
z=X#y0@ZO=?iFN!5;HN4A{s4?7#QJCwo^d-+(XsZzt^`9;vBLxYPN<f7{>F?{>_Erb
zF{@gJe04>(rROE`C8whqD4Yhukzr>rY?1S{HsIvsE@>4lHLU^Uu#5c?TAr+`aV|km
z!5o9HGn=bgYhBTM-Fy$OT=@BZ#IS}4y!ZtwKJjEP#jzKq$@Obv@M$o3tNvo7x#kvp
z$(Rq$w$L>BW!T2X<ewaVv7ML(%xFKOoPnH@Bq?YdFkA5P9JC@(Aj0@;*SeaA<f$Qu
zIunVyLND`NYz8!Iqa0ykjnZdBn7(G|5C=Xh)9=G*0T~*fP}ODdAh)P-=~fxXoo33+
zXcR|DBVfzSh;f=V1eD9(GQF7UKrWu+7J=quGKr>-up{aw?d|OW37EkQnwQ54&*Qfk
afqwy0<8w!?5xQ~!0000<MNUMnLSTX;f<&(X

diff --git a/gfx/tilesets/03.png b/gfx/tilesets/03.png
deleted file mode 100755
index 4aeab369245078fdeccd970c15327ba67eeb1239..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1422
zcmV;91#$X`P)<h;3K|Lk000e1NJLTq002M$003YD00000!X7h~000G5Nkl<Zc-l>r
ze{2(F7{{NrtBg6gp7bIlE(7)>6B4q~5Ru`oba%`dus^uhA`$BlN60i`Bg-UYcEdFp
ziKbg(NDvS-DC7o%EJS6u(2flh7z`xGM6%TcjWWBoW0XaA?dx+l|L|?nOF#WSKi==X
z&kK|S%qogPDV-j{FGyrKDUK^0oyseVrlUZ^oTP-Q5={>e+aa0;N>`jt+<qoQhx4Xg
zb~}YI<_NDlqtLQ3TzM2|hSw$&vmenPnsMz#KzXe{F<U|Nb%lggFeLWRxk~LNT_NzG
z0RYu_3cLoEV~uW@#%7X(gA5&sMY+b!k^!zS8hV$GXpyduonA;{$YY5M0i#7qavcZZ
z2_ZxiJv?#sM>}qKON@}IhRrTL#C%o=!ed#M2MDQ>Lt12EuXCvZ*3au)FNb2$m1lC=
z0e{Q=fpkU6kB#18U7)X6-R{ajiya#k3UtL+$@=@xj?y7Ac86O4%%FW_sQ$j4sO8Pg
zP0|*y+wJDI`bX716?3S>jDWGP$o<mmQ&B)XHeirAJSPfUn#dR-LKX0geNdgWyuRI!
zdmtXxXzb;(ybt9NMQhL(eRD&usYQgR$t1(jIfL95G>DoN#X*gbp+I^OZZ5ZH0zK71
z5w9(lL&+NxikC6KGA8+|92z_;XM~VpVd0(yKLT^BS5};bFoji0E$&j{T6v~VMn7mq
z`MyFqzsV|!gh+w_52BMleL5bq53uDdA)FbSn_B_0I)`n-m?#NjHrV$qhtey12b!BW
zmTj(rUv}}7YHj&f@>PL|Xwc_%%MX;6+DH<2%Ca5?zS&lGIcK_!XxV}&2zz*VRKMaJ
z)kKy?P{5k0aXySyksIsoTWy628zF80i>*7iujj8#4g|7XD|%{d-IpJR`<y12C?Z4$
zi@WW)J+h+%0l*x%rTek`e~Oho=tnyO%u&;YVAVAGvD8rP*jTG8`se(hA*#O-Wq($-
z;4tQ;w4>uRz~s1=Wi3eW$9drm#Ub^!pw4@W14JVLCV+h{LLgn9I)(G1bX6+=yH9Nh
zq{T@enjH5A;{f-z^URco9>EYr;!yF$2M$lN{DD3%arF&U{C-a*S=E0eu(1SfIM}rr
zJB^k6wp{O&wlr?6MPT~wX7#XuV0^40=s}P(ej&dX9V?o7vr*K+swF#1cIvy$kOl+1
zxa;TOecjW)56@Y+^zaT#T{eQmrFQ`4+q#{cyHjd|i3618%JPW=-CJ8tr%lDc$ue%<
z8+=kQ;OAy51`Qy~-r(Nh^{;UL%9EfU1|3{KVRvy>`ls<03GoJBExaXe5W-vk%VBD*
z8qA1p>rTM{9?=`zqE&Fd=ek%Uhd1aAx-yY9Elt^?k;5C5I9Fz5WV>JTL$Q^UvftP7
z8h`37;GxDD^bYi{ljYB<S_00QO7P~?)|6da3t*Gz=zKE|(z30^n@ZMFY9pLfr-LHv
zvKN-<KoUJmW_a+nIoqqQ>LK2?>Z|5Ts9|$9v^Tsa%Uw0B(10Pu!ZI6sR6mEs0(%rg
z(lqVI!3-pLCSzd_WkD*C_NOWJ$A*(5Rsly{^{4$Q>hn$ARqbson+L>4sjB+OCr$lZ
zhO&j#`1VyoRG;tWc=+TVYt}r>k@Bf3^*?{<%EM8I7%-Biu*zM3#yvCYiz1)_tU|?W
zlby6>M!%%-*tMF>c=7Ry5}*)U_-iEsQ!HYxoE*P63;I9FZC^85bcR22F%g~vjx0uh
z#^cAH!ujY7(~p<W1&g~tQQkWa$%uI&jhHhjLf($Y4<$gapjV=VP(|4vhRE@!<^-Ml
c#N#ycFD*O#@Px($Q2+n{07*qoM6N<$f?~0z{r~^~

diff --git a/gfx/tilesets/04.png b/gfx/tilesets/04.png
deleted file mode 100755
index 0b7c3a210b40138cd52f7eca80a1657776e96e14..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 903
zcmV;219<$2P)<h;3K|Lk000e1NJLTq000O800Kw?00000GZW&o0009{Nkl<Zc-nQ8
zOK)366o9|jsc5Q*nABdB1qv>z9J5I2V^bp8KoAv`NK1Vy!~#`_Ry1p*Y)$J{RslKP
zAeK>l7tWLw{Q-6p7plaHmuwO2BBVULDas|oIpd4%UOA&r$Kzvp9^cFvjKT9l2K#l(
zj^)5|D6!7Y4)p`<VKo0YJh61Pqj_eqn>^maT5jL&4}QlX9ceimMcOWG85(fOC@GHw
zOs>KNrV4RPP4NmaiZ{pFkGyq*jW3!0im?QlDW13J1U$Hhm*LbkPW{B_62~*dPqV(x
zh}TD346?+Q-LCT#GQ7V`c8V34k|_$h{*VCMAQ-1srbgIrv>1n000Du}P!E5=Z<b$g
z(1f<-hgFS|pRruAd@Qlf<_?<&Y#wq{>(Bc#Pqz7Mn~r7Qun&Kx_~i_{(>!h~wvDMk
zg+hg|zoYi5+t(e(|3@IlVV!E-(aT7i{6}rS=7os-REj*RdJvIc5I-aA71>)L_<|r$
z@HzGkH6!E4=2@M`%Q2GESg^$1`o-;X*R4;oM?pvPd*ty)DVCTkQE+aPLWATu$refH
zr!U_fljo3j-&6lDj2_29ynk=6OpxhN{f3Evi)&nboA$fx9&!$c;T<oGv+ib6QjEko
zjoxL*sG`@6yO3ojzvpC&#Bu#9N#m=Nl@gt%B7H%U;#}-qu4^pU`+doaJ^QAM>3+ZA
zX7679LAqB${uLpTziXJy^81EXimX-_5Wx&V?}k4F@9L112*+IQ^cE&Xnv#z?WA3Z@
zS&`<sqmesqZbtLH^9l<*&E$Db3TYB)&2$SqQ&MJ|N>{1cuJysmFQPwX{XROKuhkuK
z-h1B$oe$=R?pLU-Q#(ubTdMK`Tw+!D1annYi}2V6i4FWL{sNB{IA(_XG;U$t*RLD9
z{=4<4TaI(>I<YD%RhHvnUKGi#c=jP%MYbN&IHCEOBd{-q6Fo17G*NinhO8Jq6=xT;
zBIH%H&qB;YsVmfSS*tI;$T^Smi&`%UH=6oSve>|D@^8~s&8XW>Okb+!Io9qmUFPX$
zobh;?ccs)OIL+D;=>oUjBU$6b2PAXuA(CC}VPgazVaM2ih5ZrcEfuS=XnB<5re&!@
dzH-z%`5%%nDt)2o^4kCa002ovPDHLkV1kB~yzc-2

diff --git a/gfx/tilesets/05.png b/gfx/tilesets/05.png
deleted file mode 100755
index ca4b0669a0dbaf79f2542580de8a0907a673944a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1161
zcmV;41a|w0P)<h;3K|Lk000e1NJLTq002M$003YD00000!X7h~000C~Nkl<Zc-m!@
zZA@EL7{{M68c6MgmX<_F98O*IE+LiajPg>bEfSYC1?~|)h!|H%;KMRM5EgkWFEtf)
zGK6Hrm~^Zk%7a;E(CD}!pwz_|95Gqb!~}`5_(9=Hf@CpiIX>sy3tQroCcXLH|9Rfe
z1<nC5aifQkAz~OfS!_6+7XOST+yoFui~1KpzPkDs2tKX$FEmBO(}%iLB>d@g)4LM<
zBEglnIy%mNFMtOn7-W-^XMYl)2BnXxysiGe0r7MKAqUM2ummv<0A&ij`WIsg76RlF
z_}uz7;tX26=!i~_5QuvPP?^dc@9!iDOdb>93S&yqiUgqs34$)AFkkwZD3ieNS4^j|
zr~pA%&}D|zb;Re~whOy$BA@b`plOIB{zk_@pQbUEvmh0*pv9Wz*ZyQI{|*Qq8^~H&
zN}H!6P7qa$cruQbl<@K71qmK0*luV^&CYXPHg15RrJ=72$%mJc0mdFZf8@K?w%K{a
zSBAhVGrekgL1u~wy-5kSJxWPJi4!O_YT?;^a9mcaw%uj|yv*Q}F#+Pcy`83__;mqh
z3cf}PNJ&7Xp;PoUSS-6vAbgCO76!;+OlJB70R7x>U`jYA;o)L6cm@<2zBuhR6gCM?
zAx<0sVbzSO2jKB`rq<lA5H&tb<2eA1cIG?vQ2c%$BB7pc?RuqVX|xwnY!5}>Tibka
zNiSr+CIZhRe##fePkdHcXSY9K0zLctwLi*}wY32g^mIp0Up{@k5K5`%0%ZTb`ItX&
z=TPmreZ|1w)TO)|^_RL$u$Da@@_F^3MF;!Tq_5hgs!Nnq1;7y4-(<d;lK8~8NT73O
zP}Wl8QYV%<*q#P(g1vppS3||^bb;+8=kJgYIzr{|km4!E>gAD(h~qo01nzd%gNwQ~
zP1jBwakQ@aWeXG3cyYuS0nNo2BBH)Y&)--P#RXmDd{6soaSxJj2nC`5`sNp}fol{|
zT(QOM04cg!p;0lxZrdIvNO9&R6Qo)Uz`Q1CNf98YV^xOJg|^*(v9q-NbCu;f9CjI7
zqr%p&xq(Uzn`t`R1!6xwde+`tuJdIAt2+WD13q7+wzf*3x>o>KGZZN(!85N)MXfKO
z;QBqqAsEb4FtvKmNABfv0I4vdh;LUSld*}!#K;IF@*%UdB2qU&IO@#UKolndQ**(&
zw4#dg4MjMbaoRu?4U#~3aIP>_w9o+2OvVZK0hL1Rk3oVtOS87Y(ziUkBP_4S*3SWb
zZhiMh4`)6JKAw9|+vw`M<rcdkR$Je=s1I|#e1w0Hyt~fNgBJKri!j#YhKSctl*Z4A
z^;fK;qX{LJ0Ija>OA*q;gD&Y*zg?`u|1ASh1=J%R0y!Xcnd0yzIIM+C#Yq8Hd4?2`
zAY+!M3dCXl1IC#E00d~uag@FeaTv2O7PM9zRfizLLIhA+g-ab|FY*vg-vmeh8R{6G
br5OJK3=P@Sj)-xG00000NkvXXu0mjfJ<k*}

diff --git a/gfx/tilesets/06.png b/gfx/tilesets/06.png
deleted file mode 100755
index 970e457b40147168e27eac4378a3d0dcec9ecd8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1212
zcmV;t1Vj6YP)<h;3K|Lk000e1NJLTq002M$003YD00000!X7h~000DoNkl<Zc-l>r
zUuau(6vt1KR=b$l)aEjn&ein~^=9jm8wZj`ZeUq$HPCh5pO%8ow@IGHe8__jjceK!
zt)^2P>^|u%;pRtSWxn)5Nangwx?*KmL0D152N}X`n+nt1-k<0EVmf~zxi_EtJ?H$+
z`JHnCpj2YG09P1Hju+dW5Moak!U@CSB7$0NVykVht|<57#dXyy_pKhr#=`K+YY0Rs
zedx#H|A9TB7<&YCu`!I`W-YBdQlawA3Po|%{EqYiut6q48A*uE)fm4#4?=h|LfAHA
z8wj482gWpJw3JGysKj_jH-c#9>}^+|VmQXb%cS5be+|Kr)tAAa1I`2R@go~S!WYRz
zbEr_*xvxqOG2y`|i*%zR3zkn{6gUvggu5ZeZ9&<}jrqer5OAp;br3NS+^k(}+dBB4
z0uTs0+_n|316>d(T@($4$`QExK7<2gQmawb32;kc6vc-9l?9-uCZ~-Z^hYzNy0IQY
zm_-6gD#BvjQaE0qT)-dwK*4&9^)PNywsdk0kfwTYE5cYE6pJo;qN9X5C=_G|7*avY
zG;JFd9;x`IRJ&LD_VrqJV9^_z<_oZP^3N{Y&fERp1E>|g1a~GU7i-%irO*sOXo?wd
zV&&Ka*OL`$xuF=laN2qGsvgQhT>9u|K}#HXmlQ%OZYO-Fcb=TfD~Wg&o<Ifk1@)b#
zL|!ewB9uW?aL(uPW`Wu=8U{ZWNP?vRKy&1-0u8Vbd8?X=PW4fl5hMU2=QmT@M}0HW
z2Pn+YO1EaUECOkQsfV3k@gV)yK8RNFs96T24|LHK-DIgStgpf4Ytxh4S<gr)r;Bv@
zvp?YYPj4UJP8Ubi%7?qA`MCx6E<O9c^A6KPQzK9)pyI^uM;`1ZnvSX!9g0O%JQZl3
z+Z|^|L(}nQPCoiNTl@Zc-Z-yTvZI`QtR$Pd{!TPaD1%nZcwr9Ux6ZY7d*e+TtF>qr
zuNpvei}~=woUzCuJ%wAhZN!RM#4+f1XAun4-VoyMcmct{KLnn3y+V|^iNJnHpsjR+
z^C>lrqon(&rn-F&U}_kBP+bw6ta)@N+lxM^@&sHhX3d!B1H04%OW=4N*lN?MsdQ9)
z=X#y0@ZO=?iFN!5;HN4A{s4?7#QJCwo^d-+(XsZzt^`9;vBLxYPN<f7{>F?{>_Erb
zF{@gJe04>(rROE`C8whqD4Yhukzr>rY?1S{HsIvsE@>4lHLU^Uu#5c?TAr+`aV|km
z!5o9HGn=bgYhBTM-Fy$OT=@BZ#IS}4y!ZtwKJjEP#jzKq$@Obv@M$o3tNvo7x#kvp
z$(Rq$w$L>BW!T2X<ewaVv7ML(%xFKOoPnH@Bq?YdFkA5P9JC@(Aj0@;*SeaA<f$Qu
zIunVyLND`NYz8!Iqa0ykjnZdBn7(G|5C=Xh)9=G*0T~*fP}ODdAh)P-=~fxXoo33+
zXcR|DBVfzSh;f=V1eD9(GQF7UKrWu+7J=quGKr>-up{aw?d|OW37EkQnwQ54&*Qfk
afqwy0<8w!?5xQ~!0000<MNUMnLSTX;f<&(X

diff --git a/gfx/tilesets/07.png b/gfx/tilesets/07.png
deleted file mode 100755
index ca4b0669a0dbaf79f2542580de8a0907a673944a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1161
zcmV;41a|w0P)<h;3K|Lk000e1NJLTq002M$003YD00000!X7h~000C~Nkl<Zc-m!@
zZA@EL7{{M68c6MgmX<_F98O*IE+LiajPg>bEfSYC1?~|)h!|H%;KMRM5EgkWFEtf)
zGK6Hrm~^Zk%7a;E(CD}!pwz_|95Gqb!~}`5_(9=Hf@CpiIX>sy3tQroCcXLH|9Rfe
z1<nC5aifQkAz~OfS!_6+7XOST+yoFui~1KpzPkDs2tKX$FEmBO(}%iLB>d@g)4LM<
zBEglnIy%mNFMtOn7-W-^XMYl)2BnXxysiGe0r7MKAqUM2ummv<0A&ij`WIsg76RlF
z_}uz7;tX26=!i~_5QuvPP?^dc@9!iDOdb>93S&yqiUgqs34$)AFkkwZD3ieNS4^j|
zr~pA%&}D|zb;Re~whOy$BA@b`plOIB{zk_@pQbUEvmh0*pv9Wz*ZyQI{|*Qq8^~H&
zN}H!6P7qa$cruQbl<@K71qmK0*luV^&CYXPHg15RrJ=72$%mJc0mdFZf8@K?w%K{a
zSBAhVGrekgL1u~wy-5kSJxWPJi4!O_YT?;^a9mcaw%uj|yv*Q}F#+Pcy`83__;mqh
z3cf}PNJ&7Xp;PoUSS-6vAbgCO76!;+OlJB70R7x>U`jYA;o)L6cm@<2zBuhR6gCM?
zAx<0sVbzSO2jKB`rq<lA5H&tb<2eA1cIG?vQ2c%$BB7pc?RuqVX|xwnY!5}>Tibka
zNiSr+CIZhRe##fePkdHcXSY9K0zLctwLi*}wY32g^mIp0Up{@k5K5`%0%ZTb`ItX&
z=TPmreZ|1w)TO)|^_RL$u$Da@@_F^3MF;!Tq_5hgs!Nnq1;7y4-(<d;lK8~8NT73O
zP}Wl8QYV%<*q#P(g1vppS3||^bb;+8=kJgYIzr{|km4!E>gAD(h~qo01nzd%gNwQ~
zP1jBwakQ@aWeXG3cyYuS0nNo2BBH)Y&)--P#RXmDd{6soaSxJj2nC`5`sNp}fol{|
zT(QOM04cg!p;0lxZrdIvNO9&R6Qo)Uz`Q1CNf98YV^xOJg|^*(v9q-NbCu;f9CjI7
zqr%p&xq(Uzn`t`R1!6xwde+`tuJdIAt2+WD13q7+wzf*3x>o>KGZZN(!85N)MXfKO
z;QBqqAsEb4FtvKmNABfv0I4vdh;LUSld*}!#K;IF@*%UdB2qU&IO@#UKolndQ**(&
zw4#dg4MjMbaoRu?4U#~3aIP>_w9o+2OvVZK0hL1Rk3oVtOS87Y(ziUkBP_4S*3SWb
zZhiMh4`)6JKAw9|+vw`M<rcdkR$Je=s1I|#e1w0Hyt~fNgBJKri!j#YhKSctl*Z4A
z^;fK;qX{LJ0Ija>OA*q;gD&Y*zg?`u|1ASh1=J%R0y!Xcnd0yzIIM+C#Yq8Hd4?2`
zAY+!M3dCXl1IC#E00d~uag@FeaTv2O7PM9zRfizLLIhA+g-ab|FY*vg-vmeh8R{6G
br5OJK3=P@Sj)-xG00000NkvXXu0mjfJ<k*}

diff --git a/gfx/tilesets/08.png b/gfx/tilesets/08.png
deleted file mode 100755
index f9bc9020a102867ce88b0d41d09bb2ecb56256fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1261
zcmV<J1QPp+P)<h;3K|Lk000e1NJLTq000O800Qs=00000#fo#Q000EENkl<Zc-nQ9
zK}=Lv6ox+-OqGz1(4mQ4G&raM(v&D&RBAJ$9a3XT(DI(OENatIW7y$_q-iRR*ift;
zG||*<It8r5b77*prj-#Pp-5omrin>o(=;JXfFVt+KD<5Wz6Xq>z4>x-=g!Q1_x$HS
z_u+ZCZb;#L%&=g1WOyubjD-cp9$_9Aum24<49oMy>oj8SaCH`A)_3+SuBXUIm||os
z!mLLQnmwi3WiwQbLKJTpB6wNFb)XD4#rQ?G9cKC?>O0xAnYtRLW?1(5@)T|zTMn`1
zTgnF6SVyFm+qYRZOeGjUMSVZFj<Cb!RubwkbNIE44-$9yWG}HS<!=#7kUxi?#NW*L
zd3JXamq`u&4Al_^A=|(q_$tXuqr|r|Q$eGl2I2#3ZJ~Bf=YlMn2e6Tbex-Se=tljh
zi~lo3w`X!=o<HU_i@Zl3?pJet2aEMwol_(WFAZs&G{?`7ef|l}*9u{*)W$DHM%BNn
zcBLC4;#XHA3W?N(i1?0_poFDfmb&miuqt(6UdH5f|I#)_+i(+<Bs4mPNRWbW;}WJ6
z|82}B^3Rbkq0Nvs8hZ`r5`1VFOp{EnCN6s>@E@wv<~;7qhwI{*IiqU)Y`B(C1w`%b
z&N^7}#ZIDj^^tWn{Re8NU06JJx?$X7ok^eKNla;U_gj<r>d#4sIbUOd%w_)}4@Yzc
zC&93x-R2^Afz|zDg7ZfW2NPUqV_SPj&OSXbe<6V-WVa%IImut&vvQKVhR=`Eb%l#p
zSn1Hz<h0&MF)Cx5a;ui@wfx%2^nMoKR}CkGDDfJ$AJ_J|5T)beRs9z+&01m+#_z<x
zq>mO?NP?{{XD`!wStqTBZN4R1U$-0ggvQI=jCMcc<N;xW$Ej-K1p#Y0H*D~_K4s4Y
zd&+FTJ2>J}pO}y%RzYlrnC%z8g4_%hFe86-^p~y^D&LS*WE9?SrS~}2Nk;CKq^1^G
z)LhK7ln+=j-0R`)d&)mY713ONUpLGvH?(k4L@8x-wNIZ`K0t;%eJute1pTN7j&P`*
z(qV>%$wb0+QA1oY*}`luvjgPHb^UAyt)6PGEknT_egdysWtS3AT70)VmZ3Oq3vQ*Z
zh%oIYL_GYi{OL9A2pTYxA>II-Mjz9!YDaq5<<iun{Sp*QzL76_a<~($OxUim#gYSz
zKV<4AQ;jU1;qeeAgSoG*cP-7$C=b&7-pIfh<%To1ott}UK5e7N>(FFqx~fsmb9h>#
zB+^?>BG0GSIhof-ivrS}@4(kK1_b@`^ce7H5#?R{YRt4va7pbgM^(kP!cKc5><lS!
z*U?d`XDH2BRg*Y%?90$l!;swb)_Ci8wXe69*fQI%A_w!(qSnK{kkd3@^w{0OtAFyw
zPkgh$@EB8Lp)r2+xa4uHi>~kZ?IL&g5>HSyz;p(`hUF=y&og;|#e}|$T5Kz&p7fPm
zss}vw*>3GivA2?gDLE!4kM{%K7uv0<eN=8B)graDg0Hg6mOxIp!Bwf(=#p&9Lq`>A
z-e+r(T=lk^D9f9lDbh6*tQWrK!u0~psj{^w(RI-_6KFd^Yz;@>J|k-+87ZT;k5u1(
XR)@jQ3xZFU00000NkvXXu0mjf=t69+

diff --git a/gfx/tilesets/09.png b/gfx/tilesets/09.png
deleted file mode 100755
index fa3f8c9d83c711458e36b3f912f6f97551e45fdf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1125
zcmV-r1e*JaP)<h;3K|Lk000e1NJLTq001Ze005W*00000`S0vy000CmNkl<Zc-l>s
zTS%No6oAiO#Kdm#whPfhv6_Z;^PpCvv`GG~X{aO=FZ|P%VoM2DN-5Mnlr1e@Qnw;f
zx;9A3LLSy-Y5$z1_?|^}y*x;|U|+<S4JPy@2wiU!rH-DSng3tgd00NaIdf*_%>1)}
zn8}cCAVjgKKnO<LBL3f&Vs${VC;<#7_K;}9v4=Zph05drJOHq6$R>kG@)RpmD|2rk
zrZ{i&Orz=G^825>>EIRNw@Nl#al=6f`V9wNLI_?$4lRXYPU}ldF`7Y^`Po{=o&-xs
znml!=fu*!=0=SdFQZ9U{q-o7ac~^it0j32q*If=Fo`py)9#$&OaqW&q-U|d~6&@hQ
zU?8LsAO`Q;(ikvfAbK>0tQgF7E8GiNm0XgQpQoqP;u$Z$D}oL_zEd~gVDoU@eFraA
zd3Alb)WL=erP%enr%59(MXs(ombYP=k~c-C2}qf|jXa1C8_bmHXUPaD#$4WH^ruo`
zzYiSr`t!oZ$*3P}G~bGXYOlBYzE<Z}j}YzKuTke#1(4`3tGFh_P|XZPCr)cR5g*k2
z0GADUNnvdsUa8#cRakWannqt-SFt=SSk@m@88{iH_9{vCsk;N-oQEhz69mcV3r}gk
zk0KE`T)X<5+><o+M5BEBCnNF|$FjZnF^z3927?FXbFm0t#8lJzfh!yvQ&$eu4j{9{
z)e$D90;2ervR*M<r7T~UH8EUE+S=$?OgR>#!mL4U!3$6YY%z_9zkP$>W&jth3WeiE
z!0g>*$x?mFvFWobrehaRn&%yxEq-6J^k`wwv8w(4=l-O-4^(9sKYQ5cSox7K;8inV
zt~bfB%f_5Xe&E>U8}zbCCFC0FVO&=A@h&aJ<I+G32pAt98BxepSN8c;#5&t9+|sD*
z)XKR{RGi1|q|Y<xkDu$BIorAY3_Mg0#o`Ixeny8mWs8jM?cD{okF@RhmF*5Aw0AYL
zMIF!)Vv9PU?WSYF)7AqLCdherMkUzI13t>xTB?I66RHit@}BNCr~so8-CNE0dAS{F
z6d<ipc9$2x3N?l@)N)K2Sm>RZ-DN!6h3Vdz@3M@1z|(_`-ZL8mgN^=^tc?TJ{vz9v
z5ttsR_R>kqaXhYv(QeBzPu_BD@yoF(#CwcM#My14BgR=FlG~>mn-M?V{+lsiYTOi&
z5{my&4dYBgSUOp&OYq`zz&md1dC0gyv<mKfxJ8uDbBC)ZeWWdc*R3$mA3T%|;xCB#
zJU@drZji#Ts#8w=bPTluzao>2UA|6$EmHajI;}mP&V?HLw@%>;f_~`wXO#YUiKhTx
z7qy<cvI;L<6Ri;769CtJgU4jm8UX4a@O?>ep}>WO*ASy@5f=;B0p=MwsBqno^IX0X
ra;(B10q*I)88M^^Xva!b)_DA1Uw{^PU7q&e00000NkvXXu0mjf?Ufj+

diff --git a/gfx/tilesets/0a.png b/gfx/tilesets/0a.png
deleted file mode 100755
index fa3f8c9d83c711458e36b3f912f6f97551e45fdf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1125
zcmV-r1e*JaP)<h;3K|Lk000e1NJLTq001Ze005W*00000`S0vy000CmNkl<Zc-l>s
zTS%No6oAiO#Kdm#whPfhv6_Z;^PpCvv`GG~X{aO=FZ|P%VoM2DN-5Mnlr1e@Qnw;f
zx;9A3LLSy-Y5$z1_?|^}y*x;|U|+<S4JPy@2wiU!rH-DSng3tgd00NaIdf*_%>1)}
zn8}cCAVjgKKnO<LBL3f&Vs${VC;<#7_K;}9v4=Zph05drJOHq6$R>kG@)RpmD|2rk
zrZ{i&Orz=G^825>>EIRNw@Nl#al=6f`V9wNLI_?$4lRXYPU}ldF`7Y^`Po{=o&-xs
znml!=fu*!=0=SdFQZ9U{q-o7ac~^it0j32q*If=Fo`py)9#$&OaqW&q-U|d~6&@hQ
zU?8LsAO`Q;(ikvfAbK>0tQgF7E8GiNm0XgQpQoqP;u$Z$D}oL_zEd~gVDoU@eFraA
zd3Alb)WL=erP%enr%59(MXs(ombYP=k~c-C2}qf|jXa1C8_bmHXUPaD#$4WH^ruo`
zzYiSr`t!oZ$*3P}G~bGXYOlBYzE<Z}j}YzKuTke#1(4`3tGFh_P|XZPCr)cR5g*k2
z0GADUNnvdsUa8#cRakWannqt-SFt=SSk@m@88{iH_9{vCsk;N-oQEhz69mcV3r}gk
zk0KE`T)X<5+><o+M5BEBCnNF|$FjZnF^z3927?FXbFm0t#8lJzfh!yvQ&$eu4j{9{
z)e$D90;2ervR*M<r7T~UH8EUE+S=$?OgR>#!mL4U!3$6YY%z_9zkP$>W&jth3WeiE
z!0g>*$x?mFvFWobrehaRn&%yxEq-6J^k`wwv8w(4=l-O-4^(9sKYQ5cSox7K;8inV
zt~bfB%f_5Xe&E>U8}zbCCFC0FVO&=A@h&aJ<I+G32pAt98BxepSN8c;#5&t9+|sD*
z)XKR{RGi1|q|Y<xkDu$BIorAY3_Mg0#o`Ixeny8mWs8jM?cD{okF@RhmF*5Aw0AYL
zMIF!)Vv9PU?WSYF)7AqLCdherMkUzI13t>xTB?I66RHit@}BNCr~so8-CNE0dAS{F
z6d<ipc9$2x3N?l@)N)K2Sm>RZ-DN!6h3Vdz@3M@1z|(_`-ZL8mgN^=^tc?TJ{vz9v
z5ttsR_R>kqaXhYv(QeBzPu_BD@yoF(#CwcM#My14BgR=FlG~>mn-M?V{+lsiYTOi&
z5{my&4dYBgSUOp&OYq`zz&md1dC0gyv<mKfxJ8uDbBC)ZeWWdc*R3$mA3T%|;xCB#
zJU@drZji#Ts#8w=bPTluzao>2UA|6$EmHajI;}mP&V?HLw@%>;f_~`wXO#YUiKhTx
z7qy<cvI;L<6Ri;769CtJgU4jm8UX4a@O?>ep}>WO*ASy@5f=;B0p=MwsBqno^IX0X
ra;(B10q*I)88M^^Xva!b)_DA1Uw{^PU7q&e00000NkvXXu0mjf?Ufj+

diff --git a/gfx/tilesets/0b.png b/gfx/tilesets/0b.png
deleted file mode 100755
index b017ccd7f26e3a8af20b7f67717011b6c25a14ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 269
zcmV+o0rLKdP)<h;3K|Lk000e1NJLTq001Ze001Zg00000<0bzP0002gNkl<Zc-l?S
zF%H5Y7>405POLiVR*gD%4%2vnCeFq%^b`yZIJ!v>(9rLa`2SGbGLWY)kOq*FwE#(n
zltK_N8vLvCxe6uztMhTJ6608-k5ff-I5jfv)e9JT@Z`w-t!Yrn3QTpKHXJcg=OxQt
zr}M_N<d9_G;5)L<+~0b#%Uqj*Y%{TCJ211kv+F1JT_IK++Cu%(k#7N9<QY&XKQ~Ld
znP#S+i6x`4Pq`+}7S4x{@*QNw*2;&KgJGxq%FE$tmG&(B1Z8*&>rx-WU8&z6<U^Wh
T!v`|&00000NkvXXu0mjfhH7{K

diff --git a/gfx/tilesets/0c.png b/gfx/tilesets/0c.png
deleted file mode 100755
index fa3f8c9d83c711458e36b3f912f6f97551e45fdf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1125
zcmV-r1e*JaP)<h;3K|Lk000e1NJLTq001Ze005W*00000`S0vy000CmNkl<Zc-l>s
zTS%No6oAiO#Kdm#whPfhv6_Z;^PpCvv`GG~X{aO=FZ|P%VoM2DN-5Mnlr1e@Qnw;f
zx;9A3LLSy-Y5$z1_?|^}y*x;|U|+<S4JPy@2wiU!rH-DSng3tgd00NaIdf*_%>1)}
zn8}cCAVjgKKnO<LBL3f&Vs${VC;<#7_K;}9v4=Zph05drJOHq6$R>kG@)RpmD|2rk
zrZ{i&Orz=G^825>>EIRNw@Nl#al=6f`V9wNLI_?$4lRXYPU}ldF`7Y^`Po{=o&-xs
znml!=fu*!=0=SdFQZ9U{q-o7ac~^it0j32q*If=Fo`py)9#$&OaqW&q-U|d~6&@hQ
zU?8LsAO`Q;(ikvfAbK>0tQgF7E8GiNm0XgQpQoqP;u$Z$D}oL_zEd~gVDoU@eFraA
zd3Alb)WL=erP%enr%59(MXs(ombYP=k~c-C2}qf|jXa1C8_bmHXUPaD#$4WH^ruo`
zzYiSr`t!oZ$*3P}G~bGXYOlBYzE<Z}j}YzKuTke#1(4`3tGFh_P|XZPCr)cR5g*k2
z0GADUNnvdsUa8#cRakWannqt-SFt=SSk@m@88{iH_9{vCsk;N-oQEhz69mcV3r}gk
zk0KE`T)X<5+><o+M5BEBCnNF|$FjZnF^z3927?FXbFm0t#8lJzfh!yvQ&$eu4j{9{
z)e$D90;2ervR*M<r7T~UH8EUE+S=$?OgR>#!mL4U!3$6YY%z_9zkP$>W&jth3WeiE
z!0g>*$x?mFvFWobrehaRn&%yxEq-6J^k`wwv8w(4=l-O-4^(9sKYQ5cSox7K;8inV
zt~bfB%f_5Xe&E>U8}zbCCFC0FVO&=A@h&aJ<I+G32pAt98BxepSN8c;#5&t9+|sD*
z)XKR{RGi1|q|Y<xkDu$BIorAY3_Mg0#o`Ixeny8mWs8jM?cD{okF@RhmF*5Aw0AYL
zMIF!)Vv9PU?WSYF)7AqLCdherMkUzI13t>xTB?I66RHit@}BNCr~so8-CNE0dAS{F
z6d<ipc9$2x3N?l@)N)K2Sm>RZ-DN!6h3Vdz@3M@1z|(_`-ZL8mgN^=^tc?TJ{vz9v
z5ttsR_R>kqaXhYv(QeBzPu_BD@yoF(#CwcM#My14BgR=FlG~>mn-M?V{+lsiYTOi&
z5{my&4dYBgSUOp&OYq`zz&md1dC0gyv<mKfxJ8uDbBC)ZeWWdc*R3$mA3T%|;xCB#
zJU@drZji#Ts#8w=bPTluzao>2UA|6$EmHajI;}mP&V?HLw@%>;f_~`wXO#YUiKhTx
z7qy<cvI;L<6Ri;769CtJgU4jm8UX4a@O?>ep}>WO*ASy@5f=;B0p=MwsBqno^IX0X
ra;(B10q*I)88M^^Xva!b)_DA1Uw{^PU7q&e00000NkvXXu0mjf?Ufj+

diff --git a/gfx/tilesets/0d.png b/gfx/tilesets/0d.png
deleted file mode 100755
index e3095f7d9965a9beaef2339732397bab869f5b61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 861
zcmV-j1ETziP)<h;3K|Lk000e1NJLTq002k;002+|00000)w6WW0009dNkl<Zc-obe
zPe_zO6u{r=Zp5;%rTbNMvcJe4blIq67x@-lArf?3=aEI>Z3&M-H$@4B5XBA_c>Bmb
ztb?~Y6kni1LWtm{=&W_<w5-WOhtH<>X7<mgoto3m@B6(sZ)e^NC<UM@Q6(kNP^w%8
zjdl+S*-CjzxvoLI6NC}~5t`Jjn~xMCBX4{)-9W}VkaFlmAfaJj`r{TAVR9XeuMWco
z=+UZbgML#r$`V}BhW<b(A-QfDQECfuq=9JoQOcmT|3d`*DA%s2K44xQ(`6zKr=%0t
zXljztM?^a%7q@lk-&Ad{R7xh2+QP4l+~ho?gtqQ$<Q?u(VE0c5OX(Q&{%DF&d|n4m
zK4Vn2Jqo=0Tn9eZMYz+ggmUM|l56Gi7LK&@p+Tfj(8zV0XnDC|<xg6(m~S&Eo2^;1
zDDwYUm_L!Lj+EE1G5`TaD0D6^Gk}OnpBtSQVg(>dC__>N1tHUY0Ti7i?Lbgl2K6~4
z!R46-0*H5z<lXqxL@jTCB+nN}k|@3K{HVnNQ37uRvxHur0@G3+p97*3hQU3a8pLNk
zpM=iN1Y(d)WA#qJmCp&Kg3Z8C4(?pKE#*?vBGkXhC@jMzMp9CsvCI-|QF>!>poM(-
zs0dxS5FY&<8XQC494HDZe1~=s`!^E^XP`qAMa)QK5o()*BB6~PVGZ09nLtWH`);gQ
z%)}xftV}=*?pYj2C>Yy8VIhiZqct==69a>;ULbT9V<J1lsi$e%^cr%BZ-R%|<%Fl>
z`gUSaI$=iX#b5R|-%du+iu3@wx=M2Y7Ql6o#Zt9D?n#;M{=L56v##c7rIlRIHs5@<
z>S(Bw(Xh{2n1iQmS);G=2~)^|^E#>D2bxB?6Zyp|6jWm@l;|Z%yUWW>wDJU0sPCAy
z@(`#!-E6jridCQ+-Q~Adqi~S3(*9gB2L}TK$1G~5ij_<Ia}j!wtUX(*Td6<aL;W@s
z!c6F;v>Cmv*fzknmd00s(VjZ8VeF!|=p|wFZtTkxRK~SMUCii5bz%xalF@0zIHM2I
nO+`)S4=m@-*HJytb(Q)HR94m209D6600000NkvXXu0mjf#{!a=

diff --git a/gfx/tilesets/0e.png b/gfx/tilesets/0e.png
deleted file mode 100755
index b931bc5014979095ceb4216ce2dcdba75f19d41f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1140
zcmV-)1dIELP)<h;3K|Lk000e1NJLTq000O800Qs=00000#fo#Q000C#Nkl<Zc-nQA
zUuaWT9LGOREOWtm?M(JC7_K^p+!r0&*l^Jsr2}<;lD7AtNK0S$INXXal~!3nJ6L7-
zAbVM?FX0I8by!#fMYaheuvrA(wx`jDkw!{~WV!qO&P~#^Ne>?mhhOeJ_jkX)@A=)}
z1$YrbKs_Ma!JC%D2HzrMz_8EFGq66v^c9{&m=(@Du1qqX>x#>5x41sqidP9ea>qEf
z%(CFIK1MD{kfpxHGe^ZCqu)@#WmPA5Mo=Yq#5*3z->8%|)yT0FaJ0gS%SsSYhT1%%
z4+%3wl7>-a$hwn7%YBP=Jg}_(!-EI9j`Qrkz8Uw3sy*WI`@XP36{;gdecN@Akr{!$
z9=i2SlAh>_Kjz9M#!tEU6i>>8X-*e7?6Gf}Js#D=ycjZ@AlJ{C8tFCs6dA*rB)cZ~
zYM$Xdb{;c@&0?}U)N4YePWB==PPV~YA$#xfuHm@lq$RL?{g8tdUZ3Zn$3n!ylH&(V
zjysmQn|znUk123Ol+R$lg*5DHk;a4+Q_R=2vPb`AZh=BSBeUFkWxMQcq=>qx6Fno^
zOWm+x`A-}&NF~ktu;BBJ&q>EmKK>nj3JG^hW0S-I!cVY=$ebcILtla2MRtd*4>EO=
z-}9Ue7>al!V*d*JpE5n&8#xgf(_@a+?w+$jZ`y);LfsK@NIbtv@SLEbmd;1y(9PxC
ziPQ`C9G1T<2OWck+lCwc+$d0#9A=uvR`VCMG`x&C2X-^Q>4(Q^Huc+=jF0W8e`JYP
ziJm(dJBlJw-*;HYs?T#D<8RTtliej%yL<MYD#@q3y~4-x$^l=L8LLtC_~=i5{(}#P
zbs<a|^=-x->h5`q^3$036y%-SqH2Z6qvGK$H#yYcmj;iHQ=6k!q;6@XXcU`5#pt#r
zMTW>O%xy*LBA3bUSB*No&nPpv8?DN2QZRx^D5QwTzyL!-TV@$*+FtXLQ(I<@w0fFU
zw&6Fa`~2;5O`I=<=xSf0yyl<KwMa@*x0RzYKE-%l7wcK3Kjlfy`JtmfWb@4ADS2ut
zzr;DqCCiwv-9~!Oks7o8q%Km-v|RT+W)yoDbDo6~XAIXR8^dx{Dc7k=0`isFO91)u
zroypS?e$JR+?e9>lqM{%u)WWRm?Ys{M)Jy8hqT;UiC@DltbMkrVf@@!+oksRqF>5`
z9l#6_wTRaeH^YitBUKhri@w(ST82_ab(l$WZJ<^9R<YvrGQ+CLY{;ucJ(w4-Vg|V|
zOJW{-8*`!QF*BrnQs)Hgr(OT=>f5q;%2M_bcbqS~^Bc$M@U5@AeGcP=X5Gu~m`F=G
zvC;focKW<6z6`nYgGK%HzqhFW0osV{i$7w<SiG${w^6l69lIzPhK(jB{#*-nt37qH
zb$3XenfuIUxwk#nKY%?!DWbSS((%$HuT8MiX!p9U`}_|^mBKhGpoI+p0000<MNUMn
GLSTY-8bjRx

diff --git a/gfx/tilesets/0f.png b/gfx/tilesets/0f.png
deleted file mode 100755
index cd5b36494eb02c9f5e73d0ae1a283985e524ae89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 967
zcmV;&133JNP)<h;3K|Lk000e1NJLTq000O800Q6w00000#$0hQ000AyNkl<Zc-nQ9
zPiS0K6o<cNGKi&;nI=y}a3L|Z%*H}CH4Po8Q<Q*oO6Ss4kcg(UhzoTgxG4>4L1tlF
zh~Q9=n8_k}bSXla#f&DEFw|sK%%-@|ja^LAiYU!<p69&#=FPw7;p5Jk`_7wt@9&&@
z2Hz*17XAVL9)68hje|Y*4yd&dlc%oRPxw|He+Nd$?gV_vKK$vC@N^V@^QZ)9FnCS8
zDxSexz`IO+LFeT`GfOp#$+Dj1l8gymLM-DdViQGDaI_fCyK9P=DZnr$7Y0ulUiN#i
z!DbeJw})=a)&m;Kpe+Yzn9r2kkLu&$-tH&T&6*WWtXQSo499AbW;q;<iO0Sujvm%@
zc6GYMREdnRNah+Oaf~8T%Wl6daHyc-MBFQ~wZJ{Y7BpP$8l?`GCRrcHOu{&B1#>|m
zLAp%(vTB|#sxOWcto~IlP<xni+tC!DQj7RuvP_7Iu&d&S$(jvOF&i-u?0gWhLFFxj
z%3IQDa=Dl>%7qm(s{d#Sd(1IEL>}G0$gh8Qkgqo0T~+My{joN3BN{Obxva!->PJqm
z;y<MJ7V|l7rWiiMVn&N<e}l#-j|+HbdGrxK7^a`<?2{lPj(pU3+Fpuw;pvtN$lZ0{
z3D4MPa{Lp-!;$|XsQ<p;OuPR3f@K>LyfMP&dpOrQpXJSSnAf;5-P3cdnO?z_VBVR~
zv0A0s<jyS~JmA(H_3cbYaET6Hm@R}q*b+U3-#a-{+<2S=oH^1d7IQ46SU-cir1P(y
zVDlXNc{Z=|QkEA-82^ytNnY{e@&Ad(9?;fX<XE%!#oiR_go4b5Eh}=YNzzZkNk0H)
zT=F)XOR7L5g?m%G!I4jRG)i)We@F42WB(1F*&=_u(}=pey7*JK<N4+f-v2&kwDn+#
z8g-^!meN@6o@INH?Gp9FVXnKIShQ|ft_jXxV5q`Mh2=y{#dcdy{hRQ@_SL_|#z^l<
z<w*}K;@DPZ|2UE|lT*ZrT3Ph7mbBB(OK(Rl1kL2HIj&ye7awz<ivd?Y=IuF-&GYl?
zeD?zL$Jo8byGiml7+UKnuu`JZpx|^4>jbMG{hZNF#>U8c`n6o9Sd1ChGWvRHnJ>oq
zY(v}r^_KFf%XEgx8MbF=&2Z{@>d&(CQ~&?_lMnd%Fo%Kyl7$BIZudD@x`UB+pM#N6
pop;wpcg;k1Q|#d?PgdpT{s)O3bm*h;wD14`002ovPDHLkV1jX*?T-Ke

diff --git a/gfx/tilesets/10.png b/gfx/tilesets/10.png
deleted file mode 100755
index a48f1d847433eaef7f53464288acf97e12a4a452..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1177
zcmV;K1ZMk*P)<h;3K|Lk000e1NJLTq001Ze005W*00000`S0vy000DFNkl<Zc-l>r
zUuau(6vxjRqg||~U2it=W$AR`_728i<e{N(!(5>TWNEp-rq)XQ13K@E3Qm18>ujNH
z4;$FQ42U;d8*k1Eg2ksGx5^MZ#`dzj>`8nYLzCE=q2|x={C@Xt^*)5p{pQ^B?|04*
zh@M^$X@Jx^5XDD?Wp;dwLtkoLVPrvM0vrsBbbv7-tN?!$;-%EO*<mCAV$FXLF}(*B
z3Xv`s_xPB_%QJx*Su1qsz}y6IF;CP|I9;Jyj=;R>K;|1NbbWj|->u~e?2|1*)G>*D
z${ZlH8G^7dIX2ztjDsV_#CtX#p&Nk47`=PX?RgH^OJkIO=$?Auz`fEKJ9X3lIM8}i
zsp-8ARE9ZQ*FdfyaX<*?^PeJ|;Am8c^TRjZ;%Es|h^toYd{RJ(*mPpbNWKpTNr=*i
zuVj)Q7cazu5GRs3h2u|M8dqrEELr=%dcDT(BpP2+0XTog(Hzx4%qxQm2d*hJFyDnU
z3M05yfR@7N5ii3Z^RjFE5X+D|^YO|Uzr2x#E<JQpCjH%?1$KBkb@<CGrv(SLS5gN*
z`N$4Kp@lB1E4BmOIdoF|nT;@mxSB%wKoM~<II}IsBag<84SWiFodz{%@zkIDVDDm^
zHbYJ}9D!H09vyNQ3*CJ%yV~{+xi6ZX=b&%3(Ky~2i8dzzSH1S}&I=zr^9#G9-tmqe
z&gzh~EA!H`hLD`OJ}*7TGK@IC8RB6&4SawdV;LY;RCyT7e7v?CAvA9Rgo^<phHYhF
z-Xhw=YMGPQco2lblI2ex<ES+x)pO<Ixw19%4wuP8hZSoOAOU#cH!Np|iMAke<i1nM
zh7f;-ekT$yr@uhl3c7K~ssE}nV=Pspa13AoU})-hdW6<@{|2}jx{3i3Jw~s6bqx%}
zb=eD$wLM$sm0IR>h?-TR%(83~(NUs_ld=l@_5wHLq`yDsiTmF60wiiQc<kpGy|&i|
zIS4HF*z=&>zcd}MJh6kIMclJ}hNDRYcWK%HZHGX+)EDnR`=qwbs;xyFt)guMXvJ7I
zY$deq7^~dH6QkO;0alS0J(Gwv4Zu4xY(h?nk70?VaKx7CMTz<xBlx(V(YnYjGxZ5Z
z_u>w3ramPxx`TK}*BEbePuz`q-F}4CYH?RBBixjDty--x9<A5!U*lqJXuejheji0F
z7J<S-WO);9?m-hEO7e8M9f<07karH_j?7fe4&B}$)pf?yx<m%*Jh*NuM3lKH6yi4G
zMqt1zvd+k(BqZufYA_^jjX=!u)n-2&p7m9lW<*qYcNbf`*oCuwzF*GlhK*OIb+v_e
zi<q5!+vD?urd^qgM-_I8Yx)v--9is2v!Wj$ua#%~Yf8_PSIaTdgkB&oSCgpeL_g$P
zpMm<}ho?~fC2u5&@&hhQqI3hkDxC)?Lk0#4m5Tl~A)U#YmZKcwMH@IQ#4NQH%G2WI
reWV($Gz;*529MR4)o2IKI8^UHOk(WcgNH|>00000NkvXXu0mjfXcjG<

diff --git a/gfx/tilesets/11.png b/gfx/tilesets/11.png
deleted file mode 100755
index 321662733414770c9ad12d8e7041a250a15bb0b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1018
zcmV<W0|oqvP)<h;3K|Lk000e1NJLTq001xm003A500000+<r67000BQNkl<Zc-lRb
zQA`{~7=ZsfZcXLocH5gKy%&KNf_L#^(gz<f^nh6_7-7rpf8I4A*toZptLc+MQc}wq
zh^P;>uqHhcEmTcmF1@CW(eu`{pr9`bPeh?<c`+tj3Zj+p;KBOuH9E;8^X)gYv-AJ|
z4mi%%CPqDoD01L9c0q4`q@pHD;F{K4(X0D&qGFDJx-k}8tC&(@$rg37`;%GM?1l4U
zr0Y46Cdii~>1@rbcWrkKSHr>_Ir?UP0~Cc}JcTJ8pdN;72@{gW66?DRB3o0;n5(LE
zGToyI8n_)o_V}o_zANeOw4wcD)7o5>q`T(4(_b5%tMXJ}sCaB7y1whFOw;RIQ*q;P
zYCblvLEFNMf%ftDEz55KbW9yrqX3?X<%w;0`RJ0$5cQLPoh(Du_xt>W<CHu8?D!jE
z<tC->-NweC6}$pn`*XhMzdNv9ZB=IomKQ^}oU$S-5=2C{W~Y}4F(Yf>ofQ1iMHe6d
z2Oi#$e{tNGU(Z0~h%tgIK<)Z8JlnS_zqaB|J9`#tvZn6|Bz(}y^vuP#-8Fm~62sp5
zo?ds&!6}Fidp$ZmVE;7DSAZ;Iz0IG)>xhzZ`U|GWP6@QAM@mFJEXwbl28uD$DZByM
z;P525)Vx<@!2cTeMgIpCqYS#}{P9#a3xE<dj*ZQ<TZ1M*>^8WOG4a7C0G+>q8^9!*
z0|2jF1=gZ+#$BVF0rX}RR0hfDK6g`&6@wg9O`<(adYg)r?O?LOP+0o27KO6iANctt
zyAbd<7067ie|czYGxj*YMdtFd5wZ*Km5Vv5gLj&L{jgN{V2A2$Xy3T-M&915{+R0R
zymPss`*FV9Y6$^ceP%WMt^JKIr_-SFcq*QXrDqr8DJs5ptKDi#&n`Uu5pZs5Poc4P
zgHeQ)Q%V0eCMc5xIuGph`j~&4yGGI1ZYU^A3IXS_a~lgtXL1c|JGZf@(wPWaAeclN
zFpNAR><^%pFR6I=Yl1`TST%?m9(hR6wX6pppw2pz1kKIb{eix?bgGZwtqW~8SFfR}
zUnB50bbe)Cil4y~1ih=_o7ugjg;8iQ>S}Vu;O2l%=UMvkC!Q|_i#<ARZTH-fZSlh&
z@wkbw`MZ(X5-&J-HAx0nrDAT$Awg!vWTji-JX!=)XejPQoVekBJ9tp+hwmn>3b+Lm
zqUxsmfI<?QVFyi<(_atJEySodJ1*0GK)=)EY^EBG;fm=HqPCWyO!)x_2{Gd1oKt=X
o=r(AP6_4$%3DRxg7H59rUk8t;;6<k|=l}o!07*qoM6N<$g7Ka782|tP

diff --git a/gfx/tilesets/12.png b/gfx/tilesets/12.png
deleted file mode 100755
index 4b47b3935abb9795b59437d306b4eed257ef5e81..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1026
zcmV+d1pWJoP)<h;3K|Lk000e1NJLTq000O800Qs=00000#fo#Q000BYNkl<Zc-noI
zPiR|55XOK069`7sb`%}rQ&qPm2p`f4(_jorK_;RUTnoK6l<3s-;$zxSnoE4BX%H!a
zhCq)-@j+gfQ1GS17m+%lxQPXY9(!s}Dj3`HAr!^incerKXI0Md@iCe=Z+G7}v%A7t
z`eN6z8L{2PZbl4k!(N8%3Jt+BBj0i=k329rOd~`vPxcZNbf_S}808*_b+{9W&s!g)
z(c<}a<>oq%9`f)J>rHC#z_QWguja8h8SFOeJFNePZDU*59qbJ4CN0B`Va5=*;XLEx
z$~~5s_?WV{j0qu@vmwOHY6!9BD*vu><b0WE37t!j3K)Z=&tGv|Qv@ZM9=pXWOx~@-
zlMhsCkG&kHF00zgb6hyfY>Av(RaRD;R}S(np#bMqgdWX(A$(Cf`g`-fNd4Ux%1cAo
zBQ`hL-PO2Ay<w>us!&Z)eT$#YsrV}O4yFPXN)@hDxb~XHWl0UIul#6P_l>ckTBSZE
zwMgo?m;x`0K+L}AqDS+1EktcA`1@EblAoyB$$;ddLc~v{G~u5uMX<%1gNR=$xx&Tz
zM<9;;lwiCMMS+eE6Gq28Qz6+<h(G3n+6Kc^zoE6I5MSVXV;0hu^nKDWX_;J978|wv
zZus7C#&BS`?%02?Z=N_*7OUm!f%ZwM4>Z5sm8FB9;qj6Cgoyo&?F2)=xL%Fe&v+UR
zTuz)NzBlUf6C|I7>}T|&WpiW`>Rcc!oPXL%kezjDi7+`8blHpP{h-ukFQ)hX(~B90
zR2W%`GHX+c(p2>BAnAa!@MggI8kxav{}e|UKH#%28ErHDnCT36Gpv|C%6pg-@b)#%
z{Sb1d79!q|JrFfy!6J(w+veSxVvO#VObu}BGJiZLHxx?k;~&9co2xbUqT=cYCNOuL
zn9rOu?DTK*-c?21iTh%me)iRo1*8vo9o}$@$+;^)Y~d0M@6)Q&iu%Du)!aXH$HI#!
z?uK2+vrwRVo7S)Hd~0|6R%|@aa*^~E3TaNdcSLI0O-~K`hV~+M0{axZ9|?F5GtXL%
zRm(lgyc6e^<>q~E27DcGL-4Ui^ptx^P*!|iX041VYeWwGe7+A~4EiIO>W{w3a^v+)
zW}wgY*SYe>=T!O0hVoc!zoh11gv?!X^-xA{b8}RdY1E@_)ybDD;55?(W^Q-IFD@%Y
z@N|JEMc(<4JK1h2{|~>UiDf2M*tWFfWXNIbVZ2ylq=tQfZD@SJazpSZUzJ16JAGx#
w8k9#`g?Rj={~OU6D;$r<`{xxJN`g!N51Ra>-1>ie6#xJL07*qoM6N<$g0C_E+5i9m

diff --git a/gfx/tilesets/13.png b/gfx/tilesets/13.png
deleted file mode 100755
index 2ec8f928e52a12213e99f3c01b6000ac60b86338..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1012
zcmV<Q0}K3#P)<h;3K|Lk000e1NJLTq000O800Qs=00000#fo#Q000BKNkl<Zc-noH
zL1-Lh6vuzNSuvZ_Zkk16p*9<pbcCw(lthwMRxDOpqdQV7*eErcJ$Mp4x@=cjnqpEA
z>E70K598>?iVzqfX{-<>q!&-#5^^eWt5rlz%=o@<W_H%iY#%>f-aNi<^5*}&?=7xN
zG|Sv^*$rax%e%^FOvKVA=^4@`Vw22FP@BNidGWRlaoj!ZZxym-X2#EppVdgvY~nbf
zH%*^2E-w)J9R8c#U*U;1FZqJ<tDo}lEByE-$1adeF>;i(b-rHWqcY|QgHsG%C9y#7
z2=Of6U8LO-dD3a+J1j5xl=5PeZb<v1`$ve_?FRoe*l*}k4~XfR1WFt@RAK%u!)vS!
z)6F{c3H=1lBuxY7D9s`5vp8s}MRN;!F;6OQSN#()XEnhQ$Z@Djq|^kZ1oZ^l34Tg&
zA<uR`LVQnup2Ynv@UbwzS>mfAJFl~pWBVN69O0K7j!FD9pP#}!PHY_W2!+>(y^HCP
zIY*{Q#_rTsD)&%A{T0%_tQC7EYP-U=-Vy|@Mrudw?mS!bN^p_=)^$#-bNNKq^=gZO
zYhW8H=r<@EWDQmg9<)h8f0h2r99k#Us~#ok>A6_p_nQid1xc=;u8h<?YBK7E(4!hy
z4q~>*+dp&uPd@lp`4#<*V|FL4{^`K0Clx2vN9r)C2S^W+KCIra`k~Q@2yD4nwhk&-
zWvnXJMXY(OIUQ7kWEqPt{j86mRhWEWM*b|5)Q|R;3jc-{*q6+7XWql#djNG_23uP2
zY#@GFpM_G}3PFosQkNN{5u*NG!yiOSid)!^VeMm`!OAH_<dq)wp2EG!a-G|C{;rd(
zM=0-McOiX>{t_v#D?Ze5&<~M7I4V_<`X%0oP=fR@^)m5mEMBAD<L5;X>5A{4WuwH#
zC06=W{_!rf-<^(o^uO~8bRL!bBx8>-_K^1YYrJb%yUP3TQTxO%Rcty(?~A-+QoN61
zoucjMf6(eBE4(_u*#`08W4D@A$5}0NtjdkEJZf@7#>xoI4VH#kT_9WFt*05V=zE5N
zahf}N%5CDr*?A5p$=3Z`k8!%moTGfn;mUEQcUkzD+?;B~$o_PVXjJn@(QW;`=J{SH
zV*dR)K;(N|{F&_05sOaG+sG`hnw$(!YR9lYgCWc;=8#WSFZQ?;1o8&5YVjAF3VTt-
zYHy6G46zJTa3#YV85U5#3$+?%ULm*14}uom%oDF*>#_DyMaABHE4UHdOMf#8X?`OD
i41W$Eq%}j@f&T#Ov%dKdV?rYU0000<MNUMnLSTXw81usb

diff --git a/gfx/tilesets/14.png b/gfx/tilesets/14.png
deleted file mode 100755
index aac7064f3dc147149795ddcaa3a7ff1768f31e59..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1136
zcmV-$1dscPP)<h;3K|Lk000e1NJLTq000O800Q6w00000#$0hQ000CxNkl<Zc-nQ9
zUuYav6vls>KQw8@?6zG*izaEUgl!vzkcT9aT{YFxLjIH;tg<x~B(eM8gIX3UF)^)@
z2O)`yWEC{kMYa<vi4Rg)#YjS}7|4TGXsMu~^dZzWe`=_7<9N=@WV1;&myeG#XYRdo
z?{~j@2FoHZQYq5uJUkA5gP=v7L7lY<3NgYu@MM(EYqT%Xy{v3y^p!P@xsT+3BwI*^
z6f(njA(_XqCi#At*<t=2rgT^*m*z9@b>Qp46QrY&cq4|L7dA~O&}q$Y6>WYze%fHr
z&x?KrpreC$9HU7=(Mo_06v+Hu@V4SBQb^#ncO;9K&c%{xQb?d<!#dT~xbn>ozV1|x
zf6UcSSn71K{HY7)(NRw}y=bvGyMh%}391w$E09=|s2a7c)E=hxQEG$K-sk3Jo5c~%
zMYt0o6XDkgbx<FqelPXqHp`=l)2uthhlssS`~!Et(oTdZY2{^uXfe@YqNbbw$yU4c
zEYI!aSb~BCX2PDN5la>sz^cHiw0SqO7Li&tPeKXCA!V~q`->l@EvBYy#tkH?hrUQn
zjWRVWL7@&2wR7R~yXzOVa}l;r?X;O6=7s!NFj;^Fzs&*WaFsXvp`WnLN#Qa#uWC0_
z8`dLm4CXjZ)E<lAkJtvz$veTuc(37NUHnFhH`94I^&RQI^6+N&QNAMVcsrLLFx9}@
z``G?2JEriK=%Xa{G>iD`EQ^y0Y(Gm<-zHaq-MI&S8%V4|{gcp(Cf1z_GI53jmzg+5
zwZRV|s8Z`@_AoKZ?(1|u#m*#Kg@bBBUGO|s0hwp8N?F*#f`=B1eoMK>Vlc=Fi-CSZ
z{kGJf^Hm8mC5$Ebqm_%0F0idACvq2~nox>BwhE1M>t5d5$IO@X9pTc$ycOq>muN^a
zo@T6po7D^*;b1d^TWER`vFc%S4P^OcGIJ&7IY$0eNFcz2HOFRcqw>z7%#|@Q!So_O
z{=%jAH$`tR!&{jhacz?=M-H6JF703&AAP~!ca<fU*83s*f8*y@IdFq*UaBg%+{8=;
z@0{WIes;aagV!k<pri`V9;T+5?_oYl<^^ttxcxl;Jj8Mc>k0)eoNvJh;wi@{C)|#w
zn`iB-D$bW0vJQ^^xr=n5_d28AScl>^yarGBm<%!M<%WlEo+d42b_Y#I@ogj247&)u
z!eETzv|R_n3OT#`hg=RMS8rBUcBhGYZy(kE#jQMc55bJ0r$BplTbycFNN{>YS&}DB
zI-|5-qkBmqfjmmm8CZRbhKtJbMF(zu&S_4a4B7q>7acOzK-{99sl-@|&HkI4-Rq6Y
zJ1{pxB0rqEsvMx+Mkwm;NPlgR43kVM&U-YU-FQ|CN15!#vn^YHMA%r2uHT8BqU#DV
zgD%6ZOW8`83u_tU_<G0}v&Sv$cp&$dx&H#!2LA(KIkNI8Ow1tw0000<MNUMnLSTX`
C$0qv#

diff --git a/gfx/tilesets/15.png b/gfx/tilesets/15.png
deleted file mode 100755
index 7d0b5ea9d62167bc7e6264afc4b6dbef090ccc93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 911
zcmV;A191F_P)<h;3K|Lk000e1NJLTq001Ze004Lb00000@2mIc000A4Nkl<Zc-l?W
zPiPxQ6bA55TFEZ5&8D>$Q%F%DP6_ozaTVgart1VBO2KH0_tmBt1Wgb=#-Si61u5Vj
zdJxK`P~V)!g)l9oG?##T5X7aVF~}6>mO{W69ZFgKqmZt6eKRYmnTvk<^!Cl{?5x17
z)NQ5I!2y`};%VUv2=Dqa;m=C=vA;w_r>qMQi!1fe7T$Ywzp2#ek?^~}AlE(A1#6GO
zxaUX*NZq1R`_39TjOfik?MKWX3W+o`$D=gujhMPUBCJvEos3MuoZ--B1`&r14m-kP
zk;6O(n(}+-TEQ@#Y$h~!cR8qRtqjucrSwXac9FFbonze>sJyU#N8C)YjI9)6(7R&=
z=eu^@&<>|_ZeTc`JD)pyY<Sh%N+quvR-oQ79hCBue$sP<tq&6&nBlfQN?dnkeNb*I
zyK>Kj>;_+5t6d=4K*I^7$nfz@Tiq=ia%M!x<gs$pOzz`}_qd_gE%$K}3oXN9ak}+x
zI7r72=g%23C)4xi0+{sL-j`D?5)#$X&$K*K&>g#<3Tzz62xX#q;BOhSOAVn;4b>>U
zL?&%3RU4#jpf*f%sGW&A#ARQ{OTf+;(Q!wqhWXx)sCM2^YNz$`K^|C^3ld?W=Sq6$
zC12;HC(n2#umhXVBv}9W@`1~XKQc<@YOY(10&`D4Fe0ooKO0a!*Vzp8%KgHC{X(zI
z(oLU|bt$m}!)NPkItzORHl6h`(w*hp(}1Q!#Jc4U+337h8`1rD$bYyayK8Eft@j5!
z%6Dwk^Bp(SZFDNo<V-iPbu+n@OqY34-nXOw`AS-!7*W3g5%uy0oatWhosG=NPrzkz
ze8;EF-#$kc-}ufan7r&ErO0<k?akbToFyS`NLq=`QvAwI6mRHuZ|+LE`>hV&E?x<+
zboz7&6BWq*moHxIzx79r!z{vd+D&eLO~ENb-*Kl-Rw-zr<vaQ0W|is@r=C~ou!$$W
zb6uyCP5kORYxeV1I;;O;s`SMVdTLC%RVwSdYU8P`Da-f_bM`8kv5h&aDxZ?y!rXLC
z3QLArz4%f|IFX~MU>kI6cuT?$AP+mhFT#aC^+_$wg0>e(lV)E{xxJwOu_~CAE8oMI
lQg?7e_IHs!RqA`%{|_uhhy+$sqk8}V002ovPDHLkV1fkc!)5>g

diff --git a/gfx/tilesets/16.png b/gfx/tilesets/16.png
deleted file mode 100755
index 5d69fec8622c2f94bbf8ea113b574ab80b633bc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1088
zcmV-G1i$-<P)<h;3K|Lk000e1NJLTq002M$003YD00000!X7h~000CBNkl<Zc-mdm
zUuaWT7y$6EX+ziINV+Ct3M;O<8t=dfdvR?sHH|nTTO-_KM6eOp<-xve4}ve+H0mf3
z`e&5koiG}khx*}*TU(Ti+}0M6!d73xx(6SodzqBm#8Mdc_8z};?!7hiKtk>>-}%nD
z=X~b?=g0v#FT?M;ep7z{0z_N4o*r6lHP<8{^0`_ocP%%n-}hj7-8wkbs+v9mdPWGW
zTZ3o5JNDp&3(@75RvQaVtu<`Jq&3*p*!^3*2g8#VL_&vN)Bv}ks-4t<Zz_mW;vvep
zHEhz4PZ>KSpdIlZMJQ7TIA8G~Yq}7fb6~84{;7uZCWKW9OA``CZ+a0fbPdzQ7(+ao
z-$>_v{xNqy>q2{e;L85fEb`Aq35+TEzj*$_?o-pf5&)DeD;@0HeQTx5i@1?0H3aKM
zi)Y;k@TW?Vz3)Z-ZgC;Zu3Q=#^0m%(ZNs_ri`B<DQ`??tK@}78og@&i@4?+~2*d(;
zz&>-A&V!mgJG!s~?h<;S{sL>8)!^#~V|yC}XeK;LBWfCz#GDU19&-zfl)*C@4DcsE
z;n8Aw0gRHtO>+VS@K;OCU~Cv$x?W%cjI*y*Ft&^h)0~$PeR1nJ7~Cl7`h2~Bv0&u~
z0Vz$Zv<Rq+%`-rJl+I)-9RjjSXT3YA!vMRSl92P`T!5&Lg@6PnLVOm#t?D8^;SpM1
zroMwyQ3wN6!Ph<DyuSym8yXPLBZ>z_6ig><Tt(D%kr*+&`Q>3K+1xg%I_)Asda(ym
z1P^c1nIdQkmXnaS2kht13I0XQ#uo=*z)st@A38b4gZraY{3)3OsmtBiCjo+zEk+T5
z<NLm+z>TY31Y*PwpL72IyYsT^vING&cG5zOSDGatiW)fr5b_7AB93q#+G^eb)<-+K
zl)tKqNFa{A|Fmk@B-L{=LKADh_v?QSA@`w#{@ExGtBg%hy@*nx2--2x0=1lK-HGrg
z>6G-yRd90nDJR5S=$}<^_zvQ;82H=>2c{FgyqiP8xmwOw6Ld`!I#zp}{RNn`+WMf-
zGTjpds1rB=f1H59`e)t2q+dcoo&FdG0lJ&&f^h*gYF`^v7)yA-)Rh}h259uUF!h2T
zcw-qw(x$K)XKHd3#8v1G%T%AduRznLlpLb-#*Bs4OlESaQ$ZfJ<UJrF@)KVqkY0k|
zPX2@Inat3>KPAvbI=R%msA<<0>;y*{p@u^t%3*cvd2>+$r&O9YV$Xeet5J3lEt46s
zm!F8`rU>~(ZG`jJRCYq;&K7AS3x+KY5Jd=xAr8*;zJzV)0;suk&g~*{T#v_NGrd_S
zBFbMCk2N*<XL|S2IkW`4DJJ9b<AyDUk%!YRs^T(Zpu7cs(6Vdu1U+j20000<MNUMn
GLSTYBb^SH~

diff --git a/gfx/tilesets/17.png b/gfx/tilesets/17.png
deleted file mode 100755
index a4df8b6f8e88eea88b8ca5c02c24ff0b096335db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1013
zcmV<R0}A|!P)<h;3K|Lk000e1NJLTq001}u002+|00000Bl_`F000BLNkl<Zc-mEy
zUrbw77{EVDD^0i2d%|kAC`sGVrqZM#@MJpL(j5fCfYRL?(S(3n?_y_EmYABzWVn)4
zUjS1RZ*_(TQ|WO-Bu2NDgpNOp${&51P9IpJi^&pp$569}T{wQXFaqc1p4{L4o%4O?
ze&<}^+!z_)gvfG$u{3bLdar|Xt|&X0&xi2dwG)g6Rdv_Km8f-(WilP!W0?{@w#R0e
zIk{`|lm0yB;jrD-$_whcb=^wpmMFgb$oq}I08r}K#y=<i_Sqy!+_9<FPg;YVYs8t-
z@kUi+d;P=iege=eNie94menV^HKHg~mcbpP;o@L?z(j;d64$=E7UZUj|MdXFwm$dy
z-8rl6?7%sYB*uQK$g}xZMlbxvi?|_9Fx#-(BHcukB&{*7bOuw4&)+QC2YpO#>nOdv
zgV!adNGHmt&b^JP7+WgKu#r0NrS2ZEFg9lDBo+0Ehy6r?TE>!sM5FbIL_c{Fj#DZ&
z5OScn&=(+(%cSQ+p?19lM1}y1rzZt?YGZg~7;Sk@8M#vudgIi>sRc~q#HwF?ZZsj<
zM63~b01m4Wld2aNQKJ4?zG-}2FS6|sh&1p8-?%=dC$jZ`LirtDTJxhnKQm1Pc$LnG
zn&qTBu%)gQD11y~bbayZqkjHq`ig)7MuoY{CvF7!)|zU-?=?28OeOpDQ28r}1)uj4
z`AkPu#qF*Ys>iFxEo;x#9DE1yWXOJD)@-?E?06s`h7FdA`QF*T>=Bb0F_dzOwp5+P
zIIyYPsMFKf=~-E<3Tj6XY0}Zx*6f{dSl65Nx%LuC3i<vy_ST^v5Y5ShWg|7-X^$!5
z0ao(<nLM5>eHj)8WB(qnytjIPOUGIUAAY^r`sr0ZqhkQz$eX{mtLpaPKoBYx-fPY0
zXLeD0w-Rk}ZaIK;t8n0P<S2vTt)Ev^^?ngW-0U%zU=yA8vk~8#I|eM-5*~^!(KgZW
z{c;mPI%<BYWl9J~&8y#5f|eE?U9MO%^nvea%&lXU;P_pLx}Q0HYY1Q@Iv7sMMml6y
zUN!+6Y9ZzZaWHHT+ae>li!SOoY;c*AUFQwsAj|HUJ7xzk#&ftsin83a+=S<*ER)4w
zLzcfgZ@4%Ka44H$3~da+-3#zUE{-V6w*Xwf0GM)dJSvKU#?(uQDVxb=&_*y|7p1*O
zS+q!I3n89(4pZS@1i-cG@t}qkz_YFeA78g`@54l5AHMdbj{3af+&@lZ*rEZzJ|kn~
jA~J@3_Qien?wS7q&n+4=b+jns00000NkvXXu0mjf;Oz3x

diff --git a/gfx/tilesets/11.2bpp b/gfx/tilesets/cavern.2bpp
similarity index 100%
rename from gfx/tilesets/11.2bpp
rename to gfx/tilesets/cavern.2bpp
diff --git a/gfx/tilesets/11.tilecoll b/gfx/tilesets/cavern.tilecoll
similarity index 100%
rename from gfx/tilesets/11.tilecoll
rename to gfx/tilesets/cavern.tilecoll
diff --git a/gfx/tilesets/0f.2bpp b/gfx/tilesets/cemetery.2bpp
similarity index 100%
rename from gfx/tilesets/0f.2bpp
rename to gfx/tilesets/cemetery.2bpp
diff --git a/gfx/tilesets/0f.tilecoll b/gfx/tilesets/cemetery.tilecoll
similarity index 100%
rename from gfx/tilesets/0f.tilecoll
rename to gfx/tilesets/cemetery.tilecoll
diff --git a/gfx/tilesets/15.2bpp b/gfx/tilesets/club.2bpp
similarity index 100%
rename from gfx/tilesets/15.2bpp
rename to gfx/tilesets/club.2bpp
diff --git a/gfx/tilesets/15.tilecoll b/gfx/tilesets/club.tilecoll
similarity index 100%
rename from gfx/tilesets/15.tilecoll
rename to gfx/tilesets/club.tilecoll
diff --git a/gfx/tilesets/16.2bpp b/gfx/tilesets/facility.2bpp
similarity index 100%
rename from gfx/tilesets/16.2bpp
rename to gfx/tilesets/facility.2bpp
diff --git a/gfx/tilesets/16.tilecoll b/gfx/tilesets/facility.tilecoll
similarity index 100%
rename from gfx/tilesets/16.tilecoll
rename to gfx/tilesets/facility.tilecoll
diff --git a/gfx/tilesets/03.2bpp b/gfx/tilesets/forest.2bpp
similarity index 100%
rename from gfx/tilesets/03.2bpp
rename to gfx/tilesets/forest.2bpp
diff --git a/gfx/tilesets/03.tilecoll b/gfx/tilesets/forest.tilecoll
similarity index 100%
rename from gfx/tilesets/03.tilecoll
rename to gfx/tilesets/forest.tilecoll
diff --git a/gfx/tilesets/09.2bpp b/gfx/tilesets/gate.2bpp
similarity index 100%
rename from gfx/tilesets/09.2bpp
rename to gfx/tilesets/gate.2bpp
diff --git a/gfx/tilesets/09.tilecoll b/gfx/tilesets/gate.tilecoll
similarity index 100%
rename from gfx/tilesets/09.tilecoll
rename to gfx/tilesets/gate.tilecoll
diff --git a/gfx/tilesets/05.2bpp b/gfx/tilesets/gym.2bpp
similarity index 100%
rename from gfx/tilesets/05.2bpp
rename to gfx/tilesets/gym.2bpp
diff --git a/gfx/tilesets/05.tilecoll b/gfx/tilesets/gym.tilecoll
similarity index 100%
rename from gfx/tilesets/05.tilecoll
rename to gfx/tilesets/gym.tilecoll
diff --git a/gfx/tilesets/08.2bpp b/gfx/tilesets/house.2bpp
similarity index 100%
rename from gfx/tilesets/08.2bpp
rename to gfx/tilesets/house.2bpp
diff --git a/gfx/tilesets/08.tilecoll b/gfx/tilesets/house.tilecoll
similarity index 100%
rename from gfx/tilesets/08.tilecoll
rename to gfx/tilesets/house.tilecoll
diff --git a/gfx/tilesets/10.2bpp b/gfx/tilesets/interior.2bpp
similarity index 100%
rename from gfx/tilesets/10.2bpp
rename to gfx/tilesets/interior.2bpp
diff --git a/gfx/tilesets/10.tilecoll b/gfx/tilesets/interior.tilecoll
similarity index 100%
rename from gfx/tilesets/10.tilecoll
rename to gfx/tilesets/interior.tilecoll
diff --git a/gfx/tilesets/14.2bpp b/gfx/tilesets/lab.2bpp
similarity index 100%
rename from gfx/tilesets/14.2bpp
rename to gfx/tilesets/lab.2bpp
diff --git a/gfx/tilesets/14.tilecoll b/gfx/tilesets/lab.tilecoll
similarity index 100%
rename from gfx/tilesets/14.tilecoll
rename to gfx/tilesets/lab.tilecoll
diff --git a/gfx/tilesets/12.2bpp b/gfx/tilesets/lobby.2bpp
similarity index 100%
rename from gfx/tilesets/12.2bpp
rename to gfx/tilesets/lobby.2bpp
diff --git a/gfx/tilesets/12.tilecoll b/gfx/tilesets/lobby.tilecoll
similarity index 100%
rename from gfx/tilesets/12.tilecoll
rename to gfx/tilesets/lobby.tilecoll
diff --git a/gfx/tilesets/13.2bpp b/gfx/tilesets/mansion.2bpp
similarity index 100%
rename from gfx/tilesets/13.2bpp
rename to gfx/tilesets/mansion.2bpp
diff --git a/gfx/tilesets/13.tilecoll b/gfx/tilesets/mansion.tilecoll
similarity index 100%
rename from gfx/tilesets/13.tilecoll
rename to gfx/tilesets/mansion.tilecoll
diff --git a/gfx/tilesets/00.2bpp b/gfx/tilesets/overworld.2bpp
similarity index 100%
rename from gfx/tilesets/00.2bpp
rename to gfx/tilesets/overworld.2bpp
diff --git a/gfx/tilesets/00.tilecoll b/gfx/tilesets/overworld.tilecoll
similarity index 100%
rename from gfx/tilesets/00.tilecoll
rename to gfx/tilesets/overworld.tilecoll
diff --git a/gfx/tilesets/17.2bpp b/gfx/tilesets/plateau.2bpp
similarity index 100%
rename from gfx/tilesets/17.2bpp
rename to gfx/tilesets/plateau.2bpp
diff --git a/gfx/tilesets/17.tilecoll b/gfx/tilesets/plateau.tilecoll
similarity index 100%
rename from gfx/tilesets/17.tilecoll
rename to gfx/tilesets/plateau.tilecoll
diff --git a/gfx/tilesets/02.2bpp b/gfx/tilesets/pokecenter.2bpp
similarity index 100%
rename from gfx/tilesets/02.2bpp
rename to gfx/tilesets/pokecenter.2bpp
diff --git a/gfx/tilesets/02.tilecoll b/gfx/tilesets/pokecenter.tilecoll
similarity index 100%
rename from gfx/tilesets/02.tilecoll
rename to gfx/tilesets/pokecenter.tilecoll
diff --git a/gfx/tilesets/01.2bpp b/gfx/tilesets/reds_house.2bpp
similarity index 100%
rename from gfx/tilesets/01.2bpp
rename to gfx/tilesets/reds_house.2bpp
diff --git a/gfx/tilesets/01.tilecoll b/gfx/tilesets/reds_house.tilecoll
similarity index 100%
rename from gfx/tilesets/01.tilecoll
rename to gfx/tilesets/reds_house.tilecoll
diff --git a/gfx/tilesets/0d.2bpp b/gfx/tilesets/ship.2bpp
similarity index 100%
rename from gfx/tilesets/0d.2bpp
rename to gfx/tilesets/ship.2bpp
diff --git a/gfx/tilesets/0d.tilecoll b/gfx/tilesets/ship.tilecoll
similarity index 100%
rename from gfx/tilesets/0d.tilecoll
rename to gfx/tilesets/ship.tilecoll
diff --git a/gfx/tilesets/0e.2bpp b/gfx/tilesets/ship_port.2bpp
similarity index 100%
rename from gfx/tilesets/0e.2bpp
rename to gfx/tilesets/ship_port.2bpp
diff --git a/gfx/tilesets/0e.tilecoll b/gfx/tilesets/ship_port.tilecoll
similarity index 100%
rename from gfx/tilesets/0e.tilecoll
rename to gfx/tilesets/ship_port.tilecoll
diff --git a/gfx/tilesets/0b.2bpp b/gfx/tilesets/underground.2bpp
similarity index 100%
rename from gfx/tilesets/0b.2bpp
rename to gfx/tilesets/underground.2bpp
diff --git a/gfx/tilesets/0b.tilecoll b/gfx/tilesets/underground.tilecoll
similarity index 100%
rename from gfx/tilesets/0b.tilecoll
rename to gfx/tilesets/underground.tilecoll
diff --git a/macros.asm b/macros.asm
index 90fafdbe..b5d0ff7c 100644
--- a/macros.asm
+++ b/macros.asm
@@ -54,11 +54,17 @@ IMAP: MACRO ; imap mapid_less_than,x-coordinate,y-coordinate,textpointer
 	ENDM
 
 ; tilesets' headers macro
-TSETHEAD: MACRO
-	db BANK(\2)
-	dw \1,\2,\3
-	db \4,\5,\6,\7,\8
+tileset: MACRO
+	db BANK(\2)   ; BANK(GFX)
+	dw \1, \2, \3 ; Block, GFX, Coll
+	db \4, \5, \6 ; counter tiles
+	db \7         ; grass tile
+	db \8         ; permission (indoor, cave, outdoor)
 	ENDM
+
+INDOOR  EQU 0
+CAVE    EQU 1
+OUTDOOR EQU 2
 	
 ; macro for two nibbles
 dn: MACRO
diff --git a/main.asm b/main.asm
index c46c05d7..b0edd8e5 100644
--- a/main.asm
+++ b/main.asm
@@ -1299,7 +1299,7 @@ IsBikeRidingAllowed:: ; 09c5 (0:09c5)
 	ret
 
 BikeRidingTilesets:: ; 09e2 (0:09e2)
-	db $00, $03, $0B, $0E, $11, $FF
+	db OVERWORLD, FOREST, UNDERGROUND, SHIP_PORT, CAVERN, $FF
 
 ; load the tile pattern data of the current tileset into VRAM
 LoadTilesetTilePatternData:: ; 09e8 (0:09e8)
@@ -3659,44 +3659,49 @@ InterlaceMergeSpriteBuffers:: ; 16ea (0:16ea)
 	ld b, a
 	jp CopyVideoData
 
-Tset0B_Coll:: ; 172f (0:172f)
-	INCBIN "gfx/tilesets/0b.tilecoll"
-Tset00_Coll:: ; 1735 (0:1735)
-	INCBIN "gfx/tilesets/00.tilecoll"
-Tset01_Coll:: ; 1749 (0:1749)
-	INCBIN "gfx/tilesets/01.tilecoll"
-Tset02_Coll:: ; 1753 (0:1753)
-	INCBIN "gfx/tilesets/02.tilecoll"
-Tset05_Coll:: ; 1759 (0:1759)
-	INCBIN "gfx/tilesets/05.tilecoll"
-Tset03_Coll:: ; 1765 (0:1765)
-	INCBIN "gfx/tilesets/03.tilecoll"
-Tset08_Coll:: ; 1775 (0:1775)
-	INCBIN "gfx/tilesets/08.tilecoll"
-Tset09_Coll:: ; 177f (0:177f)
-	INCBIN "gfx/tilesets/09.tilecoll"
-Tset0D_Coll:: ; 178a (0:178a)
-	INCBIN "gfx/tilesets/0d.tilecoll"
-Tset0E_Coll:: ; 1795 (0:1795)
-	INCBIN "gfx/tilesets/0e.tilecoll"
-Tset0F_Coll:: ; 179a (0:179a)
-	INCBIN "gfx/tilesets/0f.tilecoll"
-Tset10_Coll:: ; 17a2 (0:17a2)
-	INCBIN "gfx/tilesets/10.tilecoll"
-Tset11_Coll:: ; 17ac (0:17ac)
-	INCBIN "gfx/tilesets/11.tilecoll"
-Tset12_Coll:: ; 17b8 (0:17b8)
-	INCBIN "gfx/tilesets/12.tilecoll"
-Tset13_Coll:: ; 17c0 (0:17c0)
-	INCBIN "gfx/tilesets/13.tilecoll"
-Tset14_Coll:: ; 17ca (0:17ca)
-	INCBIN "gfx/tilesets/14.tilecoll"
-Tset15_Coll:: ; 17d1 (0:17d1)
-	INCBIN "gfx/tilesets/15.tilecoll"
-Tset16_Coll:: ; 17dd (0:17dd)
-	INCBIN "gfx/tilesets/16.tilecoll"
-Tset17_Coll:: ; 17f0 (0:17f0)
-	INCBIN "gfx/tilesets/17.tilecoll"
+Underground_Coll:: ; 172f (0:172f)
+	INCBIN "gfx/tilesets/underground.tilecoll"
+Overworld_Coll:: ; 1735 (0:1735)
+	INCBIN "gfx/tilesets/overworld.tilecoll"
+RedsHouse1_Coll::
+RedsHouse2_Coll:: ; 1749 (0:1749)
+	INCBIN "gfx/tilesets/reds_house.tilecoll"
+Mart_Coll
+Pokecenter_Coll:: ; 1753 (0:1753)
+	INCBIN "gfx/tilesets/pokecenter.tilecoll"
+Dojo_Coll::
+Gym_Coll:: ; 1759 (0:1759)
+	INCBIN "gfx/tilesets/gym.tilecoll"
+Forest_Coll:: ; 1765 (0:1765)
+	INCBIN "gfx/tilesets/forest.tilecoll"
+House_Coll:: ; 1775 (0:1775)
+	INCBIN "gfx/tilesets/house.tilecoll"
+ForestGate_Coll::
+Museum_Coll::
+Gate_Coll:: ; 177f (0:177f)
+	INCBIN "gfx/tilesets/gate.tilecoll"
+Ship_Coll:: ; 178a (0:178a)
+	INCBIN "gfx/tilesets/ship.tilecoll"
+ShipPort_Coll:: ; 1795 (0:1795)
+	INCBIN "gfx/tilesets/ship_port.tilecoll"
+Cemetery_Coll:: ; 179a (0:179a)
+	INCBIN "gfx/tilesets/cemetery.tilecoll"
+Interior_Coll:: ; 17a2 (0:17a2)
+	INCBIN "gfx/tilesets/interior.tilecoll"
+Cavern_Coll:: ; 17ac (0:17ac)
+	INCBIN "gfx/tilesets/cavern.tilecoll"
+Lobby_Coll:: ; 17b8 (0:17b8)
+	INCBIN "gfx/tilesets/lobby.tilecoll"
+Mansion_Coll:: ; 17c0 (0:17c0)
+	INCBIN "gfx/tilesets/mansion.tilecoll"
+Lab_Coll:: ; 17ca (0:17ca)
+	INCBIN "gfx/tilesets/lab.tilecoll"
+Club_Coll:: ; 17d1 (0:17d1)
+	INCBIN "gfx/tilesets/club.tilecoll"
+Facility_Coll:: ; 17dd (0:17dd)
+	INCBIN "gfx/tilesets/facility.tilecoll"
+Plateau_Coll:: ; 17f0 (0:17f0)
+	INCBIN "gfx/tilesets/plateau.tilecoll"
 ;Tile Collision ends 0x17f7
 
 ; does the same thing as FarCopyData at 009D
@@ -13833,14 +13838,14 @@ Func_5a5f: ; 5a5f (1:5a5f)
 	jp InitGame
 .asm_5a75
 	call Func_5317
-	ld hl, Tset15_GFX
+	ld hl, Club_GFX
 	ld a, h
 	ld [$d52f], a
 	ld a, l
 	ld [$d52e], a
-	ld a, Bank(Tset15_GFX)
+	ld a, Bank(Club_GFX)
 	ld [$d52b], a
-	ld hl, Tset15_Coll
+	ld hl, Club_Coll
 	ld a, h
 	ld [$d531], a
 	ld a, l
@@ -19570,7 +19575,7 @@ Func_c754: ; c754 (3:4754)
 	inc d
 .asm_c765
 	ld e, a
-	ld hl, TilesetsHeadPtr
+	ld hl, Tilesets
 	add hl, de
 	ld de, $d52b
 	ld c, $b
@@ -19588,7 +19593,7 @@ Func_c754: ; c754 (3:4754)
 	ld a, [W_CURMAPTILESET] ; $d367
 	push hl
 	push de
-	ld hl, DungeonTilesetIDs ; $47b2
+	ld hl, DungeonTilesets ; $47b2
 	ld de, $1
 	call IsInArray
 	pop de
@@ -19613,34 +19618,34 @@ Func_c754: ; c754 (3:4754)
 .asm_c7b1
 	ret
 
-DungeonTilesetIDs: ; c7b2 (3:47b2)
-	db $03,$0A,$0D,$11,$12,$13,$0C,$14,$16,$0F,$07,$FF
+DungeonTilesets: ; c7b2 (3:47b2)
+	db FOREST, MUSEUM, SHIP, CAVERN, LOBBY, MANSION, GATE, LAB, FACILITY, CEMETERY, GYM, $FF
 
-TilesetsHeadPtr: ; c7be (3:47be)
-	TSETHEAD Tset00_Block,Tset00_GFX,Tset00_Coll,$FF,$FF,$FF,$52,2
-	TSETHEAD Tset01_Block,Tset01_GFX,Tset01_Coll,$FF,$FF,$FF,$FF,0
-	TSETHEAD Tset02_Block,Tset02_GFX,Tset02_Coll,$18,$19,$1E,$FF,0
-	TSETHEAD Tset03_Block,Tset03_GFX,Tset03_Coll,$FF,$FF,$FF,$20,1
-	TSETHEAD Tset01_Block,Tset01_GFX,Tset01_Coll,$FF,$FF,$FF,$FF,0
-	TSETHEAD Tset05_Block,Tset05_GFX,Tset05_Coll,$3A,$FF,$FF,$FF,2
-	TSETHEAD Tset02_Block,Tset02_GFX,Tset02_Coll,$18,$19,$1E,$FF,0
-	TSETHEAD Tset05_Block,Tset05_GFX,Tset05_Coll,$3A,$FF,$FF,$FF,2
-	TSETHEAD Tset08_Block,Tset08_GFX,Tset08_Coll,$FF,$FF,$FF,$FF,0
-	TSETHEAD Tset09_Block,Tset09_GFX,Tset09_Coll,$17,$32,$FF,$FF,0
-	TSETHEAD Tset09_Block,Tset09_GFX,Tset09_Coll,$17,$32,$FF,$FF,0
-	TSETHEAD Tset0B_Block,Tset0B_GFX,Tset0B_Coll,$FF,$FF,$FF,$FF,0
-	TSETHEAD Tset09_Block,Tset09_GFX,Tset09_Coll,$17,$32,$FF,$FF,0
-	TSETHEAD Tset0D_Block,Tset0D_GFX,Tset0D_Coll,$FF,$FF,$FF,$FF,1
-	TSETHEAD Tset0E_Block,Tset0E_GFX,Tset0E_Coll,$FF,$FF,$FF,$FF,1
-	TSETHEAD Tset0F_Block,Tset0F_GFX,Tset0F_Coll,$12,$FF,$FF,$FF,0
-	TSETHEAD Tset10_Block,Tset10_GFX,Tset10_Coll,$FF,$FF,$FF,$FF,0
-	TSETHEAD Tset11_Block,Tset11_GFX,Tset11_Coll,$FF,$FF,$FF,$FF,1
-	TSETHEAD Tset12_Block,Tset12_GFX,Tset12_Coll,$15,$36,$FF,$FF,0
-	TSETHEAD Tset13_Block,Tset13_GFX,Tset13_Coll,$FF,$FF,$FF,$FF,0
-	TSETHEAD Tset14_Block,Tset14_GFX,Tset14_Coll,$FF,$FF,$FF,$FF,0
-	TSETHEAD Tset15_Block,Tset15_GFX,Tset15_Coll,$07,$17,$FF,$FF,0
-	TSETHEAD Tset16_Block,Tset16_GFX,Tset16_Coll,$12,$FF,$FF,$FF,1
-	TSETHEAD Tset17_Block,Tset17_GFX,Tset17_Coll,$FF,$FF,$FF,$45,1
+Tilesets: ; c7be (3:47be)
+	tileset Overworld_Block,   Overworld_GFX,   Overworld_Coll,   $FF,$FF,$FF, $52, OUTDOOR
+	tileset RedsHouse1_Block,  RedsHouse1_GFX,  RedsHouse1_Coll,  $FF,$FF,$FF, $FF, INDOOR
+	tileset Mart_Block,        Mart_GFX,        Mart_Coll,        $18,$19,$1E, $FF, INDOOR
+	tileset Forest_Block,      Forest_GFX,      Forest_Coll,      $FF,$FF,$FF, $20, CAVE
+	tileset RedsHouse2_Block,  RedsHouse2_GFX,  RedsHouse2_Coll,  $FF,$FF,$FF, $FF, INDOOR
+	tileset Dojo_Block,        Dojo_GFX,        Dojo_Coll,        $3A,$FF,$FF, $FF, OUTDOOR
+	tileset Pokecenter_Block,  Pokecenter_GFX,  Pokecenter_Coll,  $18,$19,$1E, $FF, INDOOR
+	tileset Gym_Block,         Gym_GFX,         Gym_Coll,         $3A,$FF,$FF, $FF, OUTDOOR
+	tileset House_Block,       House_GFX,       House_Coll,       $FF,$FF,$FF, $FF, INDOOR
+	tileset ForestGate_Block,  ForestGate_GFX,  ForestGate_Coll,  $17,$32,$FF, $FF, INDOOR
+	tileset Museum_Block,      Museum_GFX,      Museum_Coll,      $17,$32,$FF, $FF, INDOOR
+	tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, INDOOR
+	tileset Gate_Block,        Gate_GFX,        Gate_Coll,        $17,$32,$FF, $FF, INDOOR
+	tileset Ship_Block,        Ship_GFX,        Ship_Coll,        $FF,$FF,$FF, $FF, CAVE
+	tileset ShipPort_Block,    ShipPort_GFX,    ShipPort_Coll,    $FF,$FF,$FF, $FF, CAVE
+	tileset Cemetery_Block,    Cemetery_GFX,    Cemetery_Coll,    $12,$FF,$FF, $FF, INDOOR
+	tileset Interior_Block,    Interior_GFX,    Interior_Coll,    $FF,$FF,$FF, $FF, INDOOR
+	tileset Cavern_Block,      Cavern_GFX,      Cavern_Coll,      $FF,$FF,$FF, $FF, CAVE
+	tileset Lobby_Block,       Lobby_GFX,       Lobby_Coll,       $15,$36,$FF, $FF, INDOOR
+	tileset Mansion_Block,     Mansion_GFX,     Mansion_Coll,     $FF,$FF,$FF, $FF, INDOOR
+	tileset Lab_Block,         Lab_GFX,         Lab_Coll,         $FF,$FF,$FF, $FF, INDOOR
+	tileset Club_Block,        Club_GFX,        Club_Coll,        $07,$17,$FF, $FF, INDOOR
+	tileset Facility_Block,    Facility_GFX,    Facility_Coll,    $12,$FF,$FF, $FF, CAVE
+	tileset Plateau_Block,     Plateau_GFX,     Plateau_Coll,     $FF,$FF,$FF, $45, CAVE
 
 Func_c8de: ; c8de (3:48de)
 	ld a, [W_DAYCARE_IN_USE]
@@ -25716,7 +25721,7 @@ ItemUseEscapeRope: ; dfaf (3:5faf)
 	jp ItemUseNotTime
 
 EscapeRopeTilesets: ; dffd (3:5ffd)
-	db $03,$0f,$11,$16,$10
+	db FOREST, CEMETERY, CAVERN, FACILITY, INTERIOR
 	db $ff ; terminator
 
 ItemUseRepel: ; e003 (3:6003)
@@ -27093,22 +27098,22 @@ Func_e7a4: ; e7a4 (3:67a4)
 ; used for surfing and fishing
 ; unsets carry if it is, sets carry if not
 IsNextTileShoreOrWater: ; e8b8 (3:68b8)
-	ld a,[W_CURMAPTILESET]
-	ld hl,WaterTilesets
+	ld a, [W_CURMAPTILESET]
+	ld hl, WaterTilesets
 	ld de,1
 	call IsInArray
-	jr nc,.notShoreOrWater
-	ld a,[W_CURMAPTILESET]
-	cp a,$0e ; Vermilion Dock tileset
-	ld a,[$cfc6] ; tile in front of player
-	jr z,.skipShoreTiles ; if it's the Vermilion Dock tileset
-	cp a,$48 ; eastern shore tile in Safari Zone
-	jr z,.shoreOrWater
-	cp a,$32 ; usual eastern shore tile
-	jr z,.shoreOrWater
+	jr nc, .notShoreOrWater
+	ld a, [W_CURMAPTILESET]
+	cp SHIP_PORT ; Vermilion Dock tileset
+	ld a, [$cfc6] ; tile in front of player
+	jr z, .skipShoreTiles ; if it's the Vermilion Dock tileset
+	cp $48 ; eastern shore tile in Safari Zone
+	jr z, .shoreOrWater
+	cp $32 ; usual eastern shore tile
+	jr z, .shoreOrWater
 .skipShoreTiles
-	cp a,$14 ; water tile
-	jr z,.shoreOrWater
+	cp $14 ; water tile
+	jr z, .shoreOrWater
 .notShoreOrWater
 	scf
 	ret
@@ -27118,7 +27123,7 @@ IsNextTileShoreOrWater: ; e8b8 (3:68b8)
 
 ; tilesets with water
 WaterTilesets: ; e8e0 (3:68e0)
-	db $00,$03,$05,$07,$0d,$0e,$11,$16,$17
+	db OVERWORLD, FOREST, DOJO, GYM, SHIP, SHIP_PORT, CAVERN, FACILITY, PLATEAU
 	db $ff ; terminator
 
 ReadSuperRodData: ; e8ea (3:68ea)
@@ -27649,13 +27654,13 @@ Func_eff7: ; eff7 (3:6ff7)
 	ld a, [$cd4d]
 	cp $52
 	jr z, .asm_f020
-	ld de, Tset00_GFX + $2d0 ; $42d0 ; cuttable tree sprite top row
+	ld de, Overworld_GFX + $2d0 ; $42d0 ; cuttable tree sprite top row
 	ld hl, $8fc0
-	ld bc, (BANK(Tset00_GFX) << 8) + $02
+	ld bc, (BANK(Overworld_GFX) << 8) + $02
 	call CopyVideoData
-	ld de, Tset00_GFX + $3d0 ; $43d0 ; cuttable tree sprite bottom row
+	ld de, Overworld_GFX + $3d0 ; $43d0 ; cuttable tree sprite bottom row
 	ld hl, $8fe0
-	ld bc, (BANK(Tset00_GFX) << 8) + $02
+	ld bc, (BANK(Overworld_GFX) << 8) + $02
 	call CopyVideoData
 	jr asm_f055
 .asm_f020
@@ -33483,7 +33488,7 @@ RemoveItemByID: ; 17f37 (5:7f37)
 SECTION "bank6",ROMX,BANK[$6]
 
 CeladonCity_h: ; 18000 (6:4000)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x)
 	dw CeladonCityBlocks, CeladonCityTextPointers, CeladonCityScript ; blocks, texts, scripts
 	db WEST | EAST ; connections
@@ -33550,7 +33555,7 @@ CeladonCityBlocks: ; 180df (6:40df)
 	INCBIN "maps/celadoncity.blk"
 
 PalletTown_h: ; 182a1 (6:42a1)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions
 	dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript
 	db NORTH | SOUTH ; connections
@@ -33586,7 +33591,7 @@ PalletTownBlocks: ; 182fd (6:42fd)
 	INCBIN "maps/pallettown.blk"
 
 ViridianCity_h: ; 0x18357 to 0x18384 (45 bytes) (bank=6) (id=1)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x)
 	dw ViridianCityBlocks, ViridianCityTextPointers, ViridianCityScript ; blocks, texts, scripts
 	db NORTH | SOUTH | WEST ; connections
@@ -33633,7 +33638,7 @@ ViridianCityBlocks: ; 183ec (6:43ec)
 	INCBIN "maps/viridiancity.blk"
 
 PewterCity_h: ; 0x18554 to 0x18576 (34 bytes) (bank=6) (id=2)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x)
 	dw PewterCityBlocks, PewterCityTextPointers, PewterCityScript ; blocks, texts, scripts
 	db SOUTH | EAST ; connections
@@ -33684,7 +33689,7 @@ PewterCityBlocks: ; 185e6 (6:45e6)
 	INCBIN "maps/pewtercity.blk"
 
 CeruleanCity_h: ; 0x1874e to 0x18786 (56 bytes) (bank=6) (id=3)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x)
 	dw CeruleanCityBlocks, CeruleanCityTextPointers, CeruleanCityScript ; blocks, texts, scripts
 	db NORTH | SOUTH | WEST | EAST ; connections
@@ -33746,7 +33751,7 @@ CeruleanCityBlocks: ; 18830 (6:4830)
 	INCBIN "maps/ceruleancity.blk"
 
 VermilionCity_h: ; 0x18998 to 0x189ba (34 bytes) (bank=6) (id=5)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x)
 	dw VermilionCityBlocks, VermilionCityTextPointers, VermilionCityScript ; blocks, texts, scripts
 	db NORTH | EAST ; connections
@@ -33800,7 +33805,7 @@ VermilionCityBlocks: ; 18a3f (6:4a3f)
 	INCBIN "maps/vermilioncity.blk"
 
 FuchsiaCity_h: ; 0x18ba7 to 0x18bd4 (45 bytes) (bank=6) (id=7)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x)
 	dw FuchsiaCityBlocks, FuchsiaCityTextPointers, FuchsiaCityScript ; blocks, texts, scripts
 	db SOUTH | WEST | EAST ; connections
@@ -35834,7 +35839,7 @@ UnnamedText_19b2a: ; 19b2a (6:5b2a)
 	db "@"
 
 BluesHouse_h: ; 0x19b2f id=39
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions
 	dw BluesHouseBlocks, BluesHouseTextPointers, BluesHouseScript
 	db 0
@@ -35953,7 +35958,7 @@ BluesHouseBlocks: ; 19bf6 (6:5bf6)
 	INCBIN "maps/blueshouse.blk"
 
 VermilionHouse3_h: ; 0x19c06 to 0x19c12 (12 bytes) (bank=6) (id=196)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db VERMILION_HOUSE_3_HEIGHT, VERMILION_HOUSE_3_WIDTH ; dimensions (y, x)
 	dw VermilionHouse3Blocks, VermilionHouse3TextPointers, VermilionHouse3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -35993,7 +35998,7 @@ VermilionHouse3Blocks: ; 19c3f (6:5c3f)
 	INCBIN "maps/vermilionhouse3.blk"
 
 IndigoPlateauLobby_h: ; 0x19c4f to 0x19c5b (12 bytes) (bank=6) (id=174)
-	db $02 ; tileset
+	db MART ; tileset
 	db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x)
 	dw IndigoPlateauLobbyBlocks, IndigoPlateauLobbyTextPointers, IndigoPlateauLobbyScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -36067,7 +36072,7 @@ IndigoPlateauLobbyBlocks: ; 19ccf (6:5ccf)
 	INCBIN "maps/indigoplateaulobby.blk"
 
 SilphCo4_h: ; 0x19cff to 0x19d0b (12 bytes) (bank=6) (id=209)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x)
 	dw SilphCo4Blocks, SilphCo4TextPointers, SilphCo4Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -36311,7 +36316,7 @@ SilphCo4Blocks: ; 19ea4 (6:5ea4)
 	INCBIN "maps/silphco4.blk"
 
 SilphCo5_h: ; 0x19f2b to 0x19f37 (12 bytes) (bank=6) (id=210)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x)
 	dw SilphCo5Blocks, SilphCo5TextPointers, SilphCo5Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -36581,7 +36586,7 @@ SilphCo5Blocks: ; 1a116 (6:6116)
 	INCBIN "maps/silphco5.blk"
 
 SilphCo6_h: ; 0x1a19d to 0x1a1a9 (12 bytes) (bank=6) (id=211)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x)
 	dw SilphCo6Blocks, SilphCo6TextPointers, SilphCo6Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -37319,7 +37324,7 @@ LedgeHoppingShadowOAM: ; 1a710 (6:6710)
 SECTION "bank7",ROMX,BANK[$7]
 
 CinnabarIsland_h: ; 0x1c000 to 0x1c022 (34 bytes) (bank=7) (id=8)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x)
 	dw CinnabarIslandBlocks, CinnabarIslandTextPointers, CinnabarIslandScript ; blocks, texts, scripts
 	db NORTH | EAST ; connections
@@ -37359,7 +37364,7 @@ CinnabarIslandBlocks: ; 1c069 (7:4069)
 	INCBIN "maps/cinnabarisland.blk"
 
 Route1_h: ; 0x1c0c3 to 0x1c0e5 (34 bytes) (bank=7) (id=12)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x)
 	dw Route1Blocks, Route1TextPointers, Route1Script ; blocks, texts, scripts
 	db NORTH | SOUTH ; connections
@@ -37827,7 +37832,7 @@ Route1Text3: ; 1cafd (7:4afd)
 	db "@"
 
 OaksLab_h: ; 0x1cb02 to 0x1cb0e (12 bytes) (bank=7) (id=40)
-	db $05 ; tileset
+	db DOJO ; tileset
 	db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x)
 	dw OaksLabBlocks, OaksLabTextPointers, OaksLabScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -39105,7 +39110,7 @@ OaksLabObject: ; 0x1d40a (size=88)
 	EVENT_DISP $5, $b, $5
 
 ViridianMart_h: ; 0x1d462 to 0x1d46e (12 bytes) (bank=7) (id=42)
-	db $02 ; tileset
+	db MART ; tileset
 	db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x)
 	dw ViridianMartBlocks, ViridianMartTextPointers, ViridianMartScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -39229,7 +39234,7 @@ ViridianMartBlocks: ; 1d530 (7:5530)
 	INCBIN "maps/viridianmart.blk"
 
 School_h: ; 0x1d540 to 0x1d54c (12 bytes) (bank=7) (id=43)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db VIRIDIAN_SCHOOL_HEIGHT, VIRIDIAN_SCHOOL_WIDTH ; dimensions (y, x)
 	dw SchoolBlocks, SchoolTextPointers, SchoolScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -39268,7 +39273,7 @@ SchoolObject: ; 0x1d55d (size=32)
 	EVENT_DISP $4, $7, $3
 
 ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db VIRIDIAN_HOUSE_HEIGHT, VIRIDIAN_HOUSE_WIDTH ; dimensions (y, x)
 	dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -39330,7 +39335,7 @@ ViridianHouseObject: ; 0x1d5bb (size=44)
 	EVENT_DISP $4, $7, $3
 
 PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db PEWTER_HOUSE_1_HEIGHT, PEWTER_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw PewterHouse1Blocks, PewterHouse1TextPointers, PewterHouse1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -39379,7 +39384,7 @@ PewterHouse1Object: ; 0x1d616 (size=38)
 	EVENT_DISP $4, $7, $3
 
 PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db PEWTER_HOUSE_2_HEIGHT, PEWTER_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw PewterHouse2Blocks, PewterHouse2TextPointers, PewterHouse2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -39418,7 +39423,7 @@ PewterHouse2Object: ; 0x1d659 (size=32)
 	EVENT_DISP $4, $7, $3
 
 CeruleanHouseTrashed_h: ; 0x1d679 to 0x1d685 (12 bytes) (bank=7) (id=62)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db TRASHED_HOUSE_HEIGHT, TRASHED_HOUSE_WIDTH ; dimensions (y, x)
 	dw CeruleanHouseTrashedBlocks, CeruleanHouseTrashedTextPointers, CeruleanHouseTrashedScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -39486,7 +39491,7 @@ CeruleanHouseTrashedObject: ; 0x1d6bf (size=43)
 	EVENT_DISP $4, $0, $3
 
 CeruleanHouse_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db CERULEAN_HOUSE_HEIGHT, CERULEAN_HOUSE_WIDTH ; dimensions (y, x)
 	dw CeruleanHouseBlocks, CeruleanHouseTextPointers, CeruleanHouseScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -39529,7 +39534,7 @@ CeruleanHouseObject: ; 0x1d710 (size=32)
 	EVENT_DISP $4, $7, $3
 
 BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66)
-	db $15 ; tileset
+	db CLUB ; tileset
 	db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x)
 	dw BikeShopBlocks, BikeShopTextPointers, BikeShopScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -39711,7 +39716,7 @@ BikeShopBlocks: ; 1d88c (7:588c)
 	INCBIN "maps/bikeshop.blk"
 
 LavenderHouse1_h: ; 0x1d89c to 0x1d8a8 (12 bytes) (bank=7) (id=149)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db LAVENDER_HOUSE_1_HEIGHT, LAVENDER_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw LavenderHouse1Blocks, LavenderHouse1TextPointers, LavenderHouse1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -39856,7 +39861,7 @@ LavenderHouse1Object: ; 0x1d96a (size=56)
 	EVENT_DISP $4, $7, $3
 
 LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db LAVENDER_HOUSE_2_HEIGHT, LAVENDER_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw LavenderHouse2Blocks, LavenderHouse2TextPointers, LavenderHouse2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -39917,7 +39922,7 @@ LavenderHouse2Object: ; 0x1d9e6 (size=32)
 	EVENT_DISP $4, $7, $3
 
 NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x)
 	dw NameRaterBlocks, NameRaterTextPointers, NameRaterScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -40050,7 +40055,7 @@ NameRaterObject: ; 0x1dad6 (size=26)
 	EVENT_DISP $4, $7, $3
 
 VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db VERMILION_HOUSE_1_HEIGHT, VERMILION_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw VermilionHouse1Blocks, VermilionHouse1TextPointers, VermilionHouse1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -40100,7 +40105,7 @@ VermilionHouse1Object: ; 0x1db20 (size=38)
 	EVENT_DISP $4, $7, $3
 
 VermilionDock_h: ; 0x1db46 to 0x1db52 (12 bytes) (bank=7) (id=94)
-	db $0e ; tileset
+	db SHIP_PORT ; tileset
 	db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x)
 	dw VermilionDockBlocks, VermilionDockTextPointers, VermilionDockScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -40336,7 +40341,7 @@ VermilionDockBlocks: ; 1dcda (7:5cda)
 	INCBIN "maps/vermiliondock.blk"
 
 CeladonMansion5_h: ; 0x1dd2e to 0x1dd3a (12 bytes) (bank=7) (id=132)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db CELADON_MANSION_5_HEIGHT, CELADON_MANSION_5_WIDTH ; dimensions (y, x)
 	dw CeladonMansion5Blocks, CeladonMansion5TextPointers, CeladonMansion5Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -40383,7 +40388,7 @@ CeladonMansion5Object: ; 0x1dd5c (size=32)
 	EVENT_DISP $4, $7, $3 ; CELADON_MANSION_4
 
 FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152)
-	db $02 ; tileset
+	db MART ; tileset
 	db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x)
 	dw FuchsiaMartBlocks, FuchsiaMartTextPointers, FuchsiaMartScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -40427,7 +40432,7 @@ FuchsiaMartBlocks: ; 1ddc1 (7:5dc1)
 	INCBIN "maps/fuchsiamart.blk"
 
 SaffronHouse1_h: ; 0x1ddd1 to 0x1dddd (12 bytes) (bank=7) (id=179)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db SAFFRON_HOUSE_1_HEIGHT, SAFFRON_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw SaffronHouse1Blocks, SaffronHouse1TextPointers, SaffronHouse1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -40481,7 +40486,7 @@ SaffronHouse1Object: ; 0x1de04 (size=44)
 	EVENT_DISP $4, $7, $3
 
 SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db SAFFRON_HOUSE_2_HEIGHT, SAFFRON_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw SaffronHouse2Blocks, SaffronHouse2TextPointers, SaffronHouse2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -40551,7 +40556,7 @@ SaffronHouse2Object: ; 0x1de8a (size=26)
 	EVENT_DISP $4, $7, $3
 
 DiglettsCaveRoute2_h: ; 0x1dea4 to 0x1deb0 (12 bytes) (bank=7) (id=46)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db DIGLETTS_CAVE_EXIT_HEIGHT, DIGLETTS_CAVE_EXIT_WIDTH ; dimensions (y, x)
 	dw DiglettsCaveRoute2Blocks, DiglettsCaveRoute2TextPointers, DiglettsCaveRoute2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -40588,7 +40593,7 @@ DiglettsCaveRoute2Object: ; 0x1debf (size=34)
 	EVENT_DISP $4, $4, $4 ; DIGLETTS_CAVE
 
 Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db ROUTE_2_HOUSE_HEIGHT, ROUTE_2_HOUSE_WIDTH ; dimensions (y, x)
 	dw Route2HouseBlocks, Route2HouseTextPointers, Route2HouseScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -40631,7 +40636,7 @@ Route2HouseObject: ; 0x1df07 (size=32)
 	EVENT_DISP $4, $7, $3
 
 Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x)
 	dw Route5GateBlocks, Route5GateTextPointers, Route5GateScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -40783,7 +40788,7 @@ Route5GateBlocks: ; 1e025 (7:6025)
 	INCBIN "maps/route5gate.blk"
 
 Route6Gate_h: ; 0x1e031 to 0x1e03d (12 bytes) (bank=7) (id=73)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x)
 	dw Route6GateBlocks, Route6GateTextPointers, Route6GateScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -40886,7 +40891,7 @@ Route6GateBlocks: ; 1e0e8 (7:60e8)
 	INCBIN "maps/route6gate.blk"
 
 Route7Gate_h: ; 0x1e0f4 to 0x1e100 (12 bytes) (bank=7) (id=76)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x)
 	dw Route7GateBlocks, Route7GateTextPointers, Route7GateScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -40992,7 +40997,7 @@ Route7GateBlocks: ; 1e1af (7:61af)
 	INCBIN "maps/route7gate.blk"
 
 Route8Gate_h: ; 0x1e1bb to 0x1e1c7 (12 bytes) (bank=7) (id=79)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x)
 	dw Route8GateBlocks, Route8GateTextPointers, Route8GateScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -41095,7 +41100,7 @@ Route8GateBlocks: ; 1e271 (7:6271)
 	INCBIN "maps/route8gate.blk"
 
 UndergroundPathEntranceRoute8_h: ; 0x1e27d to 0x1e289 (12 bytes) (bank=7) (id=80)
-	db $0c ; tileset
+	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_8_HEIGHT, PATH_ENTRANCE_ROUTE_8_WIDTH ; dimensions (y, x)
 	dw UndergroundPathEntranceRoute8Blocks, UndergroundPathEntranceRoute8TextPointers, UndergroundPathEntranceRoute8Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -41132,7 +41137,7 @@ UndergroundPathEntranceRoute8Object: ; 0x1e298 (size=34)
 	EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_WE
 
 PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x)
 	dw PowerPlantBlocks, PowerPlantTextPointers, PowerPlantScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -41350,7 +41355,7 @@ PowerPlantBlocks: ; 1e446 (7:6446)
 	INCBIN "maps/powerplant.blk"
 
 DiglettsCaveEntranceRoute11_h: ; 0x1e5ae to 0x1e5ba (12 bytes) (bank=7) (id=85)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db DIGLETTS_CAVE_ENTRANCE_HEIGHT, DIGLETTS_CAVE_ENTRANCE_WIDTH ; dimensions (y, x)
 	dw DiglettsCaveEntranceRoute11Blocks, DiglettsCaveEntranceRoute11TextPointers, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -41388,7 +41393,7 @@ DiglettsCaveEntranceRoute11Object: ; 0x1e5ca (size=34)
 	EVENT_DISP $4, $4, $4 ; DIGLETTS_CAVE
 
 Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db ROUTE_16_HOUSE_HEIGHT, ROUTE_16_HOUSE_WIDTH ; dimensions (y, x)
 	dw Route16HouseBlocks, Route16HouseTextPointers, Route16HouseScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -41469,7 +41474,7 @@ Route16HouseObject: ; 0x1e657 (size=32)
 	EVENT_DISP $4, $7, $3
 
 Route22Gate_h: ; 0x1e677 to 0x1e683 (12 bytes) (bank=7) (id=193)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x)
 	dw Route22GateBlocks, Route22GateTextPointers, Route22GateScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -41592,7 +41597,7 @@ Route22GateBlocks: ; 1e74a (7:674a)
 	INCBIN "maps/route22gate.blk"
 
 BillsHouse_h: ; 0x1e75e to 0x1e76a (12 bytes) (bank=7) (id=88)
-	db $10 ; tileset
+	db INTERIOR ; tileset
 	db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x)
 	dw BillsHouseBlocks, BillsHouseTextPointers, BillsHouseScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -68236,7 +68241,7 @@ OTString67E5: ; 427e5 (10:67e5)
 SECTION "bank11",ROMX,BANK[$11]
 
 LavenderTown_h: ; 0x44000 to 0x4402d (45 bytes) (bank=11) (id=4)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x)
 	dw LavenderTownBlocks, LavenderTownTextPointers, LavenderTownScript ; blocks, texts, scripts
 	db NORTH | SOUTH | WEST ; connections
@@ -68514,7 +68519,7 @@ UnnamedText_4424c: ; 4424c (11:424c)
 	db "@"
 
 ViridianPokecenter_h: ; 0x44251 to 0x4425d (12 bytes) (bank=11) (id=41)
-	db $06 ; tileset
+	db POKECENTER ; tileset
 	db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x)
 	dw ViridianPokecenterBlocks, ViridianPokecenterTextPointers, ViridianPokeCenterScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -68564,7 +68569,7 @@ ViridianPokecenterObject: ; 0x44277 (size=44)
 	EVENT_DISP $7, $7, $4
 
 Mansion1_h: ; 0x442a3 to 0x442af (12 bytes) (bank=11) (id=165)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db MANSION_1_HEIGHT, MANSION_1_WIDTH ; dimensions (y, x)
 	dw Mansion1Blocks, Mansion1TextPointers, Mansion1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -68744,7 +68749,7 @@ Mansion1Blocks: ; 443fe (11:43fe)
 	INCBIN "maps/mansion1.blk"
 
 RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db ROCK_TUNNEL_1_HEIGHT, ROCK_TUNNEL_1_WIDTH ; dimensions (y, x)
 	dw RockTunnel1Blocks, RockTunnel1TextPointers, RockTunnel1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -69004,7 +69009,7 @@ RockTunnel1Blocks: ; 44675 (11:4675)
 	INCBIN "maps/rocktunnel1.blk"
 
 SeafoamIslands1_h: ; 0x447dd to 0x447e9 (12 bytes) (bank=11) (id=192)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_1_HEIGHT, SEAFOAM_ISLANDS_1_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands1Blocks, SeafoamIslands1TextPointers, SeafoamIslands1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -69096,7 +69101,7 @@ SeafoamIslands1Blocks: ; 4489f (11:489f)
 	INCBIN "maps/seafoamislands1.blk"
 
 SSAnne3_h: ; 0x44926 to 0x44932 (12 bytes) (bank=11) (id=97)
-	db $0d ; tileset
+	db SHIP ; tileset
 	db SS_ANNE_3_HEIGHT, SS_ANNE_3_WIDTH ; dimensions (y, x)
 	dw SSAnne3Blocks, SSAnne3TextPointers, SSAnne3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -69132,7 +69137,7 @@ SSAnne3Blocks: ; 44956 (11:4956)
 	INCBIN "maps/ssanne3.blk"
 
 VictoryRoad3_h: ; 0x44974 to 0x44980 (12 bytes) (bank=11) (id=198)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db VICTORY_ROAD_3_HEIGHT, VICTORY_ROAD_3_WIDTH ; dimensions (y, x)
 	dw VictoryRoad3Blocks, VictoryRoad3TextPointers, VictoryRoad3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -69377,7 +69382,7 @@ VictoryRoad3Blocks: ; 44b37 (11:4b37)
 	INCBIN "maps/victoryroad3.blk"
 
 RocketHideout1_h: ; 0x44bbe to 0x44bca (12 bytes) (bank=11) (id=199)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db ROCKET_HIDEOUT_1_HEIGHT, ROCKET_HIDEOUT_1_WIDTH ; dimensions (y, x)
 	dw RocketHideout1Blocks, RocketHideout1TextPointers, RocketHideout1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -69609,7 +69614,7 @@ RocketHideout1Blocks: ; 44d49 (11:4d49)
 	INCBIN "maps/rockethideout1.blk"
 
 RocketHideout2_h: ; 0x44e1b to 0x44e27 (12 bytes) (bank=11) (id=200)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db ROCKET_HIDEOUT_2_HEIGHT, ROCKET_HIDEOUT_2_WIDTH ; dimensions (y, x)
 	dw RocketHideout2Blocks, RocketHideout2TextPointers, RocketHideout2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -70006,24 +70011,24 @@ SpinnerArrowTilePointers1: ; 45023 (11:5023)
 	db BANK(SpinnerArrowAnimTiles)
 	dw $9310
 
-	dw Tset16_GFX + $200
+	dw Facility_GFX + $200
 	db 1
-	db BANK(Tset16_GFX)
+	db BANK(Facility_GFX)
 	dw $9200
 
-	dw Tset16_GFX + $210
+	dw Facility_GFX + $210
 	db 1
-	db BANK(Tset16_GFX)
+	db BANK(Facility_GFX)
 	dw $9210
 
-	dw Tset16_GFX + $300
+	dw Facility_GFX + $300
 	db 1
-	db BANK(Tset16_GFX)
+	db BANK(Facility_GFX)
 	dw $9300
 
-	dw Tset16_GFX + $310
+	dw Facility_GFX + $310
 	db 1
-	db BANK(Tset16_GFX)
+	db BANK(Facility_GFX)
 	dw $9310
 
 SpinnerArrowTilePointers2: ; 45053 (11:5053)
@@ -70047,24 +70052,24 @@ SpinnerArrowTilePointers2: ; 45053 (11:5053)
 	db BANK(SpinnerArrowAnimTiles)
 	dw $94D0
 
-	dw Tset05_GFX + $3C0
+	dw Gym_GFX + $3C0
 	db 1
-	db BANK(Tset16_GFX)
+	db BANK(Facility_GFX)
 	dw $93C0
 
-	dw Tset05_GFX + $3D0
+	dw Gym_GFX + $3D0
 	db 1
-	db BANK(Tset16_GFX)
+	db BANK(Facility_GFX)
 	dw $93D0
 
-	dw Tset05_GFX + $4C0
+	dw Gym_GFX + $4C0
 	db 1
-	db BANK(Tset16_GFX)
+	db BANK(Facility_GFX)
 	dw $94C0
 
-	dw Tset05_GFX + $4D0
+	dw Gym_GFX + $4D0
 	db 1
-	db BANK(Tset16_GFX)
+	db BANK(Facility_GFX)
 	dw $94D0
 
 SpinnerPlayerFacingDirections: ; 45083 (11:5083)
@@ -70147,7 +70152,7 @@ RocketHideout2Blocks: ; 45147 (11:5147)
 	INCBIN "maps/rockethideout2.blk"
 
 RocketHideout3_h: ; 0x45219 to 0x45225 (12 bytes) (bank=11) (id=201)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db ROCKET_HIDEOUT_3_HEIGHT, ROCKET_HIDEOUT_3_WIDTH ; dimensions (y, x)
 	dw RocketHideout3Blocks, RocketHideout3TextPointers, RocketHideout3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -70388,7 +70393,7 @@ RocketHideout3Blocks: ; 4537f (11:537f)
 	INCBIN "maps/rockethideout3.blk"
 
 RocketHideout4_h: ; 0x45451 to 0x4545d (12 bytes) (bank=11) (id=202)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db ROCKET_HIDEOUT_4_HEIGHT, ROCKET_HIDEOUT_4_WIDTH ; dimensions (y, x)
 	dw RocketHideout4Blocks, RocketHideout4TextPointers, RocketHideout4Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -70657,7 +70662,7 @@ RocketHideout4Blocks: ; 45650 (11:5650)
 	INCBIN "maps/rockethideout4.blk"
 
 RocketHideoutElevator_h: ; 0x45704 to 0x45710 (12 bytes) (bank=11) (id=203)
-	db $12 ; tileset
+	db LOBBY ; tileset
 	db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x)
 	dw RocketHideoutElevatorBlocks, RocketHideoutElevatorTextPointers, RocketHideoutElevatorScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -70768,7 +70773,7 @@ RocketHideoutElevatorBlocks: ; 457a8 (11:57a8)
 	INCBIN "maps/rockethideoutelevator.blk"
 
 SilphCoElevator_h: ; 0x457b4 to 0x457c0 (12 bytes) (bank=11) (id=236)
-	db $12 ; tileset
+	db LOBBY ; tileset
 	db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x)
 	dw SilphCoElevatorBlocks, SilphCoElevatorTextPointers, SilphCoElevatorScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -70875,7 +70880,7 @@ SilphCoElevatorBlocks: ; 4585b (11:585b)
 	INCBIN "maps/silphcoelevator.blk"
 
 SafariZoneEast_h: ; 0x4585f to 0x4586b (12 bytes) (bank=11) (id=217)
-	db $03 ; tileset
+	db FOREST ; tileset
 	db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x)
 	dw SafariZoneEastBlocks, SafariZoneEastTextPointers, SafariZoneEastScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -70937,7 +70942,7 @@ SafariZoneEastBlocks: ; 458dc (11:58dc)
 	INCBIN "maps/safarizoneeast.blk"
 
 SafariZoneNorth_h: ; 0x4599f to 0x459ab (12 bytes) (bank=11) (id=218)
-	db $03 ; tileset
+	db FOREST ; tileset
 	db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x)
 	dw SafariZoneNorthBlocks, SafariZoneNorthTextPointers, SafariZoneNorthScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -71015,7 +71020,7 @@ SafariZoneNorthBlocks: ; 45a3e (11:5a3e)
 	INCBIN "maps/safarizonenorth.blk"
 
 SafariZoneCenter_h: ; 0x45ba6 to 0x45bb2 (12 bytes) (bank=11) (id=220)
-	db $03 ; tileset
+	db FOREST ; tileset
 	db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x)
 	dw SafariZoneCenterBlocks, SafariZoneCenterTextPointers, SafariZoneCenterScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -71073,7 +71078,7 @@ SafariZoneCenterBlocks: ; 45c1e (11:5c1e)
 	INCBIN "maps/safarizonecenter.blk"
 
 SafariZoneRestHouse1_h: ; 0x45ce1 to 0x45ced (12 bytes) (bank=11) (id=221)
-	db $0c ; tileset
+	db GATE ; tileset
 	db SAFARI_ZONE_REST_HOUSE_1_HEIGHT, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw SafariZoneRestHouse1Blocks, SafariZoneRestHouse1TextPointers, SafariZoneRestHouse1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -71112,7 +71117,7 @@ SafariZoneRestHouse1Object: ; 0x45cfe (size=32)
 	EVENT_DISP $4, $7, $3 ; SAFARI_ZONE_CENTER
 
 SafariZoneRestHouse2_h: ; 0x45d1e to 0x45d2a (12 bytes) (bank=11) (id=223)
-	db $0c ; tileset
+	db GATE ; tileset
 	db SAFARI_ZONE_REST_HOUSE_2_HEIGHT, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw SafariZoneRestHouse2Blocks, SafariZoneRestHouse2TextPointers, SafariZoneRestHouse2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -71158,7 +71163,7 @@ SafariZoneRestHouse2Object: ; 0x45d43 (size=38)
 	EVENT_DISP $4, $7, $3 ; SAFARI_ZONE_WEST
 
 SafariZoneRestHouse3_h: ; 0x45d69 to 0x45d75 (12 bytes) (bank=11) (id=224)
-	db $0c ; tileset
+	db GATE ; tileset
 	db SAFARI_ZONE_REST_HOUSE_3_HEIGHT, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; dimensions (y, x)
 	dw SafariZoneRestHouse3Blocks, SafariZoneRestHouse3TextPointers, SafariZoneRestHouse3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -71204,7 +71209,7 @@ SafariZoneRestHouse3Object: ; 0x45d8e (size=38)
 	EVENT_DISP $4, $7, $3 ; SAFARI_ZONE_EAST
 
 SafariZoneRestHouse4_h: ; 0x45db4 to 0x45dc0 (12 bytes) (bank=11) (id=225)
-	db $0c ; tileset
+	db GATE ; tileset
 	db SAFARI_ZONE_REST_HOUSE_4_HEIGHT, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; dimensions (y, x)
 	dw SafariZoneRestHouse4Blocks, SafariZoneRestHouse4TextPointers, SafariZoneRestHouse4Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -71250,7 +71255,7 @@ SafariZoneRestHouse4Object: ; 0x45dd9 (size=38)
 	EVENT_DISP $4, $7, $3 ; SAFARI_ZONE_NORTH
 
 UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db UNKNOWN_DUNGEON_2_HEIGHT, UNKNOWN_DUNGEON_2_WIDTH ; dimensions (y, x)
 	dw UnknownDungeon2Blocks, UnknownDungeon2TextPointers, UnknownDungeon2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -71294,7 +71299,7 @@ UnknownDungeon2Blocks: ; 45e5d (11:5e5d)
 	INCBIN "maps/unknowndungeon2.blk"
 
 UnknownDungeon3_h: ; 0x45ee4 to 0x45ef0 (12 bytes) (bank=11) (id=227)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db UNKNOWN_DUNGEON_3_HEIGHT, UNKNOWN_DUNGEON_3_WIDTH ; dimensions (y, x)
 	dw UnknownDungeon3Blocks, UnknownDungeon3TextPointers, UnknownDungeon3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -71365,7 +71370,7 @@ UnknownDungeon3Blocks: ; 45f58 (11:5f58)
 	INCBIN "maps/unknowndungeon3.blk"
 
 RockTunnel2_h: ; 0x45fdf to 0x45feb (12 bytes) (bank=11) (id=232)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db ROCK_TUNNEL_2_HEIGHT, ROCK_TUNNEL_2_WIDTH ; dimensions (y, x)
 	dw RockTunnel2Blocks, RockTunnel2TextPointers, RockTunnel2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -71645,7 +71650,7 @@ RockTunnel2Blocks: ; 461a1 (11:61a1)
 	INCBIN "maps/rocktunnel2.blk"
 
 SeafoamIslands2_h: ; 0x46309 to 0x46315 (12 bytes) (bank=11) (id=159)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_2_HEIGHT, SEAFOAM_ISLANDS_2_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands2Blocks, SeafoamIslands2TextPointers, SeafoamIslands2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -71731,7 +71736,7 @@ SeafoamIslands2Blocks: ; 463be (11:63be)
 	INCBIN "maps/seafoamislands2.blk"
 
 SeafoamIslands3_h: ; 0x46445 to 0x46451 (12 bytes) (bank=11) (id=160)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_3_HEIGHT, SEAFOAM_ISLANDS_3_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands3Blocks, SeafoamIslands3TextPointers, SeafoamIslands3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -71817,7 +71822,7 @@ SeafoamIslands3Blocks: ; 464fa (11:64fa)
 	INCBIN "maps/seafoamislands3.blk"
 
 SeafoamIslands4_h: ; 0x46581 to 0x4658d (12 bytes) (bank=11) (id=161)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_4_HEIGHT, SEAFOAM_ISLANDS_4_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands4Blocks, SeafoamIslands4TextPointers, SeafoamIslands4Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -72007,7 +72012,7 @@ SeafoamIslands4Blocks: ; 46706 (11:6706)
 	INCBIN "maps/seafoamislands4.blk"
 
 SeafoamIslands5_h: ; 0x4678d to 0x46799 (12 bytes) (bank=11) (id=162)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_5_HEIGHT, SEAFOAM_ISLANDS_5_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands5Blocks, SeafoamIslands5TextPointers, SeafoamIslands5Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -73131,7 +73136,7 @@ Route4HiddenObjects: ; 470a4 (11:70a4)
 SECTION "bank12",ROMX,BANK[$12]
 
 Route7_h: ; 0x48000 to 0x48022 (34 bytes) (bank=12) (id=18)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x)
 	dw Route7Blocks, Route7TextPointers, Route7Script ; blocks, texts, scripts
 	db WEST | EAST ; connections
@@ -73257,7 +73262,7 @@ Route7Text1: ; 48157 (12:4157)
 	db "@"
 
 RedsHouse1F_h: ; 4815c (12:415c)
-	db $01 ; tileset
+	db REDS_HOUSE_1 ; tileset
 	db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions
 	dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript
 	db 0 ; no connections
@@ -73356,7 +73361,7 @@ RedsHouse1FBlocks: ; 48209 (12:4209)
 	INCBIN "maps/redshouse1f.blk"
 
 CeladonMart3_h: ; 0x48219 to 0x48225 (12 bytes) (bank=12) (id=124)
-	db $12 ; tileset
+	db LOBBY ; tileset
 	db CELADON_MART_3_HEIGHT, CELADON_MART_3_WIDTH ; dimensions (y, x)
 	dw CeladonMart3Blocks, CeladonMart3TextPointers, CeladonMart3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -73510,7 +73515,7 @@ CeladonMart3Blocks: ; 48322 (12:4322)
 	INCBIN "maps/celadonmart3.blk"
 
 CeladonMart4_h: ; 0x4834a to 0x48356 (12 bytes) (bank=12) (id=125)
-	db $12 ; tileset
+	db LOBBY ; tileset
 	db CELADON_MART_4_HEIGHT, CELADON_MART_4_WIDTH ; dimensions (y, x)
 	dw CeladonMart4Blocks, CeladonMart4TextPointers, CeladonMart4Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -73562,7 +73567,7 @@ CeladonMart4Blocks: ; 483a1 (12:43a1)
 	INCBIN "maps/celadonmart4.blk"
 
 CeladonMartRoof_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126)
-	db $12 ; tileset
+	db LOBBY ; tileset
 	db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x)
 	dw CeladonMartRoofBlocks, CeladonMartRoofTextPointers, CeladonMartRoofScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -73855,7 +73860,7 @@ CeladonMartRoofBlocks: ; 485cc (12:45cc)
 	INCBIN "maps/celadonmartroof.blk"
 
 CeladonMartElevator_h: ; 0x485f4 to 0x48600 (12 bytes) (bank=12) (id=127)
-	db $12 ; tileset
+	db LOBBY ; tileset
 	db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x)
 	dw CeladonMartElevatorBlocks, CeladonMartElevatorTextPointers, CeladonMartElevatorScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -73953,7 +73958,7 @@ CeladonMartElevatorBlocks: ; 48684 (12:4684)
 	INCBIN "maps/celadonmartelevator.blk"
 
 CeladonMansion1_h: ; 0x48688 to 0x48694 (12 bytes) (bank=12) (id=128)
-	db $13 ; tileset
+	db MANSION ; tileset
 	db CELADON_MANSION_1_HEIGHT, CELADON_MANSION_1_WIDTH ; dimensions (y, x)
 	dw CeladonMansion1Blocks, CeladonMansion1TextPointers, CeladonMansion1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -74029,7 +74034,7 @@ CeladonMansion1Blocks: ; 48716 (12:4716)
 	INCBIN "maps/celadonmansion1.blk"
 
 CeladonMansion2_h: ; 0x4872e to 0x4873a (12 bytes) (bank=12) (id=129)
-	db $13 ; tileset
+	db MANSION ; tileset
 	db CELADON_MANSION_2_HEIGHT, CELADON_MANSION_2_WIDTH ; dimensions (y, x)
 	dw CeladonMansion2Blocks, CeladonMansion2TextPointers, CeladonMansion2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -74070,7 +74075,7 @@ CeladonMansion2Blocks: ; 4876c (12:476c)
 	INCBIN "maps/celadonmansion2.blk"
 
 CeladonMansion3_h: ; 0x48784 to 0x48790 (12 bytes) (bank=12) (id=130)
-	db $13 ; tileset
+	db MANSION ; tileset
 	db CELADON_MANSION_3_HEIGHT, CELADON_MANSION_3_WIDTH ; dimensions (y, x)
 	dw CeladonMansion3Blocks, CeladonMansion3TextPointers, CeladonMansion3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -74181,7 +74186,7 @@ CeladonMansion3Blocks: ; 48847 (12:4847)
 	INCBIN "maps/celadonmansion3.blk"
 
 CeladonMansion4_h: ; 0x4885f to 0x4886b (12 bytes) (bank=12) (id=131)
-	db $13 ; tileset
+	db MANSION ; tileset
 	db CELADON_MANSION_4_HEIGHT, CELADON_MANSION_4_WIDTH ; dimensions (y, x)
 	dw CeladonMansion4Blocks, CeladonMansion4TextPointers, CeladonMansion4Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -74219,7 +74224,7 @@ CeladonMansion4Blocks: ; 48894 (12:4894)
 	INCBIN "maps/celadonmansion4.blk"
 
 CeladonPokecenter_h: ; 0x488ac to 0x488b8 (12 bytes) (bank=12) (id=133)
-	db $06 ; tileset
+	db POKECENTER ; tileset
 	db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x)
 	dw CeladonPokecenterBlocks, CeladonPokecenterTextPointers, CeladonPokecenterScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -74269,7 +74274,7 @@ CeladonPokecenterObject: ; 0x488d2 (size=44)
 	EVENT_DISP $7, $7, $4
 
 CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134)
-	db $07 ; tileset
+	db GYM ; tileset
 	db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x)
 	dw CeladonGymBlocks, CeladonGymTextPointers, CeladonGymScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -74644,7 +74649,7 @@ CeladonGymBlocks: ; 48b84 (12:4b84)
 	INCBIN "maps/celadongym.blk"
 
 CeladonGameCorner_h: ; 0x48bb1 to 0x48bbd (12 bytes) (bank=12) (id=135)
-	db $12 ; tileset
+	db LOBBY ; tileset
 	db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x)
 	dw CeladonGameCornerBlocks, CeladonGameCornerTextPointers, CeladonGameCornerScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -75220,7 +75225,7 @@ CeladonGameCornerBlocks: ; 49003 (12:5003)
 	INCBIN "maps/celadongamecorner.blk"
 
 CeladonMart5_h: ; 0x4905d to 0x49069 (12 bytes) (bank=12) (id=136)
-	db $12 ; tileset
+	db LOBBY ; tileset
 	db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x)
 	dw CeladonMart5Blocks, CeladonMart5TextPointers, CeladonMart5Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -75274,7 +75279,7 @@ CeladonMart5Blocks: ; 490bc (12:50bc)
 	INCBIN "maps/celadonmart5.blk"
 
 CeladonPrizeRoom_h: ; 0x490e4 to 0x490f0 (12 bytes) (bank=12) (id=137)
-	db $12 ; tileset
+	db LOBBY ; tileset
 	db CELADONPRIZE_ROOM_HEIGHT, CELADONPRIZE_ROOM_WIDTH ; dimensions (y, x)
 	dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTextPointers, CeladonPrizeRoomScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -75325,7 +75330,7 @@ CeladonPrizeRoomBlocks: ; 49131 (12:5131)
 	INCBIN "maps/celadonprizeroom.blk"
 
 CeladonDiner_h: ; 0x49145 to 0x49151 (12 bytes) (bank=12) (id=138)
-	db $12 ; tileset
+	db LOBBY ; tileset
 	db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x)
 	dw CeladonDinerBlocks, CeladonDinerTextPointers, CeladonDinerScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -75423,7 +75428,7 @@ CeladonDinerBlocks: ; 491ee (12:51ee)
 	INCBIN "maps/celadondiner.blk"
 
 CeladonHouse_h: ; 0x49202 to 0x4920e (12 bytes) (bank=12) (id=139)
-	db $13 ; tileset
+	db MANSION ; tileset
 	db CELADON_HOUSE_HEIGHT, CELADON_HOUSE_WIDTH ; dimensions (y, x)
 	dw CeladonHouseBlocks, CeladonHouseTextPointers, CeladonHouseScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -75472,7 +75477,7 @@ CeladonHouseBlocks: ; 4924d (12:524d)
 	INCBIN "maps/celadonhouse.blk"
 
 CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140)
-	db $06 ; tileset
+	db POKECENTER ; tileset
 	db CELADONHOTEL_HEIGHT, CELADONHOTEL_WIDTH ; dimensions (y, x)
 	dw CeladonHotelBlocks, CeladonHotelTextPointers, CeladonHotelScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -75520,7 +75525,7 @@ CeladonHotelBlocks: ; 492a7 (12:52a7)
 	INCBIN "maps/celadonhotel.blk"
 
 MtMoonPokecenter_h: ; 0x492c3 to 0x492cf (12 bytes) (bank=12) (id=68)
-	db $06 ; tileset
+	db POKECENTER ; tileset
 	db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x)
 	dw MtMoonPokecenterBlocks, MtMoonPokecenterTextPointers, MtMoonPokecenterScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -75646,7 +75651,7 @@ MtMoonPokecenterObject: ; 0x49376 (size=56)
 	EVENT_DISP $7, $7, $4
 
 RockTunnelPokecenter_h: ; 0x493ae to 0x493ba (12 bytes) (id=81)
-	db $06 ; tileset
+	db POKECENTER ; tileset
 	db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x)
 	dw RockTunnelPokecenterBlocks, RockTunnelPokecenterTextPointers, RockTunnelPokecenterScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -75696,7 +75701,7 @@ RockTunnelPokecenterObject: ; 0x493d4 (size=44)
 	EVENT_DISP $7, $7, $4
 
 Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route11GateBlocks, Route11GateTextPointers, Route11GateScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -75735,7 +75740,7 @@ Route11GateObject: ; 0x49416 (size=50)
 	EVENT_DISP $4, $8, $6 ; ROUTE_11_GATE_2F
 
 Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route11GateUpstairsBlocks, Route11GateUpstairsTextPointers, Route11GateUpstairsScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -75841,7 +75846,7 @@ Route11GateUpstairsObject: ; 0x494da (size=30)
 	EVENT_DISP $4, $7, $7 ; ROUTE_11_GATE_1F
 
 Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_12_GATE_HEIGHT, ROUTE_12_GATE_WIDTH ; dimensions (y, x)
 	dw Route12GateBlocks, Route12GateTextPointers, Route12GateScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -75883,7 +75888,7 @@ Route12GateBlocks: ; 49540 (12:5540)
 	INCBIN "maps/route12gate.blk"
 
 Route12GateUpstairs_h: ; 0x49554 to 0x49560 (12 bytes) (id=195)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route12GateUpstairsBlocks, Route12GateUpstairsTextPointers, Route12GateUpstairsScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -75986,7 +75991,7 @@ Route12GateUpstairsObject: ; 0x495de (size=24)
 	EVENT_DISP $4, $7, $7 ; ROUTE_12_GATE
 
 Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route15GateBlocks, Route15GateTextPointers, Route15GateScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -76025,7 +76030,7 @@ Route15GateObject: ; 0x4960c (size=50)
 	EVENT_DISP $4, $8, $6
 
 Route15GateUpstairs_h: ; 4963e (12:563e)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route15GateUpstairsBlocks, Route15GateUpstairsTextPointers, Route15GateUpstairsScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -76095,7 +76100,7 @@ Route15GateUpstairsObject: ; 4969d (12:569d)
 	EVENT_DISP $4, $7, $7 ; ROUTE_15_GATE_1F
 
 Route16GateMap_h: ; 0x496b2 to 0x496be (12 bytes) (id=186)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route16GateMapBlocks, Route16GateMapTextPointers, Route16GateMapScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -76258,7 +76263,7 @@ Route16GateMapBlocks: ; 497e3 (12:57e3)
 	INCBIN "maps/route16gatemap.blk"
 
 Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route16GateUpstairsBlocks, Route16GateUpstairsTextPointers, Route16GateUpstairsScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -76329,7 +76334,7 @@ Route16GateUpstairsObject: ; 0x4984c (size=30)
 	EVENT_DISP $4, $7, $7 ; ROUTE_16_GATE_1F
 
 Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route18GateBlocks, Route18GateTextPointers, Route18GateScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -76471,7 +76476,7 @@ Route18GateObject: ; 0x49937 (size=50)
 	EVENT_DISP $4, $8, $6 ; ROUTE_18_GATE_2F
 
 Route18GateUpstairs_h: ; 0x49969 to 0x49975 (12 bytes) (id=191)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route18GateUpstairsBlocks, Route18GateUpstairsTextPointers, Route18GateUpstairsScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -76528,7 +76533,7 @@ Route18GateUpstairsObject: ; 0x499a4 (size=24)
 	EVENT_DISP $4, $7, $7 ; ROUTE_18_GATE_1F
 
 MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db MT_MOON_1_HEIGHT, MT_MOON_1_WIDTH ; dimensions (y, x)
 	dw MtMoon1Blocks, MtMoon1TextPointers, MtMoon1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -76799,7 +76804,7 @@ MtMoon1Blocks: ; 49b97 (12:5b97)
 	INCBIN "maps/mtmoon1.blk"
 
 MtMoon3_h: ; 0x49cff to 0x49d0b (12 bytes) (id=61)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db MT_MOON_3_HEIGHT, MT_MOON_3_WIDTH ; dimensions (y, x)
 	dw MtMoon3Blocks, MtMoon3TextPointers, MtMoon3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -77252,7 +77257,7 @@ MtMoon3Blocks: ; 4a041 (12:6041)
 	INCBIN "maps/mtmoon3.blk"
 
 SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219)
-	db $03 ; tileset
+	db FOREST ; tileset
 	db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x)
 	dw SafariZoneWestBlocks, SafariZoneWestTextPointers, SafariZoneWestScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -77326,7 +77331,7 @@ SafariZoneWestBlocks: ; 4a248 (12:6248)
 	INCBIN "maps/safarizonewest.blk"
 
 SafariZoneSecretHouse_h: ; 0x4a30b to 0x4a317 (12 bytes) (id=222)
-	db $14 ; tileset
+	db LAB ; tileset
 	db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x)
 	dw SafariZoneSecretHouseBlocks, SafariZoneSecretHouseTextPointers, SafariZoneSecretHouseScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -77495,7 +77500,7 @@ LancePic: ; 4fba2 (13:7ba2)
 	INCBIN "pic/trainer/lance.pic"
 
 BattleCenterM_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239)
-	db $15 ; tileset
+	db CLUB ; tileset
 	db BATTLE_CENTER_HEIGHT, BATTLE_CENTER_WIDTH ; dimensions (y, x)
 	dw BattleCenterMBlocks, BattleCenterMTextPointers, BattleCenterMScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -77554,7 +77559,7 @@ BattleCenterMBlocks: ; 4fd5d (13:7d5d)
 	INCBIN "maps/battlecenterm.blk"
 
 TradeCenterM_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240)
-	db $15 ; tileset
+	db CLUB ; tileset
 	db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x)
 	dw TradeCenterMBlocks, TradeCenterMTextPointers, TradeCenterMScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -77850,7 +77855,7 @@ DrawHPBarPredef: ; 4ff96 (13:7f96)
 SECTION "bank14",ROMX,BANK[$14]
 
 Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x)
 	dw Route22Blocks, Route22TextPointers, Route22Script ; blocks, texts, scripts
 	db NORTH | EAST ; connections
@@ -77878,7 +77883,7 @@ Route22Blocks: ; 5003d (14:403d)
 	INCBIN "maps/route22.blk"
 
 Route20_h: ; 0x500f1 to 0x50113 (34 bytes) (id=31)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x)
 	dw Route20Blocks, Route20TextPointers, Route20Script ; blocks, texts, scripts
 	db WEST | EAST ; connections
@@ -77917,7 +77922,7 @@ Route20Blocks: ; 5017d (14:417d)
 	INCBIN "maps/route20.blk"
 
 Route23_h: ; 0x5033f to 0x50361 (34 bytes) (id=34)
-	db $17 ; tileset
+	db PLATEAU ; tileset
 	db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x)
 	dw Route23Blocks, Route23TextPointers, Route23Script ; blocks, texts, scripts
 	db NORTH | SOUTH ; connections
@@ -77956,7 +77961,7 @@ Route23Blocks: ; 503b2 (14:43b2)
 	INCBIN "maps/route23.blk"
 
 Route24_h: ; 0x50682 to 0x506a4 (34 bytes) (id=35)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x)
 	dw Route24Blocks, Route24TextPointers, Route24Script ; blocks, texts, scripts
 	db SOUTH | EAST ; connections
@@ -77985,7 +77990,7 @@ Route24Blocks: ; 506e7 (14:46e7)
 	INCBIN "maps/route24.blk"
 
 Route25_h: ; 0x5079b to 0x507b2 (23 bytes) (id=36)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x)
 	dw Route25Blocks, Route25TextPointers, Route25Script ; blocks, texts, scripts
 	db WEST ; connections
@@ -78020,7 +78025,7 @@ Route25Blocks: ; 50810 (14:4810)
 	INCBIN "maps/route25.blk"
 
 IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9)
-	db $17 ; tileset
+	db PLATEAU ; tileset
 	db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x)
 	dw IndigoPlateauBlocks, IndigoPlateauTextPointers, IndigoPlateauScript ; blocks, texts, scripts
 	db SOUTH ; connections
@@ -78050,7 +78055,7 @@ IndigoPlateauBlocks: ; 5094a (14:494a)
 	INCBIN "maps/indigoplateau.blk"
 
 SaffronCity_h: ; 0x509a4 to 0x509dc (56 bytes) (id=10)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x)
 	dw SaffronCityBlocks, SaffronCityTextPointers, SaffronCityScript ; blocks, texts, scripts
 	db NORTH | SOUTH | WEST | EAST ; connections
@@ -79919,7 +79924,7 @@ Route25Text11: ; 5178c (14:578c)
 	db "@"
 
 VictoryRoad2_h: ; 0x51791 to 0x5179d (12 bytes) (id=194)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db VICTORY_ROAD_2_HEIGHT, VICTORY_ROAD_2_WIDTH ; dimensions (y, x)
 	dw VictoryRoad2Blocks, VictoryRoad2TextPointers, VictoryRoad2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -80216,7 +80221,7 @@ VictoryRoad2Blocks: ; 519af (14:59af)
 	INCBIN "maps/victoryroad2.blk"
 
 MtMoon2_h: ; 0x51a36 to 0x51a42 (12 bytes) (id=60)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db MT_MOON_2_HEIGHT, MT_MOON_2_WIDTH ; dimensions (y, x)
 	dw MtMoon2Blocks, MtMoon2TextPointers, MtMoon2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -80264,7 +80269,7 @@ MtMoon2Blocks: ; 51a91 (14:5a91)
 	INCBIN "maps/mtmoon2.blk"
 
 SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x)
 	dw SilphCo7Blocks, SilphCo7TextPointers, SilphCo7Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -80833,7 +80838,7 @@ SilphCo7Blocks: ; 51f57 (14:5f57)
 	INCBIN "maps/silphco7.blk"
 
 Mansion2_h: ; 0x51fcc to 0x51fd8 (12 bytes) (id=214)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db MANSION_2_HEIGHT, MANSION_2_WIDTH ; dimensions (y, x)
 	dw Mansion2Blocks, Mansion2TextPointers, Mansion2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -81012,7 +81017,7 @@ Mansion2Blocks: ; 52110 (14:6110)
 	INCBIN "maps/mansion2.blk"
 
 Mansion3_h: ; 0x521e2 to 0x521ee (12 bytes) (id=215)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db MANSION_3_HEIGHT, MANSION_3_WIDTH ; dimensions (y, x)
 	dw Mansion3Blocks, Mansion3TextPointers, Mansion3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -81198,7 +81203,7 @@ Mansion3Blocks: ; 52326 (14:6326)
 	INCBIN "maps/mansion3.blk"
 
 Mansion4_h: ; 0x523ad to 0x523b9 (12 bytes) (id=216)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db MANSION_4_HEIGHT, MANSION_4_WIDTH ; dimensions (y, x)
 	dw Mansion4Blocks, Mansion4TextPointers, Mansion4Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -82128,7 +82133,7 @@ Route2Blocks: ; 5407e (15:407e)
 	INCBIN "maps/route2.blk"
 
 Route3_h: ; 0x541e6 to 0x54208 (34 bytes) (id=14)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x)
 	dw Route3Blocks, Route3TextPointers, Route3Script ; blocks, texts, scripts
 	db NORTH | WEST ; connections
@@ -82159,7 +82164,7 @@ Route3Blocks: ; 54255 (15:4255)
 	INCBIN "maps/route3.blk"
 
 Route4_h: ; 0x54390 to 0x543b2 (34 bytes) (id=15)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x)
 	dw Route4Blocks, Route4TextPointers, Route4Script; blocks, texts, scripts
 	db SOUTH | EAST ; connections
@@ -82194,7 +82199,7 @@ Route4Blocks: ; 543ec (15:43ec)
 	INCBIN "maps/route4.blk"
 
 Route5_h: ; 0x54581 to 0x545a3 (34 bytes) (id=16)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x)
 	dw Route5Blocks, Route5TextPointers, Route5Script ; blocks, texts, scripts
 	db NORTH | SOUTH ; connections
@@ -82228,7 +82233,7 @@ Route5Blocks: ; 545d2 (15:45d2)
 	INCBIN "maps/route5.blk"
 
 Route9_h: ; 0x54686 to 0x546a8 (34 bytes) (id=20)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x)
 	dw Route9Blocks, Route9TextPointers, Route9Script ; blocks, texts, scripts
 	db WEST | EAST ; connections
@@ -82260,7 +82265,7 @@ Route9Blocks: ; 546fe (15:46fe)
 	INCBIN "maps/route9.blk"
 
 Route13_h: ; 0x5480c to 0x5482e (34 bytes) (id=24)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x)
 	dw Route13Blocks, Route13TextPointers, Route13Script ; blocks, texts, scripts
 	db NORTH | WEST ; connections
@@ -82294,7 +82299,7 @@ Route13Blocks: ; 5488b (15:488b)
 	INCBIN "maps/route13.blk"
 
 Route14_h: ; 0x54999 to 0x549bb (34 bytes) (id=25)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x)
 	dw Route14Blocks, Route14TextPointers, Route14Script ; blocks, texts, scripts
 	db WEST | EAST ; connections
@@ -82326,7 +82331,7 @@ Route14Blocks: ; 54a12 (15:4a12)
 	INCBIN "maps/route14.blk"
 
 Route17_h: ; 0x54b20 to 0x54b42 (34 bytes) (id=28)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x)
 	dw Route17Blocks, Route17TextPointers, Route17Script ; blocks, texts, scripts
 	db NORTH | SOUTH ; connections
@@ -82363,7 +82368,7 @@ Route17Blocks: ; 54ba8 (15:4ba8)
 	INCBIN "maps/route17.blk"
 
 Route19_h: ; 0x54e78 to 0x54e9a (34 bytes) (id=30)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x)
 	dw Route19Blocks, Route19TextPointers, Route19Script ; blocks, texts, scripts
 	db NORTH | WEST ; connections
@@ -82395,7 +82400,7 @@ Route19Blocks: ; 54ef1 (15:4ef1)
 	INCBIN "maps/route19.blk"
 
 Route21_h: ; 0x54fff to 0x55021 (34 bytes) (id=32)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x)
 	dw Route21Blocks, Route21TextPointers, Route21Script ; blocks, texts, scripts
 	db NORTH | SOUTH ; connections
@@ -84952,7 +84957,7 @@ Route21AfterBattleText9: ; 5605f (15:605f)
 	db "@"
 
 VermilionHouse2_h: ; 0x56064 to 0x56070 (12 bytes) (id=163)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db VERMILION_HOUSE_2_HEIGHT, VERMILION_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw VermilionHouse2Blocks, VermilionHouse2TextPointers, VermilionHouse2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -85033,7 +85038,7 @@ VermilionHouse2Object: ; 0x560cf (size=26)
 	EVENT_DISP $4, $7, $3
 
 CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123)
-	db $12 ; tileset
+	db LOBBY ; tileset
 	db CELADON_MART_2_HEIGHT, CELADON_MART_2_WIDTH ; dimensions (y, x)
 	dw CeladonMart2Blocks, CeladonMart2TextPointers, CeladonMart2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -85087,7 +85092,7 @@ CeladonMart2Blocks: ; 56148 (15:6148)
 	INCBIN "maps/celadonmart2.blk"
 
 FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164)
-	db $0d ; tileset
+	db SHIP ; tileset
 	db FUCHSIA_HOUSE_3_HEIGHT, FUCHSIA_HOUSE_3_WIDTH ; dimensions (y, x)
 	dw FuchsiaHouse3Blocks, FuchsiaHouse3TextPointers, FuchsiaHouse3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -85188,7 +85193,7 @@ FuchsiaHouse3Object: ; 0x56221 (size=34)
 	EVENT_DISP $4, $7, $3
 
 DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db DAYCAREM_HEIGHT, DAYCAREM_WIDTH ; dimensions (y, x)
 	dw DayCareMBlocks, DayCareMTextPointers, DayCareMScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -85486,7 +85491,7 @@ DayCareMObject: ; 0x56459 (size=26)
 	EVENT_DISP $4, $7, $3
 
 Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db ROUTE_12_HOUSE_HEIGHT, ROUTE_12_HOUSE_WIDTH ; dimensions (y, x)
 	dw Route12HouseBlocks, Route12HouseTextPointers, Route12HouseScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -85567,7 +85572,7 @@ Route12HouseObject: ; 0x564de (size=26)
 	EVENT_DISP $4, $7, $3
 
 SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x)
 	dw SilphCo8Blocks, SilphCo8TextPointers, SilphCo8Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -86258,7 +86263,7 @@ CheckPlayerIsInFrontOfSprite: ; 569e3 (15:69e3)
 SECTION "bank16",ROMX,BANK[$16]
 
 Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x)
 	dw Route6Blocks, Route6TextPointers, Route6Script ; blocks, texts, scripts
 	db NORTH | SOUTH ; connections
@@ -86296,7 +86301,7 @@ Route6Blocks: ; 58079 (16:4079)
 	INCBIN "maps/route6.blk"
 
 Route8_h: ; 0x5812d to 0x5814f (34 bytes) (id=19)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x)
 	dw Route8Blocks, Route8TextPointers, Route8Script ; blocks, texts, scripts
 	db WEST | EAST ; connections
@@ -86339,7 +86344,7 @@ Route8Blocks: ; 581c6 (16:41c6)
 	INCBIN "maps/route8.blk"
 
 Route10_h: ; 0x582d4 to 0x582f6 (34 bytes) (id=21)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x)
 	dw Route10Blocks, Route10TextPointers, Route10Script ; blocks, texts, scripts
 	db SOUTH | WEST ; connections
@@ -86380,7 +86385,7 @@ Route10Blocks: ; 58356 (16:4356)
 	INCBIN "maps/route10.blk"
 
 Route11_h: ; 0x584be to 0x584e0 (34 bytes) (id=22)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x)
 	dw Route11Blocks, Route11TextPointers, Route11Script ; blocks, texts, scripts
 	db WEST | EAST ; connections
@@ -86424,7 +86429,7 @@ Route11Blocks: ; 5855f (16:455f)
 	INCBIN "maps/route11.blk"
 
 Route12_h: ; 0x5866d to 0x5869a (45 bytes) (id=23)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x)
 	dw Route12Blocks, Route12TextPointers, Route12Script ; blocks, texts, scripts
 	db NORTH | SOUTH | WEST ; connections
@@ -86468,7 +86473,7 @@ Route12Blocks: ; 58710 (16:4710)
 	INCBIN "maps/route12.blk"
 
 Route15_h: ; 0x5892c to 0x5894e (34 bytes) (id=26)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x)
 	dw Route15Blocks, Route15TextPointers, Route15Script ; blocks, texts, scripts
 	db WEST | EAST ; connections
@@ -86511,7 +86516,7 @@ Route15Blocks: ; 589cc (16:49cc)
 	INCBIN "maps/route15.blk"
 
 Route16_h: ; 0x58ada to 0x58afc (34 bytes) (id=27)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x)
 	dw Route16Blocks, Route16TextPointers, Route16Script ; blocks, texts, scripts
 	db SOUTH | EAST ; connections
@@ -86561,7 +86566,7 @@ Route16Blocks: ; 58b84 (16:4b84)
 	INCBIN "maps/route16.blk"
 
 Route18_h: ; 0x58c38 to 0x58c5a (34 bytes) (id=29)
-	db $00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x)
 	dw Route18Blocks, Route18TextPointers, Route18Script ; blocks, texts, scripts
 	db NORTH | EAST ; connections
@@ -89010,7 +89015,7 @@ Route18Text5: ; 59b5f (16:5b5f)
 	db "@"
 
 FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90)
-	db $10 ; tileset
+	db INTERIOR ; tileset
 	db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x)
 	dw FanClubBlocks, FanClubTextPointers, FanClubScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -89216,7 +89221,7 @@ FanClubBlocks: ; 59cd5 (16:5cd5)
 	INCBIN "maps/fanclub.blk"
 
 SilphCo2_h: ; 0x59ce5 to 0x59cf1 (12 bytes) (id=207)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x)
 	dw SilphCo2Blocks, SilphCo2TextPointers, SilphCo2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -89505,7 +89510,7 @@ SilphCo2Blocks: ; 59ec8 (16:5ec8)
 	INCBIN "maps/silphco2.blk"
 
 SilphCo3_h: ; 0x59f4f to 0x59f5b (12 bytes) (id=208)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x)
 	dw SilphCo3Blocks, SilphCo3TextPointers, SilphCo3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -89690,7 +89695,7 @@ SilphCo3Blocks: ; 5a0a6 (16:60a6)
 	INCBIN "maps/silphco3.blk"
 
 SilphCo10_h: ; 0x5a12d to 0x5a139 (12 bytes) (id=234)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x)
 	dw SilphCo10Blocks, SilphCo10TextPointers, SilphCo10Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -89856,7 +89861,7 @@ SilphCo10Blocks: ; 5a25a (16:625a)
 	INCBIN "maps/silphco10.blk"
 
 Lance_h: ; 0x5a2a2 to 0x5a2ae (12 bytes) (id=113)
-	db $05 ; tileset
+	db DOJO ; tileset
 	db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x)
 	dw LanceBlocks, LanceTextPointers, LanceScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -90051,7 +90056,7 @@ LanceBlocks: ; 5a3e9 (16:63e9)
 	INCBIN "maps/lance.blk"
 
 HallofFameRoom_h: ; 0x5a492 to 0x5a49e (12 bytes) (id=118)
-	db $07 ; tileset
+	db GYM ; tileset
 	db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x)
 	dw HallofFameRoomBlocks, HallofFameRoomTextPointers, HallofFameRoomScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -90249,7 +90254,7 @@ ViridianForestexitBlocks: ; 5c090 (17:4090)
 	INCBIN "maps/viridianforestexit.blk"
 
 RedsHouse2F_h: ; 5c0a4 (17:40a4)
-	db $04 ; tileset
+	db REDS_HOUSE_2 ; tileset
 	db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions
 	dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript
 	db $00 ; no connections
@@ -90303,7 +90308,7 @@ Func_5c0dc: ; 5c0dc (17:40dc)
 	ret
 
 MuseumF1_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52)
-	db $0a ; tileset
+	db MUSEUM ; tileset
 	db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x)
 	dw MuseumF1Blocks, MuseumF1TextPointers, MuseumF1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -90590,7 +90595,7 @@ MuseumF1Object: ; 0x5c2c1 (size=74)
 	EVENT_DISP $a, $7, $7 ; MUSEUM_2F
 
 MuseumF2_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53)
-	db $0a ; tileset
+	db MUSEUM ; tileset
 	db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x)
 	dw MuseumF2Blocks, MuseumF2TextPointers, MuseumF2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -90657,7 +90662,7 @@ MuseumF2Object: ; 0x5c34b (size=48)
 	EVENT_DISP $7, $7, $7 ; MUSEUM_1F
 
 PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54)
-	db $07 ; tileset
+	db GYM ; tileset
 	db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x)
 	dw PewterGymBlocks, PewterGymTextPointers, PewterGymScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -90918,7 +90923,7 @@ PewterGymBlocks: ; 5c558 (17:4558)
 	INCBIN "maps/pewtergym.blk"
 
 PewterPokecenter_h: ; 0x5c57b to 0x5c587 (12 bytes) (id=58)
-	db $06 ; tileset
+	db POKECENTER ; tileset
 	db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x)
 	dw PewterPokecenterBlocks, PewterPokecenterTextPointers, PewterPokecenterScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -91020,7 +91025,7 @@ PewterPokecenterObject: ; 0x5c60d (size=44)
 	EVENT_DISP $7, $7, $4
 
 CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64)
-	db $06 ; tileset
+	db POKECENTER ; tileset
 	db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x)
 	dw CeruleanPokecenterBlocks, CeruleanPokecenterTextPointers, CeruleanPokecenterScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -91073,7 +91078,7 @@ CeruleanPokecenterBlocks: ; 5c68b (17:468b)
 	INCBIN "maps/ceruleanpokecenter.blk"
 
 CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65)
-	db $07 ; tileset
+	db GYM ; tileset
 	db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x)
 	dw CeruleanGymBlocks, CeruleanGymTextPointers, CeruleanGymScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -91324,7 +91329,7 @@ CeruleanGymBlocks: ; 5c866 (17:4866)
 	INCBIN "maps/ceruleangym.blk"
 
 CeruleanMart_h: ; 0x5c889 to 0x5c895 (12 bytes) (id=67)
-	db $02 ; tileset
+	db MART ; tileset
 	db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x)
 	dw CeruleanMartBlocks, CeruleanMartTextPointers, CeruleanMartScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -91365,7 +91370,7 @@ CeruleanMartObject: ; 0x5c8a8 (size=38)
 	EVENT_DISP $4, $7, $4
 
 LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141)
-	db $06 ; tileset
+	db POKECENTER ; tileset
 	db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x)
 	dw LavenderPokecenterBlocks, LavenderPokecenterTextPointers, LavenderPokecenterScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -91415,7 +91420,7 @@ LavenderPokecenterObject: ; 0x5c8f4 (size=44)
 	EVENT_DISP $7, $7, $4
 
 LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150)
-	db $02 ; tileset
+	db MART ; tileset
 	db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x)
 	dw LavenderMartBlocks, LavenderMartTextPointers, LavenderMartScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -91474,7 +91479,7 @@ LavenderMartObject: ; 0x5c95d (size=38)
 	EVENT_DISP $4, $7, $4
 
 VermilionPokecenter_h: ; 0x5c983 to 0x5c98f (12 bytes) (id=89)
-	db $06 ; tileset
+	db POKECENTER ; tileset
 	db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x)
 	dw VermilionPokecenterBlocks, VermilionPokecenterTextPointers, VermilionPokecenterScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -91524,7 +91529,7 @@ VermilionPokecenterObject: ; 0x5c9a9 (size=44)
 	EVENT_DISP $7, $7, $4
 
 VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91)
-	db $02 ; tileset
+	db MART ; tileset
 	db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x)
 	dw VermilionMartBlocks, VermilionMartTextPointers, VermilionMartScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -91565,7 +91570,7 @@ VermilionMartObject: ; 0x5c9f4 (size=38)
 	EVENT_DISP $4, $7, $4
 
 VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92)
-	db $07 ; tileset
+	db GYM ; tileset
 	db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x)
 	dw VermilionGymBlocks, VermilionGymTextPointers, VermilionGymScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -91868,7 +91873,7 @@ VermilionGymBlocks: ; 5cc38 (17:4c38)
 	INCBIN "maps/vermiliongym.blk"
 
 CopycatsHouseF2_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176)
-	db $04 ; tileset
+	db REDS_HOUSE_2 ; tileset
 	db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x)
 	dw CopycatsHouseF2Blocks, CopycatsHouseF2TextPointers, CopycatsHouseF2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -92000,7 +92005,7 @@ CopycatsHouseF2Object: ; 0x5cd21 (size=48)
 	EVENT_DISP $4, $1, $7 ; COPYCATS_HOUSE_1F
 
 FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177)
-	db $05 ; tileset
+	db DOJO ; tileset
 	db FIGHTINGDOJO_HEIGHT, FIGHTINGDOJO_WIDTH ; dimensions (y, x)
 	dw FightingDojoBlocks, FightingDojoTextPointers, FightingDojoScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -92370,7 +92375,7 @@ FightingDojoBlocks: ; 5cfe3 (17:4fe3)
 	INCBIN "maps/fightingdojo.blk"
 
 SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x)
 	dw SaffronGymBlocks, SaffronGymTextPointers, SaffronGymScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -92829,7 +92834,7 @@ SaffronGymBlocks: ; 5d3a3 (17:53a3)
 	INCBIN "maps/saffrongym.blk"
 
 SaffronMart_h: ; 0x5d3fd to 0x5d409 (12 bytes) (id=180)
-	db $02 ; tileset
+	db MART ; tileset
 	db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x)
 	dw SaffronMartBlocks, SaffronMartTextPointers, SaffronMartScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -92870,7 +92875,7 @@ SaffronMartObject: ; 0x5d41c (size=38)
 	EVENT_DISP $4, $7, $4
 
 SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x)
 	dw SilphCo1Blocks, SilphCo1TextPointers, SilphCo1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -92923,7 +92928,7 @@ SilphCo1Blocks: ; 5d4a2 (17:54a2)
 	INCBIN "maps/silphco1.blk"
 
 SaffronPokecenter_h: ; 0x5d529 to 0x5d535 (12 bytes) (id=182)
-	db $06 ; tileset
+	db POKECENTER ; tileset
 	db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x)
 	dw SaffronPokecenterBlocks, SaffronPokecenterTextPointers, SaffronPokecenterScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -92973,7 +92978,7 @@ SaffronPokecenterObject: ; 0x5d54f (size=44)
 	EVENT_DISP $7, $7, $4
 
 ViridianForestexit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47)
-	db $09 ; tileset
+	db FOREST_GATE ; tileset
 	db VIRIDIAN_FOREST_EXIT_HEIGHT, VIRIDIAN_FOREST_EXIT_WIDTH ; dimensions (y, x)
 	dw ViridianForestexitBlocks, ViridianForestexitTextPointers, ViridianForestexitScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -93016,7 +93021,7 @@ ViridianForestexitObject: ; 0x5d598 (size=48)
 	EVENT_DISP $5, $7, $5 ; VIRIDIAN_FOREST
 
 Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49)
-	db $0c ; tileset
+	db GATE ; tileset
 	db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x)
 	dw Route2GateBlocks, Route2GateTextPointers, Route2GateScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -93087,7 +93092,7 @@ Route2GateObject: ; 0x5d620 (size=48)
 	EVENT_DISP $5, $7, $5
 
 ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50)
-	db $09 ; tileset
+	db FOREST_GATE ; tileset
 	db VIRIDIAN_FOREST_ENTRANCE_HEIGHT, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; dimensions (y, x)
 	dw ViridianForestEntranceBlocks, ViridianForestEntranceTextPointers, ViridianForestEntranceScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -93130,7 +93135,7 @@ ViridianForestEntranceObject: ; 0x5d66d (size=48)
 	EVENT_DISP $5, $7, $5
 
 UndergroundTunnelEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71)
-	db $0c ; tileset
+	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_5_HEIGHT, PATH_ENTRANCE_ROUTE_5_WIDTH ; dimensions (y, x)
 	dw UndergroundTunnelEntranceRoute5Blocks, UndergroundTunnelEntranceRoute5TextPointers, UndergroundTunnelEntranceRoute5Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -93175,7 +93180,7 @@ UndergroundTunnelEntranceRoute5Object: ; 0x5d6c1 (size=34)
 	EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_NS
 
 UndergroundTunnelEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74)
-	db $0c ; tileset
+	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_6_HEIGHT, PATH_ENTRANCE_ROUTE_6_WIDTH ; dimensions (y, x)
 	dw UndergroundTunnelEntranceRoute6Blocks, UndergroundTunnelEntranceRoute6TextPointers, UndergroundTunnelEntranceRoute6Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -93212,7 +93217,7 @@ UndergroundTunnelEntranceRoute6Object: ; 0x5d6fe (size=34)
 	EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_NS
 
 UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77)
-	db $0c ; tileset
+	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x)
 	dw UndergroundTunnelEntranceRoute7Blocks, UndergroundPathEntranceRoute7TextPointers, UndergroundPathEntranceRoute7Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -93249,7 +93254,7 @@ UndergroundPathEntranceRoute7Object: ; 0x5d73b (size=34)
 	EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_WE
 
 UndergroundPathEntranceRoute7Copy_h: ; 5d75d (17:575d)
-	db $0c ; tileset
+	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x)
 	dw UndergroundTunnelEntranceRoute7CopyBlocks, UndergroundPathEntranceRoute7CopyTextPointers, UndergroundPathEntranceRoute7CopyScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -93300,7 +93305,7 @@ UndergroundPathEntranceRoute7CopyObject: ; 5d787 (17:5787)
 	EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_WE
 
 SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x)
 	dw SilphCo9Blocks, SilphCo9TextPointers, SilphCo9Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -93584,7 +93589,7 @@ SilphCo9Blocks: ; 5d989 (17:5989)
 	INCBIN "maps/silphco9.blk"
 
 VictoryRoad1_h: ; 0x5d9fe to 0x5da0a (12 bytes) (id=108)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db VICTORY_ROAD_1_HEIGHT, VICTORY_ROAD_1_WIDTH ; dimensions (y, x)
 	dw VictoryRoad1Blocks, VictoryRoad1TextPointers, VictoryRoad1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -94228,7 +94233,7 @@ SSAnne9Blocks: ; 603c0 (18:43c0)
 	INCBIN "maps/ssanne9.blk"
 
 PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142)
-	db $0f ; tileset
+	db CEMETERY ; tileset
 	db POKEMONTOWER_1_HEIGHT, POKEMONTOWER_1_WIDTH ; dimensions (y, x)
 	dw PokemonTower1Blocks, PokemonTower1TextPointers, PokemonTower1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -94290,7 +94295,7 @@ PokemonTower1Blocks: ; 6048c (18:448c)
 	INCBIN "maps/pokemontower1.blk"
 
 PokemonTower2_h: ; 0x604e6 to 0x604f2 (12 bytes) (id=143)
-	db $0f ; tileset
+	db CEMETERY ; tileset
 	db POKEMONTOWER_2_HEIGHT, POKEMONTOWER_2_WIDTH ; dimensions (y, x)
 	dw PokemonTower2Blocks, PokemonTower2TextPointers, PokemonTower2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -94498,7 +94503,7 @@ PokemonTower2Blocks: ; 60666 (18:4666)
 	INCBIN "maps/pokemontower2.blk"
 
 PokemonTower3_h: ; 0x606c0 to 0x606cc (12 bytes) (id=144)
-	db $0f ; tileset
+	db CEMETERY ; tileset
 	db POKEMONTOWER_3_HEIGHT, POKEMONTOWER_3_WIDTH ; dimensions (y, x)
 	dw PokemonTower3Blocks, PokemonTower3TextPointers, PokemonTower3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -94630,7 +94635,7 @@ PokemonTower3Blocks: ; 60790 (18:4790)
 	INCBIN "maps/pokemontower3.blk"
 
 PokemonTower4_h: ; 0x607ea to 0x607f6 (12 bytes) (id=145)
-	db $0f ; tileset
+	db CEMETERY ; tileset
 	db POKEMONTOWER_4_HEIGHT, POKEMONTOWER_4_WIDTH ; dimensions (y, x)
 	dw PokemonTower4Blocks, PokemonTower4TextPointers, PokemonTower4Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -94767,7 +94772,7 @@ PokemonTower4Blocks: ; 608cc (18:48cc)
 	INCBIN "maps/pokemontower4.blk"
 
 PokemonTower5_h: ; 0x60926 to 0x60932 (12 bytes) (id=146)
-	db $0f ; tileset
+	db CEMETERY ; tileset
 	db POKEMONTOWER_5_HEIGHT, POKEMONTOWER_5_WIDTH ; dimensions (y, x)
 	dw PokemonTower5Blocks, PokemonTower5TextPointers, PokemonTower5Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -94980,7 +94985,7 @@ PokemonTower5Blocks: ; 60a89 (18:4a89)
 	INCBIN "maps/pokemontower5.blk"
 
 PokemonTower6_h: ; 0x60ae3 to 0x60aef (12 bytes) (id=147)
-	db $0f ; tileset
+	db CEMETERY ; tileset
 	db POKEMONTOWER_6_HEIGHT, POKEMONTOWER_6_WIDTH ; dimensions (y, x)
 	dw PokemonTower6Blocks, PokemonTower6TextPointers, PokemonTower6Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -95228,7 +95233,7 @@ PokemonTower6Blocks: ; 60c95 (18:4c95)
 	INCBIN "maps/unusedblocks60cef.blk"
 
 PokemonTower7_h: ; 0x60cf9 to 0x60d05 (12 bytes) (id=148)
-	db $0f ; tileset
+	db CEMETERY ; tileset
 	db POKEMONTOWER_7_HEIGHT, POKEMONTOWER_7_WIDTH ; dimensions (y, x)
 	dw PokemonTower7Blocks, PokemonTower7TextPointers, PokemonTower7Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -95538,7 +95543,7 @@ PokemonTower7Blocks: ; 60f20 (18:4f20)
 	INCBIN "maps/pokemontower7.blk"
 
 CeladonMart1_h: ; 0x60f7a to 0x60f86 (12 bytes) (id=122)
-	db $12 ; tileset
+	db LOBBY ; tileset
 	db CELADON_MART_1_HEIGHT, CELADON_MART_1_WIDTH ; dimensions (y, x)
 	dw CeladonMart1Blocks, CeladonMart1TextPointers, CeladonMart1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -95722,7 +95727,7 @@ LoadFossilItemAndMonName: ; 610eb (18:50eb)
 	ret
 
 ViridianForest_h: ; 0x61101 to 0x6110d (12 bytes) (id=51)
-	db $03 ; tileset
+	db FOREST ; tileset
 	db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x)
 	dw ViridianForestBlocks, ViridianForestTextPointers, ViridianForestScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -95912,7 +95917,7 @@ ViridianForestObject: ; 0x611da (size=127)
 	EVENT_DISP $11, $2f, $12 ; VIRIDIAN_FOREST_ENTRANCE
 
 SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95)
-	db $0d ; tileset
+	db SHIP ; tileset
 	db SS_ANNE_1_HEIGHT, SS_ANNE_1_WIDTH ; dimensions (y, x)
 	dw SSAnne1Blocks, SSAnne1TextPointers, SSAnne1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -95973,7 +95978,7 @@ SSAnne1Blocks: ; 612df (18:52df)
 	INCBIN "maps/ssanne1.blk"
 
 SSAnne2_h: ; 0x61393 to 0x6139f (12 bytes) (id=96)
-	db $0d ; tileset
+	db SHIP ; tileset
 	db SS_ANNE_2_HEIGHT, SS_ANNE_2_WIDTH ; dimensions (y, x)
 	dw SSAnne2Blocks, SSAnne2TextPointers, SSAnne2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -96225,7 +96230,7 @@ SSAnne2Blocks: ; 6156e (18:556e)
 	INCBIN "maps/ssanne2.blk"
 
 SSAnne4_h: ; 0x61622 to 0x6162e (12 bytes) (id=98)
-	db $0d ; tileset
+	db SHIP ; tileset
 	db SS_ANNE_4_HEIGHT, SS_ANNE_4_WIDTH ; dimensions (y, x)
 	dw SSAnne4Blocks, SSAnne4TextPointers, SSAnne4Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -96264,7 +96269,7 @@ SSAnne4Blocks: ; 61666 (18:5666)
 	INCBIN "maps/ssanne4.blk"
 
 SSAnne5_h: ; 0x616a2 to 0x616ae (12 bytes) (id=99)
-	db $0d ; tileset
+	db SHIP ; tileset
 	db SS_ANNE_5_HEIGHT, SS_ANNE_5_WIDTH ; dimensions (y, x)
 	dw SSAnne5Blocks, SSAnne5TextPointers, SSAnne5Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -96384,7 +96389,7 @@ SSAnne5Blocks: ; 61761 (18:5761)
 	INCBIN "maps/ssanne5.blk"
 
 SSAnne6_h: ; 0x617a7 to 0x617b3 (12 bytes) (id=100)
-	db $0d ; tileset
+	db SHIP ; tileset
 	db SS_ANNE_6_HEIGHT, SS_ANNE_6_WIDTH ; dimensions (y, x)
 	dw SSAnne6Blocks, SSAnne6TextPointers, SSAnne6Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -96487,7 +96492,7 @@ SSAnne6Blocks: ; 61851 (18:5851)
 	INCBIN "maps/ssanne6.blk"
 
 SSAnne7_h: ; 0x61889 to 0x61895 (12 bytes) (id=101)
-	db $0d ; tileset
+	db SHIP ; tileset
 	db SS_ANNE_7_HEIGHT, SS_ANNE_7_WIDTH ; dimensions (y, x)
 	dw SSAnne7Blocks, SSAnne7TextPointers, SSAnne7Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -96610,7 +96615,7 @@ SSAnne7Blocks: ; 6195e (18:595e)
 	INCBIN "maps/ssanne7.blk"
 
 SSAnne8_h: ; 0x6196a to 0x61976 (12 bytes) (id=102)
-	db $0d ; tileset
+	db SHIP ; tileset
 	db SS_ANNE_8_HEIGHT, SS_ANNE_8_WIDTH ; dimensions (y, x)
 	dw SSAnne8Blocks, SSAnne8TextPointers, SSAnne8Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -96819,7 +96824,7 @@ SSAnne8Blocks: ; 61adf (18:5adf)
 	INCBIN "maps/ssanne8.blk"
 
 SSAnne9_h: ; 0x61b3f to 0x61b4b (12 bytes) (id=103)
-	db $0d ; tileset
+	db SHIP ; tileset
 	db SS_ANNE_9_HEIGHT, SS_ANNE_9_WIDTH ; dimensions (y, x)
 	dw SSAnne9Blocks, SSAnne9TextPointers, SSAnne9Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -97091,7 +97096,7 @@ SSAnne9Object: ; 0x61c8d (size=188)
 	EVENT_DISP $c, $f, $17 ; SS_ANNE_2
 
 SSAnne10_h: ; 0x61d49 to 0x61d55 (12 bytes) (id=104)
-	db $0d ; tileset
+	db SHIP ; tileset
 	db SS_ANNE_10_HEIGHT, SS_ANNE_10_WIDTH ; dimensions (y, x)
 	dw SSAnne10Blocks, SSAnne10TextPointers, SSAnne10Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -97343,7 +97348,7 @@ SSAnne10Object: ; 0x61e75 (size=165)
 	EVENT_DISP $c, $f, $d ; SS_ANNE_4
 
 UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119)
-	db $0b ; tileset
+	db UNDERGROUND ; tileset
 	db UNDERGROUND_PATH_NS_HEIGHT, UNDERGROUND_PATH_NS_WIDTH ; dimensions (y, x)
 	dw UndergroundPathNSBlocks, UndergroundPathNSTextPointers, UndergroundPathNSScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -97371,7 +97376,7 @@ UndergroundPathNSObject: ; 0x61f2a (size=20)
 	EVENT_DISP $4, $29, $2 ; PATH_ENTRANCE_ROUTE_6
 
 UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121)
-	db $0b ; tileset
+	db UNDERGROUND ; tileset
 	db UNDERGROUND_PATH_WE_HEIGHT, UNDERGROUND_PATH_WE_WIDTH ; dimensions (y, x)
 	dw UndergroundPathWEBlocks, UndergroundPathWETextPointers, UndergroundPathWEScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -97399,7 +97404,7 @@ UndergroundPathWEObject: ; 0x61f4e (size=20)
 	EVENT_DISP $19, $2, $2f ; PATH_ENTRANCE_ROUTE_8
 
 DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x)
 	dw DiglettsCaveBlocks, DiglettsCaveTextPointers, DiglettsCaveScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -97430,7 +97435,7 @@ DiglettsCaveBlocks: ; 61f86 (18:5f86)
 	INCBIN "maps/diglettscave.blk"
 
 SilphCo11_h: ; 0x620ee to 0x620fa (12 bytes) (id=235)
-	db $10 ; tileset
+	db INTERIOR ; tileset
 	db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x)
 	dw SilphCo11Blocks, SilphCo11TextPointers, SilphCo11Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -98025,34 +98030,36 @@ Unknown_62529: ; 62529 (18:6529)
 
 SECTION "bank19",ROMX,BANK[$19]
 
-Tset00_GFX: ; 64000 (19:4000)
-	INCBIN "gfx/tilesets/00.2bpp"
-Tset00_Block: ; 645e0 (19:45e0)
-	INCBIN "gfx/blocksets/00.bst"
-Tset01_GFX: ; 64de0 (19:4de0)
-	INCBIN "gfx/tilesets/01.2bpp"
-Tset01_Block: ; 65270 (19:5270)
-	INCBIN "gfx/blocksets/01.bst"
-Tset08_GFX: ; 653a0 (19:53a0)
-	INCBIN "gfx/tilesets/08.2bpp"
-Tset08_Block: ; 65980 (19:5980)
-	INCBIN "gfx/blocksets/08.bst"
-Tset13_GFX: ; 65bb0 (19:5bb0)
-	INCBIN "gfx/tilesets/13.2bpp"
-Tset13_Block: ; 66190 (19:6190)
-	INCBIN "gfx/blocksets/13.bst"
-Tset0E_GFX: ; 66610 (19:6610)
-	INCBIN "gfx/tilesets/0e.2bpp"
-Tset0E_Block: ; 66bf0 (19:6bf0)
-	INCBIN "gfx/blocksets/0e.bst"
-Tset10_GFX: ; 66d60 (19:6d60)
-	INCBIN "gfx/tilesets/10.2bpp"
-Tset10_Block: ; 67350 (19:7350)
-	INCBIN "gfx/blocksets/10.bst"
-Tset17_GFX: ; 676f0 (19:76f0)
-	INCBIN "gfx/tilesets/17.2bpp"
-Tset17_Block: ; 67b50 (19:7b50)
-	INCBIN "gfx/blocksets/17.bst"
+Overworld_GFX: ; 64000 (19:4000)
+	INCBIN "gfx/tilesets/overworld.2bpp"
+Overworld_Block: ; 645e0 (19:45e0)
+	INCBIN "gfx/blocksets/overworld.bst"
+RedsHouse1_GFX:
+RedsHouse2_GFX: ; 64de0 (19:4de0)
+	INCBIN "gfx/tilesets/reds_house.2bpp"
+RedsHouse1_Block:
+RedsHouse2_Block: ; 65270 (19:5270)
+	INCBIN "gfx/blocksets/reds_house.bst"
+House_GFX: ; 653a0 (19:53a0)
+	INCBIN "gfx/tilesets/house.2bpp"
+House_Block: ; 65980 (19:5980)
+	INCBIN "gfx/blocksets/house.bst"
+Mansion_GFX: ; 65bb0 (19:5bb0)
+	INCBIN "gfx/tilesets/mansion.2bpp"
+Mansion_Block: ; 66190 (19:6190)
+	INCBIN "gfx/blocksets/mansion.bst"
+ShipPort_GFX: ; 66610 (19:6610)
+	INCBIN "gfx/tilesets/ship_port.2bpp"
+ShipPort_Block: ; 66bf0 (19:6bf0)
+	INCBIN "gfx/blocksets/ship_port.bst"
+Interior_GFX: ; 66d60 (19:6d60)
+	INCBIN "gfx/tilesets/interior.2bpp"
+Interior_Block: ; 67350 (19:7350)
+	INCBIN "gfx/blocksets/interior.bst"
+Plateau_GFX: ; 676f0 (19:76f0)
+	INCBIN "gfx/tilesets/plateau.2bpp"
+Plateau_Block: ; 67b50 (19:7b50)
+	INCBIN "gfx/blocksets/plateau.bst"
 
 SECTION "bank1A",ROMX,BANK[$1A]
 
@@ -98107,57 +98114,65 @@ IF _BLUE
 	; 64 bytes
 ENDC
 
-Tset05_GFX: ; 6807f (1a:407f)
-	INCBIN "gfx/tilesets/05.2bpp"
-Tset05_Block: ; 6867f (1a:467f)
-	INCBIN "gfx/blocksets/05.bst"
-Tset02_GFX: ; 68dbf (1a:4dbf)
-	INCBIN "gfx/tilesets/02.2bpp"
-Tset02_Block: ; 693bf (1a:53bf)
-	INCBIN "gfx/blocksets/02.bst"
-Tset09_GFX: ; 6960f (1a:560f)
-	INCBIN "gfx/tilesets/09.2bpp"
-Tset09_Block: ; 69bff (1a:5bff)
-	INCBIN "gfx/blocksets/09.bst"
-Tset03_GFX: ; 6a3ff (1a:63ff)
-	INCBIN "gfx/tilesets/03.2bpp"
-Tset03_Block: ; 6a9ff (1a:69ff)
-	INCBIN "gfx/blocksets/03.bst"
-Tset16_GFX: ; 6b1ff (1a:71ff)
-	INCBIN "gfx/tilesets/16.2bpp"
-Tset16_Block: ; 6b7ff (1a:77ff)
-	INCBIN "gfx/blocksets/16.bst"
+Dojo_GFX:
+Gym_GFX: ; 6807f (1a:407f)
+	INCBIN "gfx/tilesets/gym.2bpp"
+Dojo_Block:
+Gym_Block: ; 6867f (1a:467f)
+	INCBIN "gfx/blocksets/gym.bst"
+Mart_GFX:
+Pokecenter_GFX: ; 68dbf (1a:4dbf)
+	INCBIN "gfx/tilesets/pokecenter.2bpp"
+Mart_Block:
+Pokecenter_Block: ; 693bf (1a:53bf)
+	INCBIN "gfx/blocksets/pokecenter.bst"
+ForestGate_GFX:
+Museum_GFX:
+Gate_GFX: ; 6960f (1a:560f)
+	INCBIN "gfx/tilesets/gate.2bpp"
+ForestGate_Block:
+Museum_Block:
+Gate_Block: ; 69bff (1a:5bff)
+	INCBIN "gfx/blocksets/gate.bst"
+Forest_GFX: ; 6a3ff (1a:63ff)
+	INCBIN "gfx/tilesets/forest.2bpp"
+Forest_Block: ; 6a9ff (1a:69ff)
+	INCBIN "gfx/blocksets/forest.bst"
+Facility_GFX: ; 6b1ff (1a:71ff)
+	INCBIN "gfx/tilesets/facility.2bpp"
+Facility_Block: ; 6b7ff (1a:77ff)
+	INCBIN "gfx/blocksets/facility.bst"
 
 SECTION "bank1B",ROMX,BANK[$1B]
 
-Tset0F_GFX: ; 6c000 (1b:4000)
-	INCBIN "gfx/tilesets/0f.2bpp"
-Tset0F_Block: ; 6c5c0 (1b:45c0)
-	INCBIN "gfx/blocksets/0f.bst"
-Tset11_GFX: ; 6cca0 (1b:4ca0)
-	INCBIN "gfx/tilesets/11.2bpp"
-Tset11_Block: ; 6d0c0 (1b:50c0)
-	INCBIN "gfx/blocksets/11.bst"
-Tset12_GFX: ; 6d8c0 (1b:58c0)
-	INCBIN "gfx/tilesets/12.2bpp"
-Tset12_Block: ; 6dea0 (1b:5ea0)
-	INCBIN "gfx/blocksets/12.bst"
-Tset0D_GFX: ; 6e390 (1b:6390)
-	INCBIN "gfx/tilesets/0d.2bpp"
-Tset0D_Block: ; 6e930 (1b:6930)
-	INCBIN "gfx/blocksets/0d.bst"
-Tset14_GFX: ; 6ed10 (1b:6d10)
-	INCBIN "gfx/tilesets/14.2bpp"
-Tset14_Block: ; 6f2d0 (1b:72d0)
-	INCBIN "gfx/blocksets/14.bst"
-Tset15_GFX: ; 6f670 (1b:7670)
-	INCBIN "gfx/tilesets/15.2bpp"
-Tset15_Block: ; 6fb20 (1b:7b20)
-	INCBIN "gfx/blocksets/15.bst"
-Tset0B_GFX: ; 6fd60 (1b:7d60)
-	INCBIN "gfx/tilesets/0b.2bpp"
-Tset0B_Block: ; 6fef0 (1b:7ef0)
-	INCBIN "gfx/blocksets/0b.bst"
+Cemetery_GFX: ; 6c000 (1b:4000)
+	INCBIN "gfx/tilesets/cemetery.2bpp"
+Cemetery_Block: ; 6c5c0 (1b:45c0)
+	INCBIN "gfx/blocksets/cemetery.bst"
+Cavern_GFX: ; 6cca0 (1b:4ca0)
+	INCBIN "gfx/tilesets/cavern.2bpp"
+Cavern_Block: ; 6d0c0 (1b:50c0)
+	INCBIN "gfx/blocksets/cavern.bst"
+Lobby_GFX: ; 6d8c0 (1b:58c0)
+	INCBIN "gfx/tilesets/lobby.2bpp"
+Lobby_Block: ; 6dea0 (1b:5ea0)
+	INCBIN "gfx/blocksets/lobby.bst"
+Ship_GFX: ; 6e390 (1b:6390)
+	INCBIN "gfx/tilesets/ship.2bpp"
+Ship_Block: ; 6e930 (1b:6930)
+	INCBIN "gfx/blocksets/ship.bst"
+Lab_GFX: ; 6ed10 (1b:6d10)
+	INCBIN "gfx/tilesets/lab.2bpp"
+Lab_Block: ; 6f2d0 (1b:72d0)
+	INCBIN "gfx/blocksets/lab.bst"
+Club_GFX: ; 6f670 (1b:7670)
+	INCBIN "gfx/tilesets/club.2bpp"
+Club_Block: ; 6fb20 (1b:7b20)
+	INCBIN "gfx/blocksets/club.bst"
+Underground_GFX: ; 6fd60 (1b:7d60)
+	INCBIN "gfx/tilesets/underground.2bpp"
+Underground_Block: ; 6fef0 (1b:7ef0)
+	INCBIN "gfx/blocksets/underground.bst"
 
 SECTION "bank1C",ROMX,BANK[$1C]
 
@@ -104414,7 +104429,7 @@ Func_74872: ; 74872 (1d:4872)
 	ret
 
 ViridianGym_h: ; 0x74897 to 0x748a3 (12 bytes) (id=45)
-	db $07 ; tileset
+	db GYM ; tileset
 	db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x)
 	dw ViridianGymBlocks, ViridianGymTextPointers, ViridianGymScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -104962,7 +104977,7 @@ ViridianGymBlocks: ; 74c47 (1d:4c47)
 	INCBIN "maps/viridiangym.blk"
 
 PewterMart_h: ; 0x74ca1 to 0x74cad (12 bytes) (id=56)
-	db $02 ; tileset
+	db MART ; tileset
 	db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x)
 	dw PewterMartBlocks, PewterMartTextPointers, PewterMartScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -105018,7 +105033,7 @@ PewterMartObject: ; 0x74cda (size=38)
 	EVENT_DISP $4, $7, $4
 
 UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228)
-	db $11 ; tileset
+	db CAVERN ; tileset
 	db UNKNOWN_DUNGEON_1_HEIGHT, UNKNOWN_DUNGEON_1_WIDTH ; dimensions (y, x)
 	dw UnknownDungeon1Blocks, UnknownDungeon1TextPointers, UnknownDungeon1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -105068,7 +105083,7 @@ UnknownDungeon1Blocks: ; 74d76 (1d:4d76)
 	INCBIN "maps/unknowndungeon1.blk"
 
 CeruleanHouse2_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230)
-	db $0d ; tileset
+	db SHIP ; tileset
 	db CERULEAN_HOUSE_2_HEIGHT, CERULEAN_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw CeruleanHouse2Blocks, CeruleanHouse2TextPointers, CeruleanHouse2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -105342,7 +105357,7 @@ VendingPrices: ; 75000 (1d:5000)
 	db LEMONADE,   $00,$03,$50
 
 FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153)
-	db $08 ; tileset
+	db HOUSE ; tileset
 	db FUCHSIA_HOUSE_1_HEIGHT, FUCHSIA_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw FuchsiaHouse1Blocks, FuchsiaHouse1TextPointers, FuchsiaHouse1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -105388,7 +105403,7 @@ FuchsiaHouse1Object: ; 0x75031 (size=38)
 	EVENT_DISP $4, $7, $3
 
 FuchsiaPokecenter_h: ; 0x75057 to 0x75063 (12 bytes) (id=154)
-	db $06 ; tileset
+	db POKECENTER ; tileset
 	db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x)
 	dw FuchsiaPokecenterBlocks, FuchsiaPokecenterTextPointers, FuchsiaPokecenterScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -105438,7 +105453,7 @@ FuchsiaPokecenterObject: ; 0x7507d (size=44)
 	EVENT_DISP $7, $7, $4
 
 FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155)
-	db $14 ; tileset
+	db LAB ; tileset
 	db FUCHSIA_HOUSE_2_HEIGHT, FUCHSIA_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw FuchsiaHouse2Blocks, FuchsiaHouse2TextPointers, FuchsiaHouse2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -105587,7 +105602,7 @@ FuchsiaHouse2Blocks: ; 751ad (1d:51ad)
 	INCBIN "maps/fuchsiahouse2.blk"
 
 SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156)
-	db $0c ; tileset
+	db GATE ; tileset
 	db SAFARIZONEENTRANCE_HEIGHT, SAFARIZONEENTRANCE_WIDTH ; dimensions (y, x)
 	dw SafariZoneEntranceBlocks, SafariZoneEntranceTextPointers, SafariZoneEntranceScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -105919,7 +105934,7 @@ SafariZoneEntranceBlocks: ; 75425 (1d:5425)
 	INCBIN "maps/safarizoneentrance.blk"
 
 FuchsiaGym_h: ; 0x75431 to 0x7543d (12 bytes) (id=157)
-	db $07 ; tileset
+	db GYM ; tileset
 	db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x)
 	dw FuchsiaGymBlocks, FuchsiaGymTextPointers, FuchsiaGymScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -106286,7 +106301,7 @@ FuchsiaGymBlocks: ; 756aa (1d:56aa)
 	INCBIN "maps/fuchsiagym.blk"
 
 FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158)
-	db $14 ; tileset
+	db LAB ; tileset
 	db FUCHSIAMEETINGROOM_HEIGHT, FUCHSIAMEETINGROOM_WIDTH ; dimensions (y, x)
 	dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTextPointers, FuchsiaMeetingRoomScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -106335,7 +106350,7 @@ FuchsiaMeetingRoomBlocks: ; 75722 (1d:5722)
 	INCBIN "maps/fuchsiameetingroom.blk"
 
 CinnabarGym_h: ; 0x7573e to 0x7574a (12 bytes) (id=166)
-	db $16 ; tileset
+	db FACILITY ; tileset
 	db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x)
 	dw CinnabarGymBlocks, CinnabarGymTextPointers, CinnabarGymScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -106849,7 +106864,7 @@ CinnabarGymBlocks: ; 75b26 (1d:5b26)
 	INCBIN "maps/cinnabargym.blk"
 
 Lab1_h: ; 0x75b80 to 0x75b8c (12 bytes) (id=167)
-	db $14 ; tileset
+	db LAB ; tileset
 	db CINNABAR_LAB_1_HEIGHT, CINNABAR_LAB_1_WIDTH ; dimensions (y, x)
 	dw Lab1Blocks, Lab1TextPointers, Lab1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -106916,7 +106931,7 @@ Lab1Blocks: ; 75bf1 (1d:5bf1)
 	INCBIN "maps/lab1.blk"
 
 Lab2_h: ; 0x75c15 to 0x75c21 (12 bytes) (id=168)
-	db $14 ; tileset
+	db LAB ; tileset
 	db CINNABAR_LAB_2_HEIGHT, CINNABAR_LAB_2_WIDTH ; dimensions (y, x)
 	dw Lab2Blocks, Lab2TextPointers, Lab2Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -106971,7 +106986,7 @@ Lab2Blocks: ; 75c6b (1d:5c6b)
 	INCBIN "maps/lab2.blk"
 
 Lab3_h: ; 0x75c7b to 0x75c87 (12 bytes) (id=169)
-	db $14 ; tileset
+	db LAB ; tileset
 	db CINNABAR_LAB_3_HEIGHT, CINNABAR_LAB_3_WIDTH ; dimensions (y, x)
 	dw Lab3Blocks, Lab3TextPointers, Lab3Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -107065,7 +107080,7 @@ Lab3Blocks: ; 75d15 (1d:5d15)
 	INCBIN "maps/lab3.blk"
 
 Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170)
-	db $14 ; tileset
+	db LAB ; tileset
 	db CINNABAR_LAB_4_HEIGHT, CINNABAR_LAB_4_WIDTH ; dimensions (y, x)
 	dw Lab4Blocks, Lab4TextPointers, Lab4Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -107210,7 +107225,7 @@ Lab4Blocks: ; 75e10 (1d:5e10)
 	INCBIN "maps/lab4.blk"
 
 CinnabarPokecenter_h: ; 0x75e20 to 0x75e2c (12 bytes) (id=171)
-	db $06 ; tileset
+	db POKECENTER ; tileset
 	db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x)
 	dw CinnabarPokecenterBlocks, CinnabarPokecenterTextPointers, CinnabarPokecenterScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -107260,7 +107275,7 @@ CinnabarPokecenterObject: ; 0x75e46 (size=44)
 	EVENT_DISP $7, $7, $4
 
 CinnabarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172)
-	db $02 ; tileset
+	db MART ; tileset
 	db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x)
 	dw CinnabarMartBlocks, CinnabarMartTextPointers, CinnabarMartScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -107301,7 +107316,7 @@ CinnabarMartObject: ; 0x75e91 (size=38)
 	EVENT_DISP $4, $7, $4
 
 CopycatsHouseF1_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175)
-	db $01 ; tileset
+	db REDS_HOUSE_1 ; tileset
 	db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x)
 	dw CopycatsHouseF1Blocks, CopycatsHouseF1TextPointers, CopycatsHouseF1Script ; blocks, texts, scripts
 	db $00 ; connections
@@ -107680,7 +107695,7 @@ GaryBlocks: ; 7615f (1d:615f)
 	INCBIN "maps/gary.blk"
 
 Lorelei_h: ; 0x7616f to 0x7617b (12 bytes) (id=245)
-	db $07 ; tileset
+	db GYM ; tileset
 	db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x)
 	dw LoreleiBlocks, LoreleiTextPointers, LoreleiScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -107864,7 +107879,7 @@ LoreleiBlocks: ; 762ac (1d:62ac)
 	INCBIN "maps/lorelei.blk"
 
 Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246)
-	db $07 ; tileset
+	db GYM ; tileset
 	db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x)
 	dw BrunoBlocks, BrunoTextPointers, BrunoScript ; blocks, texts, scripts
 	db $00 ; connections
@@ -108049,7 +108064,7 @@ BrunoBlocks: ; 76403 (1d:6403)
 	INCBIN "maps/bruno.blk"
 
 Agatha_h: ; 0x76421 to 0x7642d (12 bytes) (id=247)
-	db $0f ; tileset
+	db CEMETERY ; tileset
 	db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x)
 	dw AgathaBlocks, AgathaTextPointers, AgathaScript ; blocks, texts, scripts
 	db $00 ; connections