50 files changed, 23 insertions, 23 deletions
diff --git a/gfx/tilesets/olivine_gym.2bpp.lz.93800351 b/gfx/tilesets/champions_room.2bpp.lz.93800351
index e19994f37..e19994f37 100644
--- a/gfx/tilesets/olivine_gym.2bpp.lz.93800351
+++ b/gfx/tilesets/champions_room.2bpp.lz.93800351
diff --git a/gfx/tilesets/olivine_gym.png b/gfx/tilesets/champions_room.png
index e32c2fb28..e32c2fb28 100644
--- a/gfx/tilesets/olivine_gym.png
+++ b/gfx/tilesets/champions_room.png
diff --git a/gfx/tilesets/olivine_gym_palette_map.asm b/gfx/tilesets/champions_room_palette_map.asm
index 551a09351..551a09351 100644
--- a/gfx/tilesets/olivine_gym_palette_map.asm
+++ b/gfx/tilesets/champions_room_palette_map.asm
diff --git a/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 b/gfx/tilesets/dark_cave.2bpp.lz.25b9c4b6
index 50a5ab9ac..50a5ab9ac 100644
--- a/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6
+++ b/gfx/tilesets/dark_cave.2bpp.lz.25b9c4b6
diff --git a/gfx/tilesets/whirl_islands.png b/gfx/tilesets/dark_cave.png
index 1d0a91e5e..1d0a91e5e 100644
--- a/gfx/tilesets/whirl_islands.png
+++ b/gfx/tilesets/dark_cave.png
diff --git a/gfx/tilesets/whirl_islands_palette_map.asm b/gfx/tilesets/dark_cave_palette_map.asm
index 73c09ebe5..73c09ebe5 100644
--- a/gfx/tilesets/whirl_islands_palette_map.asm
+++ b/gfx/tilesets/dark_cave_palette_map.asm
diff --git a/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f b/gfx/tilesets/elite_four_room.2bpp.lz.c1f2ed8f
index 6b45c769d..6b45c769d 100644
--- a/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f
+++ b/gfx/tilesets/elite_four_room.2bpp.lz.c1f2ed8f
diff --git a/gfx/tilesets/gym_1.png b/gfx/tilesets/elite_four_room.png
index 27f64afa2..27f64afa2 100644
--- a/gfx/tilesets/gym_1.png
+++ b/gfx/tilesets/elite_four_room.png
diff --git a/gfx/tilesets/gym_1_palette_map.asm b/gfx/tilesets/elite_four_room_palette_map.asm
index b20f49195..b20f49195 100644
--- a/gfx/tilesets/gym_1_palette_map.asm
+++ b/gfx/tilesets/elite_four_room_palette_map.asm
diff --git a/gfx/tilesets/power_plant.2bpp.lz.454cfd8b b/gfx/tilesets/facility.2bpp.lz.454cfd8b
index 584e54dd2..584e54dd2 100644
--- a/gfx/tilesets/power_plant.2bpp.lz.454cfd8b
+++ b/gfx/tilesets/facility.2bpp.lz.454cfd8b
diff --git a/gfx/tilesets/power_plant.png b/gfx/tilesets/facility.png
index e2e501077..e2e501077 100644
--- a/gfx/tilesets/power_plant.png
+++ b/gfx/tilesets/facility.png
diff --git a/gfx/tilesets/power_plant_palette_map.asm b/gfx/tilesets/facility_palette_map.asm
index f79f9c01b..f79f9c01b 100644
--- a/gfx/tilesets/power_plant_palette_map.asm
+++ b/gfx/tilesets/facility_palette_map.asm
diff --git a/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 b/gfx/tilesets/forest.2bpp.lz.6b0ac896
index 7b5355705..7b5355705 100644
--- a/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896
+++ b/gfx/tilesets/forest.2bpp.lz.6b0ac896
diff --git a/gfx/tilesets/ilex_forest.png b/gfx/tilesets/forest.png
index 853625944..853625944 100644
--- a/gfx/tilesets/ilex_forest.png
+++ b/gfx/tilesets/forest.png
diff --git a/gfx/tilesets/ilex_forest_palette_map.asm b/gfx/tilesets/forest_palette_map.asm
index 696788084..696788084 100644
--- a/gfx/tilesets/ilex_forest_palette_map.asm
+++ b/gfx/tilesets/forest_palette_map.asm
diff --git a/gfx/tilesets/house_1.2bpp.lz.c848ef13 b/gfx/tilesets/house.2bpp.lz.c848ef13
index f9afaf70d..f9afaf70d 100644
--- a/gfx/tilesets/house_1.2bpp.lz.c848ef13
+++ b/gfx/tilesets/house.2bpp.lz.c848ef13
diff --git a/gfx/tilesets/house_1.pal b/gfx/tilesets/house.pal
index a9f8b74b6..a9f8b74b6 100644
--- a/gfx/tilesets/house_1.pal
+++ b/gfx/tilesets/house.pal
diff --git a/gfx/tilesets/house_1.png b/gfx/tilesets/house.png
index ce3547bb8..ce3547bb8 100644
--- a/gfx/tilesets/house_1.png
+++ b/gfx/tilesets/house.png
diff --git a/gfx/tilesets/house_1_palette_map.asm b/gfx/tilesets/house_palette_map.asm
index ce7b988b7..ce7b988b7 100644
--- a/gfx/tilesets/house_1_palette_map.asm
+++ b/gfx/tilesets/house_palette_map.asm
diff --git a/gfx/tilesets/johto_1.2bpp.lz.0c7e555a b/gfx/tilesets/johto.2bpp.lz.0c7e555a
index 9821e1433..9821e1433 100644
--- a/gfx/tilesets/johto_1.2bpp.lz.0c7e555a
+++ b/gfx/tilesets/johto.2bpp.lz.0c7e555a
diff --git a/gfx/tilesets/johto_1.png b/gfx/tilesets/johto.png
index 62ceb23a0..62ceb23a0 100644
--- a/gfx/tilesets/johto_1.png
+++ b/gfx/tilesets/johto.png
diff --git a/gfx/tilesets/johto_2.2bpp.lz.391603fb b/gfx/tilesets/johto_modern.2bpp.lz.391603fb
index 64f23e23b..64f23e23b 100644
--- a/gfx/tilesets/johto_2.2bpp.lz.391603fb
+++ b/gfx/tilesets/johto_modern.2bpp.lz.391603fb
diff --git a/gfx/tilesets/johto_2.png b/gfx/tilesets/johto_modern.png
index 1c080ff45..1c080ff45 100644
--- a/gfx/tilesets/johto_2.png
+++ b/gfx/tilesets/johto_modern.png
diff --git a/gfx/tilesets/johto_2_palette_map.asm b/gfx/tilesets/johto_modern_palette_map.asm
index f2af7a92d..f2af7a92d 100644
--- a/gfx/tilesets/johto_2_palette_map.asm
+++ b/gfx/tilesets/johto_modern_palette_map.asm
diff --git a/gfx/tilesets/johto_1_palette_map.asm b/gfx/tilesets/johto_palette_map.asm
index 62fbd2d00..62fbd2d00 100644
--- a/gfx/tilesets/johto_1_palette_map.asm
+++ b/gfx/tilesets/johto_palette_map.asm
diff --git a/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 b/gfx/tilesets/mansion.2bpp.lz.63b414d4
index b68f147d0..b68f147d0 100644
--- a/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4
+++ b/gfx/tilesets/mansion.2bpp.lz.63b414d4
diff --git a/gfx/tilesets/celadon_mansion.png b/gfx/tilesets/mansion.png
index 44e697a1b..44e697a1b 100644
--- a/gfx/tilesets/celadon_mansion.png
+++ b/gfx/tilesets/mansion.png
diff --git a/gfx/tilesets/celadon_mansion_1.pal b/gfx/tilesets/mansion_1.pal
index 1ed1de75f..1ed1de75f 100644
--- a/gfx/tilesets/celadon_mansion_1.pal
+++ b/gfx/tilesets/mansion_1.pal
diff --git a/gfx/tilesets/celadon_mansion_2.pal b/gfx/tilesets/mansion_2.pal
index ad5c5e4db..ad5c5e4db 100644
--- a/gfx/tilesets/celadon_mansion_2.pal
+++ b/gfx/tilesets/mansion_2.pal
diff --git a/gfx/tilesets/celadon_mansion_palette_map.asm b/gfx/tilesets/mansion_palette_map.asm
index 2bd27ad22..2bd27ad22 100644
--- a/gfx/tilesets/celadon_mansion_palette_map.asm
+++ b/gfx/tilesets/mansion_palette_map.asm
diff --git a/gfx/tilesets/palette_maps.asm b/gfx/tilesets/palette_maps.asm
index b67daeb8d..5e8f9f4eb 100644
--- a/gfx/tilesets/palette_maps.asm
+++ b/gfx/tilesets/palette_maps.asm
@@ -15,16 +15,16 @@ INCLUDE "gfx/tilesets/kanto_palette_map.asm"
 ; 0x4c0e5
 
 Tileset0PalMap: ; 0x4c0e5
