195 files changed, 378 insertions, 407 deletions

diff --git a/constants/tilemap_constants.asm b/constants/tilemap_constants.asm
index 702dc92bf..d06e22cc6 100644
--- a/constants/tilemap_constants.asm
+++ b/constants/tilemap_constants.asm
@@ -11,7 +11,7 @@ const_value SET 1
 	const TILESET_KANTO                ; 03
 	const TILESET_BATTLE_TOWER_OUTSIDE ; 04
 	const TILESET_HOUSE_1              ; 05
-	const TILESET_KRISS_HOUSE          ; 06
+	const TILESET_PLAYERS_HOUSE        ; 06
 	const TILESET_POKECENTER           ; 07
 	const TILESET_GATE                 ; 08
 	const TILESET_PORT                 ; 09
@@ -21,11 +21,11 @@ const_value SET 1
 	const TILESET_CELADON_MANSION      ; 0d
 	const TILESET_GAME_CORNER          ; 0e
 	const TILESET_GYM_1                ; 0f
-	const TILESET_KURT_HOUSE           ; 10
+	const TILESET_KURTS_HOUSE          ; 10
 	const TILESET_TRAIN_STATION        ; 11
 	const TILESET_OLIVINE_GYM          ; 12
 	const TILESET_LIGHTHOUSE           ; 13
-	const TILESET_KRISS_HOUSE_2F       ; 14
+	const TILESET_PLAYERS_HOUSE_2F     ; 14
 	const TILESET_POKECOM_CENTER       ; 15
 	const TILESET_BATTLE_TOWER         ; 16
 	const TILESET_SPROUT_TOWER         ; 17
@@ -37,7 +37,7 @@ const_value SET 1
 	const TILESET_ICE_PATH             ; 1d
 	const TILESET_WHIRL_ISLANDS        ; 1e
 	const TILESET_ILEX_FOREST          ; 1f
-	const TILESET_32                   ; 20
+	const TILESET_BETA_WORD_ROOM       ; 20
 	const TILESET_HO_OH_WORD_ROOM      ; 21
 	const TILESET_KABUTO_WORD_ROOM     ; 22
 	const TILESET_OMANYTE_WORD_ROOM    ; 23
diff --git a/data/sprite_engine.asm b/data/sprite_engine.asm
index 31872d531..e3662fdaf 100755
--- a/data/sprite_engine.asm
+++ b/data/sprite_engine.asm
@@ -1640,7 +1640,7 @@ BrokenStdGFXPointers: ; Broken 2bpp pointers
 	dbbw $80, $01, .deleted
 	dbbw $80, $01, .deleted
 	dbbw $80, $01, .deleted
-	dbbw $10, $37, .deleted ; 16-tile 2bpp at 37:672a (within Tileset11GFX)
+	dbbw $10, $37, .deleted ; 16-tile 2bpp at 37:672a (within TilesetTrainStationGFX)
 	dbbw $10, $11, .deleted ; 16-tile 2bpp at 11:672a (empty data)
 	dbbw $10, $39, .deleted ; 16-tile 2bpp at 39:672a (empty data)
 	dbbw $10, $24, .deleted ; 16-tile 2bpp at 24:672a (inside Function926f7)
