121 files changed, 1640 insertions, 0 deletions

diff --git a/gfx/tilesets/aerodactyl_word_room.png b/gfx/tilesets/aerodactyl_word_room.png
index f41866c58..7ae272358 100644
--- a/gfx/tilesets/aerodactyl_word_room.png
+++ b/gfx/tilesets/aerodactyl_word_room.png
diff --git a/gfx/tilesets/aerodactyl_word_room_palette_map.asm b/gfx/tilesets/aerodactyl_word_room_palette_map.asm
new file mode 100644
index 000000000..5ebde24ba
--- /dev/null
+++ b/gfx/tilesets/aerodactyl_word_room_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	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
+	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
+	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/gfx/tilesets/battle_tower.pal b/gfx/tilesets/battle_tower.pal
new file mode 100644
index 000000000..4e71a5575
--- /dev/null
+++ b/gfx/tilesets/battle_tower.pal
@@ -0,0 +1,40 @@
+; gray
+	RGB 30, 28, 26
+	RGB 19, 19, 19
+	RGB 13, 13, 13
+	RGB 07, 07, 07
+; red
+	RGB 30, 28, 26
+	RGB 31, 19, 24
+	RGB 30, 10, 06
+	RGB 07, 07, 07
+; green
+	RGB 18, 24, 09
+	RGB 15, 20, 01
+	RGB 09, 13, 00
+	RGB 07, 07, 07
+; water (blue)
+	RGB 30, 28, 26
+	RGB 15, 16, 31
+	RGB 09, 09, 31
+	RGB 07, 07, 07
+; yellow
+	RGB 30, 28, 26
+	RGB 31, 31, 07
+	RGB 31, 16, 01
+	RGB 07, 07, 07
+; brown
+	RGB 26, 24, 17
+	RGB 21, 17, 07
+	RGB 16, 13, 03
+	RGB 07, 07, 07
+; roof
+	RGB 05, 05, 16
+	RGB 08, 19, 28
+	RGB 00, 00, 00
+	RGB 31, 31, 31
+; text
+	RGB 31, 31, 16
+	RGB 31, 31, 16
+	RGB 14, 09, 00
+	RGB 00, 00, 00
diff --git a/gfx/tilesets/battle_tower.png b/gfx/tilesets/battle_tower.png
index 1cd57402d..cf9e12d53 100644
--- a/gfx/tilesets/battle_tower.png
+++ b/gfx/tilesets/battle_tower.png
diff --git a/gfx/tilesets/battle_tower_outside.png b/gfx/tilesets/battle_tower_outside.png
index 126573b7b..1c080ff45 100644
--- a/gfx/tilesets/battle_tower_outside.png
+++ b/gfx/tilesets/battle_tower_outside.png
diff --git a/gfx/tilesets/battle_tower_outside_palette_map.asm b/gfx/tilesets/battle_tower_outside_palette_map.asm
new file mode 100644
index 000000000..dfc74a9c0
--- /dev/null
+++ b/gfx/tilesets/battle_tower_outside_palette_map.asm
@@ -0,0 +1,29 @@
+	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, BROWN
+	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, RED, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, RED, RED, RED, ROOF, RED, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED, RED
+	tilepal 1, RED, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED
+	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
+	tilepal 1, RED, RED, RED, RED, RED, YELLOW, YELLOW, YELLOW
+	tilepal 1, YELLOW, RED, RED, RED, WATER, WATER, WATER, RED
+	tilepal 1, RED, RED, ROOF, RED, RED, ROOF, RED, RED
+	tilepal 1, RED, ROOF, ROOF, RED, RED, RED, ROOF, ROOF
+	tilepal 1, RED, RED, RED, RED, YELLOW, RED, GREEN, RED
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF
diff --git a/gfx/tilesets/battle_tower_palette_map.asm b/gfx/tilesets/battle_tower_palette_map.asm
new file mode 100644
index 000000000..1abce2a16
--- /dev/null
+++ b/gfx/tilesets/battle_tower_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, RED, WATER, WATER, GRAY, GRAY, WATER, WATER
+	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
+	tilepal 0, WATER, RED, WATER, WATER, GRAY, GRAY, WATER, WATER
+	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
+	tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, GRAY
+	tilepal 0, WATER, WATER, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, WATER
+	tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, RED, BROWN, RED, BROWN, BROWN, BROWN, RED, RED
+	tilepal 0, WATER, WATER, WATER, RED, RED, RED, RED, WATER
+	tilepal 0, BROWN, YELLOW, RED, BROWN, BROWN, BROWN, RED, RED
+	tilepal 0, WATER, RED, RED, RED, RED, GRAY, RED, WATER
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, WATER, GRAY, WATER, WATER, WATER, ROOF, ROOF
+	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, WATER, WATER, RED, RED
+	tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, RED, GRAY, GRAY, GRAY, GREEN, YELLOW, RED, RED
+	tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
+	tilepal 1, YELLOW, YELLOW, BROWN, YELLOW, WATER, WATER, YELLOW, RED
+	tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
+	tilepal 1, GRAY, GRAY, BROWN, YELLOW, RED, RED, YELLOW, RED
+	tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+	tilepal 1, GRAY, GRAY, YELLOW, BROWN, WATER, WATER, GRAY, BROWN
+	tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY
+	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/gfx/tilesets/beta_word_room.png b/gfx/tilesets/beta_word_room.png
index f41866c58..7ae272358 100644
--- a/gfx/tilesets/beta_word_room.png
+++ b/gfx/tilesets/beta_word_room.png
diff --git a/gfx/tilesets/beta_word_room_palette_map.asm b/gfx/tilesets/beta_word_room_palette_map.asm
new file mode 100644
index 000000000..5ebde24ba
--- /dev/null
+++ b/gfx/tilesets/beta_word_room_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	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
+	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
+	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/gfx/tilesets/bg_tiles.pal b/gfx/tilesets/bg_tiles.pal
new file mode 100644
index 000000000..e21561c74
--- /dev/null
+++ b/gfx/tilesets/bg_tiles.pal
@@ -0,0 +1,61 @@
+; morn
+	RGB 28,31,16, 21,21,21, 13,13,13, 07,07,07 ; gray
+	RGB 28,31,16, 31,19,24, 30,10,06, 07,07,07 ; red
+	RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; green
+	RGB 31,31,31, 08,12,31, 01,04,31, 07,07,07 ; water
+	RGB 28,31,16, 31,31,07, 31,16,01, 07,07,07 ; yellow
+	RGB 28,31,16, 24,18,07, 20,15,03, 07,07,07 ; brown
+	RGB 28,31,16, 15,31,31, 05,17,31, 07,07,07 ; roof
+	RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
+
+; day
+	RGB 27,31,27, 21,21,21, 13,13,13, 07,07,07 ; gray
+	RGB 27,31,27, 31,19,24, 30,10,06, 07,07,07 ; red
+	RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; green
+	RGB 31,31,31, 08,12,31, 01,04,31, 07,07,07 ; water
+	RGB 27,31,27, 31,31,07, 31,16,01, 07,07,07 ; yellow
+	RGB 27,31,27, 24,18,07, 20,15,03, 07,07,07 ; brown
+	RGB 27,31,27, 15,31,31, 05,17,31, 07,07,07 ; roof
+	RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
+
+; nite
+	RGB 15,14,24, 11,11,19, 07,07,12, 00,00,00 ; gray
+	RGB 15,14,24, 14,07,17, 13,00,08, 00,00,00 ; red
+	RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; green
+	RGB 15,14,24, 05,05,17, 03,03,10, 00,00,00 ; water
+	RGB 30,30,11, 16,14,18, 16,14,10, 00,00,00 ; yellow
+	RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; brown
+	RGB 15,14,24, 13,12,23, 11,09,20, 00,00,00 ; roof
+	RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
+
+; dark
+	RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; gray
+	RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; red
+	RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; green
+	RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; water
+	RGB 30,30,11, 00,00,00, 00,00,00, 00,00,00 ; yellow
+	RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; brown
+	RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; roof
+	RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
+
+; indoor
+	RGB 30,28,26, 19,19,19, 13,13,13, 07,07,07 ; gray
+	RGB 30,28,26, 31,19,24, 30,10,06, 07,07,07 ; red
+	RGB 18,24,09, 15,20,01, 09,13,00, 07,07,07 ; green
+	RGB 30,28,26, 15,16,31, 09,09,31, 07,07,07 ; water
+	RGB 30,28,26, 31,31,07, 31,16,01, 07,07,07 ; yellow
+	RGB 26,24,17, 21,17,07, 16,13,03, 07,07,07 ; brown
+	RGB 30,28,26, 17,19,31, 14,16,31, 07,07,07 ; roof
+	RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
+
+; overworld water
+; morn/day
+	RGB 23, 23, 31
+	RGB 18, 19, 31
+	RGB 13, 12, 31
+	RGB 07, 07, 07
+; nite
+	RGB 15, 13, 27
+	RGB 10, 09, 20
+	RGB 04, 03, 18
+	RGB 00, 00, 00
diff --git a/gfx/tilesets/cave.png b/gfx/tilesets/cave.png
index 0e5bdee7e..fe15a740e 100644
--- a/gfx/tilesets/cave.png
+++ b/gfx/tilesets/cave.png
diff --git a/gfx/tilesets/cave_palette_map.asm b/gfx/tilesets/cave_palette_map.asm
new file mode 100644
index 000000000..73c09ebe5
--- /dev/null
+++ b/gfx/tilesets/cave_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/gfx/tilesets/celadon_mansion.png b/gfx/tilesets/celadon_mansion.png
deleted file mode 100644
index 7dde8574e..000000000
--- a/gfx/tilesets/celadon_mansion.png
+++ /dev/null
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/champions_room.png b/gfx/tilesets/champions_room.png
new file mode 100644
index 000000000..e32c2fb28
--- /dev/null
+++ b/gfx/tilesets/champions_room.png
diff --git a/gfx/tilesets/champions_room_palette_map.asm b/gfx/tilesets/champions_room_palette_map.asm
new file mode 100644
index 000000000..551a09351
--- /dev/null
+++ b/gfx/tilesets/champions_room_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, GREEN, GREEN, GREEN, RED, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GREEN, GREEN, RED, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GREEN, GREEN, YELLOW, RED, RED
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, RED, RED
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, RED, ROOF, RED, RED, RED, RED, RED
+	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, RED, GRAY, GRAY, RED, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, GRAY
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/dark_cave.png b/gfx/tilesets/dark_cave.png
new file mode 100644
index 000000000..1d0a91e5e
--- /dev/null
+++ b/gfx/tilesets/dark_cave.png
diff --git a/gfx/tilesets/dark_cave_palette_map.asm b/gfx/tilesets/dark_cave_palette_map.asm
new file mode 100644
index 000000000..73c09ebe5
--- /dev/null
+++ b/gfx/tilesets/dark_cave_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
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/elite_four_room.png b/gfx/tilesets/elite_four_room.png
new file mode 100644
index 000000000..27f64afa2
--- /dev/null
+++ b/gfx/tilesets/elite_four_room.png
diff --git a/gfx/tilesets/elite_four_room_palette_map.asm b/gfx/tilesets/elite_four_room_palette_map.asm
new file mode 100644
index 000000000..b20f49195
--- /dev/null
+++ b/gfx/tilesets/elite_four_room_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN
+	tilepal 0, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN
+	tilepal 0, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN
+	tilepal 0, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN
+	tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
+	tilepal 0, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF
+	tilepal 0, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN
+	tilepal 1, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN
+	tilepal 1, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN
+	tilepal 1, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN
+	tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
+	tilepal 1, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF
+	tilepal 1, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF
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/facility.png b/gfx/tilesets/facility.png
new file mode 100644
index 000000000..e2e501077
--- /dev/null
+++ b/gfx/tilesets/facility.png
diff --git a/gfx/tilesets/facility_palette_map.asm b/gfx/tilesets/facility_palette_map.asm
new file mode 100644
index 000000000..f79f9c01b
--- /dev/null
+++ b/gfx/tilesets/facility_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN
+	tilepal 0, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN
+	tilepal 0, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
+	tilepal 0, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED
+	tilepal 0, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER
+	tilepal 0, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF
+	tilepal 0, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN
+	tilepal 1, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN
+	tilepal 1, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
+	tilepal 1, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED
+	tilepal 1, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER
+	tilepal 1, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF
+	tilepal 1, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
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/forest.png b/gfx/tilesets/forest.png
new file mode 100644
index 000000000..853625944
--- /dev/null
+++ b/gfx/tilesets/forest.png
diff --git a/gfx/tilesets/forest_palette_map.asm b/gfx/tilesets/forest_palette_map.asm
new file mode 100644
index 000000000..696788084
--- /dev/null
+++ b/gfx/tilesets/forest_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW
+	tilepal 0, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW
+	tilepal 1, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 1, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 1, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN
+	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/gfx/tilesets/game_corner.png b/gfx/tilesets/game_corner.png
index 776900638..d519dd636 100644
--- a/gfx/tilesets/game_corner.png
+++ b/gfx/tilesets/game_corner.png
diff --git a/gfx/tilesets/game_corner_palette_map.asm b/gfx/tilesets/game_corner_palette_map.asm
new file mode 100644
index 000000000..34bb9f6f0
--- /dev/null
+++ b/gfx/tilesets/game_corner_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, GREEN, GREEN, GREEN
+	tilepal 0, GREEN, GREEN, GRAY, GRAY, RED, RED, GREEN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, RED, BROWN, GREEN, GRAY, GRAY
+	tilepal 0, GRAY, GREEN, GRAY, GRAY, RED, RED, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, GRAY, GREEN, RED, RED, GREEN, GRAY, RED, RED
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, GREEN, BROWN, RED, RED
+	tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED
+	tilepal 0, RED, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, BROWN
+	tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF
+	tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, RED, ROOF, ROOF
+	tilepal 1, YELLOW, RED, YELLOW, RED, WATER, WATER, RED, RED
+	tilepal 1, RED, RED, RED, RED, GREEN, GRAY, RED, RED
+	tilepal 1, RED, RED, YELLOW, YELLOW, WATER, WATER, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, RED, RED, GREEN, ROOF, RED, RED
+	tilepal 1, RED, RED, YELLOW, YELLOW, ROOF, ROOF, RED, RED
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED
+	tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED
+	tilepal 1, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER
diff --git a/gfx/tilesets/gate.png b/gfx/tilesets/gate.png
index b8f2db2d2..5036f9066 100644
--- a/gfx/tilesets/gate.png
+++ b/gfx/tilesets/gate.png
diff --git a/gfx/tilesets/gate_palette_map.asm b/gfx/tilesets/gate_palette_map.asm
new file mode 100644
index 000000000..7854d3a81
--- /dev/null
+++ b/gfx/tilesets/gate_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, WATER, WATER, RED, GREEN, GREEN, GREEN
+	tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
+	tilepal 0, WATER, GRAY, WATER, WATER, RED, BROWN, BROWN, WATER
+	tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, WATER
+	tilepal 0, GREEN, GREEN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
+	tilepal 0, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, GREEN, GREEN, GREEN, GREEN, GRAY, WATER, WATER, WATER
+	tilepal 0, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, ROOF, RED, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, WATER
+	tilepal 1, GRAY, ROOF, RED, GRAY, GRAY, WATER, GRAY, GRAY
+	tilepal 1, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, WATER, WATER, WATER
+	tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY
diff --git a/gfx/tilesets/gym_1.png b/gfx/tilesets/gym_1.png
deleted file mode 100644
index 582b9365d..000000000
--- a/gfx/tilesets/gym_1.png
+++ /dev/null
diff --git a/gfx/tilesets/ho_oh_word_room.png b/gfx/tilesets/ho_oh_word_room.png
index f41866c58..7ae272358 100644
--- a/gfx/tilesets/ho_oh_word_room.png
+++ b/gfx/tilesets/ho_oh_word_room.png
diff --git a/gfx/tilesets/ho_oh_word_room_palette_map.asm b/gfx/tilesets/ho_oh_word_room_palette_map.asm
new file mode 100644
index 000000000..5ebde24ba
--- /dev/null
+++ b/gfx/tilesets/ho_oh_word_room_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	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
+	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
+	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/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.pal b/gfx/tilesets/house.pal
new file mode 100644
index 000000000..a9f8b74b6
--- /dev/null
+++ b/gfx/tilesets/house.pal
@@ -0,0 +1,40 @@
+; gray
+	RGB 30, 28, 26
+	RGB 19, 19, 19
+	RGB 13, 13, 13
+	RGB 07, 07, 07
+; red
+	RGB 30, 28, 26
+	RGB 31, 19, 24
+	RGB 30, 10, 06
+	RGB 07, 07, 07
+; green
+	RGB 30, 28, 26
+	RGB 15, 20, 01
+	RGB 09, 13, 00
+	RGB 07, 07, 07
+; water (blue)
+	RGB 30, 28, 26
+	RGB 15, 16, 31
+	RGB 09, 09, 31
+	RGB 07, 07, 07
+; yellow
+	RGB 30, 28, 26
+	RGB 31, 31, 07
+	RGB 31, 16, 01
+	RGB 07, 07, 07
+; brown
+	RGB 26, 24, 17
+	RGB 21, 17, 07
+	RGB 16, 13, 03
+	RGB 07, 07, 07
+; roof (glass)
+	RGB 30, 28, 26
+	RGB 31, 19, 24
+	RGB 16, 13, 03
+	RGB 07, 07, 07
+; text
+	RGB 31, 31, 16
+	RGB 31, 31, 16
+	RGB 14, 09, 00
+	RGB 00, 00, 00
diff --git a/gfx/tilesets/house.png b/gfx/tilesets/house.png
new file mode 100644
index 000000000..ce3547bb8
--- /dev/null
+++ b/gfx/tilesets/house.png
diff --git a/gfx/tilesets/house_1.png b/gfx/tilesets/house_1.png
deleted file mode 100644
index 3ab7b5ce8..000000000
--- a/gfx/tilesets/house_1.png
+++ /dev/null
diff --git a/gfx/tilesets/house_palette_map.asm b/gfx/tilesets/house_palette_map.asm
new file mode 100644
index 000000000..ce7b988b7
--- /dev/null
+++ b/gfx/tilesets/house_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, WATER, RED, RED, RED, RED, BROWN, WATER, WATER
+	tilepal 0, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN
+	tilepal 0, WATER, WATER, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER
+	tilepal 0, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, WATER, RED, RED, RED, RED, BROWN, WATER, WATER
+	tilepal 1, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER
+	tilepal 1, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
diff --git a/gfx/tilesets/ice_path.pal b/gfx/tilesets/ice_path.pal
new file mode 100644
index 000000000..cb7659f50
--- /dev/null
+++ b/gfx/tilesets/ice_path.pal
@@ -0,0 +1,40 @@
+; gray
+	RGB 15, 14, 24
+	RGB 11, 11, 19
+	RGB 07, 07, 12
+	RGB 00, 00, 00
+; red
+	RGB 15, 14, 24
+	RGB 14, 07, 17
+	RGB 13, 00, 08
+	RGB 00, 00, 00
+; green (ice)
+	RGB 22, 29, 31
+	RGB 10, 27, 31
+	RGB 31, 31, 31
+	RGB 05, 00, 09
+; water
+	RGB 15, 14, 24
+	RGB 05, 05, 17
+	RGB 03, 03, 10
+	RGB 00, 00, 00
+; yellow
+	RGB 30, 30, 11
+	RGB 16, 14, 18
+	RGB 16, 14, 10
+	RGB 00, 00, 00
+; brown
+	RGB 15, 14, 24
+	RGB 12, 09, 15
+	RGB 08, 04, 05
+	RGB 00, 00, 00
+; roof (snow)
+	RGB 25, 31, 31
+	RGB 09, 28, 31
+	RGB 16, 11, 31
+	RGB 05, 00, 09
+; text
+	RGB 31, 31, 16
+	RGB 31, 31, 16
+	RGB 14, 09, 00
+	RGB 00, 00, 00
diff --git a/gfx/tilesets/ice_path.png b/gfx/tilesets/ice_path.png
index d70eb53be..70dea39f5 100644
--- a/gfx/tilesets/ice_path.png
+++ b/gfx/tilesets/ice_path.png
diff --git a/gfx/tilesets/ice_path_palette_map.asm b/gfx/tilesets/ice_path_palette_map.asm
new file mode 100644
index 000000000..985844071
--- /dev/null
+++ b/gfx/tilesets/ice_path_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, BROWN, ROOF, ROOF, BROWN, BROWN, WATER, WATER
+	tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, BROWN, BROWN, WATER, WATER
+	tilepal 0, WATER, ROOF, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
+	tilepal 0, WATER, WATER, ROOF, ROOF, WATER, WATER, WATER, WATER
+	tilepal 0, BROWN, WATER, WATER, WATER, WATER, WATER, GRAY, GRAY
+	tilepal 0, WATER, WATER, ROOF, ROOF, GRAY, GRAY, WATER, WATER
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, GREEN, GRAY, GRAY, WATER
+	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, WATER
+	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
diff --git a/gfx/tilesets/ilex_forest.png b/gfx/tilesets/ilex_forest.png
deleted file mode 100644
index a85cc0394..000000000
--- a/gfx/tilesets/ilex_forest.png
+++ /dev/null
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.png b/gfx/tilesets/johto.png
new file mode 100644
index 000000000..62ceb23a0
--- /dev/null
+++ b/gfx/tilesets/johto.png
diff --git a/gfx/tilesets/johto_1.png b/gfx/tilesets/johto_1.png
deleted file mode 100644
index 0fc2db12f..000000000
--- a/gfx/tilesets/johto_1.png
+++ /dev/null
diff --git a/gfx/tilesets/johto_2.png b/gfx/tilesets/johto_2.png
deleted file mode 100644
index 126573b7b..000000000
--- a/gfx/tilesets/johto_2.png
+++ /dev/null
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_modern.png b/gfx/tilesets/johto_modern.png
new file mode 100644
index 000000000..1c080ff45
--- /dev/null
+++ b/gfx/tilesets/johto_modern.png
diff --git a/gfx/tilesets/johto_modern_palette_map.asm b/gfx/tilesets/johto_modern_palette_map.asm
new file mode 100644
index 000000000..f2af7a92d
--- /dev/null
+++ b/gfx/tilesets/johto_modern_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF
+	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, GRAY, GREEN, GREEN
+	tilepal 0, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED
+	tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW
+	tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY
+	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF
+	tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, BROWN, BROWN, GRAY, GREEN, GREEN
+	tilepal 1, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED
+	tilepal 1, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW
+	tilepal 1, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 1, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, GRAY, BROWN, BROWN, GRAY, RED, RED, GREEN, GREEN
+	tilepal 1, YELLOW, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF
diff --git a/gfx/tilesets/johto_palette_map.asm b/gfx/tilesets/johto_palette_map.asm
new file mode 100644
index 000000000..62fbd2d00
--- /dev/null
+++ b/gfx/tilesets/johto_palette_map.asm
@@ -0,0 +1,29 @@
+	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/gfx/tilesets/kabuto_word_room.png b/gfx/tilesets/kabuto_word_room.png
index f41866c58..7ae272358 100644
--- a/gfx/tilesets/kabuto_word_room.png
+++ b/gfx/tilesets/kabuto_word_room.png
diff --git a/gfx/tilesets/kabuto_word_room_palette_map.asm b/gfx/tilesets/kabuto_word_room_palette_map.asm
new file mode 100644
index 000000000..5ebde24ba
--- /dev/null
+++ b/gfx/tilesets/kabuto_word_room_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	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
+	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
+	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/gfx/tilesets/kanto.png b/gfx/tilesets/kanto.png
index 08b2cbeea..a3036406e 100644
--- a/gfx/tilesets/kanto.png
+++ b/gfx/tilesets/kanto.png
diff --git a/gfx/tilesets/kanto_palette_map.asm b/gfx/tilesets/kanto_palette_map.asm
new file mode 100644
index 000000000..e3e497fb9
--- /dev/null
+++ b/gfx/tilesets/kanto_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY
+	tilepal 0, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN
+	tilepal 0, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+	tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED
+	tilepal 0, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY
+	tilepal 1, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN
+	tilepal 1, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+	tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED
+	tilepal 1, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
diff --git a/gfx/tilesets/kurts_house.png b/gfx/tilesets/kurts_house.png
deleted file mode 100644
index 3d6f1b511..000000000
--- a/gfx/tilesets/kurts_house.png
+++ /dev/null
diff --git a/gfx/tilesets/lab.png b/gfx/tilesets/lab.png
index 418a068fa..75301c7e2 100644
--- a/gfx/tilesets/lab.png
+++ b/gfx/tilesets/lab.png
diff --git a/gfx/tilesets/lab_palette_map.asm b/gfx/tilesets/lab_palette_map.asm
new file mode 100644
index 000000000..24399c6ea
--- /dev/null
+++ b/gfx/tilesets/lab_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, WATER, WATER, WATER, WATER, ROOF, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
+	tilepal 0, WATER, WATER, WATER, WATER, RED, BROWN, BROWN, GRAY
+	tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
+	tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, BROWN, GREEN, GREEN, GREEN
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, RED, RED, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
diff --git a/gfx/tilesets/safari/1.png b/gfx/tilesets/lava/1.png
index c5b500ccc..c5b500ccc 100644
--- a/gfx/tilesets/safari/1.png
+++ b/gfx/tilesets/lava/1.png
diff --git a/gfx/tilesets/safari/2.png b/gfx/tilesets/lava/2.png
index 1512e35ad..1512e35ad 100644
--- a/gfx/tilesets/safari/2.png
+++ b/gfx/tilesets/lava/2.png
diff --git a/gfx/tilesets/safari/3.png b/gfx/tilesets/lava/3.png
index 449c2a317..449c2a317 100644
--- a/gfx/tilesets/safari/3.png
+++ b/gfx/tilesets/lava/3.png
diff --git a/gfx/tilesets/safari/4.png b/gfx/tilesets/lava/4.png
index 8e4c8e0e5..8e4c8e0e5 100644
--- a/gfx/tilesets/safari/4.png
+++ b/gfx/tilesets/lava/4.png
diff --git a/gfx/tilesets/lighthouse.png b/gfx/tilesets/lighthouse.png
index 920ee30ec..0da4b3919 100644
--- a/gfx/tilesets/lighthouse.png
+++ b/gfx/tilesets/lighthouse.png
diff --git a/gfx/tilesets/lighthouse_palette_map.asm b/gfx/tilesets/lighthouse_palette_map.asm
new file mode 100644
index 000000000..5f80e3a4d
--- /dev/null
+++ b/gfx/tilesets/lighthouse_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, WATER, WATER, WATER, BROWN, WATER, WATER, RED
+	tilepal 0, RED, ROOF, ROOF, BROWN, ROOF, RED, RED, RED
+	tilepal 0, ROOF, WATER, ROOF, BROWN, ROOF, WATER, WATER, RED
+	tilepal 0, RED, ROOF, ROOF, WATER, ROOF, RED, RED, RED
+	tilepal 0, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, GRAY, GRAY
+	tilepal 0, ROOF, ROOF, WATER, WATER, RED, ROOF, BROWN, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER
+	tilepal 0, YELLOW, YELLOW, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF
+	tilepal 0, YELLOW, YELLOW, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
+	tilepal 0, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, ROOF, GRAY, GRAY, BROWN, BROWN, RED
+	tilepal 1, RED, RED, RED, BROWN, RED, RED, RED, RED
+	tilepal 1, ROOF, WATER, ROOF, BROWN, RED, WATER, WATER, RED
+	tilepal 1, RED, RED, RED, WATER, RED, RED, RED, RED
+	tilepal 1, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, BROWN, RED, ROOF, GRAY, GRAY
+	tilepal 1, ROOF, ROOF, WATER, WATER, RED, RED, BROWN, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER
+	tilepal 1, RED, RED, ROOF, ROOF, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF
+	tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
+	tilepal 1, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY
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/mansion.png b/gfx/tilesets/mansion.png
new file mode 100644
index 000000000..44e697a1b
--- /dev/null
+++ b/gfx/tilesets/mansion.png
diff --git a/gfx/tilesets/mansion_1.pal b/gfx/tilesets/mansion_1.pal
new file mode 100644
index 000000000..1ed1de75f
--- /dev/null
+++ b/gfx/tilesets/mansion_1.pal
@@ -0,0 +1,44 @@
+	RGB 30, 28, 26
+	RGB 19, 19, 19
+	RGB 13, 13, 13
+	RGB 07, 07, 07
+
+	RGB 30, 28, 26
+	RGB 31, 19, 24
+	RGB 30, 10, 06
+	RGB 07, 07, 07
+
+	RGB 18, 24, 09
+	RGB 15, 20, 01
+	RGB 09, 13, 00
+	RGB 07, 07, 07
+
+	RGB 30, 28, 26
+	RGB 15, 16, 31
+	RGB 09, 09, 31
+	RGB 07, 07, 07
+
+	RGB 30, 28, 26
+	RGB 31, 31, 07
+	RGB 31, 16, 01
+	RGB 07, 07, 07
+
+	RGB 26, 24, 17
+	RGB 21, 17, 07
+	RGB 16, 13, 03
+	RGB 07, 07, 07
+
+	RGB 30, 28, 26
+	RGB 17, 19, 31
+	RGB 14, 16, 31
+	RGB 07, 07, 07
+
+	RGB 31, 31, 16
+	RGB 31, 31, 16
+	RGB 14, 09, 00
+	RGB 00, 00, 00
+
+	RGB 05, 05, 16
+	RGB 08, 19, 28
+	RGB 00, 00, 00
+	RGB 31, 31, 31
diff --git a/gfx/tilesets/mansion_2.pal b/gfx/tilesets/mansion_2.pal
new file mode 100644
index 000000000..ad5c5e4db
--- /dev/null
+++ b/gfx/tilesets/mansion_2.pal
@@ -0,0 +1,4 @@
+	RGB 25, 24, 23
+	RGB 20, 19, 19
+	RGB 14, 16, 31
+	RGB 07, 07, 07
diff --git a/gfx/tilesets/mansion_palette_map.asm b/gfx/tilesets/mansion_palette_map.asm
new file mode 100644
index 000000000..2bd27ad22
--- /dev/null
+++ b/gfx/tilesets/mansion_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, BROWN, WATER, WATER, RED, WATER, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER
+	tilepal 0, GRAY, RED, WATER, WATER, WATER, WATER, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, RED, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, BROWN, BROWN
+	tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, WATER, BROWN, BROWN
+	tilepal 0, BROWN, GREEN, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW
+	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, RED, RED, WATER, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW
+	tilepal 1, WATER, YELLOW, YELLOW, YELLOW, GREEN, GREEN, WATER, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, RED, RED, GRAY, YELLOW, RED, RED, YELLOW, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, YELLOW, YELLOW, GRAY, YELLOW, RED, RED, YELLOW, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GREEN
+	tilepal 1, YELLOW, YELLOW, WATER, YELLOW, WATER, WATER, YELLOW, YELLOW
+	tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
diff --git a/gfx/tilesets/mart.png b/gfx/tilesets/mart.png
index 4053283bc..d4ef69d2a 100644
--- a/gfx/tilesets/mart.png
+++ b/gfx/tilesets/mart.png
diff --git a/gfx/tilesets/mart_palette_map.asm b/gfx/tilesets/mart_palette_map.asm
new file mode 100644
index 000000000..991510d12
--- /dev/null
+++ b/gfx/tilesets/mart_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GREEN, GREEN, WATER, RED, GRAY, GRAY, ROOF, ROOF
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, RED, ROOF, ROOF, GRAY, YELLOW
+	tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+	tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+	tilepal 0, WATER, WATER, RED, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED, RED
+	tilepal 0, GREEN, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, RED, YELLOW, YELLOW, YELLOW, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, RED, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN, GRAY
+	tilepal 1, GRAY, GREEN, GREEN, RED, RED, WATER, WATER, ROOF
+	tilepal 1, GRAY, GRAY, GRAY, YELLOW, YELLOW, YELLOW, ROOF, GRAY
+	tilepal 1, GRAY, GRAY, WATER, GRAY, GRAY, GRAY, YELLOW, YELLOW
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, RED, WATER, RED
+	tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
+	tilepal 1, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, GRAY, GRAY, WATER, GRAY, WATER, RED, BROWN, BROWN
diff --git a/gfx/tilesets/olivine_gym.png b/gfx/tilesets/olivine_gym.png
deleted file mode 100644
index 350c04932..000000000
--- a/gfx/tilesets/olivine_gym.png
+++ /dev/null
diff --git a/gfx/tilesets/omanyte_word_room.png b/gfx/tilesets/omanyte_word_room.png
index f41866c58..7ae272358 100644
--- a/gfx/tilesets/omanyte_word_room.png
+++ b/gfx/tilesets/omanyte_word_room.png
diff --git a/gfx/tilesets/omanyte_word_room_palette_map.asm b/gfx/tilesets/omanyte_word_room_palette_map.asm
new file mode 100644
index 000000000..5ebde24ba
--- /dev/null
+++ b/gfx/tilesets/omanyte_word_room_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	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
+	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
+	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/gfx/tilesets/palette_maps.asm b/gfx/tilesets/palette_maps.asm
new file mode 100644
index 000000000..5e8f9f4eb
--- /dev/null
+++ b/gfx/tilesets/palette_maps.asm
@@ -0,0 +1,149 @@
+tilepal: MACRO
+; used in gfx/tilesets/*_palette_map.asm
+; vram bank, pals
+x = \1 << OAM_TILE_BANK
+rept (_NARG +- 1) / 2
+	dn (x | PAL_BG_\3), (x | PAL_BG_\2)
+	shift
+	shift
+endr
+ENDM
+
+
+TilesetKantoPalMap: ; 0x4c075
+INCLUDE "gfx/tilesets/kanto_palette_map.asm"
+; 0x4c0e5
+
+Tileset0PalMap: ; 0x4c0e5
+TilesetJohtoPalMap: ; 0x4c0e5
+INCLUDE "gfx/tilesets/johto_palette_map.asm"
+; 0x4c155
+
+TilesetJohtoModernPalMap: ; 0x4c155
+INCLUDE "gfx/tilesets/johto_modern_palette_map.asm"
+; 0x4c1c5
+
+TilesetHousePalMap: ; 0x4c1c5
+INCLUDE "gfx/tilesets/house_palette_map.asm"
+; 0x4c235
+
+TilesetPlayersHousePalMap: ; 0x4c235
+INCLUDE "gfx/tilesets/players_house_palette_map.asm"
+; 0x4c2a5
+
+TilesetPokecenterPalMap: ; 0x4c2a5
+INCLUDE "gfx/tilesets/pokecenter_palette_map.asm"
+; 0x4c315
+
+TilesetGatePalMap: ; 0x4c315
+INCLUDE "gfx/tilesets/gate_palette_map.asm"
+; 0x4c385
+
+TilesetPortPalMap: ; 0x4c385
+INCLUDE "gfx/tilesets/port_palette_map.asm"
+; 0x4c3f5
+
+TilesetLabPalMap: ; 0x4c3f5
+INCLUDE "gfx/tilesets/lab_palette_map.asm"
+; 0x4c465
+
+TilesetFacilityPalMap: ; 0x4c465
+INCLUDE "gfx/tilesets/facility_palette_map.asm"
+; 0x4c4d5
+
+TilesetMartPalMap: ; 0x4c4d5
+INCLUDE "gfx/tilesets/mart_palette_map.asm"
+; 0x4c545
+
+TilesetMansionPalMap: ; 0x4c545
+INCLUDE "gfx/tilesets/mansion_palette_map.asm"
+; 0x4c5b5
+
+TilesetGameCornerPalMap: ; 0x4c5b5
+INCLUDE "gfx/tilesets/game_corner_palette_map.asm"
+; 0x4c625
+
+TilesetEliteFourRoomPalMap: ; 0x4c625
+INCLUDE "gfx/tilesets/elite_four_room_palette_map.asm"
+; 0x4c695
+
+TilesetTraditionalHousePalMap: ; 0x4c695
+INCLUDE "gfx/tilesets/traditional_house_palette_map.asm"
+; 0x4c705
+
+TilesetTowerPalMap: ; 0x4c705
+INCLUDE "gfx/tilesets/tower_palette_map.asm"
+; 0x4c775
+
+TilesetCavePalMap: ; 0x4c775
+TilesetDarkCavePalMap: ; 0x4c775
+INCLUDE "gfx/tilesets/cave_palette_map.asm"
+; 0x4c7e5
+
+TilesetParkPalMap: ; 0x4c7e5
+INCLUDE "gfx/tilesets/park_palette_map.asm"
+; 0x4c855
+
+TilesetRuinsOfAlphPalMap: ; 0x4c855
+TilesetBetaWordRoomPalMap: ; 0x4c855
+TilesetHoOhWordRoomPalMap: ; 0x4c855
+TilesetKabutoWordRoomPalMap: ; 0x4c855
+TilesetOmanyteWordRoomPalMap: ; 0x4c855
+TilesetAerodactylWordRoomPalMap: ; 0x4c855
+INCLUDE "gfx/tilesets/ruins_of_alph_palette_map.asm"
+; 0x4c8c5
+
+TilesetRadioTowerPalMap: ; 0x4c8c5
+INCLUDE "gfx/tilesets/radio_tower_palette_map.asm"
+; 0x4c935
+
+TilesetTrainStationPalMap: ; 0x4c935
+INCLUDE "gfx/tilesets/train_station_palette_map.asm"
+; 0x4c9a5
+
+TilesetUndergroundPalMap: ; 0x4c9a5
+INCLUDE "gfx/tilesets/underground_palette_map.asm"
+; 0x4ca15
+
+TilesetChampionsRoomPalMap: ; 0x4ca15
+INCLUDE "gfx/tilesets/champions_room_palette_map.asm"
+; 0x4ca85
+
+TilesetLighthousePalMap: ; 0x4ca85
+INCLUDE "gfx/tilesets/lighthouse_palette_map.asm"
+; 0x4caf5
+
+TilesetPlayersRoomPalMap: ; 0x4caf5
+INCLUDE "gfx/tilesets/players_room_palette_map.asm"
+; 0x4cb65
+
+UnusedMuseumPalMap: ; 0x4cb65
+INCLUDE "gfx/tilesets/unused_museum_palette_map.asm"
+; 4cbd5
+
+TilesetIcePathPalMap: ; 0x4cbd5
+INCLUDE "gfx/tilesets/ice_path_palette_map.asm"
+; 0x4cc45
+
+TilesetForestPalMap: ; 0x4cc45
+INCLUDE "gfx/tilesets/forest_palette_map.asm"
+; 0x4ccb5
+
+TilesetPokeComCenterPalMap: ; 0x4ccb5
+INCLUDE "gfx/tilesets/pokecom_center_palette_map.asm"
+; 0x4cd25
+
+TilesetBattleTowerPalMap: ; 0x4cd25
+INCLUDE "gfx/tilesets/battle_tower_palette_map.asm"
+; 0x4cd95
+
+TilesetBattleTowerOutsidePalMap: ; 0x4cd95
+INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm"
+; 0x4ce05
+
+; unused
+; 0x4ce05
+rept 26
+	db $06
+endr
+; 0x4ce1f
diff --git a/gfx/tilesets/park.png b/gfx/tilesets/park.png
index 7a4a5f8eb..830affef7 100644
--- a/gfx/tilesets/park.png
+++ b/gfx/tilesets/park.png
diff --git a/gfx/tilesets/park_palette_map.asm b/gfx/tilesets/park_palette_map.asm
new file mode 100644
index 000000000..f9c65ef89
--- /dev/null
+++ b/gfx/tilesets/park_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, GREEN, BROWN, RED, GREEN, BROWN, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, RED, RED, RED, GRAY, WATER, ROOF, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN
+	tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN
+	tilepal 0, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
+	tilepal 0, BROWN, BROWN, GREEN, GREEN, GRAY, GRAY, GRAY, RED
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, WATER
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, WATER, WATER, GRAY, RED, GREEN, BROWN, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, WATER, WATER, RED, GRAY, WATER, ROOF, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN
+	tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN
+	tilepal 1, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
+	tilepal 1, BROWN, BROWN, GREEN, GREEN, WATER, WATER, WATER, RED
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, GRAY
diff --git a/gfx/tilesets/players_house.png b/gfx/tilesets/players_house.png
index b49f799d8..76e470781 100644
--- a/gfx/tilesets/players_house.png
+++ b/gfx/tilesets/players_house.png
diff --git a/gfx/tilesets/players_house_2f.png b/gfx/tilesets/players_house_2f.png
deleted file mode 100644
index e46a847b9..000000000
--- a/gfx/tilesets/players_house_2f.png
+++ /dev/null
diff --git a/gfx/tilesets/players_house_palette_map.asm b/gfx/tilesets/players_house_palette_map.asm
new file mode 100644
index 000000000..5d089835b
--- /dev/null
+++ b/gfx/tilesets/players_house_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+	tilepal 0, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
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_room.png b/gfx/tilesets/players_room.png
new file mode 100644
index 000000000..a0f268eb5
--- /dev/null
+++ b/gfx/tilesets/players_room.png
diff --git a/gfx/tilesets/players_room_palette_map.asm b/gfx/tilesets/players_room_palette_map.asm
new file mode 100644
index 000000000..1c0cb1f08
--- /dev/null
+++ b/gfx/tilesets/players_room_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 0, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED
+	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 0, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED
+	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 0, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED
+	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 0, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
+	tilepal 0, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
+	tilepal 0, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 1, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED
+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 1, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED
+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 1, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED
+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 1, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
+	tilepal 1, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
+	tilepal 1, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW
diff --git a/gfx/tilesets/pokecenter.png b/gfx/tilesets/pokecenter.png
index d4084ebd4..69cacdb7b 100644
--- a/gfx/tilesets/pokecenter.png
+++ b/gfx/tilesets/pokecenter.png
diff --git a/gfx/tilesets/pokecenter_palette_map.asm b/gfx/tilesets/pokecenter_palette_map.asm
new file mode 100644
index 000000000..78508b59e
--- /dev/null
+++ b/gfx/tilesets/pokecenter_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
+	tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
+	tilepal 0, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+	tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY
+	tilepal 0, RED, RED, RED, RED, RED, RED, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
+	tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+	tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY
+	tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY
+	tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY
+	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/gfx/tilesets/pokecom_center.pal b/gfx/tilesets/pokecom_center.pal
new file mode 100644
index 000000000..9fe7b765a
--- /dev/null
+++ b/gfx/tilesets/pokecom_center.pal
@@ -0,0 +1,40 @@
+; gray
+	RGB 30, 28, 26
+	RGB 19, 19, 19
+	RGB 13, 13, 13
+	RGB 07, 07, 07
+; red
+	RGB 30, 28, 26
+	RGB 31, 19, 24
+	RGB 30, 10, 06
+	RGB 07, 07, 07
+; green
+	RGB 18, 24, 09
+	RGB 15, 20, 01
+	RGB 09, 13, 00
+	RGB 07, 07, 07
+; water (blue)
+	RGB 30, 28, 26
+	RGB 17, 19, 31
+	RGB 14, 16, 31
+	RGB 07, 07, 07
+; yellow
+	RGB 31, 26, 21
+	RGB 31, 20, 01
+	RGB 14, 16, 31
+	RGB 07, 07, 07
+; brown
+	RGB 21, 17, 07
+	RGB 17, 19, 31
+	RGB 16, 13, 03
+	RGB 07, 07, 07
+; roof
+	RGB 05, 05, 16
+	RGB 08, 19, 28
+	RGB 00, 00, 00
+	RGB 31, 31, 31
+; text
+	RGB 31, 31, 16
+	RGB 31, 31, 16
+	RGB 14, 09, 00
+	RGB 00, 00, 00
diff --git a/gfx/tilesets/pokecom_center.png b/gfx/tilesets/pokecom_center.png
index 889b02727..fbbf270b3 100644
--- a/gfx/tilesets/pokecom_center.png
+++ b/gfx/tilesets/pokecom_center.png
diff --git a/gfx/tilesets/pokecom_center_palette_map.asm b/gfx/tilesets/pokecom_center_palette_map.asm
new file mode 100644
index 000000000..75ee649f9
--- /dev/null
+++ b/gfx/tilesets/pokecom_center_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 0, WATER, WATER, GRAY, GRAY, RED, GRAY, WATER, WATER
+	tilepal 0, RED, WATER, GRAY, WATER, WATER, WATER, RED, RED
+	tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER
+	tilepal 0, RED, RED, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY
+	tilepal 0, GRAY, GRAY, WATER, WATER, WATER, WATER, RED, WATER
+	tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, RED, RED, GRAY
+	tilepal 0, RED, RED, WATER, WATER, WATER, WATER, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, GRAY, YELLOW, YELLOW
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, GRAY, GRAY, WATER, RED, RED, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GRAY, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, RED, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, RED, RED, GRAY, GRAY, RED, RED, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN
+	tilepal 1, WATER, RED, WATER, BROWN, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN
+	tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
diff --git a/gfx/tilesets/port.png b/gfx/tilesets/port.png
index 6990a7d7b..3e05e0da7 100644
--- a/gfx/tilesets/port.png
+++ b/gfx/tilesets/port.png
diff --git a/gfx/tilesets/port_palette_map.asm b/gfx/tilesets/port_palette_map.asm
new file mode 100644
index 000000000..6bfdf4686
--- /dev/null
+++ b/gfx/tilesets/port_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN
+	tilepal 0, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN
+	tilepal 1, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY
+	tilepal 1, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
diff --git a/gfx/tilesets/power_plant.png b/gfx/tilesets/power_plant.png
deleted file mode 100644
index b72e3f401..000000000
--- a/gfx/tilesets/power_plant.png
+++ /dev/null
diff --git a/gfx/tilesets/radio_tower.pal b/gfx/tilesets/radio_tower.pal
new file mode 100644
index 000000000..5799b6f77
--- /dev/null
+++ b/gfx/tilesets/radio_tower.pal
@@ -0,0 +1,39 @@
+	RGB 27, 31, 27
+	RGB 21, 21, 21
+	RGB 13, 13, 13
+	RGB 07, 07, 07
+
+	RGB 27, 31, 27
+	RGB 31, 19, 24
+	RGB 30, 10, 06
+	RGB 07, 07, 07
+
+	RGB 08, 12, 31
+	RGB 12, 25, 01
+	RGB 05, 14, 00
+	RGB 07, 07, 07
+
+	RGB 31, 31, 31
+	RGB 08, 12, 31
+	RGB 01, 04, 31
+	RGB 07, 07, 07
+
+	RGB 27, 31, 27
+	RGB 12, 25, 01
+	RGB 05, 14, 00
+	RGB 07, 07, 07
+
+	RGB 27, 31, 27
+	RGB 24, 18, 07
+	RGB 20, 15, 03
+	RGB 07, 07, 07
+
+	RGB 27, 31, 27
+	RGB 15, 31, 31
+	RGB 05, 17, 31
+	RGB 07, 07, 07
+
+	RGB 31, 31, 16
+	RGB 31, 31, 16
+	RGB 14, 09, 00
+	RGB 00, 00, 00
diff --git a/gfx/tilesets/radio_tower.png b/gfx/tilesets/radio_tower.png
index 8d2d32e1f..4f823f756 100644
--- a/gfx/tilesets/radio_tower.png
+++ b/gfx/tilesets/radio_tower.png
diff --git a/gfx/tilesets/radio_tower_palette_map.asm b/gfx/tilesets/radio_tower_palette_map.asm
new file mode 100644
index 000000000..3530f7479
--- /dev/null
+++ b/gfx/tilesets/radio_tower_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, RED, RED, WATER, WATER, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, WATER, WATER, RED, WATER, WATER, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, ROOF, ROOF, GRAY, GRAY, BROWN, GRAY, GRAY, BROWN
+	tilepal 0, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
+	tilepal 0, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GREEN, GREEN
+	tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, YELLOW, YELLOW, RED
+	tilepal 1, ROOF, RED, RED, ROOF, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, ROOF, ROOF, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
+	tilepal 1, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
+	tilepal 1, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN
+	tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, RED, GRAY, GRAY, GRAY, GRAY
diff --git a/gfx/tilesets/roofs.pal b/gfx/tilesets/roofs.pal
new file mode 100644
index 000000000..6daf87cb6
--- /dev/null
+++ b/gfx/tilesets/roofs.pal
@@ -0,0 +1,107 @@
+; group 0 (unused)
+	RGB 21,21,21, 11,11,11 ; morn/day
+	RGB 21,21,21, 11,11,11; nite
+
+; group 1 (Olivine)
+	RGB 14,17,31, 07,11,15 ; morn/day
+	RGB 09,09,17, 05,07,13; nite
+
+; group 2 (Mahogany)
+	RGB 12,19,00, 06,10,00 ; morn/day
+	RGB 06,09,07, 04,05,06; nite
+
+; group 3 (dungeons)
+	RGB 21,21,21, 11,11,11 ; morn/day
+	RGB 21,21,21, 17,08,07; nite
+
+; group 4 (Ecruteak)
+	RGB 31,19,00, 27,10,05 ; morn/day
+	RGB 15,07,02, 11,04,02; nite
+
+; group 5 (Blackthorn)
+	RGB 11,10,16, 05,06,07 ; morn/day
+	RGB 03,04,08, 00,00,00; nite
+
+; group 6 (Cinnabar)
+	RGB 31,10,00, 18,06,00 ; morn/day
+	RGB 18,05,09, 17,08,07; nite
+
+; group 7 (Cerulean)
+	RGB 17,27,31, 05,15,31 ; morn/day
+	RGB 07,08,22, 07,07,16; nite
+
+; group 8 (Azalea)
+	RGB 22,20,10, 17,14,03 ; morn/day
+	RGB 11,11,05, 10,09,07; nite
+
+; group 9 (Lake of Rage)
+	RGB 31,08,04, 09,09,08 ; morn/day
+	RGB 18,05,09, 09,09,08; nite
+
+; group 10 (Violet)
+	RGB 24,14,31, 13,07,21 ; morn/day
+	RGB 12,03,18, 09,03,15; nite
+
+; group 11 (Goldenrod)
+	RGB 25,25,00, 20,17,08 ; morn/day
+	RGB 12,12,00, 10,09,05; nite
+
+; group 12 (Vermilion)
+	RGB 27,23,01, 23,11,00 ; morn/day
+	RGB 15,11,01, 11,10,01; nite
+
+; group 13 (Pallet)
+	RGB 27,28,31, 17,19,22 ; morn/day
+	RGB 14,14,18, 10,09,13; nite
+
+; group 14 (Pewter)
+	RGB 19,19,16, 10,12,15 ; morn/day
+	RGB 09,09,11, 04,05,07; nite
+
+; group 15 (Mount Moon Square)
+	RGB 14,17,31, 07,11,15 ; morn/day
+	RGB 09,13,19, 07,07,16; nite
+
+; group 16 (Indigo)
+	RGB 21,21,21, 13,13,13 ; morn/day
+	RGB 11,11,19, 07,07,12; nite
+
+; group 17 (Fuchsia)
+	RGB 31,18,29, 17,13,20 ; morn/day
+	RGB 14,06,12, 11,03,10; nite
+
+; group 18 (Lavender)
+	RGB 23,15,31, 16,05,31 ; morn/day
+	RGB 12,07,17, 08,06,10; nite
+
+; group 19 (Silver Cave)
+	RGB 21,21,25, 16,16,16 ; morn/day
+	RGB 13,13,13, 07,07,07; nite
+
+; group 20 (Cable Club)
+	RGB 21,21,21, 11,11,11 ; morn/day
+	RGB 21,21,21, 11,11,11; nite
+
+; group 21 (Celadon)
+	RGB 19,31,15, 31,22,02 ; morn/day
+	RGB 12,13,09, 09,12,03; nite
+
+; group 22 (Cianwood)
+	RGB 15,10,31, 07,05,15 ; morn/day
+	RGB 06,05,17, 02,02,08; nite
+
+; group 23 (Viridian)
+	RGB 21,31,07, 13,25,04 ; morn/day
+	RGB 09,14,08, 06,10,04; nite
+
+; group 24 (New Bark)
+	RGB 20,31,14, 11,23,05 ; morn/day
+	RGB 09,13,08, 06,09,04; nite
+
+; group 25 (Saffron)
+	RGB 31,26,00, 31,15,00 ; morn/day
+	RGB 13,13,01, 08,08,01; nite
+
+; group 26 (Cherrygrove)
+	RGB 31,14,28, 31,05,21 ; morn/day
+	RGB 14,07,17, 13,00,08; nite
diff --git a/gfx/tilesets/ruins_of_alph.png b/gfx/tilesets/ruins_of_alph.png
index f41866c58..7ae272358 100644
--- a/gfx/tilesets/ruins_of_alph.png
+++ b/gfx/tilesets/ruins_of_alph.png
diff --git a/gfx/tilesets/ruins_of_alph_palette_map.asm b/gfx/tilesets/ruins_of_alph_palette_map.asm
new file mode 100644
index 000000000..5ebde24ba
--- /dev/null
+++ b/gfx/tilesets/ruins_of_alph_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	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
+	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
+	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/gfx/tilesets/sprout_tower.png b/gfx/tilesets/sprout_tower.png
deleted file mode 100644
index 268fc998f..000000000
--- a/gfx/tilesets/sprout_tower.png
+++ /dev/null
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/tower.png b/gfx/tilesets/tower.png
new file mode 100644
index 000000000..05484b5d9
--- /dev/null
+++ b/gfx/tilesets/tower.png
diff --git a/gfx/tilesets/tower_palette_map.asm b/gfx/tilesets/tower_palette_map.asm
new file mode 100644
index 000000000..6e3c10115
--- /dev/null
+++ b/gfx/tilesets/tower_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED
+	tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED
+	tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED
+	tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED
+	tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
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/traditional_house.png b/gfx/tilesets/traditional_house.png
new file mode 100644
index 000000000..bda1f7983
--- /dev/null
+++ b/gfx/tilesets/traditional_house.png
diff --git a/gfx/tilesets/traditional_house_palette_map.asm b/gfx/tilesets/traditional_house_palette_map.asm
new file mode 100644
index 000000000..5daa0da6b
--- /dev/null
+++ b/gfx/tilesets/traditional_house_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY
+	tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY
+	tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN
diff --git a/gfx/tilesets/train_station.png b/gfx/tilesets/train_station.png
index 0c148f95d..b0704b9df 100644
--- a/gfx/tilesets/train_station.png
+++ b/gfx/tilesets/train_station.png
diff --git a/gfx/tilesets/train_station_palette_map.asm b/gfx/tilesets/train_station_palette_map.asm
new file mode 100644
index 000000000..f52f5bbe7
--- /dev/null
+++ b/gfx/tilesets/train_station_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
+	tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
+	tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
+	tilepal 0, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
+	tilepal 1, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
+	tilepal 1, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY
+	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
+	tilepal 1, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
diff --git a/gfx/tilesets/underground.png b/gfx/tilesets/underground.png
index 0a83d2043..c33c3fd5b 100644
--- a/gfx/tilesets/underground.png
+++ b/gfx/tilesets/underground.png
diff --git a/gfx/tilesets/underground_palette_map.asm b/gfx/tilesets/underground_palette_map.asm
new file mode 100644
index 000000000..6b9b5546d
--- /dev/null
+++ b/gfx/tilesets/underground_palette_map.asm
@@ -0,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED
+	tilepal 0, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
+	tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED
+	tilepal 0, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED
+	tilepal 1, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
+	tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED
+	tilepal 1, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/gfx/tilesets/unused_museum_palette_map.asm b/gfx/tilesets/unused_museum_palette_map.asm
new file mode 100644
index 000000000..cfbe6dbcd
--- /dev/null
+++ b/gfx/tilesets/unused_museum_palette_map.asm
@@ -0,0 +1,32 @@
+; Matches pokered's "gate" tileset (notable for its Pewter Museum tiles)
+; https://tcrf.net/Pok%C3%A9mon_Gold_and_Silver#Unused_Tile_Palette_Assignment_Data
+
+	tilepal 0, WATER, RED, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN
+	tilepal 0, BROWN, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF
+	tilepal 0, ROOF, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF
+	tilepal 0, ROOF, GRAY, ROOF, BROWN, ROOF, ROOF, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, ROOF
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, WATER, RED, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN
+	tilepal 1, BROWN, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF
+	tilepal 1, ROOF, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF
+	tilepal 1, ROOF, GRAY, ROOF, BROWN, ROOF, ROOF, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, ROOF
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/gfx/tilesets/whirl_islands.png b/gfx/tilesets/whirl_islands.png
deleted file mode 100644
index 9dc74c45b..000000000
--- a/gfx/tilesets/whirl_islands.png
+++ /dev/null