-TilesetJohto1PalMap: ; 0x4c0e5
-INCLUDE "gfx/tilesets/johto_1_palette_map.asm"
+TilesetJohtoPalMap: ; 0x4c0e5
+INCLUDE "gfx/tilesets/johto_palette_map.asm"
 ; 0x4c155
 
-TilesetJohto2PalMap: ; 0x4c155
-INCLUDE "gfx/tilesets/johto_2_palette_map.asm"
+TilesetJohtoModernPalMap: ; 0x4c155
+INCLUDE "gfx/tilesets/johto_modern_palette_map.asm"
 ; 0x4c1c5
 
-TilesetHouse1PalMap: ; 0x4c1c5
-INCLUDE "gfx/tilesets/house_1_palette_map.asm"
+TilesetHousePalMap: ; 0x4c1c5
+INCLUDE "gfx/tilesets/house_palette_map.asm"
 ; 0x4c235
 
 TilesetPlayersHousePalMap: ; 0x4c235
@@ -47,36 +47,36 @@ TilesetLabPalMap: ; 0x4c3f5
 INCLUDE "gfx/tilesets/lab_palette_map.asm"
 ; 0x4c465
 
-TilesetPowerPlantPalMap: ; 0x4c465
-INCLUDE "gfx/tilesets/power_plant_palette_map.asm"
+TilesetFacilityPalMap: ; 0x4c465
+INCLUDE "gfx/tilesets/facility_palette_map.asm"
 ; 0x4c4d5
 
 TilesetMartPalMap: ; 0x4c4d5
 INCLUDE "gfx/tilesets/mart_palette_map.asm"
 ; 0x4c545
 