diff --git a/gfx/tilesets/01.2bpp.lz.0c7e555a b/gfx/tilesets/01.2bpp.lz.0c7e555a
deleted file mode 100644
index 9821e1433..000000000
--- a/gfx/tilesets/01.2bpp.lz.0c7e555a
+++ /dev/null
diff --git a/gfx/tilesets/01.png b/gfx/tilesets/01.png
deleted file mode 100644
index 0fc2db12f..000000000
--- a/gfx/tilesets/01.png
+++ /dev/null
diff --git a/gfx/tilesets/26.2bpp.lz.8b42470b b/gfx/tilesets/aerodactyl_word_room.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/26.2bpp.lz.8b42470b
+++ b/gfx/tilesets/aerodactyl_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/26.png b/gfx/tilesets/aerodactyl_word_room.png
index f41866c58..f41866c58 100644
--- a/gfx/tilesets/26.png
+++ b/gfx/tilesets/aerodactyl_word_room.png
diff --git a/gfx/tilesets/22.2bpp.lz.467b6a2d b/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d
index fa5d0a9f0..fa5d0a9f0 100644
--- a/gfx/tilesets/22.2bpp.lz.467b6a2d
+++ b/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d
diff --git a/gfx/tilesets/22.png b/gfx/tilesets/battle_tower.png
index 1cd57402d..1cd57402d 100644
--- a/gfx/tilesets/22.png
+++ b/gfx/tilesets/battle_tower.png
diff --git a/gfx/tilesets/02.2bpp.lz.391603fb b/gfx/tilesets/battle_tower_outside.2bpp.lz.391603fb
index 64f23e23b..64f23e23b 100644
--- a/gfx/tilesets/02.2bpp.lz.391603fb
+++ b/gfx/tilesets/battle_tower_outside.2bpp.lz.391603fb
diff --git a/gfx/tilesets/02.png b/gfx/tilesets/battle_tower_outside.png
index 126573b7b..126573b7b 100644
--- a/gfx/tilesets/02.png
+++ b/gfx/tilesets/battle_tower_outside.png
diff --git a/gfx/tilesets/32.2bpp.lz.8b42470b b/gfx/tilesets/beta_word_room.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/32.2bpp.lz.8b42470b
+++ b/gfx/tilesets/beta_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/32.png b/gfx/tilesets/beta_word_room.png
index f41866c58..f41866c58 100644
--- a/gfx/tilesets/32.png
+++ b/gfx/tilesets/beta_word_room.png
diff --git a/gfx/tilesets/24.2bpp.lz.3437812a b/gfx/tilesets/cave.2bpp.lz.3437812a
index 69069fb75..69069fb75 100644
--- a/gfx/tilesets/24.2bpp.lz.3437812a
+++ b/gfx/tilesets/cave.2bpp.lz.3437812a
diff --git a/gfx/tilesets/24.png b/gfx/tilesets/cave.png
index 0e5bdee7e..0e5bdee7e 100644
--- a/gfx/tilesets/24.png
+++ b/gfx/tilesets/cave.png
diff --git a/gfx/tilesets/13.2bpp.lz.63b414d4 b/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4
index b68f147d0..b68f147d0 100644
--- a/gfx/tilesets/13.2bpp.lz.63b414d4
+++ b/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4
diff --git a/gfx/tilesets/13.png b/gfx/tilesets/celadon_mansion.png
index 7dde8574e..7dde8574e 100644
--- a/gfx/tilesets/13.png
+++ b/gfx/tilesets/celadon_mansion.png
diff --git a/gfx/tilesets/14.2bpp.lz.71d29a2f b/gfx/tilesets/game_corner.2bpp.lz.71d29a2f
index f7e185b4e..f7e185b4e 100644
--- a/gfx/tilesets/14.2bpp.lz.71d29a2f
+++ b/gfx/tilesets/game_corner.2bpp.lz.71d29a2f
diff --git a/gfx/tilesets/14.png b/gfx/tilesets/game_corner.png
index 776900638..776900638 100644
--- a/gfx/tilesets/14.png
+++ b/gfx/tilesets/game_corner.png
diff --git a/gfx/tilesets/08.2bpp.lz.f5a55006 b/gfx/tilesets/gate.2bpp.lz.f5a55006
index 724b6b8b7..724b6b8b7 100644
--- a/gfx/tilesets/08.2bpp.lz.f5a55006
+++ b/gfx/tilesets/gate.2bpp.lz.f5a55006
diff --git a/gfx/tilesets/08.png b/gfx/tilesets/gate.png
index b8f2db2d2..b8f2db2d2 100644
--- a/gfx/tilesets/08.png
+++ b/gfx/tilesets/gate.png
diff --git a/gfx/tilesets/15.2bpp.lz.c1f2ed8f b/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f
index 6b45c769d..6b45c769d 100644
--- a/gfx/tilesets/15.2bpp.lz.c1f2ed8f
+++ b/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f
diff --git a/gfx/tilesets/15.png b/gfx/tilesets/gym_1.png
index 582b9365d..582b9365d 100644
--- a/gfx/tilesets/15.png
+++ b/gfx/tilesets/gym_1.png
diff --git a/gfx/tilesets/33.2bpp.lz.8b42470b b/gfx/tilesets/ho_oh_word_room.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/33.2bpp.lz.8b42470b
+++ b/gfx/tilesets/ho_oh_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/33.png b/gfx/tilesets/ho_oh_word_room.png
index f41866c58..f41866c58 100644
--- a/gfx/tilesets/33.png
+++ b/gfx/tilesets/ho_oh_word_room.png
diff --git a/gfx/tilesets/05.2bpp.lz.c848ef13 b/gfx/tilesets/house_1.2bpp.lz.c848ef13
index f9afaf70d..f9afaf70d 100644
--- a/gfx/tilesets/05.2bpp.lz.c848ef13
+++ b/gfx/tilesets/house_1.2bpp.lz.c848ef13
diff --git a/gfx/tilesets/05.png b/gfx/tilesets/house_1.png
index 3ab7b5ce8..3ab7b5ce8 100644
--- a/gfx/tilesets/05.png
+++ b/gfx/tilesets/house_1.png
diff --git a/gfx/tilesets/29.2bpp.lz.e23bc89f b/gfx/tilesets/ice_path.2bpp.lz.e23bc89f
index 25cc45c85..25cc45c85 100644
--- a/gfx/tilesets/29.2bpp.lz.e23bc89f
+++ b/gfx/tilesets/ice_path.2bpp.lz.e23bc89f
diff --git a/gfx/tilesets/29.png b/gfx/tilesets/ice_path.png
index d70eb53be..d70eb53be 100644
--- a/gfx/tilesets/29.png
+++ b/gfx/tilesets/ice_path.png
diff --git a/gfx/tilesets/31.2bpp.lz.6b0ac896 b/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896
index 7b5355705..7b5355705 100644
--- a/gfx/tilesets/31.2bpp.lz.6b0ac896
+++ b/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896
diff --git a/gfx/tilesets/31.png b/gfx/tilesets/ilex_forest.png
index a85cc0394..a85cc0394 100644
--- a/gfx/tilesets/31.png
+++ b/gfx/tilesets/ilex_forest.png
diff --git a/gfx/tilesets/00.2bpp.lz.0c7e555a b/gfx/tilesets/johto_1.2bpp.lz.0c7e555a
index 9821e1433..9821e1433 100644
--- a/gfx/tilesets/00.2bpp.lz.0c7e555a
+++ b/gfx/tilesets/johto_1.2bpp.lz.0c7e555a
diff --git a/gfx/tilesets/00.png b/gfx/tilesets/johto_1.png
index 0fc2db12f..0fc2db12f 100644
--- a/gfx/tilesets/00.png
+++ b/gfx/tilesets/johto_1.png
diff --git a/gfx/tilesets/04.2bpp.lz.391603fb b/gfx/tilesets/johto_2.2bpp.lz.391603fb
index 64f23e23b..64f23e23b 100644
--- a/gfx/tilesets/04.2bpp.lz.391603fb
+++ b/gfx/tilesets/johto_2.2bpp.lz.391603fb
diff --git a/gfx/tilesets/04.png b/gfx/tilesets/johto_2.png
index 126573b7b..126573b7b 100644
--- a/gfx/tilesets/04.png
+++ b/gfx/tilesets/johto_2.png
diff --git a/gfx/tilesets/34.2bpp.lz.8b42470b b/gfx/tilesets/kabuto_word_room.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/34.2bpp.lz.8b42470b
+++ b/gfx/tilesets/kabuto_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/34.png b/gfx/tilesets/kabuto_word_room.png
index f41866c58..f41866c58 100644
--- a/gfx/tilesets/34.png
+++ b/gfx/tilesets/kabuto_word_room.png
diff --git a/gfx/tilesets/03.2bpp.lz.a29f5d51 b/gfx/tilesets/kanto.2bpp.lz.a29f5d51
index d925ee111..d925ee111 100644
--- a/gfx/tilesets/03.2bpp.lz.a29f5d51
+++ b/gfx/tilesets/kanto.2bpp.lz.a29f5d51
diff --git a/gfx/tilesets/03.png b/gfx/tilesets/kanto.png
index 08b2cbeea..08b2cbeea 100644
--- a/gfx/tilesets/03.png
+++ b/gfx/tilesets/kanto.png
diff --git a/gfx/tilesets/16.2bpp.lz.dd51d079 b/gfx/tilesets/kurts_house.2bpp.lz.dd51d079
index 28f025413..28f025413 100644
--- a/gfx/tilesets/16.2bpp.lz.dd51d079
+++ b/gfx/tilesets/kurts_house.2bpp.lz.dd51d079
diff --git a/gfx/tilesets/16.png b/gfx/tilesets/kurts_house.png
index 3d6f1b511..3d6f1b511 100644
--- a/gfx/tilesets/16.png
+++ b/gfx/tilesets/kurts_house.png
diff --git a/gfx/tilesets/10.2bpp.lz.b8d0f547 b/gfx/tilesets/lab.2bpp.lz.b8d0f547
index cd0f43861..cd0f43861 100644
--- a/gfx/tilesets/10.2bpp.lz.b8d0f547
+++ b/gfx/tilesets/lab.2bpp.lz.b8d0f547
diff --git a/gfx/tilesets/10.png b/gfx/tilesets/lab.png
index 418a068fa..418a068fa 100644
--- a/gfx/tilesets/10.png
+++ b/gfx/tilesets/lab.png
diff --git a/gfx/tilesets/19.2bpp.lz.0c1544c1 b/gfx/tilesets/lighthouse.2bpp.lz.0c1544c1
index d208e65c3..d208e65c3 100644
--- a/gfx/tilesets/19.2bpp.lz.0c1544c1
+++ b/gfx/tilesets/lighthouse.2bpp.lz.0c1544c1
diff --git a/gfx/tilesets/19.png b/gfx/tilesets/lighthouse.png
index 920ee30ec..920ee30ec 100644
--- a/gfx/tilesets/19.png
+++ b/gfx/tilesets/lighthouse.png
diff --git a/gfx/tilesets/12.2bpp.lz.e2e94f92 b/gfx/tilesets/mart.2bpp.lz.e2e94f92
index e8091a899..e8091a899 100644
--- a/gfx/tilesets/12.2bpp.lz.e2e94f92
+++ b/gfx/tilesets/mart.2bpp.lz.e2e94f92
diff --git a/gfx/tilesets/12.png b/gfx/tilesets/mart.png
index 4053283bc..4053283bc 100644
--- a/gfx/tilesets/12.png
+++ b/gfx/tilesets/mart.png
diff --git a/gfx/tilesets/18.2bpp.lz.93800351 b/gfx/tilesets/olivine_gym.2bpp.lz.93800351
index e19994f37..e19994f37 100644
--- a/gfx/tilesets/18.2bpp.lz.93800351
+++ b/gfx/tilesets/olivine_gym.2bpp.lz.93800351
diff --git a/gfx/tilesets/18.png b/gfx/tilesets/olivine_gym.png
index 350c04932..350c04932 100644
--- a/gfx/tilesets/18.png
+++ b/gfx/tilesets/olivine_gym.png
diff --git a/gfx/tilesets/35.2bpp.lz.8b42470b b/gfx/tilesets/omanyte_word_room.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/35.2bpp.lz.8b42470b
+++ b/gfx/tilesets/omanyte_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/35.png b/gfx/tilesets/omanyte_word_room.png
index f41866c58..f41866c58 100644
--- a/gfx/tilesets/35.png
+++ b/gfx/tilesets/omanyte_word_room.png
diff --git a/gfx/tilesets/25.2bpp.lz.7fcb81d6 b/gfx/tilesets/park.2bpp.lz.7fcb81d6
index 01a0e56bd..01a0e56bd 100644
--- a/gfx/tilesets/25.2bpp.lz.7fcb81d6
+++ b/gfx/tilesets/park.2bpp.lz.7fcb81d6
diff --git a/gfx/tilesets/25.png b/gfx/tilesets/park.png
index 7a4a5f8eb..7a4a5f8eb 100644
--- a/gfx/tilesets/25.png
+++ b/gfx/tilesets/park.png
diff --git a/gfx/tilesets/06.2bpp.lz.252cbd8f b/gfx/tilesets/players_house.2bpp.lz.252cbd8f
index 17c64de65..17c64de65 100644
--- a/gfx/tilesets/06.2bpp.lz.252cbd8f
+++ b/gfx/tilesets/players_house.2bpp.lz.252cbd8f
diff --git a/gfx/tilesets/06.png b/gfx/tilesets/players_house.png
index b49f799d8..b49f799d8 100644
--- a/gfx/tilesets/06.png
+++ b/gfx/tilesets/players_house.png
diff --git a/gfx/tilesets/20.2bpp.lz.35e51007 b/gfx/tilesets/players_house_2f.2bpp.lz.35e51007
index b458a501d..b458a501d 100644
--- a/gfx/tilesets/20.2bpp.lz.35e51007
+++ b/gfx/tilesets/players_house_2f.2bpp.lz.35e51007
diff --git a/gfx/tilesets/20.png b/gfx/tilesets/players_house_2f.png
index e46a847b9..e46a847b9 100644
--- a/gfx/tilesets/20.png
+++ b/gfx/tilesets/players_house_2f.png
diff --git a/gfx/tilesets/07.2bpp.lz.e1c4014c b/gfx/tilesets/pokecenter.2bpp.lz.e1c4014c
index 71783d9f2..71783d9f2 100644
--- a/gfx/tilesets/07.2bpp.lz.e1c4014c
+++ b/gfx/tilesets/pokecenter.2bpp.lz.e1c4014c
diff --git a/gfx/tilesets/07.png b/gfx/tilesets/pokecenter.png
index d4084ebd4..d4084ebd4 100644
--- a/gfx/tilesets/07.png
+++ b/gfx/tilesets/pokecenter.png
diff --git a/gfx/tilesets/21.2bpp.lz.febbc4ec b/gfx/tilesets/pokecom_center.2bpp.lz.febbc4ec
index 5b787c854..5b787c854 100644
--- a/gfx/tilesets/21.2bpp.lz.febbc4ec
+++ b/gfx/tilesets/pokecom_center.2bpp.lz.febbc4ec
diff --git a/gfx/tilesets/21.png b/gfx/tilesets/pokecom_center.png
index 889b02727..889b02727 100644
--- a/gfx/tilesets/21.png
+++ b/gfx/tilesets/pokecom_center.png
diff --git a/gfx/tilesets/09.2bpp.lz.56b1a405 b/gfx/tilesets/port.2bpp.lz.56b1a405
index 96dd2e594..96dd2e594 100644
--- a/gfx/tilesets/09.2bpp.lz.56b1a405
+++ b/gfx/tilesets/port.2bpp.lz.56b1a405
diff --git a/gfx/tilesets/09.png b/gfx/tilesets/port.png
index 6990a7d7b..6990a7d7b 100644
--- a/gfx/tilesets/09.png
+++ b/gfx/tilesets/port.png
diff --git a/gfx/tilesets/11.2bpp.lz.454cfd8b b/gfx/tilesets/power_plant.2bpp.lz.454cfd8b
index 584e54dd2..584e54dd2 100644
--- a/gfx/tilesets/11.2bpp.lz.454cfd8b
+++ b/gfx/tilesets/power_plant.2bpp.lz.454cfd8b
diff --git a/gfx/tilesets/11.png b/gfx/tilesets/power_plant.png
index b72e3f401..b72e3f401 100644
--- a/gfx/tilesets/11.png
+++ b/gfx/tilesets/power_plant.png
diff --git a/gfx/tilesets/27.2bpp.lz.27cdd9ad b/gfx/tilesets/radio_tower.2bpp.lz.27cdd9ad
index 34be33856..34be33856 100644
--- a/gfx/tilesets/27.2bpp.lz.27cdd9ad
+++ b/gfx/tilesets/radio_tower.2bpp.lz.27cdd9ad
diff --git a/gfx/tilesets/27.png b/gfx/tilesets/radio_tower.png
index 8d2d32e1f..8d2d32e1f 100644
--- a/gfx/tilesets/27.png
+++ b/gfx/tilesets/radio_tower.png
diff --git a/gfx/tilesets/36.2bpp.lz.8b42470b b/gfx/tilesets/ruins_of_alph.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/36.2bpp.lz.8b42470b
+++ b/gfx/tilesets/ruins_of_alph.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/36.png b/gfx/tilesets/ruins_of_alph.png
index f41866c58..f41866c58 100644
--- a/gfx/tilesets/36.png
+++ b/gfx/tilesets/ruins_of_alph.png
diff --git a/gfx/tilesets/23.2bpp.lz.bc56789c b/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c
index 2033306e3..2033306e3 100644
--- a/gfx/tilesets/23.2bpp.lz.bc56789c
+++ b/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c
diff --git a/gfx/tilesets/23.png b/gfx/tilesets/sprout_tower.png
index 268fc998f..268fc998f 100644
--- a/gfx/tilesets/23.png
+++ b/gfx/tilesets/sprout_tower.png
diff --git a/gfx/tilesets/17.2bpp.lz.1600ca86 b/gfx/tilesets/train_station.2bpp.lz.1600ca86
index 56e509f5e..56e509f5e 100644
--- a/gfx/tilesets/17.2bpp.lz.1600ca86
+++ b/gfx/tilesets/train_station.2bpp.lz.1600ca86
diff --git a/gfx/tilesets/17.png b/gfx/tilesets/train_station.png
index 0c148f95d..0c148f95d 100644
--- a/gfx/tilesets/17.png
+++ b/gfx/tilesets/train_station.png
diff --git a/gfx/tilesets/28.2bpp.lz.cace291c b/gfx/tilesets/underground.2bpp.lz.cace291c
index c204dca26..c204dca26 100644
--- a/gfx/tilesets/28.2bpp.lz.cace291c
+++ b/gfx/tilesets/underground.2bpp.lz.cace291c
diff --git a/gfx/tilesets/28.png b/gfx/tilesets/underground.png
index 0a83d2043..0a83d2043 100644
--- a/gfx/tilesets/28.png
+++ b/gfx/tilesets/underground.png
diff --git a/gfx/tilesets/30.2bpp.lz.25b9c4b6 b/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6
index 50a5ab9ac..50a5ab9ac 100644
--- a/gfx/tilesets/30.2bpp.lz.25b9c4b6
+++ b/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6
diff --git a/gfx/tilesets/30.png b/gfx/tilesets/whirl_islands.png
index 9dc74c45b..9dc74c45b 100644
--- a/gfx/tilesets/30.png
+++ b/gfx/tilesets/whirl_islands.png
diff --git a/home/map.asm b/home/map.asm
index baf42cb19..6d9337fe9 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -2374,12 +2374,12 @@ LoadTilesetHeader:: ; 2d27
 	push bc
 
 	ld hl, Tilesets
-	ld bc, Tileset01 - Tileset00
+	ld bc, Tileset1 - Tileset0
 	ld a, [wTileset]
 	call AddNTimes
 
 	ld de, TilesetBank
-	ld bc, Tileset01 - Tileset00
+	ld bc, Tileset1 - Tileset0
 
 	ld a, BANK(Tilesets)
 	call FarCopyBytes
diff --git a/maps/map_headers.asm b/maps/map_headers.asm
index 9d58c7cbe..30010042e 100644
--- a/maps/map_headers.asm
+++ b/maps/map_headers.asm
@@ -38,7 +38,7 @@ MapGroup1:
 	map_header OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route39Barn, TILESET_KURT_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header Route39Barn, TILESET_KURTS_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route39Farmhouse, TILESET_HOUSE_1, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route38, TILESET_JOHTO_1, ROUTE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_AUTO, FISHGROUP_SHORE
 	map_header Route39, TILESET_JOHTO_1, ROUTE, ROUTE_39, MUSIC_ROUTE_37, 0, PALETTE_AUTO, FISHGROUP_SHORE
@@ -103,7 +103,7 @@ MapGroup3:
 	map_header OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header MahoganyMart1F, TILESET_KURT_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, 1, PALETTE_DAY, FISHGROUP_SHORE
+	map_header MahoganyMart1F, TILESET_KURTS_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, 1, PALETTE_DAY, FISHGROUP_SHORE
 	map_header TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE
 	map_header TeamRocketBaseB2F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE
 	map_header TeamRocketBaseB3F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE
@@ -151,13 +151,13 @@ MapGroup3:
 
 MapGroup4:
 	map_header EcruteakHouse, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header WiseTriosRoom, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE
+	map_header WiseTriosRoom, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE
 	map_header EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header EcruteakLugiaSpeechHouse, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header DanceTheatre, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header EcruteakLugiaSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header DanceTheatre, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header EcruteakGym, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
-	map_header EcruteakItemfinderHouse, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header EcruteakItemfinderHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header EcruteakCity, TILESET_JOHTO_1, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, FISHGROUP_POND
 
 
@@ -209,7 +209,7 @@ MapGroup8:
 	map_header AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header CharcoalKiln, TILESET_HOUSE_1, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header KurtsHouse, TILESET_KURT_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header KurtsHouse, TILESET_KURTS_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header AzaleaGym, TILESET_GYM_1, INDOOR, AZALEA_TOWN, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route33, TILESET_JOHTO_2, ROUTE, ROUTE_33, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_SHORE
 	map_header AzaleaTown, TILESET_JOHTO_2, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_AUTO, FISHGROUP_SHORE
@@ -233,9 +233,9 @@ MapGroup10:
 	map_header VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header VioletGym, TILESET_GYM_1, INDOOR, VIOLET_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
 	map_header EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header VioletNicknameSpeechHouse, TILESET_KURT_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header VioletNicknameSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header VioletOnixTradeHouse, TILESET_KURT_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header VioletOnixTradeHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -290,8 +290,8 @@ MapGroup12:
 MapGroup13:
 	map_header Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, 0, PALETTE_AUTO, FISHGROUP_SHORE
 	map_header PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_header RedsHouse1F, TILESET_KRISS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RedsHouse2F, TILESET_KRISS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header RedsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header BluesHouse, TILESET_HOUSE_1, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, 0, PALETTE_DAY, FISHGROUP_SHORE
 
@@ -318,7 +318,7 @@ MapGroup15:
 	map_header OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, 0, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header MountMoonGiftShop, TILESET_KURT_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header MountMoonGiftShop, TILESET_KURTS_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header TinTowerRoof, TILESET_SPROUT_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_AUTO, FISHGROUP_SHORE
 
 
@@ -452,10 +452,10 @@ MapGroup24:
 	map_header Route29, TILESET_JOHTO_1, ROUTE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_AUTO, FISHGROUP_SHORE
 	map_header NewBarkTown, TILESET_JOHTO_1, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_AUTO, FISHGROUP_OCEAN
 	map_header ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header KrissHouse1F, TILESET_KRISS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header KrissHouse2F, TILESET_KRISS_HOUSE_2F, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header KrissHouse2F, TILESET_PLAYERS_HOUSE_2F, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header KrissNeighborsHouse, TILESET_HOUSE_1, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header ElmsHouse, TILESET_KRISS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route26HealSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route26DayofWeekSiblingsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route27SandstormHouse, TILESET_HOUSE_1, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -473,8 +473,8 @@ MapGroup25:
 	map_header MrPsychicsHouse, TILESET_HOUSE_1, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header SaffronTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header SilphCo1F, TILESET_POWER_PLANT, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CopycatsHouse1F, TILESET_KRISS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CopycatsHouse2F, TILESET_KRISS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route5UndergroundEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route5SaffronCityGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route5CleanseTagSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
diff --git a/tilesets/00_collision.bin b/tilesets/00_collision.bin
deleted file mode 100644
index 085171e36..000000000
--- a/tilesets/00_collision.bin
+++ /dev/null
diff --git a/tilesets/00_metatiles.bin b/tilesets/00_metatiles.bin
deleted file mode 100644
index 763df1997..000000000
--- a/tilesets/00_metatiles.bin
+++ /dev/null
diff --git a/tilesets/01_palette_map.asm b/tilesets/01_palette_map.asm
deleted file mode 100644
index 62fbd2d00..000000000
--- a/tilesets/01_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
-	tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED
-	tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
-	tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
-	tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW
-	tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN
-	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED
-	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
-	tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
-	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
-	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
-	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/32_collision.bin b/tilesets/aerodactyl_word_room_collision.bin
index a4da351d3..a4da351d3 100644
--- a/tilesets/32_collision.bin
+++ b/tilesets/aerodactyl_word_room_collision.bin
diff --git a/tilesets/36_metatiles.bin b/tilesets/aerodactyl_word_room_metatiles.bin
index 0538baa98..0538baa98 100644
--- a/tilesets/36_metatiles.bin
+++ b/tilesets/aerodactyl_word_room_metatiles.bin
diff --git a/tilesets/26_palette_map.asm b/tilesets/aerodactyl_word_room_palette_map.asm
index 5ebde24ba..5ebde24ba 100644
--- a/tilesets/26_palette_map.asm
+++ b/tilesets/aerodactyl_word_room_palette_map.asm
diff --git a/tilesets/animations.asm b/tilesets/animations.asm
index 9bc80454c..3de67ee6e 100644
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -35,9 +35,9 @@ _AnimateTileset:: ; fc000
 	jp hl
 ; fc01b
 
-Tileset00Anim: ; 0xfc01b
-Tileset02Anim: ; 0xfc01b
-Tileset03Anim: ; 0xfc01b
+Tileset0Anim: ; 0xfc01b
+TilesetJohto2Anim: ; 0xfc01b
+TilesetKantoAnim: ; 0xfc01b
 	dw VTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
@@ -51,7 +51,7 @@ Tileset03Anim: ; 0xfc01b
 	dw NULL,  DoneTileAnimation
 ; 0xfc047
 
-Tileset25Anim: ; 0xfc047
+TilesetParkAnim: ; 0xfc047
 	dw VTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw VTiles2 tile $5f, AnimateFountain
@@ -65,7 +65,7 @@ Tileset25Anim: ; 0xfc047
 	dw NULL,  DoneTileAnimation
 ; 0xfc073
 
-Tileset31Anim: ; 0xfc073
+TilesetIlexForestAnim: ; 0xfc073
 	dw NULL,  ForestTreeLeftAnimation
 	dw NULL,  ForestTreeRightAnimation
 	dw NULL,  WaitTileAnimation
@@ -80,7 +80,7 @@ Tileset31Anim: ; 0xfc073
 	dw NULL,  DoneTileAnimation
 ; 0xfc0a3
 
-Tileset01Anim: ; 0xfc0a3
+TilesetJohto1Anim: ; 0xfc0a3
 	dw VTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
@@ -124,7 +124,7 @@ TilesetAnimfc103: ; 0xfc103
 	dw NULL,  DoneTileAnimation
 ; 0xfc12f
 
-Tileset09Anim: ; 0xfc12f
+TilesetPortAnim: ; 0xfc12f
 	dw VTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
@@ -139,7 +139,7 @@ Tileset09Anim: ; 0xfc12f
 	dw NULL,  DoneTileAnimation
 ; 0xfc15f
 
-Tileset15Anim: ; 0xfc15f
+TilesetGym1Anim: ; 0xfc15f
 	dw NULL,  SafariFountainAnim2
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
@@ -182,8 +182,8 @@ TilesetAnimfc1af: ; 0xfc1af
 	dw NULL,  DoneTileAnimation
 ; 0xfc1e7
 
-Tileset24Anim: ; 0xfc1e7
-Tileset30Anim: ; 0xfc1e7
+TilesetCaveAnim: ; 0xfc1e7
+TilesetWhirlIslandsAnim: ; 0xfc1e7
 	dw VTiles2 tile $14, WriteTileToBuffer
 	dw NULL,  FlickeringCaveEntrancePalette
 	dw wTileAnimBuffer, ScrollTileRightLeft
@@ -205,7 +205,7 @@ Tileset30Anim: ; 0xfc1e7
 	dw NULL,  DoneTileAnimation
 ; 0xfc233
 
-Tileset29Anim: ; 0xfc233
+TilesetIcePathAnim: ; 0xfc233
 	dw VTiles2 tile $35, WriteTileToBuffer
 	dw NULL,  FlickeringCaveEntrancePalette
 	dw wTileAnimBuffer, ScrollTileRightLeft
@@ -227,7 +227,7 @@ Tileset29Anim: ; 0xfc233
 	dw NULL,  DoneTileAnimation
 ; 0xfc27f
 
-Tileset23Anim: ; 0xfc27f
+TilesetSproutTowerAnim: ; 0xfc27f
 	dw SproutPillarTilePointer9,  AnimateSproutPillarTile
 	dw SproutPillarTilePointer10, AnimateSproutPillarTile
 	dw SproutPillarTilePointer7,  AnimateSproutPillarTile
@@ -259,31 +259,31 @@ TilesetAnimfc2bf: ; 0xfc2bf
 	dw NULL,  DoneTileAnimation
 ; 0xfc2e7
 
-Tileset04Anim: ; 0xfc2e7
-Tileset05Anim: ; 0xfc2e7
-Tileset06Anim: ; 0xfc2e7
-Tileset07Anim: ; 0xfc2e7
-Tileset08Anim: ; 0xfc2e7
-Tileset10Anim: ; 0xfc2e7
-Tileset11Anim: ; 0xfc2e7
-Tileset12Anim: ; 0xfc2e7
-Tileset13Anim: ; 0xfc2e7
-Tileset14Anim: ; 0xfc2e7
-Tileset16Anim: ; 0xfc2e7
-Tileset17Anim: ; 0xfc2e7
-Tileset18Anim: ; 0xfc2e7
-Tileset19Anim: ; 0xfc2e7
-Tileset20Anim: ; 0xfc2e7
-Tileset21Anim: ; 0xfc2e7
-Tileset22Anim: ; 0xfc2e7
-Tileset26Anim: ; 0xfc2e7
-Tileset27Anim: ; 0xfc2e7
-Tileset28Anim: ; 0xfc2e7
-Tileset32Anim: ; 0xfc2e7
-Tileset33Anim: ; 0xfc2e7
-Tileset34Anim: ; 0xfc2e7
-Tileset35Anim: ; 0xfc2e7
-Tileset36Anim: ; 0xfc2e7
+TilesetBattleTowerOutsideAnim: ; 0xfc2e7
+TilesetHouse1Anim: ; 0xfc2e7
+TilesetPlayersHouseAnim: ; 0xfc2e7
+TilesetPokecenterAnim: ; 0xfc2e7
+TilesetGateAnim: ; 0xfc2e7
+TilesetLabAnim: ; 0xfc2e7
+TilesetPowerPlantAnim: ; 0xfc2e7
+TilesetMartAnim: ; 0xfc2e7
+TilesetCeladonMansionAnim: ; 0xfc2e7
+TilesetGameCornerAnim: ; 0xfc2e7
+TilesetKurtsHouseAnim: ; 0xfc2e7
+TilesetTrainStationAnim: ; 0xfc2e7
+TilesetOlivineGymAnim: ; 0xfc2e7
+TilesetLighthouseAnim: ; 0xfc2e7
+TilesetPlayersHouse2FAnim: ; 0xfc2e7
+TilesetPokeComCenterAnim: ; 0xfc2e7
+TilesetBattleTowerAnim: ; 0xfc2e7
+TilesetRuinsOfAlphAnim: ; 0xfc2e7
+TilesetRadioTowerAnim: ; 0xfc2e7
+TilesetUndergroundAnim: ; 0xfc2e7
+TilesetBetaWordRoomAnim: ; 0xfc2e7
+TilesetHoOhWordRoomAnim: ; 0xfc2e7
+TilesetKabutoWordRoomAnim: ; 0xfc2e7
+TilesetOmanyteWordRoomAnim: ; 0xfc2e7
+TilesetAerodactylWordRoomAnim: ; 0xfc2e7
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
diff --git a/tilesets/22_collision.bin b/tilesets/battle_tower_collision.bin
index 5cb2b0eeb..5cb2b0eeb 100644
--- a/tilesets/22_collision.bin
+++ b/tilesets/battle_tower_collision.bin
diff --git a/tilesets/22_metatiles.bin b/tilesets/battle_tower_metatiles.bin
index c64ef0a12..c64ef0a12 100644
--- a/tilesets/22_metatiles.bin
+++ b/tilesets/battle_tower_metatiles.bin
diff --git a/tilesets/04_collision.bin b/tilesets/battle_tower_outside_collision.bin
index 5ca0e3954..5ca0e3954 100644
--- a/tilesets/04_collision.bin
+++ b/tilesets/battle_tower_outside_collision.bin
diff --git a/tilesets/04_metatiles.bin b/tilesets/battle_tower_outside_metatiles.bin
index c4390bcba..c4390bcba 100644
--- a/tilesets/04_metatiles.bin
+++ b/tilesets/battle_tower_outside_metatiles.bin
diff --git a/tilesets/04_palette_map.asm b/tilesets/battle_tower_outside_palette_map.asm
index dfc74a9c0..dfc74a9c0 100644
--- a/tilesets/04_palette_map.asm
+++ b/tilesets/battle_tower_outside_palette_map.asm
diff --git a/tilesets/22_palette_map.asm b/tilesets/battle_tower_palette_map.asm
index 1abce2a16..1abce2a16 100644
--- a/tilesets/22_palette_map.asm
+++ b/tilesets/battle_tower_palette_map.asm
diff --git a/tilesets/33_collision.bin b/tilesets/beta_word_room_collision.bin
index a4da351d3..a4da351d3 100644
--- a/tilesets/33_collision.bin
+++ b/tilesets/beta_word_room_collision.bin
diff --git a/tilesets/32_metatiles.bin b/tilesets/beta_word_room_metatiles.bin
index 47c531b2e..47c531b2e 100644
--- a/tilesets/32_metatiles.bin
+++ b/tilesets/beta_word_room_metatiles.bin
diff --git a/tilesets/32_palette_map.asm b/tilesets/beta_word_room_palette_map.asm
index 5ebde24ba..5ebde24ba 100644
--- a/tilesets/32_palette_map.asm
+++ b/tilesets/beta_word_room_palette_map.asm
diff --git a/tilesets/24_collision.bin b/tilesets/cave_collision.bin
index 701de1c0b..701de1c0b 100644
--- a/tilesets/24_collision.bin
+++ b/tilesets/cave_collision.bin
diff --git a/tilesets/24_metatiles.bin b/tilesets/cave_metatiles.bin
index a41b5b080..a41b5b080 100644
--- a/tilesets/24_metatiles.bin
+++ b/tilesets/cave_metatiles.bin
diff --git a/tilesets/24_palette_map.asm b/tilesets/cave_palette_map.asm
index 73c09ebe5..73c09ebe5 100644
--- a/tilesets/24_palette_map.asm
+++ b/tilesets/cave_palette_map.asm
diff --git a/tilesets/13_collision.bin b/tilesets/celadon_mansion_collision.bin
index a07b03bce..a07b03bce 100644
--- a/tilesets/13_collision.bin
+++ b/tilesets/celadon_mansion_collision.bin
diff --git a/tilesets/13_metatiles.bin b/tilesets/celadon_mansion_metatiles.bin
index d4506328f..d4506328f 100644
--- a/tilesets/13_metatiles.bin
+++ b/tilesets/celadon_mansion_metatiles.bin
diff --git a/tilesets/13_palette_map.asm b/tilesets/celadon_mansion_palette_map.asm
index 2bd27ad22..2bd27ad22 100644
--- a/tilesets/13_palette_map.asm
+++ b/tilesets/celadon_mansion_palette_map.asm
diff --git a/tilesets/data.asm b/tilesets/data.asm
index 6d1ead4c0..52f63cb89 100644
--- a/tilesets/data.asm
+++ b/tilesets/data.asm
@@ -5,430 +5,430 @@ INCLUDE "tilesets/roofs.asm"
 
 SECTION "Tileset Data 1", ROMX
 