-TilesetCeladonMansionPalMap: ; 0x4c545
-INCLUDE "gfx/tilesets/celadon_mansion_palette_map.asm"
+TilesetMansionPalMap: ; 0x4c545
+INCLUDE "gfx/tilesets/mansion_palette_map.asm"
 ; 0x4c5b5
 
 TilesetGameCornerPalMap: ; 0x4c5b5
 INCLUDE "gfx/tilesets/game_corner_palette_map.asm"
 ; 0x4c625
 
-TilesetGym1PalMap: ; 0x4c625
-INCLUDE "gfx/tilesets/gym_1_palette_map.asm"
+TilesetEliteFourRoomPalMap: ; 0x4c625
+INCLUDE "gfx/tilesets/elite_four_room_palette_map.asm"
 ; 0x4c695
 
-TilesetKurtsHousePalMap: ; 0x4c695
-INCLUDE "gfx/tilesets/kurts_house_palette_map.asm"
+TilesetTraditionalHousePalMap: ; 0x4c695
+INCLUDE "gfx/tilesets/traditional_house_palette_map.asm"
 ; 0x4c705
 
-TilesetSproutTowerPalMap: ; 0x4c705
-INCLUDE "gfx/tilesets/sprout_tower_palette_map.asm"
+TilesetTowerPalMap: ; 0x4c705
+INCLUDE "gfx/tilesets/tower_palette_map.asm"
 ; 0x4c775
 
 TilesetCavePalMap: ; 0x4c775