-Tileset03GFX: ; 0x18000
-INCBIN "gfx/tilesets/03.2bpp.lz"
+TilesetKantoGFX: ; 0x18000
+INCBIN "gfx/tilesets/kanto.2bpp.lz"
 ; 0x18606
 
-Tileset03Meta: ; 0x18606
-INCBIN "tilesets/03_metatiles.bin"
+TilesetKantoMeta: ; 0x18606
+INCBIN "tilesets/kanto_metatiles.bin"
 ; 0x18e06
 
-Tileset03Coll: ; 0x18e06
-INCBIN "tilesets/03_collision.bin"
+TilesetKantoColl: ; 0x18e06
+INCBIN "tilesets/kanto_collision.bin"
 ; 0x19006
 
-Tileset00GFX: ; 0x19006
-Tileset01GFX: ; 0x19006
-INCBIN "gfx/tilesets/01.2bpp.lz"
+Tileset0GFX: ; 0x19006
+TilesetJohto1GFX: ; 0x19006
+INCBIN "gfx/tilesets/johto_1.2bpp.lz"
 ; 0x19c0e
 
-Tileset00Meta: ; 0x19c0e
-Tileset01Meta: ; 0x19c0e
-INCBIN "tilesets/01_metatiles.bin"
+Tileset0Meta: ; 0x19c0e
+TilesetJohto1Meta: ; 0x19c0e
+INCBIN "tilesets/johto_1_metatiles.bin"
 ; 0x1a40e
 
-Tileset00Coll: ; 0x1a40e
-Tileset01Coll: ; 0x1a40e
-INCBIN "tilesets/01_collision.bin"
+Tileset0Coll: ; 0x1a40e
+TilesetJohto1Coll: ; 0x1a40e
+INCBIN "tilesets/johto_1_collision.bin"
 ; 0x1a60e
 
-Tileset29GFX: ; 0x1a60e
-INCBIN "gfx/tilesets/29.2bpp.lz"
+TilesetIcePathGFX: ; 0x1a60e
+INCBIN "gfx/tilesets/ice_path.2bpp.lz"
 ; 0x1af3e
 
-Tileset29Meta: ; 0x1af3e
-INCBIN "tilesets/29_metatiles.bin"
+TilesetIcePathMeta: ; 0x1af3e
+INCBIN "tilesets/ice_path_metatiles.bin"
 ; 0x1b33e
 
-Tileset29Coll: ; 0x1b33e
-INCBIN "tilesets/29_collision.bin"
+TilesetIcePathColl: ; 0x1b33e
+INCBIN "tilesets/ice_path_collision.bin"
 ; 0x1b43e
 
-Tileset20GFX: ; 0x1b43e
-INCBIN "gfx/tilesets/20.2bpp.lz"
+TilesetPlayersHouse2FGFX: ; 0x1b43e
+INCBIN "gfx/tilesets/players_house_2f.2bpp.lz"
 ; 0x1b8fe
 
-Tileset20Meta: ; 0x1b8fe
-INCBIN "tilesets/20_metatiles.bin"
+TilesetPlayersHouse2FMeta: ; 0x1b8fe
+INCBIN "tilesets/players_house_2f_metatiles.bin"
 ; 0x1bcfe
 
-Tileset20Coll: ; 0x1bcfe
-INCBIN "tilesets/20_collision.bin"
+TilesetPlayersHouse2FColl: ; 0x1bcfe
+INCBIN "tilesets/players_house_2f_collision.bin"
 ; 0x1bdfe
 
 
 SECTION "Tileset Data 2", ROMX
 
-Tileset07GFX: ; 0x1c30c
-INCBIN "gfx/tilesets/07.2bpp.lz"
+TilesetPokecenterGFX: ; 0x1c30c
+INCBIN "gfx/tilesets/pokecenter.2bpp.lz"
 ; 0x1c73c
 
-Tileset07Meta: ; 0x1c73c
-INCBIN "tilesets/07_metatiles.bin"
+TilesetPokecenterMeta: ; 0x1c73c
+INCBIN "tilesets/pokecenter_metatiles.bin"
 ; 0x1cb3c
 
-Tileset07Coll: ; 0x1cb3c
-INCBIN "tilesets/07_collision.bin"
+TilesetPokecenterColl: ; 0x1cb3c
+INCBIN "tilesets/pokecenter_collision.bin"
 ; 0x1cc3c
 
-Tileset09GFX: ; 0x1cc3c
-INCBIN "gfx/tilesets/09.2bpp.lz"
+TilesetPortGFX: ; 0x1cc3c
+INCBIN "gfx/tilesets/port.2bpp.lz"
 ; 0x1d04c
 
-Tileset09Meta: ; 0x1d04c
-INCBIN "tilesets/09_metatiles.bin"
+TilesetPortMeta: ; 0x1d04c
+INCBIN "tilesets/port_metatiles.bin"
 ; 0x1d44c
 
-Tileset09Coll: ; 0x1d44c
-INCBIN "tilesets/09_collision.bin"
+TilesetPortColl: ; 0x1d44c
+INCBIN "tilesets/port_collision.bin"
 ; 0x1d54c
 
-Tileset06GFX: ; 0x1d54c
-INCBIN "gfx/tilesets/06.2bpp.lz"
+TilesetPlayersHouseGFX: ; 0x1d54c
+INCBIN "gfx/tilesets/players_house.2bpp.lz"
 ; 0x1d92c
 
-Tileset06Meta: ; 0x1d92c
-INCBIN "tilesets/06_metatiles.bin"
+TilesetPlayersHouseMeta: ; 0x1d92c
+INCBIN "tilesets/players_house_metatiles.bin"
 ; 0x1dd2c
 
-Tileset06Coll: ; 0x1dd2c
-INCBIN "tilesets/06_collision.bin"
+TilesetPlayersHouseColl: ; 0x1dd2c
+INCBIN "tilesets/players_house_collision.bin"
 ; 0x1de2c
 
-Tileset13GFX: ; 0x1de2c
-INCBIN "gfx/tilesets/13.2bpp.lz"
+TilesetCeladonMansionGFX: ; 0x1de2c
+INCBIN "gfx/tilesets/celadon_mansion.2bpp.lz"
 ; 0x1e58c
 
-Tileset13Meta: ; 0x1e58c
-INCBIN "tilesets/13_metatiles.bin"
+TilesetCeladonMansionMeta: ; 0x1e58c
+INCBIN "tilesets/celadon_mansion_metatiles.bin"
 ; 0x1e98c
 
-Tileset13Coll: ; 0x1e98c
-INCBIN "tilesets/13_collision.bin"
+TilesetCeladonMansionColl: ; 0x1e98c
+INCBIN "tilesets/celadon_mansion_collision.bin"
 ; 0x1ea8c
 
-Tileset24GFX: ; 0x1ea8c
-INCBIN "gfx/tilesets/24.2bpp.lz"
+TilesetCaveGFX: ; 0x1ea8c
+INCBIN "gfx/tilesets/cave.2bpp.lz"
 ; 0x1ee1c
 
-Tileset24Meta: ; 0x1ee1c
-Tileset30Meta: ; 0x1ee1c
-INCBIN "tilesets/24_metatiles.bin"
+TilesetCaveMeta: ; 0x1ee1c
+TilesetWhirlIslandsMeta: ; 0x1ee1c
+INCBIN "tilesets/cave_metatiles.bin"
 ; 0x1f21c
 
-Tileset24Coll: ; 0x1f21c
-Tileset30Coll: ; 0x1f21c
-INCBIN "tilesets/24_collision.bin"
+TilesetCaveColl: ; 0x1f21c
+TilesetWhirlIslandsColl: ; 0x1f21c
+INCBIN "tilesets/cave_collision.bin"
 ; 0x1f31c
 
 
 SECTION "Tileset Data 3", ROMX
 
-Tileset23GFX: ; 0x20181
-INCBIN "gfx/tilesets/23.2bpp.lz"
+TilesetSproutTowerGFX: ; 0x20181
+INCBIN "gfx/tilesets/sprout_tower.2bpp.lz"
 ; 0x206e1
 
-Tileset23Meta: ; 0x206e1
-INCBIN "tilesets/23_metatiles.bin"
+TilesetSproutTowerMeta: ; 0x206e1
+INCBIN "tilesets/sprout_tower_metatiles.bin"
 ; 0x20ae1
 
-Tileset23Coll: ; 0x20ae1
-INCBIN "tilesets/23_collision.bin"
+TilesetSproutTowerColl: ; 0x20ae1
+INCBIN "tilesets/sprout_tower_collision.bin"
 ; 0x20be1
 
-Tileset10GFX: ; 0x20be1
-INCBIN "gfx/tilesets/10.2bpp.lz"
+TilesetLabGFX: ; 0x20be1
+INCBIN "gfx/tilesets/lab.2bpp.lz"
 ; 0x213e1
 
-Tileset10Meta: ; 0x213e1
-INCBIN "tilesets/10_metatiles.bin"
+TilesetLabMeta: ; 0x213e1
+INCBIN "tilesets/lab_metatiles.bin"
 ; 0x217e1
 
-Tileset10Coll: ; 0x217e1
-INCBIN "tilesets/10_collision.bin"
+TilesetLabColl: ; 0x217e1
+INCBIN "tilesets/lab_collision.bin"
 ; 0x218e1
 
-Tileset12GFX: ; 0x218e1
-INCBIN "gfx/tilesets/12.2bpp.lz"
+TilesetMartGFX: ; 0x218e1
+INCBIN "gfx/tilesets/mart.2bpp.lz"
 ; 0x22031
 
-Tileset12Meta: ; 0x22031
-INCBIN "tilesets/12_metatiles.bin"
+TilesetMartMeta: ; 0x22031
+INCBIN "tilesets/mart_metatiles.bin"
 ; 0x22431
 
-Tileset12Coll: ; 0x22431
-INCBIN "tilesets/12_collision.bin"
+TilesetMartColl: ; 0x22431
+INCBIN "tilesets/mart_collision.bin"
 ; 0x22531
 
-Tileset14GFX: ; 0x22531
-INCBIN "gfx/tilesets/14.2bpp.lz"
+TilesetGameCornerGFX: ; 0x22531
+INCBIN "gfx/tilesets/game_corner.2bpp.lz"
 ; 0x22af1
 
-Tileset14Meta: ; 0x22af1
-INCBIN "tilesets/14_metatiles.bin"
+TilesetGameCornerMeta: ; 0x22af1
+INCBIN "tilesets/game_corner_metatiles.bin"
 ; 0x22ef1
 
-Tileset14Coll: ; 0x22ef1
-INCBIN "tilesets/14_collision.bin"
+TilesetGameCornerColl: ; 0x22ef1
+INCBIN "tilesets/game_corner_collision.bin"
 ; 0x22ff1
 
-Tileset17GFX: ; 0x22ff1
-INCBIN "gfx/tilesets/17.2bpp.lz"
+TilesetTrainStationGFX: ; 0x22ff1
+INCBIN "gfx/tilesets/train_station.2bpp.lz"
 ; 0x23391
 
-Tileset17Meta: ; 0x23391
-INCBIN "tilesets/17_metatiles.bin"
+TilesetTrainStationMeta: ; 0x23391
+INCBIN "tilesets/train_station_metatiles.bin"
 ; 0x23791
 
-Tileset17Coll: ; 0x23791
-INCBIN "tilesets/17_collision.bin"
+TilesetTrainStationColl: ; 0x23791
+INCBIN "tilesets/train_station_collision.bin"
 ; 0x23891
 
-Tileset31Meta: ; 0x23891
-INCBIN "tilesets/31_metatiles.bin"
+TilesetIlexForestMeta: ; 0x23891
+INCBIN "tilesets/ilex_forest_metatiles.bin"
 ; 0x23b11
 
 
 SECTION "Tileset Data 4", ROMX
 
-Tileset15GFX: ; 0x30000
-INCBIN "gfx/tilesets/15.2bpp.lz"
+TilesetGym1GFX: ; 0x30000
+INCBIN "gfx/tilesets/gym_1.2bpp.lz"
 ; 0x304e0
 
-Tileset15Meta: ; 0x304e0
-INCBIN "tilesets/15_metatiles.bin"
+TilesetGym1Meta: ; 0x304e0
+INCBIN "tilesets/gym_1_metatiles.bin"
 ; 0x308e0
 
-Tileset15Coll: ; 0x308e0
-INCBIN "tilesets/15_collision.bin"
+TilesetGym1Coll: ; 0x308e0
+INCBIN "tilesets/gym_1_collision.bin"
 ; 0x309e0
 
-Tileset25GFX: ; 0x309e0
-INCBIN "gfx/tilesets/25.2bpp.lz"
+TilesetParkGFX: ; 0x309e0
+INCBIN "gfx/tilesets/park.2bpp.lz"
 ; 0x30e80
 
-Tileset25Meta: ; 0x30e80
-INCBIN "tilesets/25_metatiles.bin"
+TilesetParkMeta: ; 0x30e80
+INCBIN "tilesets/park_metatiles.bin"
 ; 0x31280
 
-Tileset25Coll: ; 0x31280
-INCBIN "tilesets/25_collision.bin"
+TilesetParkColl: ; 0x31280
+INCBIN "tilesets/park_collision.bin"
 ; 0x31380
 
-Tileset27GFX: ; 0x31380
-INCBIN "gfx/tilesets/27.2bpp.lz"
+TilesetRadioTowerGFX: ; 0x31380
+INCBIN "gfx/tilesets/radio_tower.2bpp.lz"
 ; 0x318e0
 
-Tileset27Meta: ; 0x318e0
-INCBIN "tilesets/27_metatiles.bin"
+TilesetRadioTowerMeta: ; 0x318e0
+INCBIN "tilesets/radio_tower_metatiles.bin"
 ; 0x31ce0
 
-Tileset27Coll: ; 0x31ce0
-INCBIN "tilesets/27_collision.bin"
+TilesetRadioTowerColl: ; 0x31ce0
+INCBIN "tilesets/radio_tower_collision.bin"
 ; 0x31de0
 
-Tileset28GFX: ; 0x31de0
-INCBIN "gfx/tilesets/28.2bpp.lz"
+TilesetUndergroundGFX: ; 0x31de0
+INCBIN "gfx/tilesets/underground.2bpp.lz"
 ; 0x321b0
 
-Tileset28Meta: ; 0x321b0
-INCBIN "tilesets/28_metatiles.bin"
+TilesetUndergroundMeta: ; 0x321b0
+INCBIN "tilesets/underground_metatiles.bin"
 ; 0x325b0
 
-Tileset28Coll: ; 0x325b0
-INCBIN "tilesets/28_collision.bin"
+TilesetUndergroundColl: ; 0x325b0
+INCBIN "tilesets/underground_collision.bin"
 ; 0x326b0
 
-Tileset30GFX: ; 0x326b0
-INCBIN "gfx/tilesets/30.2bpp.lz"
+TilesetWhirlIslandsGFX: ; 0x326b0
+INCBIN "gfx/tilesets/whirl_islands.2bpp.lz"
 ; 0x329f0
 
-UnusedTileset30Meta: ; 0x329f0
-INCBIN "tilesets/unused_30_metatiles.bin"
+UnusedTilesetWhirlIslandsMeta: ; 0x329f0
+INCBIN "tilesets/unused_whirl_islands_metatiles.bin"
 ; 0x331f0
 
-UnusedTileset30Coll: ; 0x331f0
-INCBIN "tilesets/unused_30_collision.bin"
+UnusedTilesetWhirlIslandsColl: ; 0x331f0
+INCBIN "tilesets/unused_whirl_islands_collision.bin"
 ; 0x333f0
 
 
 SECTION "Tileset Data 5", ROMX
 
-Tileset21GFX: ; 0xb4000
-INCBIN "gfx/tilesets/21.2bpp.lz"
+TilesetPokeComCenterGFX: ; 0xb4000
+INCBIN "gfx/tilesets/pokecom_center.2bpp.lz"
 ; 0xb48a0
 
-Tileset21Meta: ; 0xb48a0
-INCBIN "tilesets/21_metatiles.bin"
+TilesetPokeComCenterMeta: ; 0xb48a0
+INCBIN "tilesets/pokecom_center_metatiles.bin"
 ; 0xb4ca0
 
-Tileset21Coll: ; 0xb4ca0
-INCBIN "tilesets/21_collision.bin"
+TilesetPokeComCenterColl: ; 0xb4ca0
+INCBIN "tilesets/pokecom_center_collision.bin"
 ; 0xb4da0
 
-Tileset22GFX: ; 0xb4da0
-INCBIN "gfx/tilesets/22.2bpp.lz"
+TilesetBattleTowerGFX: ; 0xb4da0
+INCBIN "gfx/tilesets/battle_tower.2bpp.lz"
 ; 0xb50e0
 
-Tileset22Meta: ; 0xb50e0
-INCBIN "tilesets/22_metatiles.bin"
+TilesetBattleTowerMeta: ; 0xb50e0
+INCBIN "tilesets/battle_tower_metatiles.bin"
 ; 0xb54e0
 
-Tileset22Coll: ; 0xb54e0
-INCBIN "tilesets/22_collision.bin"
+TilesetBattleTowerColl: ; 0xb54e0
+INCBIN "tilesets/battle_tower_collision.bin"
 ; 0xb55e0
 
-Tileset08GFX: ; 0xb55e0
-INCBIN "gfx/tilesets/08.2bpp.lz"
+TilesetGateGFX: ; 0xb55e0
+INCBIN "gfx/tilesets/gate.2bpp.lz"
 ; 0xb59e0
 
-Tileset08Meta: ; 0xb59e0
-INCBIN "tilesets/08_metatiles.bin"
+TilesetGateMeta: ; 0xb59e0
+INCBIN "tilesets/gate_metatiles.bin"
 ; 0xb5de0
 
-Tileset08Coll: ; 0xb5de0
-INCBIN "tilesets/08_collision.bin"
+TilesetGateColl: ; 0xb5de0
+INCBIN "tilesets/gate_collision.bin"
 ; 0xb5ee0
 
-Tileset02GFX: ; 0xb5ee0
-Tileset04GFX: ; 0xb5ee0
-INCBIN "gfx/tilesets/02.2bpp.lz"
+TilesetJohto2GFX: ; 0xb5ee0
+TilesetBattleTowerOutsideGFX: ; 0xb5ee0
+INCBIN "gfx/tilesets/johto_2.2bpp.lz"
 ; 0xb6ae8
 
-Tileset02Meta: ; 0xb6ae8
-INCBIN "tilesets/02_metatiles.bin"
+TilesetJohto2Meta: ; 0xb6ae8
+INCBIN "tilesets/johto_2_metatiles.bin"
 ; 0xb72e8
 
-Tileset02Coll: ; 0xb72e8
-INCBIN "tilesets/02_collision.bin"
+TilesetJohto2Coll: ; 0xb72e8
+INCBIN "tilesets/johto_2_collision.bin"
 ; 0xb74e8
 
-Tileset16GFX: ; 0xb74e8
-INCBIN "gfx/tilesets/16.2bpp.lz"
+TilesetKurtsHouseGFX: ; 0xb74e8
+INCBIN "gfx/tilesets/kurts_house.2bpp.lz"
 ; 0xb79a8
 
-Tileset16Meta: ; 0xb79a8
-INCBIN "tilesets/16_metatiles.bin"
+TilesetKurtsHouseMeta: ; 0xb79a8
+INCBIN "tilesets/kurts_house_metatiles.bin"
 ; 0xb7da8
 
-Tileset16Coll: ; 0xb7da8
-INCBIN "tilesets/16_collision.bin"
+TilesetKurtsHouseColl: ; 0xb7da8
+INCBIN "tilesets/kurts_house_collision.bin"
 ; 0xb7ea8
 
 
 SECTION "Tileset Data 6", ROMX
 
-Tileset31GFX: ; 0xdc000
-INCBIN "gfx/tilesets/31.2bpp.lz"
+TilesetIlexForestGFX: ; 0xdc000
+INCBIN "gfx/tilesets/ilex_forest.2bpp.lz"
 ; 0xdc3d0
 
-Tileset18GFX: ; 0xdc3d0
-INCBIN "gfx/tilesets/18.2bpp.lz"
+TilesetOlivineGymGFX: ; 0xdc3d0
+INCBIN "gfx/tilesets/olivine_gym.2bpp.lz"
 ; 0xdcc50
 
-Tileset18Meta: ; 0xdcc50
-INCBIN "tilesets/18_metatiles.bin"
+TilesetOlivineGymMeta: ; 0xdcc50
+INCBIN "tilesets/olivine_gym_metatiles.bin"
 ; 0xdd050
 
-Tileset18Coll: ; 0xdd050
-INCBIN "tilesets/18_collision.bin"
+TilesetOlivineGymColl: ; 0xdd050
+INCBIN "tilesets/olivine_gym_collision.bin"
 ; 0xdd150
 
-Tileset05GFX: ; 0xdd150
-INCBIN "gfx/tilesets/05.2bpp.lz"
+TilesetHouse1GFX: ; 0xdd150
+INCBIN "gfx/tilesets/house_1.2bpp.lz"
 ; 0xdd600
 
-Tileset05Meta: ; 0xdd600
-INCBIN "tilesets/05_metatiles.bin"
+TilesetHouse1Meta: ; 0xdd600
+INCBIN "tilesets/house_1_metatiles.bin"
 ; 0xdda00
 
-Tileset05Coll: ; 0xdda00
-INCBIN "tilesets/05_collision.bin"
+TilesetHouse1Coll: ; 0xdda00
+INCBIN "tilesets/house_1_collision.bin"
 ; 0xddb00
 
-Tileset19GFX: ; 0xddb00
-INCBIN "gfx/tilesets/19.2bpp.lz"
+TilesetLighthouseGFX: ; 0xddb00
+INCBIN "gfx/tilesets/lighthouse.2bpp.lz"
 ; 0xddf70
 
-Tileset19Meta: ; 0xddf70
-INCBIN "tilesets/19_metatiles.bin"
+TilesetLighthouseMeta: ; 0xddf70
+INCBIN "tilesets/lighthouse_metatiles.bin"
 ; 0xde370
 
-Tileset19Coll: ; 0xde370
-INCBIN "tilesets/19_collision.bin"
+TilesetLighthouseColl: ; 0xde370
+INCBIN "tilesets/lighthouse_collision.bin"
 ; 0xde470
 
-Tileset31Coll: ; 0xde470
-INCBIN "tilesets/31_collision.bin"
+TilesetIlexForestColl: ; 0xde470
+INCBIN "tilesets/ilex_forest_collision.bin"
 ; 0xde570
 
-Tileset11GFX: ; 0xde570
-INCBIN "gfx/tilesets/11.2bpp.lz"
+TilesetPowerPlantGFX: ; 0xde570
+INCBIN "gfx/tilesets/power_plant.2bpp.lz"
 ; 0xde990
 
-Tileset11Meta: ; 0xde990
-INCBIN "tilesets/11_metatiles.bin"
+TilesetPowerPlantMeta: ; 0xde990
+INCBIN "tilesets/power_plant_metatiles.bin"
 ; 0xded90
 
-Tileset11Coll: ; 0xded90
-INCBIN "tilesets/11_collision.bin"
+TilesetPowerPlantColl: ; 0xded90
+INCBIN "tilesets/power_plant_collision.bin"
 ; 0xdee90
 
-Tileset04Meta: ; 0xdee90
-INCBIN "tilesets/04_metatiles.bin"
+TilesetBattleTowerOutsideMeta: ; 0xdee90
+INCBIN "tilesets/battle_tower_outside_metatiles.bin"
 ; 0xdf690
 
-Tileset04Coll: ; 0xdf690
-INCBIN "tilesets/04_collision.bin"
+TilesetBattleTowerOutsideColl: ; 0xdf690
+INCBIN "tilesets/battle_tower_outside_collision.bin"
 ; 0xdf890
 