-TilesetWhirlIslandsPalMap: ; 0x4c775
+TilesetDarkCavePalMap: ; 0x4c775
 INCLUDE "gfx/tilesets/cave_palette_map.asm"
 ; 0x4c7e5
 
@@ -105,16 +105,16 @@ TilesetUndergroundPalMap: ; 0x4c9a5
 INCLUDE "gfx/tilesets/underground_palette_map.asm"
 ; 0x4ca15
 
-TilesetOlivineGymPalMap: ; 0x4ca15
-INCLUDE "gfx/tilesets/olivine_gym_palette_map.asm"
+TilesetChampionsRoomPalMap: ; 0x4ca15
+INCLUDE "gfx/tilesets/champions_room_palette_map.asm"
 ; 0x4ca85
 
 TilesetLighthousePalMap: ; 0x4ca85
 INCLUDE "gfx/tilesets/lighthouse_palette_map.asm"
 ; 0x4caf5
 
-TilesetPlayersHouse2FPalMap: ; 0x4caf5
-INCLUDE "gfx/tilesets/players_house_2f_palette_map.asm"
+TilesetPlayersRoomPalMap: ; 0x4caf5
+INCLUDE "gfx/tilesets/players_room_palette_map.asm"
 ; 0x4cb65
 
 UnusedMuseumPalMap: ; 0x4cb65
@@ -125,8 +125,8 @@ TilesetIcePathPalMap: ; 0x4cbd5
 INCLUDE "gfx/tilesets/ice_path_palette_map.asm"
 ; 0x4cc45
 
-TilesetIlexForestPalMap: ; 0x4cc45
-INCLUDE "gfx/tilesets/ilex_forest_palette_map.asm"
+TilesetForestPalMap: ; 0x4cc45
+INCLUDE "gfx/tilesets/forest_palette_map.asm"
 ; 0x4ccb5
 
 TilesetPokeComCenterPalMap: ; 0x4ccb5