-Tileset32Meta: ; 0xdf890
-INCBIN "tilesets/32_metatiles.bin"
+TilesetBetaWordRoomMeta: ; 0xdf890
+INCBIN "tilesets/beta_word_room_metatiles.bin"
 ; 0xdfc90
 
-Tileset32Coll: ; 0xdfc90
-Tileset33Coll: ; 0xdfc90
-Tileset34Coll: ; 0xdfc90
-Tileset35Coll: ; 0xdfc90
-Tileset36Coll: ; 0xdfc90
-INCBIN "tilesets/32_collision.bin"
+TilesetBetaWordRoomColl: ; 0xdfc90
+TilesetHoOhWordRoomColl: ; 0xdfc90
+TilesetKabutoWordRoomColl: ; 0xdfc90
+TilesetOmanyteWordRoomColl: ; 0xdfc90
+TilesetAerodactylWordRoomColl: ; 0xdfc90
+INCBIN "tilesets/beta_word_room_collision.bin"
 ; 0xdfd90
 
 
 SECTION "Tileset Data 7", ROMX
 
-Tileset26GFX: ; 0x1dc5a1
-Tileset32GFX: ; 0x1dc5a1
-Tileset33GFX: ; 0x1dc5a1
-Tileset34GFX: ; 0x1dc5a1
-Tileset35GFX: ; 0x1dc5a1
-Tileset36GFX: ; 0x1dc5a1
-INCBIN "gfx/tilesets/26.2bpp.lz"
+TilesetRuinsOfAlphGFX: ; 0x1dc5a1
+TilesetBetaWordRoomGFX: ; 0x1dc5a1
+TilesetHoOhWordRoomGFX: ; 0x1dc5a1
+TilesetKabutoWordRoomGFX: ; 0x1dc5a1
+TilesetOmanyteWordRoomGFX: ; 0x1dc5a1
+TilesetAerodactylWordRoomGFX: ; 0x1dc5a1
+INCBIN "gfx/tilesets/ruins_of_alph.2bpp.lz"
 ; 0x1dd1a9
 
-Tileset26Meta: ; 0x1dd1a9
-INCBIN "tilesets/26_metatiles.bin"
+TilesetRuinsOfAlphMeta: ; 0x1dd1a9
+INCBIN "tilesets/ruins_of_alph_metatiles.bin"
 ; 0x1dd5a9
 
-Tileset26Coll: ; 0x1dd5a9
-INCBIN "tilesets/26_collision.bin"
+TilesetRuinsOfAlphColl: ; 0x1dd5a9
+INCBIN "tilesets/ruins_of_alph_collision.bin"
 ; 0x1dd6a9
 
 
 SECTION "Tileset Data 8", ROMX
 
-Tileset33Meta: ; 0x1e0000
-INCBIN "tilesets/33_metatiles.bin"
+TilesetHoOhWordRoomMeta: ; 0x1e0000
+INCBIN "tilesets/ho_oh_word_room_metatiles.bin"
 ; 0x1e0400
 
-Tileset34Meta: ; 0x1e0400
-INCBIN "tilesets/34_metatiles.bin"
+TilesetKabutoWordRoomMeta: ; 0x1e0400
+INCBIN "tilesets/kabuto_word_room_metatiles.bin"
 ; 0x1e0800
 
-Tileset35Meta: ; 0x1e0800
-INCBIN "tilesets/35_metatiles.bin"
+TilesetOmanyteWordRoomMeta: ; 0x1e0800
+INCBIN "tilesets/omanyte_word_room_metatiles.bin"
 ; 0x1e0c00
 
-Tileset36Meta: ; 0x1e0c00
-INCBIN "tilesets/36_metatiles.bin"
+TilesetAerodactylWordRoomMeta: ; 0x1e0c00
+INCBIN "tilesets/aerodactyl_word_room_metatiles.bin"
 ; 0x1e1000
diff --git a/tilesets/14_collision.bin b/tilesets/game_corner_collision.bin
index 2bfcad418..2bfcad418 100644
--- a/tilesets/14_collision.bin
+++ b/tilesets/game_corner_collision.bin
diff --git a/tilesets/14_metatiles.bin b/tilesets/game_corner_metatiles.bin
index 24beba2d3..24beba2d3 100644
--- a/tilesets/14_metatiles.bin
+++ b/tilesets/game_corner_metatiles.bin
diff --git a/tilesets/14_palette_map.asm b/tilesets/game_corner_palette_map.asm
index 34bb9f6f0..34bb9f6f0 100644
--- a/tilesets/14_palette_map.asm
+++ b/tilesets/game_corner_palette_map.asm
diff --git a/tilesets/08_collision.bin b/tilesets/gate_collision.bin
index 5876a3fbe..5876a3fbe 100644
--- a/tilesets/08_collision.bin
+++ b/tilesets/gate_collision.bin
diff --git a/tilesets/08_metatiles.bin b/tilesets/gate_metatiles.bin
index 74076ff58..74076ff58 100644
--- a/tilesets/08_metatiles.bin
+++ b/tilesets/gate_metatiles.bin
diff --git a/tilesets/08_palette_map.asm b/tilesets/gate_palette_map.asm
index 7854d3a81..7854d3a81 100644
--- a/tilesets/08_palette_map.asm
+++ b/tilesets/gate_palette_map.asm
diff --git a/tilesets/15_collision.bin b/tilesets/gym_1_collision.bin
index fe8c334f0..fe8c334f0 100644
--- a/tilesets/15_collision.bin
+++ b/tilesets/gym_1_collision.bin
diff --git a/tilesets/15_metatiles.bin b/tilesets/gym_1_metatiles.bin
index a9df6062c..a9df6062c 100644
--- a/tilesets/15_metatiles.bin
+++ b/tilesets/gym_1_metatiles.bin
diff --git a/tilesets/15_palette_map.asm b/tilesets/gym_1_palette_map.asm
index b20f49195..b20f49195 100644
--- a/tilesets/15_palette_map.asm
+++ b/tilesets/gym_1_palette_map.asm
diff --git a/tilesets/34_collision.bin b/tilesets/ho_oh_word_room_collision.bin
index a4da351d3..a4da351d3 100644
--- a/tilesets/34_collision.bin
+++ b/tilesets/ho_oh_word_room_collision.bin
diff --git a/tilesets/33_metatiles.bin b/tilesets/ho_oh_word_room_metatiles.bin
index 2b542c632..2b542c632 100644
--- a/tilesets/33_metatiles.bin
+++ b/tilesets/ho_oh_word_room_metatiles.bin
diff --git a/tilesets/33_palette_map.asm b/tilesets/ho_oh_word_room_palette_map.asm
index 5ebde24ba..5ebde24ba 100644
--- a/tilesets/33_palette_map.asm
+++ b/tilesets/ho_oh_word_room_palette_map.asm
diff --git a/tilesets/05_collision.bin b/tilesets/house_1_collision.bin
index e11da7330..e11da7330 100644
--- a/tilesets/05_collision.bin
+++ b/tilesets/house_1_collision.bin
diff --git a/tilesets/05_metatiles.bin b/tilesets/house_1_metatiles.bin
index 0d3a22f32..0d3a22f32 100644
--- a/tilesets/05_metatiles.bin
+++ b/tilesets/house_1_metatiles.bin
diff --git a/tilesets/05_palette_map.asm b/tilesets/house_1_palette_map.asm
index ce7b988b7..ce7b988b7 100644
--- a/tilesets/05_palette_map.asm
+++ b/tilesets/house_1_palette_map.asm
diff --git a/tilesets/29_collision.bin b/tilesets/ice_path_collision.bin
index a4498cbee..a4498cbee 100644
--- a/tilesets/29_collision.bin
+++ b/tilesets/ice_path_collision.bin
diff --git a/tilesets/29_metatiles.bin b/tilesets/ice_path_metatiles.bin
index c92246e8a..c92246e8a 100644
--- a/tilesets/29_metatiles.bin
+++ b/tilesets/ice_path_metatiles.bin
diff --git a/tilesets/29_palette_map.asm b/tilesets/ice_path_palette_map.asm
index 985844071..985844071 100644
--- a/tilesets/29_palette_map.asm
+++ b/tilesets/ice_path_palette_map.asm
diff --git a/tilesets/31_collision.bin b/tilesets/ilex_forest_collision.bin
index 9f66b5fdd..9f66b5fdd 100644
--- a/tilesets/31_collision.bin
+++ b/tilesets/ilex_forest_collision.bin
diff --git a/tilesets/31_metatiles.bin b/tilesets/ilex_forest_metatiles.bin
index a8b82d8cf..a8b82d8cf 100644
--- a/tilesets/31_metatiles.bin
+++ b/tilesets/ilex_forest_metatiles.bin
diff --git a/tilesets/31_palette_map.asm b/tilesets/ilex_forest_palette_map.asm
index 696788084..696788084 100644
--- a/tilesets/31_palette_map.asm
+++ b/tilesets/ilex_forest_palette_map.asm
diff --git a/tilesets/01_collision.bin b/tilesets/johto_1_collision.bin
index b3276e1cf..b3276e1cf 100644
--- a/tilesets/01_collision.bin
+++ b/tilesets/johto_1_collision.bin
diff --git a/tilesets/01_metatiles.bin b/tilesets/johto_1_metatiles.bin
index 9024f2ad6..9024f2ad6 100644
--- a/tilesets/01_metatiles.bin
+++ b/tilesets/johto_1_metatiles.bin
diff --git a/tilesets/00_palette_map.asm b/tilesets/johto_1_palette_map.asm
index 62fbd2d00..62fbd2d00 100755..100644
--- a/tilesets/00_palette_map.asm
+++ b/tilesets/johto_1_palette_map.asm
diff --git a/tilesets/02_collision.bin b/tilesets/johto_2_collision.bin
index 6e5addd6d..6e5addd6d 100644
--- a/tilesets/02_collision.bin
+++ b/tilesets/johto_2_collision.bin
diff --git a/tilesets/02_metatiles.bin b/tilesets/johto_2_metatiles.bin
index a15c0c2c7..a15c0c2c7 100644
--- a/tilesets/02_metatiles.bin
+++ b/tilesets/johto_2_metatiles.bin
diff --git a/tilesets/02_palette_map.asm b/tilesets/johto_2_palette_map.asm
index f2af7a92d..f2af7a92d 100644
--- a/tilesets/02_palette_map.asm
+++ b/tilesets/johto_2_palette_map.asm
diff --git a/tilesets/35_collision.bin b/tilesets/kabuto_word_room_collision.bin
index a4da351d3..a4da351d3 100644
--- a/tilesets/35_collision.bin
+++ b/tilesets/kabuto_word_room_collision.bin
diff --git a/tilesets/34_metatiles.bin b/tilesets/kabuto_word_room_metatiles.bin
index 14d082e2a..14d082e2a 100644
--- a/tilesets/34_metatiles.bin
+++ b/tilesets/kabuto_word_room_metatiles.bin
diff --git a/tilesets/34_palette_map.asm b/tilesets/kabuto_word_room_palette_map.asm
index 5ebde24ba..5ebde24ba 100644
--- a/tilesets/34_palette_map.asm
+++ b/tilesets/kabuto_word_room_palette_map.asm
diff --git a/tilesets/03_collision.bin b/tilesets/kanto_collision.bin
index f0038d731..f0038d731 100644
--- a/tilesets/03_collision.bin
+++ b/tilesets/kanto_collision.bin
diff --git a/tilesets/03_metatiles.bin b/tilesets/kanto_metatiles.bin
index 41b0cfffd..41b0cfffd 100644
--- a/tilesets/03_metatiles.bin
+++ b/tilesets/kanto_metatiles.bin
diff --git a/tilesets/03_palette_map.asm b/tilesets/kanto_palette_map.asm
index e3e497fb9..e3e497fb9 100644
--- a/tilesets/03_palette_map.asm
+++ b/tilesets/kanto_palette_map.asm
diff --git a/tilesets/16_collision.bin b/tilesets/kurts_house_collision.bin
index 499a1d071..499a1d071 100644
--- a/tilesets/16_collision.bin
+++ b/tilesets/kurts_house_collision.bin
diff --git a/tilesets/16_metatiles.bin b/tilesets/kurts_house_metatiles.bin
index 3f6b41bd1..3f6b41bd1 100644
--- a/tilesets/16_metatiles.bin
+++ b/tilesets/kurts_house_metatiles.bin
diff --git a/tilesets/16_palette_map.asm b/tilesets/kurts_house_palette_map.asm
index 5daa0da6b..5daa0da6b 100644
--- a/tilesets/16_palette_map.asm
+++ b/tilesets/kurts_house_palette_map.asm
diff --git a/tilesets/10_collision.bin b/tilesets/lab_collision.bin
index 4396125f0..4396125f0 100644
--- a/tilesets/10_collision.bin
+++ b/tilesets/lab_collision.bin
diff --git a/tilesets/10_metatiles.bin b/tilesets/lab_metatiles.bin
index 62da01e8b..62da01e8b 100644
--- a/tilesets/10_metatiles.bin
+++ b/tilesets/lab_metatiles.bin
diff --git a/tilesets/10_palette_map.asm b/tilesets/lab_palette_map.asm
index 24399c6ea..24399c6ea 100644
--- a/tilesets/10_palette_map.asm
+++ b/tilesets/lab_palette_map.asm
diff --git a/tilesets/19_collision.bin b/tilesets/lighthouse_collision.bin
index f15ac266a..f15ac266a 100644
--- a/tilesets/19_collision.bin
+++ b/tilesets/lighthouse_collision.bin
diff --git a/tilesets/19_metatiles.bin b/tilesets/lighthouse_metatiles.bin
index 21ca0f09a..21ca0f09a 100644
--- a/tilesets/19_metatiles.bin
+++ b/tilesets/lighthouse_metatiles.bin
diff --git a/tilesets/19_palette_map.asm b/tilesets/lighthouse_palette_map.asm
index 5f80e3a4d..5f80e3a4d 100644
--- a/tilesets/19_palette_map.asm
+++ b/tilesets/lighthouse_palette_map.asm
diff --git a/tilesets/12_collision.bin b/tilesets/mart_collision.bin
index 0f8763b7b..0f8763b7b 100644
--- a/tilesets/12_collision.bin
+++ b/tilesets/mart_collision.bin
diff --git a/tilesets/12_metatiles.bin b/tilesets/mart_metatiles.bin
index 63b2f629d..63b2f629d 100644
--- a/tilesets/12_metatiles.bin
+++ b/tilesets/mart_metatiles.bin
diff --git a/tilesets/12_palette_map.asm b/tilesets/mart_palette_map.asm
index 991510d12..991510d12 100644
--- a/tilesets/12_palette_map.asm
+++ b/tilesets/mart_palette_map.asm
diff --git a/tilesets/18_collision.bin b/tilesets/olivine_gym_collision.bin
index cf77d603e..cf77d603e 100644
--- a/tilesets/18_collision.bin
+++ b/tilesets/olivine_gym_collision.bin
diff --git a/tilesets/18_metatiles.bin b/tilesets/olivine_gym_metatiles.bin
index a2adb197a..a2adb197a 100644
--- a/tilesets/18_metatiles.bin
+++ b/tilesets/olivine_gym_metatiles.bin
diff --git a/tilesets/18_palette_map.asm b/tilesets/olivine_gym_palette_map.asm
index 551a09351..551a09351 100644
--- a/tilesets/18_palette_map.asm
+++ b/tilesets/olivine_gym_palette_map.asm
diff --git a/tilesets/36_collision.bin b/tilesets/omanyte_word_room_collision.bin
index a4da351d3..a4da351d3 100644
--- a/tilesets/36_collision.bin
+++ b/tilesets/omanyte_word_room_collision.bin
diff --git a/tilesets/35_metatiles.bin b/tilesets/omanyte_word_room_metatiles.bin
index 3cc62f562..3cc62f562 100644
--- a/tilesets/35_metatiles.bin
+++ b/tilesets/omanyte_word_room_metatiles.bin
diff --git a/tilesets/35_palette_map.asm b/tilesets/omanyte_word_room_palette_map.asm
index 5ebde24ba..5ebde24ba 100644
--- a/tilesets/35_palette_map.asm
+++ b/tilesets/omanyte_word_room_palette_map.asm
diff --git a/tilesets/palette_maps.asm b/tilesets/palette_maps.asm
index 7e19893d4..fb7da4cf4 100644
--- a/tilesets/palette_maps.asm
+++ b/tilesets/palette_maps.asm
@@ -1,132 +1,132 @@
-Tileset03PalMap: ; 0x4c075
-INCLUDE "tilesets/03_palette_map.asm"
+TilesetKantoPalMap: ; 0x4c075
+INCLUDE "tilesets/kanto_palette_map.asm"
 ; 0x4c0e5
 
-Tileset00PalMap: ; 0x4c0e5
-Tileset01PalMap: ; 0x4c0e5
-INCLUDE "tilesets/01_palette_map.asm"
+Tileset0PalMap: ; 0x4c0e5
+TilesetJohto1PalMap: ; 0x4c0e5
+INCLUDE "tilesets/johto_1_palette_map.asm"
 ; 0x4c155
 
-Tileset02PalMap: ; 0x4c155
-INCLUDE "tilesets/02_palette_map.asm"
+TilesetJohto2PalMap: ; 0x4c155
+INCLUDE "tilesets/johto_2_palette_map.asm"
 ; 0x4c1c5
 
-Tileset05PalMap: ; 0x4c1c5
-INCLUDE "tilesets/05_palette_map.asm"
+TilesetHouse1PalMap: ; 0x4c1c5
+INCLUDE "tilesets/house_1_palette_map.asm"
 ; 0x4c235
 
-Tileset06PalMap: ; 0x4c235
-INCLUDE "tilesets/06_palette_map.asm"
+TilesetPlayersHousePalMap: ; 0x4c235
+INCLUDE "tilesets/players_house_palette_map.asm"
 ; 0x4c2a5
 
-Tileset07PalMap: ; 0x4c2a5
-INCLUDE "tilesets/07_palette_map.asm"
+TilesetPokecenterPalMap: ; 0x4c2a5
+INCLUDE "tilesets/pokecenter_palette_map.asm"
 ; 0x4c315
 
-Tileset08PalMap: ; 0x4c315
-INCLUDE "tilesets/08_palette_map.asm"
+TilesetGatePalMap: ; 0x4c315
+INCLUDE "tilesets/gate_palette_map.asm"
 ; 0x4c385
 
-Tileset09PalMap: ; 0x4c385
-INCLUDE "tilesets/09_palette_map.asm"
+TilesetPortPalMap: ; 0x4c385
+INCLUDE "tilesets/port_palette_map.asm"
 ; 0x4c3f5
 
-Tileset10PalMap: ; 0x4c3f5
-INCLUDE "tilesets/10_palette_map.asm"
+TilesetLabPalMap: ; 0x4c3f5
+INCLUDE "tilesets/lab_palette_map.asm"
 ; 0x4c465
 
-Tileset11PalMap: ; 0x4c465
-INCLUDE "tilesets/11_palette_map.asm"
+TilesetPowerPlantPalMap: ; 0x4c465
+INCLUDE "tilesets/power_plant_palette_map.asm"
 ; 0x4c4d5
 
-Tileset12PalMap: ; 0x4c4d5
-INCLUDE "tilesets/12_palette_map.asm"
+TilesetMartPalMap: ; 0x4c4d5
+INCLUDE "tilesets/mart_palette_map.asm"
 ; 0x4c545
 
-Tileset13PalMap: ; 0x4c545
-INCLUDE "tilesets/13_palette_map.asm"
+TilesetCeladonMansionPalMap: ; 0x4c545
+INCLUDE "tilesets/celadon_mansion_palette_map.asm"
 ; 0x4c5b5
 
-Tileset14PalMap: ; 0x4c5b5
-INCLUDE "tilesets/14_palette_map.asm"
+TilesetGameCornerPalMap: ; 0x4c5b5
+INCLUDE "tilesets/game_corner_palette_map.asm"
 ; 0x4c625
 
-Tileset15PalMap: ; 0x4c625
-INCLUDE "tilesets/15_palette_map.asm"
+TilesetGym1PalMap: ; 0x4c625
+INCLUDE "tilesets/gym_1_palette_map.asm"
 ; 0x4c695
 
-Tileset16PalMap: ; 0x4c695
-INCLUDE "tilesets/16_palette_map.asm"
+TilesetKurtsHousePalMap: ; 0x4c695
+INCLUDE "tilesets/kurts_house_palette_map.asm"
 ; 0x4c705
 
-Tileset23PalMap: ; 0x4c705
-INCLUDE "tilesets/23_palette_map.asm"
+TilesetSproutTowerPalMap: ; 0x4c705
+INCLUDE "tilesets/sprout_tower_palette_map.asm"
 ; 0x4c775
 
-Tileset24PalMap: ; 0x4c775
-Tileset30PalMap: ; 0x4c775
-INCLUDE "tilesets/30_palette_map.asm"
+TilesetCavePalMap: ; 0x4c775
+TilesetWhirlIslandsPalMap: ; 0x4c775
+INCLUDE "tilesets/cave_palette_map.asm"
 ; 0x4c7e5
 
-Tileset25PalMap: ; 0x4c7e5
-INCLUDE "tilesets/25_palette_map.asm"
+TilesetParkPalMap: ; 0x4c7e5
+INCLUDE "tilesets/park_palette_map.asm"
 ; 0x4c855
 
-Tileset26PalMap: ; 0x4c855
-Tileset32PalMap: ; 0x4c855
-Tileset33PalMap: ; 0x4c855
-Tileset34PalMap: ; 0x4c855
-Tileset35PalMap: ; 0x4c855
-Tileset36PalMap: ; 0x4c855
-INCLUDE "tilesets/36_palette_map.asm"
+TilesetRuinsOfAlphPalMap: ; 0x4c855
+TilesetBetaWordRoomPalMap: ; 0x4c855
+TilesetHoOhWordRoomPalMap: ; 0x4c855
+TilesetKabutoWordRoomPalMap: ; 0x4c855
+TilesetOmanyteWordRoomPalMap: ; 0x4c855
+TilesetAerodactylWordRoomPalMap: ; 0x4c855
+INCLUDE "tilesets/ruins_of_alph_palette_map.asm"
 ; 0x4c8c5
 
-Tileset27PalMap: ; 0x4c8c5
-INCLUDE "tilesets/27_palette_map.asm"
+TilesetRadioTowerPalMap: ; 0x4c8c5
+INCLUDE "tilesets/radio_tower_palette_map.asm"
 ; 0x4c935
 
-Tileset17PalMap: ; 0x4c935
-INCLUDE "tilesets/17_palette_map.asm"
+TilesetTrainStationPalMap: ; 0x4c935
+INCLUDE "tilesets/train_station_palette_map.asm"
 ; 0x4c9a5
 
-Tileset28PalMap: ; 0x4c9a5
-INCLUDE "tilesets/28_palette_map.asm"
+TilesetUndergroundPalMap: ; 0x4c9a5
+INCLUDE "tilesets/underground_palette_map.asm"
 ; 0x4ca15
 
-Tileset18PalMap: ; 0x4ca15
-INCLUDE "tilesets/18_palette_map.asm"
+TilesetOlivineGymPalMap: ; 0x4ca15
+INCLUDE "tilesets/olivine_gym_palette_map.asm"
 ; 0x4ca85
 
-Tileset19PalMap: ; 0x4ca85
-INCLUDE "tilesets/19_palette_map.asm"
+TilesetLighthousePalMap: ; 0x4ca85
+INCLUDE "tilesets/lighthouse_palette_map.asm"
 ; 0x4caf5
 
-Tileset20PalMap: ; 0x4caf5
-INCLUDE "tilesets/20_palette_map.asm"
+TilesetPlayersHouse2FPalMap: ; 0x4caf5
+INCLUDE "tilesets/players_house_2f_palette_map.asm"
 ; 0x4cb65
 
 UnusedPalMap1:
 INCBIN "tilesets/unused_palette_map_1.bin"
 ; 4cbd5
 
-Tileset29PalMap: ; 0x4cbd5
-INCLUDE "tilesets/29_palette_map.asm"
+TilesetIcePathPalMap: ; 0x4cbd5
+INCLUDE "tilesets/ice_path_palette_map.asm"
 ; 0x4cc45
 
-Tileset31PalMap: ; 0x4cc45
-INCLUDE "tilesets/31_palette_map.asm"
+TilesetIlexForestPalMap: ; 0x4cc45
+INCLUDE "tilesets/ilex_forest_palette_map.asm"
 ; 0x4ccb5
 
-Tileset21PalMap: ; 0x4ccb5
-INCLUDE "tilesets/21_palette_map.asm"
+TilesetPokeComCenterPalMap: ; 0x4ccb5
+INCLUDE "tilesets/pokecom_center_palette_map.asm"
 ; 0x4cd25
 
-Tileset22PalMap: ; 0x4cd25
-INCLUDE "tilesets/22_palette_map.asm"
+TilesetBattleTowerPalMap: ; 0x4cd25
+INCLUDE "tilesets/battle_tower_palette_map.asm"
 ; 0x4cd95
 
-Tileset04PalMap: ; 0x4cd95
-INCLUDE "tilesets/04_palette_map.asm"
+TilesetBattleTowerOutsidePalMap: ; 0x4cd95
+INCLUDE "tilesets/battle_tower_outside_palette_map.asm"
 ; 0x4ce05
 
 UnusedPalMap2:
diff --git a/tilesets/25_collision.bin b/tilesets/park_collision.bin
index 29e6fa56d..29e6fa56d 100644
--- a/tilesets/25_collision.bin
+++ b/tilesets/park_collision.bin
diff --git a/tilesets/25_metatiles.bin b/tilesets/park_metatiles.bin
index 1fe931640..1fe931640 100644
--- a/tilesets/25_metatiles.bin
+++ b/tilesets/park_metatiles.bin
diff --git a/tilesets/25_palette_map.asm b/tilesets/park_palette_map.asm
index f9c65ef89..f9c65ef89 100644
--- a/tilesets/25_palette_map.asm
+++ b/tilesets/park_palette_map.asm
diff --git a/tilesets/20_collision.bin b/tilesets/players_house_2f_collision.bin
index 9ceb978ab..9ceb978ab 100644
--- a/tilesets/20_collision.bin
+++ b/tilesets/players_house_2f_collision.bin
diff --git a/tilesets/20_metatiles.bin b/tilesets/players_house_2f_metatiles.bin
index 0839798fe..0839798fe 100644
--- a/tilesets/20_metatiles.bin
+++ b/tilesets/players_house_2f_metatiles.bin
diff --git a/tilesets/20_palette_map.asm b/tilesets/players_house_2f_palette_map.asm
index 1c0cb1f08..1c0cb1f08 100644
--- a/tilesets/20_palette_map.asm
+++ b/tilesets/players_house_2f_palette_map.asm
diff --git a/tilesets/06_collision.bin b/tilesets/players_house_collision.bin
index dc3a08bfb..dc3a08bfb 100644
--- a/tilesets/06_collision.bin
+++ b/tilesets/players_house_collision.bin
diff --git a/tilesets/06_metatiles.bin b/tilesets/players_house_metatiles.bin
index f316eb8c1..f316eb8c1 100644
--- a/tilesets/06_metatiles.bin
+++ b/tilesets/players_house_metatiles.bin
diff --git a/tilesets/06_palette_map.asm b/tilesets/players_house_palette_map.asm
index 5d089835b..5d089835b 100644
--- a/tilesets/06_palette_map.asm
+++ b/tilesets/players_house_palette_map.asm
diff --git a/tilesets/07_collision.bin b/tilesets/pokecenter_collision.bin
index 5e58e03c9..5e58e03c9 100644
--- a/tilesets/07_collision.bin
+++ b/tilesets/pokecenter_collision.bin
diff --git a/tilesets/07_metatiles.bin b/tilesets/pokecenter_metatiles.bin
index c96c4843b..c96c4843b 100644
--- a/tilesets/07_metatiles.bin
+++ b/tilesets/pokecenter_metatiles.bin
diff --git a/tilesets/07_palette_map.asm b/tilesets/pokecenter_palette_map.asm
index 78508b59e..78508b59e 100644
--- a/tilesets/07_palette_map.asm
+++ b/tilesets/pokecenter_palette_map.asm
diff --git a/tilesets/21_collision.bin b/tilesets/pokecom_center_collision.bin
index 0dfed1d91..0dfed1d91 100644
--- a/tilesets/21_collision.bin
+++ b/tilesets/pokecom_center_collision.bin
diff --git a/tilesets/21_metatiles.bin b/tilesets/pokecom_center_metatiles.bin
index 097a882fd..097a882fd 100644
--- a/tilesets/21_metatiles.bin
+++ b/tilesets/pokecom_center_metatiles.bin
diff --git a/tilesets/21_palette_map.asm b/tilesets/pokecom_center_palette_map.asm
index 75ee649f9..75ee649f9 100644
--- a/tilesets/21_palette_map.asm
+++ b/tilesets/pokecom_center_palette_map.asm
diff --git a/tilesets/09_collision.bin b/tilesets/port_collision.bin
index af2e7fd34..af2e7fd34 100644
--- a/tilesets/09_collision.bin
+++ b/tilesets/port_collision.bin
diff --git a/tilesets/09_metatiles.bin b/tilesets/port_metatiles.bin
index 69a600707..69a600707 100644
--- a/tilesets/09_metatiles.bin
+++ b/tilesets/port_metatiles.bin
diff --git a/tilesets/09_palette_map.asm b/tilesets/port_palette_map.asm
index 6bfdf4686..6bfdf4686 100644
--- a/tilesets/09_palette_map.asm
+++ b/tilesets/port_palette_map.asm
diff --git a/tilesets/11_collision.bin b/tilesets/power_plant_collision.bin
index ee03c4528..ee03c4528 100644
--- a/tilesets/11_collision.bin
+++ b/tilesets/power_plant_collision.bin
diff --git a/tilesets/11_metatiles.bin b/tilesets/power_plant_metatiles.bin
index f6089d29c..f6089d29c 100644
--- a/tilesets/11_metatiles.bin
+++ b/tilesets/power_plant_metatiles.bin
diff --git a/tilesets/11_palette_map.asm b/tilesets/power_plant_palette_map.asm
index f79f9c01b..f79f9c01b 100644
--- a/tilesets/11_palette_map.asm
+++ b/tilesets/power_plant_palette_map.asm
diff --git a/tilesets/27_collision.bin b/tilesets/radio_tower_collision.bin
index 0d77042b7..0d77042b7 100644
--- a/tilesets/27_collision.bin
+++ b/tilesets/radio_tower_collision.bin
diff --git a/tilesets/27_metatiles.bin b/tilesets/radio_tower_metatiles.bin
index 01c0b4aa5..01c0b4aa5 100644
--- a/tilesets/27_metatiles.bin
+++ b/tilesets/radio_tower_metatiles.bin
diff --git a/tilesets/27_palette_map.asm b/tilesets/radio_tower_palette_map.asm
index 3530f7479..3530f7479 100644
--- a/tilesets/27_palette_map.asm
+++ b/tilesets/radio_tower_palette_map.asm
diff --git a/tilesets/26_collision.bin b/tilesets/ruins_of_alph_collision.bin
index 1eedacfe8..1eedacfe8 100644
--- a/tilesets/26_collision.bin
+++ b/tilesets/ruins_of_alph_collision.bin
diff --git a/tilesets/26_metatiles.bin b/tilesets/ruins_of_alph_metatiles.bin
index 61ef041b5..61ef041b5 100644
--- a/tilesets/26_metatiles.bin
+++ b/tilesets/ruins_of_alph_metatiles.bin
diff --git a/tilesets/36_palette_map.asm b/tilesets/ruins_of_alph_palette_map.asm
index 5ebde24ba..5ebde24ba 100644
--- a/tilesets/36_palette_map.asm
+++ b/tilesets/ruins_of_alph_palette_map.asm
diff --git a/tilesets/23_collision.bin b/tilesets/sprout_tower_collision.bin
index 878803fb8..878803fb8 100644
--- a/tilesets/23_collision.bin
+++ b/tilesets/sprout_tower_collision.bin
diff --git a/tilesets/23_metatiles.bin b/tilesets/sprout_tower_metatiles.bin
index b6668fcd4..b6668fcd4 100644
--- a/tilesets/23_metatiles.bin
+++ b/tilesets/sprout_tower_metatiles.bin
diff --git a/tilesets/23_palette_map.asm b/tilesets/sprout_tower_palette_map.asm
index 6e3c10115..6e3c10115 100644
--- a/tilesets/23_palette_map.asm
+++ b/tilesets/sprout_tower_palette_map.asm
diff --git a/tilesets/tileset_headers.asm b/tilesets/tileset_headers.asm
index d0debd2b7..d96931c17 100644
--- a/tilesets/tileset_headers.asm
+++ b/tilesets/tileset_headers.asm
@@ -7,42 +7,42 @@ tileset: macro
 	dw \1PalMap
 endm
 
-Tileset00::
-	tileset Tileset00
-Tileset01::
-	tileset Tileset01
-	tileset Tileset02
-	tileset Tileset03
-	tileset Tileset04
-	tileset Tileset05
-	tileset Tileset06
-	tileset Tileset07
-	tileset Tileset08
-	tileset Tileset09
-	tileset Tileset10
-	tileset Tileset11
-	tileset Tileset12
-	tileset Tileset13
-	tileset Tileset14
-	tileset Tileset15
-	tileset Tileset16
-	tileset Tileset17
-	tileset Tileset18
-	tileset Tileset19
-	tileset Tileset20
-	tileset Tileset21
-	tileset Tileset22
-	tileset Tileset23
-	tileset Tileset24
-	tileset Tileset25
-	tileset Tileset26
-	tileset Tileset27
-	tileset Tileset28
-	tileset Tileset29
-	tileset Tileset30
-	tileset Tileset31
-	tileset Tileset32
-	tileset Tileset33
-	tileset Tileset34
-	tileset Tileset35
-	tileset Tileset36
+Tileset0::
+	tileset Tileset0
+Tileset1::
+	tileset TilesetJohto1
+	tileset TilesetJohto2
+	tileset TilesetKanto
+	tileset TilesetBattleTowerOutside
+	tileset TilesetHouse1
+	tileset TilesetPlayersHouse
+	tileset TilesetPokecenter
+	tileset TilesetGate
+	tileset TilesetPort
+	tileset TilesetLab
+	tileset TilesetPowerPlant
+	tileset TilesetMart
+	tileset TilesetCeladonMansion
+	tileset TilesetGameCorner
+	tileset TilesetGym1
+	tileset TilesetKurtsHouse
+	tileset TilesetTrainStation
+	tileset TilesetOlivineGym
+	tileset TilesetLighthouse
+	tileset TilesetPlayersHouse2F
+	tileset TilesetPokeComCenter
+	tileset TilesetBattleTower
+	tileset TilesetSproutTower
+	tileset TilesetCave
+	tileset TilesetPark
+	tileset TilesetRuinsOfAlph
+	tileset TilesetRadioTower
+	tileset TilesetUnderground
+	tileset TilesetIcePath
+	tileset TilesetWhirlIslands
+	tileset TilesetIlexForest
+	tileset TilesetBetaWordRoom
+	tileset TilesetHoOhWordRoom
+	tileset TilesetKabutoWordRoom
+	tileset TilesetOmanyteWordRoom
+	tileset TilesetAerodactylWordRoom
diff --git a/tilesets/17_collision.bin b/tilesets/train_station_collision.bin
index bd5c4c586..bd5c4c586 100644
--- a/tilesets/17_collision.bin
+++ b/tilesets/train_station_collision.bin
diff --git a/tilesets/17_metatiles.bin b/tilesets/train_station_metatiles.bin
index 9bbdd0bd2..9bbdd0bd2 100644
--- a/tilesets/17_metatiles.bin
+++ b/tilesets/train_station_metatiles.bin
diff --git a/tilesets/17_palette_map.asm b/tilesets/train_station_palette_map.asm
index f52f5bbe7..f52f5bbe7 100644
--- a/tilesets/17_palette_map.asm
+++ b/tilesets/train_station_palette_map.asm
diff --git a/tilesets/28_collision.bin b/tilesets/underground_collision.bin
index eccd3e3df..eccd3e3df 100644
--- a/tilesets/28_collision.bin
+++ b/tilesets/underground_collision.bin
diff --git a/tilesets/28_metatiles.bin b/tilesets/underground_metatiles.bin
index 28b807e1e..28b807e1e 100644
--- a/tilesets/28_metatiles.bin
+++ b/tilesets/underground_metatiles.bin
diff --git a/tilesets/28_palette_map.asm b/tilesets/underground_palette_map.asm
index 6b9b5546d..6b9b5546d 100644
--- a/tilesets/28_palette_map.asm
+++ b/tilesets/underground_palette_map.asm
diff --git a/tilesets/unused_30_collision.bin b/tilesets/unused_whirl_islands_collision.bin
index 559aad109..559aad109 100644
--- a/tilesets/unused_30_collision.bin
+++ b/tilesets/unused_whirl_islands_collision.bin
diff --git a/tilesets/unused_30_metatiles.bin b/tilesets/unused_whirl_islands_metatiles.bin
index b70f1a0e6..b70f1a0e6 100644
--- a/tilesets/unused_30_metatiles.bin
+++ b/tilesets/unused_whirl_islands_metatiles.bin
diff --git a/tilesets/30_collision.bin b/tilesets/whirl_islands_collision.bin
index 701de1c0b..701de1c0b 100644
--- a/tilesets/30_collision.bin
+++ b/tilesets/whirl_islands_collision.bin
diff --git a/tilesets/30_metatiles.bin b/tilesets/whirl_islands_metatiles.bin
index a41b5b080..a41b5b080 100644
--- a/tilesets/30_metatiles.bin
+++ b/tilesets/whirl_islands_metatiles.bin
diff --git a/tilesets/30_palette_map.asm b/tilesets/whirl_islands_palette_map.asm
index 73c09ebe5..73c09ebe5 100644
--- a/tilesets/30_palette_map.asm
+++ b/tilesets/whirl_islands_palette_map.asm