diff --git a/gfx/tilesets/players_house_2f.2bpp.lz.35e51007 b/gfx/tilesets/players_room.2bpp.lz.35e51007
index b458a501d..b458a501d 100644
--- a/gfx/tilesets/players_house_2f.2bpp.lz.35e51007
+++ b/gfx/tilesets/players_room.2bpp.lz.35e51007
diff --git a/gfx/tilesets/players_house_2f.png b/gfx/tilesets/players_room.png
index a0f268eb5..a0f268eb5 100644
--- a/gfx/tilesets/players_house_2f.png
+++ b/gfx/tilesets/players_room.png
diff --git a/gfx/tilesets/players_house_2f_palette_map.asm b/gfx/tilesets/players_room_palette_map.asm
index 1c0cb1f08..1c0cb1f08 100644
--- a/gfx/tilesets/players_house_2f_palette_map.asm
+++ b/gfx/tilesets/players_room_palette_map.asm
diff --git a/gfx/tilesets/sprout-pillar/1.png b/gfx/tilesets/tower-pillar/1.png
index c22fb2a13..c22fb2a13 100644
--- a/gfx/tilesets/sprout-pillar/1.png
+++ b/gfx/tilesets/tower-pillar/1.png
diff --git a/gfx/tilesets/sprout-pillar/10.png b/gfx/tilesets/tower-pillar/10.png
index 01dbe1afc..01dbe1afc 100644
--- a/gfx/tilesets/sprout-pillar/10.png
+++ b/gfx/tilesets/tower-pillar/10.png
diff --git a/gfx/tilesets/sprout-pillar/2.png b/gfx/tilesets/tower-pillar/2.png
index 76fae403b..76fae403b 100644
--- a/gfx/tilesets/sprout-pillar/2.png
+++ b/gfx/tilesets/tower-pillar/2.png
diff --git a/gfx/tilesets/sprout-pillar/3.png b/gfx/tilesets/tower-pillar/3.png
index 80ce4657c..80ce4657c 100644
--- a/gfx/tilesets/sprout-pillar/3.png
+++ b/gfx/tilesets/tower-pillar/3.png
diff --git a/gfx/tilesets/sprout-pillar/4.png b/gfx/tilesets/tower-pillar/4.png
index 9d523c4bc..9d523c4bc 100644
--- a/gfx/tilesets/sprout-pillar/4.png
+++ b/gfx/tilesets/tower-pillar/4.png
diff --git a/gfx/tilesets/sprout-pillar/5.png b/gfx/tilesets/tower-pillar/5.png
index b7796c8d6..b7796c8d6 100644
--- a/gfx/tilesets/sprout-pillar/5.png
+++ b/gfx/tilesets/tower-pillar/5.png
diff --git a/gfx/tilesets/sprout-pillar/6.png b/gfx/tilesets/tower-pillar/6.png
index 0ca0e5936..0ca0e5936 100644
--- a/gfx/tilesets/sprout-pillar/6.png
+++ b/gfx/tilesets/tower-pillar/6.png
diff --git a/gfx/tilesets/sprout-pillar/7.png b/gfx/tilesets/tower-pillar/7.png
index 3aa4b4e94..3aa4b4e94 100644
--- a/gfx/tilesets/sprout-pillar/7.png
+++ b/gfx/tilesets/tower-pillar/7.png
diff --git a/gfx/tilesets/sprout-pillar/8.png b/gfx/tilesets/tower-pillar/8.png
index e81475618..e81475618 100644
--- a/gfx/tilesets/sprout-pillar/8.png
+++ b/gfx/tilesets/tower-pillar/8.png
diff --git a/gfx/tilesets/sprout-pillar/9.png b/gfx/tilesets/tower-pillar/9.png
index da74607be..da74607be 100644
--- a/gfx/tilesets/sprout-pillar/9.png
+++ b/gfx/tilesets/tower-pillar/9.png
diff --git a/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c b/gfx/tilesets/tower.2bpp.lz.bc56789c
index 2033306e3..2033306e3 100644
--- a/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c
+++ b/gfx/tilesets/tower.2bpp.lz.bc56789c
diff --git a/gfx/tilesets/sprout_tower.png b/gfx/tilesets/tower.png
index 05484b5d9..05484b5d9 100644
--- a/gfx/tilesets/sprout_tower.png
+++ b/gfx/tilesets/tower.png
diff --git a/gfx/tilesets/sprout_tower_palette_map.asm b/gfx/tilesets/tower_palette_map.asm
index 6e3c10115..6e3c10115 100644
--- a/gfx/tilesets/sprout_tower_palette_map.asm
+++ b/gfx/tilesets/tower_palette_map.asm
diff --git a/gfx/tilesets/kurts_house.2bpp.lz.dd51d079 b/gfx/tilesets/traditional_house.2bpp.lz.dd51d079
index 28f025413..28f025413 100644
--- a/gfx/tilesets/kurts_house.2bpp.lz.dd51d079
+++ b/gfx/tilesets/traditional_house.2bpp.lz.dd51d079
diff --git a/gfx/tilesets/kurts_house.png b/gfx/tilesets/traditional_house.png
index bda1f7983..bda1f7983 100644
--- a/gfx/tilesets/kurts_house.png
+++ b/gfx/tilesets/traditional_house.png
diff --git a/gfx/tilesets/kurts_house_palette_map.asm b/gfx/tilesets/traditional_house_palette_map.asm
index 5daa0da6b..5daa0da6b 100644
--- a/gfx/tilesets/kurts_house_palette_map.asm
+++ b/gfx/tilesets/traditional_house_palette_map.asm