1237 files changed, 0 insertions, 0 deletions

diff --git a/data/tilesets/secondary/82D5004/metatile_attributes.bin b/data/tilesets/secondary/berry_forest/metatile_attributes.bin
index 6d6c6d544..6d6c6d544 100644
--- a/data/tilesets/secondary/82D5004/metatile_attributes.bin
+++ b/data/tilesets/secondary/berry_forest/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5004/metatiles.bin b/data/tilesets/secondary/berry_forest/metatiles.bin
index fb47747c4..fb47747c4 100644
--- a/data/tilesets/secondary/82D5004/metatiles.bin
+++ b/data/tilesets/secondary/berry_forest/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B3C/palettes/0.pal b/data/tilesets/secondary/berry_forest/palettes/0.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/0.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/1.pal b/data/tilesets/secondary/berry_forest/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/1.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/10.pal b/data/tilesets/secondary/berry_forest/palettes/10.pal
index 746437492..746437492 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/10.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/11.pal b/data/tilesets/secondary/berry_forest/palettes/11.pal
index 6fe747b2d..6fe747b2d 100644
--- a/data/tilesets/secondary/82D5004/palettes/11.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/12.pal b/data/tilesets/secondary/berry_forest/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/12.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/13.pal b/data/tilesets/secondary/berry_forest/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/13.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/14.pal b/data/tilesets/secondary/berry_forest/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/14.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/15.pal b/data/tilesets/secondary/berry_forest/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/15.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/2.pal b/data/tilesets/secondary/berry_forest/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/2.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/3.pal b/data/tilesets/secondary/berry_forest/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/3.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/4.pal b/data/tilesets/secondary/berry_forest/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/4.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/5.pal b/data/tilesets/secondary/berry_forest/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/5.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/6.pal b/data/tilesets/secondary/berry_forest/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/6.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/7.pal b/data/tilesets/secondary/berry_forest/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4B84/palettes/7.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/8.pal b/data/tilesets/secondary/berry_forest/palettes/8.pal
index 650a35cc8..650a35cc8 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/8.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/9.pal b/data/tilesets/secondary/berry_forest/palettes/9.pal
index df2d04037..df2d04037 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/9.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5004/tiles.png b/data/tilesets/secondary/berry_forest/tiles.png
index dacbc0120..dacbc0120 100644
--- a/data/tilesets/secondary/82D5004/tiles.png
+++ b/data/tilesets/secondary/berry_forest/tiles.png
diff --git a/data/tilesets/secondary/82D4C5C/metatile_attributes.bin b/data/tilesets/secondary/bike_shop/metatile_attributes.bin
index d1a4900c5..d1a4900c5 100644
--- a/data/tilesets/secondary/82D4C5C/metatile_attributes.bin
+++ b/data/tilesets/secondary/bike_shop/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C5C/metatiles.bin b/data/tilesets/secondary/bike_shop/metatiles.bin
index f1c0ab02d..f1c0ab02d 100644
--- a/data/tilesets/secondary/82D4C5C/metatiles.bin
+++ b/data/tilesets/secondary/bike_shop/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C5C/palettes/0.pal b/data/tilesets/secondary/bike_shop/palettes/0.pal
index 4b44e19f4..4b44e19f4 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/0.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/1.pal b/data/tilesets/secondary/bike_shop/palettes/1.pal
index a39ca6aa8..a39ca6aa8 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/1.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/10.pal b/data/tilesets/secondary/bike_shop/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/10.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/11.pal b/data/tilesets/secondary/bike_shop/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/11.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/12.pal b/data/tilesets/secondary/bike_shop/palettes/12.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/12.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/13.pal b/data/tilesets/secondary/bike_shop/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/13.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/14.pal b/data/tilesets/secondary/bike_shop/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/14.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/15.pal b/data/tilesets/secondary/bike_shop/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/15.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/2.pal b/data/tilesets/secondary/bike_shop/palettes/2.pal
index 5a4f127be..5a4f127be 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/2.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/3.pal b/data/tilesets/secondary/bike_shop/palettes/3.pal
index c84fa4a58..c84fa4a58 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/3.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/4.pal b/data/tilesets/secondary/bike_shop/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/4.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/5.pal b/data/tilesets/secondary/bike_shop/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/5.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/6.pal b/data/tilesets/secondary/bike_shop/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/6.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/7.pal b/data/tilesets/secondary/bike_shop/palettes/7.pal
index a71b8fee2..a71b8fee2 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/7.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/8.pal b/data/tilesets/secondary/bike_shop/palettes/8.pal
index 0a666a9c9..0a666a9c9 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/8.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/9.pal b/data/tilesets/secondary/bike_shop/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/9.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C5C/tiles.png b/data/tilesets/secondary/bike_shop/tiles.png
index 90124ff4a..90124ff4a 100644
--- a/data/tilesets/secondary/82D4C5C/tiles.png
+++ b/data/tilesets/secondary/bike_shop/tiles.png
diff --git a/data/tilesets/secondary/82D4FA4/metatile_attributes.bin b/data/tilesets/secondary/burgled_house/metatile_attributes.bin
index db0f7817e..db0f7817e 100644
--- a/data/tilesets/secondary/82D4FA4/metatile_attributes.bin
+++ b/data/tilesets/secondary/burgled_house/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FA4/metatiles.bin b/data/tilesets/secondary/burgled_house/metatiles.bin
index dfe78c910..dfe78c910 100644
--- a/data/tilesets/secondary/82D4FA4/metatiles.bin
+++ b/data/tilesets/secondary/burgled_house/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EE4/palettes/0.pal b/data/tilesets/secondary/burgled_house/palettes/0.pal
index 6d876039d..6d876039d 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/0.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/1.pal b/data/tilesets/secondary/burgled_house/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4D04/palettes/1.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/10.pal b/data/tilesets/secondary/burgled_house/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/10.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/11.pal b/data/tilesets/secondary/burgled_house/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/11.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/12.pal b/data/tilesets/secondary/burgled_house/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/12.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/13.pal b/data/tilesets/secondary/burgled_house/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/13.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/14.pal b/data/tilesets/secondary/burgled_house/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/14.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/15.pal b/data/tilesets/secondary/burgled_house/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/15.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/2.pal b/data/tilesets/secondary/burgled_house/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4D04/palettes/2.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/3.pal b/data/tilesets/secondary/burgled_house/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4D04/palettes/3.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/4.pal b/data/tilesets/secondary/burgled_house/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4D04/palettes/4.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/5.pal b/data/tilesets/secondary/burgled_house/palettes/5.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/82D4D04/palettes/5.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/6.pal b/data/tilesets/secondary/burgled_house/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4D04/palettes/6.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/7.pal b/data/tilesets/secondary/burgled_house/palettes/7.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D4C74/palettes/7.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/8.pal b/data/tilesets/secondary/burgled_house/palettes/8.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/8.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/9.pal b/data/tilesets/secondary/burgled_house/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/9.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FA4/tiles.png b/data/tilesets/secondary/burgled_house/tiles.png
index 9fcf94314..9fcf94314 100644
--- a/data/tilesets/secondary/82D4FA4/tiles.png
+++ b/data/tilesets/secondary/burgled_house/tiles.png
diff --git a/data/tilesets/secondary/82D4C44/metatile_attributes.bin b/data/tilesets/secondary/cable_club/metatile_attributes.bin
index 53505839d..53505839d 100644
--- a/data/tilesets/secondary/82D4C44/metatile_attributes.bin
+++ b/data/tilesets/secondary/cable_club/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C44/metatiles.bin b/data/tilesets/secondary/cable_club/metatiles.bin
index 0e2f2a6c3..0e2f2a6c3 100644
--- a/data/tilesets/secondary/82D4C44/metatiles.bin
+++ b/data/tilesets/secondary/cable_club/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C14/palettes/0.pal b/data/tilesets/secondary/cable_club/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/0.pal
+++ b/data/tilesets/secondary/cable_club/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/1.pal b/data/tilesets/secondary/cable_club/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/1.pal
+++ b/data/tilesets/secondary/cable_club/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/10.pal b/data/tilesets/secondary/cable_club/palettes/10.pal
index ab8f75e5a..ab8f75e5a 100644
--- a/data/tilesets/secondary/82D4C44/palettes/10.pal
+++ b/data/tilesets/secondary/cable_club/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/11.pal b/data/tilesets/secondary/cable_club/palettes/11.pal
index 468d7212c..468d7212c 100644
--- a/data/tilesets/secondary/82D4C44/palettes/11.pal
+++ b/data/tilesets/secondary/cable_club/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/12.pal b/data/tilesets/secondary/cable_club/palettes/12.pal
index 05794ac82..05794ac82 100644
--- a/data/tilesets/secondary/82D4C44/palettes/12.pal
+++ b/data/tilesets/secondary/cable_club/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/13.pal b/data/tilesets/secondary/cable_club/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/13.pal
+++ b/data/tilesets/secondary/cable_club/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/14.pal b/data/tilesets/secondary/cable_club/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/14.pal
+++ b/data/tilesets/secondary/cable_club/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/15.pal b/data/tilesets/secondary/cable_club/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/15.pal
+++ b/data/tilesets/secondary/cable_club/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/2.pal b/data/tilesets/secondary/cable_club/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/2.pal
+++ b/data/tilesets/secondary/cable_club/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/3.pal b/data/tilesets/secondary/cable_club/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/3.pal
+++ b/data/tilesets/secondary/cable_club/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/4.pal b/data/tilesets/secondary/cable_club/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/4.pal
+++ b/data/tilesets/secondary/cable_club/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/5.pal b/data/tilesets/secondary/cable_club/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/5.pal
+++ b/data/tilesets/secondary/cable_club/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/6.pal b/data/tilesets/secondary/cable_club/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/6.pal
+++ b/data/tilesets/secondary/cable_club/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/7.pal b/data/tilesets/secondary/cable_club/palettes/7.pal
index 00ca6903f..00ca6903f 100644
--- a/data/tilesets/secondary/82D4C44/palettes/7.pal
+++ b/data/tilesets/secondary/cable_club/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/8.pal b/data/tilesets/secondary/cable_club/palettes/8.pal
index 43d6db90d..43d6db90d 100644
--- a/data/tilesets/secondary/82D4C44/palettes/8.pal
+++ b/data/tilesets/secondary/cable_club/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/9.pal b/data/tilesets/secondary/cable_club/palettes/9.pal
index 87857607f..87857607f 100644
--- a/data/tilesets/secondary/82D4C44/palettes/9.pal
+++ b/data/tilesets/secondary/cable_club/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C44/tiles.png b/data/tilesets/secondary/cable_club/tiles.png
index f71f29432..f71f29432 100644
--- a/data/tilesets/secondary/82D4C44/tiles.png
+++ b/data/tilesets/secondary/cable_club/tiles.png
diff --git a/data/tilesets/secondary/82D4BFC/metatile_attributes.bin b/data/tilesets/secondary/cave/metatile_attributes.bin
index 510f0fdf1..510f0fdf1 100644
--- a/data/tilesets/secondary/82D4BFC/metatile_attributes.bin
+++ b/data/tilesets/secondary/cave/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BFC/metatiles.bin b/data/tilesets/secondary/cave/metatiles.bin
index 9f35adc11..9f35adc11 100644
--- a/data/tilesets/secondary/82D4BFC/metatiles.bin
+++ b/data/tilesets/secondary/cave/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AC4/palettes/0.pal b/data/tilesets/secondary/cave/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/0.pal
+++ b/data/tilesets/secondary/cave/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/1.pal b/data/tilesets/secondary/cave/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/82D4B24/palettes/1.pal
+++ b/data/tilesets/secondary/cave/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/10.pal b/data/tilesets/secondary/cave/palettes/10.pal
index 937405d15..937405d15 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/10.pal
+++ b/data/tilesets/secondary/cave/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/11.pal b/data/tilesets/secondary/cave/palettes/11.pal
index bb4f4867c..bb4f4867c 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/11.pal
+++ b/data/tilesets/secondary/cave/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/12.pal b/data/tilesets/secondary/cave/palettes/12.pal
index 583384664..583384664 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/12.pal
+++ b/data/tilesets/secondary/cave/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/13.pal b/data/tilesets/secondary/cave/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/13.pal
+++ b/data/tilesets/secondary/cave/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/14.pal b/data/tilesets/secondary/cave/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/14.pal
+++ b/data/tilesets/secondary/cave/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/15.pal b/data/tilesets/secondary/cave/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/15.pal
+++ b/data/tilesets/secondary/cave/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/2.pal b/data/tilesets/secondary/cave/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/2.pal
+++ b/data/tilesets/secondary/cave/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/3.pal b/data/tilesets/secondary/cave/palettes/3.pal
index ef7460f41..ef7460f41 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/3.pal
+++ b/data/tilesets/secondary/cave/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/4.pal b/data/tilesets/secondary/cave/palettes/4.pal
index e83c6b367..e83c6b367 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/4.pal
+++ b/data/tilesets/secondary/cave/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/5.pal b/data/tilesets/secondary/cave/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/5.pal
+++ b/data/tilesets/secondary/cave/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/6.pal b/data/tilesets/secondary/cave/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D4B24/palettes/6.pal
+++ b/data/tilesets/secondary/cave/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/7.pal b/data/tilesets/secondary/cave/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/7.pal
+++ b/data/tilesets/secondary/cave/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/8.pal b/data/tilesets/secondary/cave/palettes/8.pal
index 1c8d33fac..1c8d33fac 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/8.pal
+++ b/data/tilesets/secondary/cave/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/9.pal b/data/tilesets/secondary/cave/palettes/9.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/9.pal
+++ b/data/tilesets/secondary/cave/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4BFC/tiles.png b/data/tilesets/secondary/cave/tiles.png
index 8e0f64a78..8e0f64a78 100644
--- a/data/tilesets/secondary/82D4BFC/tiles.png
+++ b/data/tilesets/secondary/cave/tiles.png
diff --git a/data/tilesets/secondary/82D4B3C/metatile_attributes.bin b/data/tilesets/secondary/celadon_city/metatile_attributes.bin
index 5dd139155..5dd139155 100644
--- a/data/tilesets/secondary/82D4B3C/metatile_attributes.bin
+++ b/data/tilesets/secondary/celadon_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B3C/metatiles.bin b/data/tilesets/secondary/celadon_city/metatiles.bin
index 3bfb9d239..3bfb9d239 100644
--- a/data/tilesets/secondary/82D4B3C/metatiles.bin
+++ b/data/tilesets/secondary/celadon_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DC4/palettes/0.pal b/data/tilesets/secondary/celadon_city/palettes/0.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/0.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/1.pal b/data/tilesets/secondary/celadon_city/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B54/palettes/1.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/10.pal b/data/tilesets/secondary/celadon_city/palettes/10.pal
index 361b133e6..361b133e6 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/10.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/11.pal b/data/tilesets/secondary/celadon_city/palettes/11.pal
index 00caf8dfc..00caf8dfc 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/11.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/12.pal b/data/tilesets/secondary/celadon_city/palettes/12.pal
index 4257575ae..4257575ae 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/12.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/13.pal b/data/tilesets/secondary/celadon_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B24/palettes/13.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/14.pal b/data/tilesets/secondary/celadon_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B24/palettes/14.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/15.pal b/data/tilesets/secondary/celadon_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B54/palettes/15.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/2.pal b/data/tilesets/secondary/celadon_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/2.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/3.pal b/data/tilesets/secondary/celadon_city/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/3.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/4.pal b/data/tilesets/secondary/celadon_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/4.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/5.pal b/data/tilesets/secondary/celadon_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/5.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/6.pal b/data/tilesets/secondary/celadon_city/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/6.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/7.pal b/data/tilesets/secondary/celadon_city/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/7.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/8.pal b/data/tilesets/secondary/celadon_city/palettes/8.pal
index 86930c1d1..86930c1d1 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/8.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/9.pal b/data/tilesets/secondary/celadon_city/palettes/9.pal
index 5dc82505a..5dc82505a 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/9.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B3C/tiles.png b/data/tilesets/secondary/celadon_city/tiles.png
index db18cb938..db18cb938 100644
--- a/data/tilesets/secondary/82D4B3C/tiles.png
+++ b/data/tilesets/secondary/celadon_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D4C/metatile_attributes.bin b/data/tilesets/secondary/celadon_gym/metatile_attributes.bin
index def1ee695..def1ee695 100644
--- a/data/tilesets/secondary/82D4D4C/metatile_attributes.bin
+++ b/data/tilesets/secondary/celadon_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D4C/metatiles.bin b/data/tilesets/secondary/celadon_gym/metatiles.bin
index f3f58a44d..f3f58a44d 100644
--- a/data/tilesets/secondary/82D4D4C/metatiles.bin
+++ b/data/tilesets/secondary/celadon_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BCC/palettes/0.pal b/data/tilesets/secondary/celadon_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/0.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/1.pal b/data/tilesets/secondary/celadon_gym/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/1.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/10.pal b/data/tilesets/secondary/celadon_gym/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/10.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/11.pal b/data/tilesets/secondary/celadon_gym/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/11.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/12.pal b/data/tilesets/secondary/celadon_gym/palettes/12.pal
index 041512724..041512724 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/12.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/13.pal b/data/tilesets/secondary/celadon_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/13.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/14.pal b/data/tilesets/secondary/celadon_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/14.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/15.pal b/data/tilesets/secondary/celadon_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/15.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/2.pal b/data/tilesets/secondary/celadon_gym/palettes/2.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/2.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/3.pal b/data/tilesets/secondary/celadon_gym/palettes/3.pal
index eac8236f1..eac8236f1 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/3.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/4.pal b/data/tilesets/secondary/celadon_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/4.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/5.pal b/data/tilesets/secondary/celadon_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/5.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/6.pal b/data/tilesets/secondary/celadon_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/6.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/7.pal b/data/tilesets/secondary/celadon_gym/palettes/7.pal
index 9d84ecaba..9d84ecaba 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/7.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/8.pal b/data/tilesets/secondary/celadon_gym/palettes/8.pal
index 085c49344..085c49344 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/8.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/9.pal b/data/tilesets/secondary/celadon_gym/palettes/9.pal
index 9020b628f..9020b628f 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/9.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D4C/tiles.png b/data/tilesets/secondary/celadon_gym/tiles.png
index ef08ccc83..ef08ccc83 100644
--- a/data/tilesets/secondary/82D4D4C/tiles.png
+++ b/data/tilesets/secondary/celadon_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4E54/metatile_attributes.bin b/data/tilesets/secondary/cerulean_cave/metatile_attributes.bin
index 45b5bef90..45b5bef90 100644
--- a/data/tilesets/secondary/82D4E54/metatile_attributes.bin
+++ b/data/tilesets/secondary/cerulean_cave/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E54/metatiles.bin b/data/tilesets/secondary/cerulean_cave/metatiles.bin
index 249addbc7..249addbc7 100644
--- a/data/tilesets/secondary/82D4E54/metatiles.bin
+++ b/data/tilesets/secondary/cerulean_cave/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E0C/palettes/0.pal b/data/tilesets/secondary/cerulean_cave/palettes/0.pal
index a3fab1c2f..a3fab1c2f 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/1.pal b/data/tilesets/secondary/cerulean_cave/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/10.pal b/data/tilesets/secondary/cerulean_cave/palettes/10.pal
index eb9198b0a..eb9198b0a 100644
--- a/data/tilesets/secondary/82D4E54/palettes/10.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/11.pal b/data/tilesets/secondary/cerulean_cave/palettes/11.pal
index 9afe8750d..9afe8750d 100644
--- a/data/tilesets/secondary/82D4E54/palettes/11.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/12.pal b/data/tilesets/secondary/cerulean_cave/palettes/12.pal
index aced117f7..aced117f7 100644
--- a/data/tilesets/secondary/82D4E54/palettes/12.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/13.pal b/data/tilesets/secondary/cerulean_cave/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B54/palettes/13.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/14.pal b/data/tilesets/secondary/cerulean_cave/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B54/palettes/14.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/15.pal b/data/tilesets/secondary/cerulean_cave/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B84/palettes/15.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/2.pal b/data/tilesets/secondary/cerulean_cave/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B54/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/3.pal b/data/tilesets/secondary/cerulean_cave/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/4.pal b/data/tilesets/secondary/cerulean_cave/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B54/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/5.pal b/data/tilesets/secondary/cerulean_cave/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4B24/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/6.pal b/data/tilesets/secondary/cerulean_cave/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/7.pal b/data/tilesets/secondary/cerulean_cave/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/8.pal b/data/tilesets/secondary/cerulean_cave/palettes/8.pal
index db2216a05..db2216a05 100644
--- a/data/tilesets/secondary/82D4E54/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/9.pal b/data/tilesets/secondary/cerulean_cave/palettes/9.pal
index c1a5d4f29..c1a5d4f29 100644
--- a/data/tilesets/secondary/82D4E54/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E54/tiles.png b/data/tilesets/secondary/cerulean_cave/tiles.png
index d53a0cf17..d53a0cf17 100644
--- a/data/tilesets/secondary/82D4E54/tiles.png
+++ b/data/tilesets/secondary/cerulean_cave/tiles.png
diff --git a/data/tilesets/secondary/82D4AF4/metatile_attributes.bin b/data/tilesets/secondary/cerulean_city/metatile_attributes.bin
index 7de4de077..7de4de077 100644
--- a/data/tilesets/secondary/82D4AF4/metatile_attributes.bin
+++ b/data/tilesets/secondary/cerulean_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AF4/metatiles.bin b/data/tilesets/secondary/cerulean_city/metatiles.bin
index b810e7996..b810e7996 100644
--- a/data/tilesets/secondary/82D4AF4/metatiles.bin
+++ b/data/tilesets/secondary/cerulean_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AF4/palettes/0.pal b/data/tilesets/secondary/cerulean_city/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/1.pal b/data/tilesets/secondary/cerulean_city/palettes/1.pal
index 31a636983..31a636983 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/10.pal b/data/tilesets/secondary/cerulean_city/palettes/10.pal
index 536972f8f..536972f8f 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/10.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/11.pal b/data/tilesets/secondary/cerulean_city/palettes/11.pal
index 986335b74..986335b74 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/11.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/12.pal b/data/tilesets/secondary/cerulean_city/palettes/12.pal
index c44bc32b5..c44bc32b5 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/12.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/13.pal b/data/tilesets/secondary/cerulean_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/13.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/14.pal b/data/tilesets/secondary/cerulean_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/14.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/15.pal b/data/tilesets/secondary/cerulean_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/15.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/2.pal b/data/tilesets/secondary/cerulean_city/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/3.pal b/data/tilesets/secondary/cerulean_city/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/4.pal b/data/tilesets/secondary/cerulean_city/palettes/4.pal
index 91fdcabdf..91fdcabdf 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/5.pal b/data/tilesets/secondary/cerulean_city/palettes/5.pal
index 0edb843f5..0edb843f5 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/6.pal b/data/tilesets/secondary/cerulean_city/palettes/6.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/7.pal b/data/tilesets/secondary/cerulean_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/8.pal b/data/tilesets/secondary/cerulean_city/palettes/8.pal
index ae3dd3f0d..ae3dd3f0d 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/9.pal b/data/tilesets/secondary/cerulean_city/palettes/9.pal
index 3ed18e08f..3ed18e08f 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4AF4/tiles.png b/data/tilesets/secondary/cerulean_city/tiles.png
index 737d3dd7f..737d3dd7f 100644
--- a/data/tilesets/secondary/82D4AF4/tiles.png
+++ b/data/tilesets/secondary/cerulean_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D1C/metatile_attributes.bin b/data/tilesets/secondary/cerulean_gym/metatile_attributes.bin
index 84b5e2049..84b5e2049 100644
--- a/data/tilesets/secondary/82D4D1C/metatile_attributes.bin
+++ b/data/tilesets/secondary/cerulean_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D1C/metatiles.bin b/data/tilesets/secondary/cerulean_gym/metatiles.bin
index c026eb65a..c026eb65a 100644
--- a/data/tilesets/secondary/82D4D1C/metatiles.bin
+++ b/data/tilesets/secondary/cerulean_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D1C/palettes/0.pal b/data/tilesets/secondary/cerulean_gym/palettes/0.pal
index 4b44e19f4..4b44e19f4 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/1.pal b/data/tilesets/secondary/cerulean_gym/palettes/1.pal
index a39ca6aa8..a39ca6aa8 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/10.pal b/data/tilesets/secondary/cerulean_gym/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/10.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/11.pal b/data/tilesets/secondary/cerulean_gym/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/11.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/12.pal b/data/tilesets/secondary/cerulean_gym/palettes/12.pal
index 419c00911..419c00911 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/12.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/13.pal b/data/tilesets/secondary/cerulean_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B84/palettes/13.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/14.pal b/data/tilesets/secondary/cerulean_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B84/palettes/14.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/15.pal b/data/tilesets/secondary/cerulean_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/15.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/2.pal b/data/tilesets/secondary/cerulean_gym/palettes/2.pal
index 5a4f127be..5a4f127be 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/3.pal b/data/tilesets/secondary/cerulean_gym/palettes/3.pal
index c84fa4a58..c84fa4a58 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/4.pal b/data/tilesets/secondary/cerulean_gym/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/5.pal b/data/tilesets/secondary/cerulean_gym/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/6.pal b/data/tilesets/secondary/cerulean_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/7.pal b/data/tilesets/secondary/cerulean_gym/palettes/7.pal
index aac016a72..aac016a72 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/8.pal b/data/tilesets/secondary/cerulean_gym/palettes/8.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/9.pal b/data/tilesets/secondary/cerulean_gym/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D1C/tiles.png b/data/tilesets/secondary/cerulean_gym/tiles.png
index 44b7c0c34..44b7c0c34 100644
--- a/data/tilesets/secondary/82D4D1C/tiles.png
+++ b/data/tilesets/secondary/cerulean_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4D7C/metatile_attributes.bin b/data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin
index 1d68a40a4..1d68a40a4 100644
--- a/data/tilesets/secondary/82D4D7C/metatile_attributes.bin
+++ b/data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D7C/metatiles.bin b/data/tilesets/secondary/cinnabar_gym/metatiles.bin
index 7a5532619..7a5532619 100644
--- a/data/tilesets/secondary/82D4D7C/metatiles.bin
+++ b/data/tilesets/secondary/cinnabar_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BE4/palettes/0.pal b/data/tilesets/secondary/cinnabar_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/0.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/1.pal b/data/tilesets/secondary/cinnabar_gym/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4C74/palettes/1.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/10.pal b/data/tilesets/secondary/cinnabar_gym/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/10.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/11.pal b/data/tilesets/secondary/cinnabar_gym/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/11.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/12.pal b/data/tilesets/secondary/cinnabar_gym/palettes/12.pal
index 3f9aa94d6..3f9aa94d6 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/12.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/13.pal b/data/tilesets/secondary/cinnabar_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/13.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/14.pal b/data/tilesets/secondary/cinnabar_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/14.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/15.pal b/data/tilesets/secondary/cinnabar_gym/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/15.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/2.pal b/data/tilesets/secondary/cinnabar_gym/palettes/2.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/2.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/3.pal b/data/tilesets/secondary/cinnabar_gym/palettes/3.pal
index eac8236f1..eac8236f1 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/3.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/4.pal b/data/tilesets/secondary/cinnabar_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/4.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/5.pal b/data/tilesets/secondary/cinnabar_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/5.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/6.pal b/data/tilesets/secondary/cinnabar_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/6.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/7.pal b/data/tilesets/secondary/cinnabar_gym/palettes/7.pal
index 5b659ef1b..5b659ef1b 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/7.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/8.pal b/data/tilesets/secondary/cinnabar_gym/palettes/8.pal
index f5a4ee678..f5a4ee678 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/8.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/9.pal b/data/tilesets/secondary/cinnabar_gym/palettes/9.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/9.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D7C/tiles.png b/data/tilesets/secondary/cinnabar_gym/tiles.png
index 213799158..213799158 100644
--- a/data/tilesets/secondary/82D4D7C/tiles.png
+++ b/data/tilesets/secondary/cinnabar_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4B6C/metatile_attributes.bin b/data/tilesets/secondary/cinnabar_island/metatile_attributes.bin
index d2c655c41..d2c655c41 100644
--- a/data/tilesets/secondary/82D4B6C/metatile_attributes.bin
+++ b/data/tilesets/secondary/cinnabar_island/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B6C/metatiles.bin b/data/tilesets/secondary/cinnabar_island/metatiles.bin
index 0abe4b18d..0abe4b18d 100644
--- a/data/tilesets/secondary/82D4B6C/metatiles.bin
+++ b/data/tilesets/secondary/cinnabar_island/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B6C/palettes/0.pal b/data/tilesets/secondary/cinnabar_island/palettes/0.pal
index 9dcb673aa..9dcb673aa 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/0.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/1.pal b/data/tilesets/secondary/cinnabar_island/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/1.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/10.pal b/data/tilesets/secondary/cinnabar_island/palettes/10.pal
index 608bbc2cf..608bbc2cf 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/10.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/11.pal b/data/tilesets/secondary/cinnabar_island/palettes/11.pal
index 608bbc2cf..608bbc2cf 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/11.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/12.pal b/data/tilesets/secondary/cinnabar_island/palettes/12.pal
index 608bbc2cf..608bbc2cf 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/12.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/13.pal b/data/tilesets/secondary/cinnabar_island/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/13.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/14.pal b/data/tilesets/secondary/cinnabar_island/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/14.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/15.pal b/data/tilesets/secondary/cinnabar_island/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/15.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/2.pal b/data/tilesets/secondary/cinnabar_island/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/2.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/3.pal b/data/tilesets/secondary/cinnabar_island/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4B24/palettes/3.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/4.pal b/data/tilesets/secondary/cinnabar_island/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/4.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/5.pal b/data/tilesets/secondary/cinnabar_island/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B54/palettes/5.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/6.pal b/data/tilesets/secondary/cinnabar_island/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B54/palettes/6.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/7.pal b/data/tilesets/secondary/cinnabar_island/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/7.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/8.pal b/data/tilesets/secondary/cinnabar_island/palettes/8.pal
index f734cd166..f734cd166 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/8.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/9.pal b/data/tilesets/secondary/cinnabar_island/palettes/9.pal
index ca26d1b08..ca26d1b08 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/9.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B6C/tiles.png b/data/tilesets/secondary/cinnabar_island/tiles.png
index ddb9ad0cb..ddb9ad0cb 100644
--- a/data/tilesets/secondary/82D4B6C/tiles.png
+++ b/data/tilesets/secondary/cinnabar_island/tiles.png
diff --git a/data/tilesets/secondary/82D4F8C/metatile_attributes.bin b/data/tilesets/secondary/condominiums/metatile_attributes.bin
index aa43d15ee..aa43d15ee 100644
--- a/data/tilesets/secondary/82D4F8C/metatile_attributes.bin
+++ b/data/tilesets/secondary/condominiums/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F8C/metatiles.bin b/data/tilesets/secondary/condominiums/metatiles.bin
index 117c036fa..117c036fa 100644
--- a/data/tilesets/secondary/82D4F8C/metatiles.bin
+++ b/data/tilesets/secondary/condominiums/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F8C/palettes/0.pal b/data/tilesets/secondary/condominiums/palettes/0.pal
index 5867e5ba6..5867e5ba6 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/0.pal
+++ b/data/tilesets/secondary/condominiums/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/1.pal b/data/tilesets/secondary/condominiums/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/1.pal
+++ b/data/tilesets/secondary/condominiums/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/10.pal b/data/tilesets/secondary/condominiums/palettes/10.pal
index 3c091df8b..3c091df8b 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/10.pal
+++ b/data/tilesets/secondary/condominiums/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/11.pal b/data/tilesets/secondary/condominiums/palettes/11.pal
index 79494336b..79494336b 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/11.pal
+++ b/data/tilesets/secondary/condominiums/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/12.pal b/data/tilesets/secondary/condominiums/palettes/12.pal
index b9b1e6061..b9b1e6061 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/12.pal
+++ b/data/tilesets/secondary/condominiums/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/13.pal b/data/tilesets/secondary/condominiums/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/13.pal
+++ b/data/tilesets/secondary/condominiums/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/14.pal b/data/tilesets/secondary/condominiums/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/14.pal
+++ b/data/tilesets/secondary/condominiums/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/15.pal b/data/tilesets/secondary/condominiums/palettes/15.pal
index 093fbdd6c..093fbdd6c 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/15.pal
+++ b/data/tilesets/secondary/condominiums/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/2.pal b/data/tilesets/secondary/condominiums/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/2.pal
+++ b/data/tilesets/secondary/condominiums/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/3.pal b/data/tilesets/secondary/condominiums/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/3.pal
+++ b/data/tilesets/secondary/condominiums/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/4.pal b/data/tilesets/secondary/condominiums/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/4.pal
+++ b/data/tilesets/secondary/condominiums/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/5.pal b/data/tilesets/secondary/condominiums/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/5.pal
+++ b/data/tilesets/secondary/condominiums/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/6.pal b/data/tilesets/secondary/condominiums/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/6.pal
+++ b/data/tilesets/secondary/condominiums/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/7.pal b/data/tilesets/secondary/condominiums/palettes/7.pal
index 35987db53..35987db53 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/7.pal
+++ b/data/tilesets/secondary/condominiums/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/8.pal b/data/tilesets/secondary/condominiums/palettes/8.pal
index 7f33e006f..7f33e006f 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/8.pal
+++ b/data/tilesets/secondary/condominiums/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/9.pal b/data/tilesets/secondary/condominiums/palettes/9.pal
index 75022050d..75022050d 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/9.pal
+++ b/data/tilesets/secondary/condominiums/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F8C/tiles.png b/data/tilesets/secondary/condominiums/tiles.png
index 324b42c9f..324b42c9f 100644
--- a/data/tilesets/secondary/82D4F8C/tiles.png
+++ b/data/tilesets/secondary/condominiums/tiles.png
diff --git a/data/tilesets/secondary/82D4E6C/metatile_attributes.bin b/data/tilesets/secondary/department_store/metatile_attributes.bin
index 5eca0b5c7..5eca0b5c7 100644
--- a/data/tilesets/secondary/82D4E6C/metatile_attributes.bin
+++ b/data/tilesets/secondary/department_store/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E6C/metatiles.bin b/data/tilesets/secondary/department_store/metatiles.bin
index 053045190..053045190 100644
--- a/data/tilesets/secondary/82D4E6C/metatiles.bin
+++ b/data/tilesets/secondary/department_store/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C2C/palettes/0.pal b/data/tilesets/secondary/department_store/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/0.pal
+++ b/data/tilesets/secondary/department_store/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/1.pal b/data/tilesets/secondary/department_store/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/1.pal
+++ b/data/tilesets/secondary/department_store/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/10.pal b/data/tilesets/secondary/department_store/palettes/10.pal
index c6e769ccc..c6e769ccc 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/10.pal
+++ b/data/tilesets/secondary/department_store/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/11.pal b/data/tilesets/secondary/department_store/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/11.pal
+++ b/data/tilesets/secondary/department_store/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/12.pal b/data/tilesets/secondary/department_store/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/12.pal
+++ b/data/tilesets/secondary/department_store/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/13.pal b/data/tilesets/secondary/department_store/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/13.pal
+++ b/data/tilesets/secondary/department_store/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/14.pal b/data/tilesets/secondary/department_store/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/14.pal
+++ b/data/tilesets/secondary/department_store/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/15.pal b/data/tilesets/secondary/department_store/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/15.pal
+++ b/data/tilesets/secondary/department_store/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/2.pal b/data/tilesets/secondary/department_store/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/2.pal
+++ b/data/tilesets/secondary/department_store/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/3.pal b/data/tilesets/secondary/department_store/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/3.pal
+++ b/data/tilesets/secondary/department_store/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/4.pal b/data/tilesets/secondary/department_store/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/4.pal
+++ b/data/tilesets/secondary/department_store/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/5.pal b/data/tilesets/secondary/department_store/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/5.pal
+++ b/data/tilesets/secondary/department_store/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/6.pal b/data/tilesets/secondary/department_store/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/6.pal
+++ b/data/tilesets/secondary/department_store/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/7.pal b/data/tilesets/secondary/department_store/palettes/7.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/7.pal
+++ b/data/tilesets/secondary/department_store/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/8.pal b/data/tilesets/secondary/department_store/palettes/8.pal
index 18480092b..18480092b 100644
--- a/data/tilesets/secondary/82D4C74/palettes/8.pal
+++ b/data/tilesets/secondary/department_store/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/9.pal b/data/tilesets/secondary/department_store/palettes/9.pal
index dd18b9d07..dd18b9d07 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/9.pal
+++ b/data/tilesets/secondary/department_store/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E6C/tiles.png b/data/tilesets/secondary/department_store/tiles.png
index 421932118..421932118 100644
--- a/data/tilesets/secondary/82D4E6C/tiles.png
+++ b/data/tilesets/secondary/department_store/tiles.png
diff --git a/data/tilesets/secondary/82D4E0C/metatile_attributes.bin b/data/tilesets/secondary/digletts_cave/metatile_attributes.bin
index 2b24a5266..2b24a5266 100644
--- a/data/tilesets/secondary/82D4E0C/metatile_attributes.bin
+++ b/data/tilesets/secondary/digletts_cave/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E0C/metatiles.bin b/data/tilesets/secondary/digletts_cave/metatiles.bin
index 37ef8fe34..37ef8fe34 100644
--- a/data/tilesets/secondary/82D4E0C/metatiles.bin
+++ b/data/tilesets/secondary/digletts_cave/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E54/palettes/0.pal b/data/tilesets/secondary/digletts_cave/palettes/0.pal
index a3fab1c2f..a3fab1c2f 100644
--- a/data/tilesets/secondary/82D4E54/palettes/0.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/1.pal b/data/tilesets/secondary/digletts_cave/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/1.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/10.pal b/data/tilesets/secondary/digletts_cave/palettes/10.pal
index 5ccabc5a0..5ccabc5a0 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/10.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/11.pal b/data/tilesets/secondary/digletts_cave/palettes/11.pal
index fa0038726..fa0038726 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/11.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/12.pal b/data/tilesets/secondary/digletts_cave/palettes/12.pal
index c19d59bd0..c19d59bd0 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/12.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/13.pal b/data/tilesets/secondary/digletts_cave/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/13.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/14.pal b/data/tilesets/secondary/digletts_cave/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/14.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/15.pal b/data/tilesets/secondary/digletts_cave/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/15.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/2.pal b/data/tilesets/secondary/digletts_cave/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/2.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/3.pal b/data/tilesets/secondary/digletts_cave/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/3.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/4.pal b/data/tilesets/secondary/digletts_cave/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/4.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/5.pal b/data/tilesets/secondary/digletts_cave/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/5.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/6.pal b/data/tilesets/secondary/digletts_cave/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/6.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/7.pal b/data/tilesets/secondary/digletts_cave/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/7.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/8.pal b/data/tilesets/secondary/digletts_cave/palettes/8.pal
index 74cbc54c6..74cbc54c6 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/8.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/9.pal b/data/tilesets/secondary/digletts_cave/palettes/9.pal
index def7acffc..def7acffc 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/9.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E0C/tiles.png b/data/tilesets/secondary/digletts_cave/tiles.png
index 77b767b79..77b767b79 100644
--- a/data/tilesets/secondary/82D4E0C/tiles.png
+++ b/data/tilesets/secondary/digletts_cave/tiles.png
diff --git a/data/tilesets/secondary/82D4C14/metatile_attributes.bin b/data/tilesets/secondary/dummy1/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4C14/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy1/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C14/metatiles.bin b/data/tilesets/secondary/dummy1/metatiles.bin
index 274da22a6..274da22a6 100644
--- a/data/tilesets/secondary/82D4C14/metatiles.bin
+++ b/data/tilesets/secondary/dummy1/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C44/palettes/0.pal b/data/tilesets/secondary/dummy1/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/0.pal
+++ b/data/tilesets/secondary/dummy1/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/1.pal b/data/tilesets/secondary/dummy1/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/1.pal
+++ b/data/tilesets/secondary/dummy1/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/10.pal b/data/tilesets/secondary/dummy1/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/10.pal
+++ b/data/tilesets/secondary/dummy1/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/11.pal b/data/tilesets/secondary/dummy1/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/11.pal
+++ b/data/tilesets/secondary/dummy1/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/12.pal b/data/tilesets/secondary/dummy1/palettes/12.pal
index 97d3f20bd..97d3f20bd 100644
--- a/data/tilesets/secondary/82D4C14/palettes/12.pal
+++ b/data/tilesets/secondary/dummy1/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/13.pal b/data/tilesets/secondary/dummy1/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/13.pal
+++ b/data/tilesets/secondary/dummy1/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/14.pal b/data/tilesets/secondary/dummy1/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/14.pal
+++ b/data/tilesets/secondary/dummy1/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/15.pal b/data/tilesets/secondary/dummy1/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/15.pal
+++ b/data/tilesets/secondary/dummy1/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/2.pal b/data/tilesets/secondary/dummy1/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/2.pal
+++ b/data/tilesets/secondary/dummy1/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/3.pal b/data/tilesets/secondary/dummy1/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/3.pal
+++ b/data/tilesets/secondary/dummy1/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/4.pal b/data/tilesets/secondary/dummy1/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/4.pal
+++ b/data/tilesets/secondary/dummy1/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/5.pal b/data/tilesets/secondary/dummy1/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/5.pal
+++ b/data/tilesets/secondary/dummy1/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/6.pal b/data/tilesets/secondary/dummy1/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/6.pal
+++ b/data/tilesets/secondary/dummy1/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/7.pal b/data/tilesets/secondary/dummy1/palettes/7.pal
index 4172436d0..4172436d0 100644
--- a/data/tilesets/secondary/82D4C14/palettes/7.pal
+++ b/data/tilesets/secondary/dummy1/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/8.pal b/data/tilesets/secondary/dummy1/palettes/8.pal
index 7fd087b3b..7fd087b3b 100644
--- a/data/tilesets/secondary/82D4C14/palettes/8.pal
+++ b/data/tilesets/secondary/dummy1/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/9.pal b/data/tilesets/secondary/dummy1/palettes/9.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/9.pal
+++ b/data/tilesets/secondary/dummy1/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C14/tiles.png b/data/tilesets/secondary/dummy1/tiles.png
index d4b21f3e4..d4b21f3e4 100644
--- a/data/tilesets/secondary/82D4C14/tiles.png
+++ b/data/tilesets/secondary/dummy1/tiles.png
diff --git a/data/tilesets/secondary/82D4DAC/metatile_attributes.bin b/data/tilesets/secondary/dummy2/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4DAC/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy2/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DAC/metatiles.bin b/data/tilesets/secondary/dummy2/metatiles.bin
index c15edf653..c15edf653 100644
--- a/data/tilesets/secondary/82D4DAC/metatiles.bin
+++ b/data/tilesets/secondary/dummy2/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DAC/palettes/0.pal b/data/tilesets/secondary/dummy2/palettes/0.pal
index 0fd74602e..0fd74602e 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/0.pal
+++ b/data/tilesets/secondary/dummy2/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/1.pal b/data/tilesets/secondary/dummy2/palettes/1.pal
index 3c6e40c2e..3c6e40c2e 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/1.pal
+++ b/data/tilesets/secondary/dummy2/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/10.pal b/data/tilesets/secondary/dummy2/palettes/10.pal
index cd86ca4ae..cd86ca4ae 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/10.pal
+++ b/data/tilesets/secondary/dummy2/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/11.pal b/data/tilesets/secondary/dummy2/palettes/11.pal
index ec8e2f42d..ec8e2f42d 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/11.pal
+++ b/data/tilesets/secondary/dummy2/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/12.pal b/data/tilesets/secondary/dummy2/palettes/12.pal
index 5caa038ad..5caa038ad 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/12.pal
+++ b/data/tilesets/secondary/dummy2/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/13.pal b/data/tilesets/secondary/dummy2/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/13.pal
+++ b/data/tilesets/secondary/dummy2/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/14.pal b/data/tilesets/secondary/dummy2/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/14.pal
+++ b/data/tilesets/secondary/dummy2/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/15.pal b/data/tilesets/secondary/dummy2/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/15.pal
+++ b/data/tilesets/secondary/dummy2/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/2.pal b/data/tilesets/secondary/dummy2/palettes/2.pal
index 4c41030f6..4c41030f6 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/2.pal
+++ b/data/tilesets/secondary/dummy2/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/3.pal b/data/tilesets/secondary/dummy2/palettes/3.pal
index 5665ddc22..5665ddc22 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/3.pal
+++ b/data/tilesets/secondary/dummy2/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/4.pal b/data/tilesets/secondary/dummy2/palettes/4.pal
index d8051b7ba..d8051b7ba 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/4.pal
+++ b/data/tilesets/secondary/dummy2/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/5.pal b/data/tilesets/secondary/dummy2/palettes/5.pal
index 4e684594c..4e684594c 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/5.pal
+++ b/data/tilesets/secondary/dummy2/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/6.pal b/data/tilesets/secondary/dummy2/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/6.pal
+++ b/data/tilesets/secondary/dummy2/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/7.pal b/data/tilesets/secondary/dummy2/palettes/7.pal
index 2064b3bd2..2064b3bd2 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/7.pal
+++ b/data/tilesets/secondary/dummy2/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/8.pal b/data/tilesets/secondary/dummy2/palettes/8.pal
index 42a3483c0..42a3483c0 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/8.pal
+++ b/data/tilesets/secondary/dummy2/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/9.pal b/data/tilesets/secondary/dummy2/palettes/9.pal
index b06dfbda7..b06dfbda7 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/9.pal
+++ b/data/tilesets/secondary/dummy2/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DAC/tiles.png b/data/tilesets/secondary/dummy2/tiles.png
index c00ba0d61..c00ba0d61 100644
--- a/data/tilesets/secondary/82D4DAC/tiles.png
+++ b/data/tilesets/secondary/dummy2/tiles.png
diff --git a/data/tilesets/secondary/82D4FBC/metatile_attributes.bin b/data/tilesets/secondary/dummy3/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4FBC/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy3/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FBC/metatiles.bin b/data/tilesets/secondary/dummy3/metatiles.bin
index 274da22a6..274da22a6 100644
--- a/data/tilesets/secondary/82D4FBC/metatiles.bin
+++ b/data/tilesets/secondary/dummy3/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B0C/palettes/0.pal b/data/tilesets/secondary/dummy3/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/0.pal
+++ b/data/tilesets/secondary/dummy3/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/1.pal b/data/tilesets/secondary/dummy3/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/1.pal
+++ b/data/tilesets/secondary/dummy3/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/10.pal b/data/tilesets/secondary/dummy3/palettes/10.pal
index 937405d15..937405d15 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/10.pal
+++ b/data/tilesets/secondary/dummy3/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/11.pal b/data/tilesets/secondary/dummy3/palettes/11.pal
index bb4f4867c..bb4f4867c 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/11.pal
+++ b/data/tilesets/secondary/dummy3/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/12.pal b/data/tilesets/secondary/dummy3/palettes/12.pal
index 583384664..583384664 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/12.pal
+++ b/data/tilesets/secondary/dummy3/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/13.pal b/data/tilesets/secondary/dummy3/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/13.pal
+++ b/data/tilesets/secondary/dummy3/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/14.pal b/data/tilesets/secondary/dummy3/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/14.pal
+++ b/data/tilesets/secondary/dummy3/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/15.pal b/data/tilesets/secondary/dummy3/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/15.pal
+++ b/data/tilesets/secondary/dummy3/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/2.pal b/data/tilesets/secondary/dummy3/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/2.pal
+++ b/data/tilesets/secondary/dummy3/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/3.pal b/data/tilesets/secondary/dummy3/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/3.pal
+++ b/data/tilesets/secondary/dummy3/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/4.pal b/data/tilesets/secondary/dummy3/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/4.pal
+++ b/data/tilesets/secondary/dummy3/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/5.pal b/data/tilesets/secondary/dummy3/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/5.pal
+++ b/data/tilesets/secondary/dummy3/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/6.pal b/data/tilesets/secondary/dummy3/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E24/palettes/6.pal
+++ b/data/tilesets/secondary/dummy3/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/7.pal b/data/tilesets/secondary/dummy3/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/7.pal
+++ b/data/tilesets/secondary/dummy3/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/8.pal b/data/tilesets/secondary/dummy3/palettes/8.pal
index 6774e407f..6774e407f 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/8.pal
+++ b/data/tilesets/secondary/dummy3/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/9.pal b/data/tilesets/secondary/dummy3/palettes/9.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/9.pal
+++ b/data/tilesets/secondary/dummy3/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FBC/tiles.png b/data/tilesets/secondary/dummy3/tiles.png
index b2d960c60..b2d960c60 100644
--- a/data/tilesets/secondary/82D4FBC/tiles.png
+++ b/data/tilesets/secondary/dummy3/tiles.png
diff --git a/data/tilesets/secondary/82D4FD4/metatile_attributes.bin b/data/tilesets/secondary/dummy4/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4FD4/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FD4/metatiles.bin b/data/tilesets/secondary/dummy4/metatiles.bin
index 8f740f6af..8f740f6af 100644
--- a/data/tilesets/secondary/82D4FD4/metatiles.bin
+++ b/data/tilesets/secondary/dummy4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B24/palettes/0.pal b/data/tilesets/secondary/dummy4/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4B24/palettes/0.pal
+++ b/data/tilesets/secondary/dummy4/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/1.pal b/data/tilesets/secondary/dummy4/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4E24/palettes/1.pal
+++ b/data/tilesets/secondary/dummy4/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/10.pal b/data/tilesets/secondary/dummy4/palettes/10.pal
index 937405d15..937405d15 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/10.pal
+++ b/data/tilesets/secondary/dummy4/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/11.pal b/data/tilesets/secondary/dummy4/palettes/11.pal
index bb4f4867c..bb4f4867c 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/11.pal
+++ b/data/tilesets/secondary/dummy4/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/12.pal b/data/tilesets/secondary/dummy4/palettes/12.pal
index 583384664..583384664 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/12.pal
+++ b/data/tilesets/secondary/dummy4/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/13.pal b/data/tilesets/secondary/dummy4/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/13.pal
+++ b/data/tilesets/secondary/dummy4/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/14.pal b/data/tilesets/secondary/dummy4/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/14.pal
+++ b/data/tilesets/secondary/dummy4/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/15.pal b/data/tilesets/secondary/dummy4/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D04/palettes/15.pal
+++ b/data/tilesets/secondary/dummy4/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/2.pal b/data/tilesets/secondary/dummy4/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/2.pal
+++ b/data/tilesets/secondary/dummy4/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/3.pal b/data/tilesets/secondary/dummy4/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/3.pal
+++ b/data/tilesets/secondary/dummy4/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/4.pal b/data/tilesets/secondary/dummy4/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/4.pal
+++ b/data/tilesets/secondary/dummy4/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/5.pal b/data/tilesets/secondary/dummy4/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/5.pal
+++ b/data/tilesets/secondary/dummy4/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/6.pal b/data/tilesets/secondary/dummy4/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E54/palettes/6.pal
+++ b/data/tilesets/secondary/dummy4/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/7.pal b/data/tilesets/secondary/dummy4/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E24/palettes/7.pal
+++ b/data/tilesets/secondary/dummy4/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/8.pal b/data/tilesets/secondary/dummy4/palettes/8.pal
index 6774e407f..6774e407f 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/8.pal
+++ b/data/tilesets/secondary/dummy4/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/9.pal b/data/tilesets/secondary/dummy4/palettes/9.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/9.pal
+++ b/data/tilesets/secondary/dummy4/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FD4/tiles.png b/data/tilesets/secondary/dummy4/tiles.png
index 201df80fb..201df80fb 100644
--- a/data/tilesets/secondary/82D4FD4/tiles.png
+++ b/data/tilesets/secondary/dummy4/tiles.png
diff --git a/data/tilesets/secondary/82D4F74/metatile_attributes.bin b/data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin
index 8255cca20..8255cca20 100644
--- a/data/tilesets/secondary/82D4F74/metatile_attributes.bin
+++ b/data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F74/metatiles.bin b/data/tilesets/secondary/fan_club_daycare/metatiles.bin
index 63ddd975b..63ddd975b 100644
--- a/data/tilesets/secondary/82D4F74/metatiles.bin
+++ b/data/tilesets/secondary/fan_club_daycare/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CD4/palettes/0.pal b/data/tilesets/secondary/fan_club_daycare/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/0.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/1.pal b/data/tilesets/secondary/fan_club_daycare/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/1.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/10.pal b/data/tilesets/secondary/fan_club_daycare/palettes/10.pal
index afe462f8e..afe462f8e 100644
--- a/data/tilesets/secondary/82D4F74/palettes/10.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/11.pal b/data/tilesets/secondary/fan_club_daycare/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/11.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/12.pal b/data/tilesets/secondary/fan_club_daycare/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/12.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/13.pal b/data/tilesets/secondary/fan_club_daycare/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/13.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/14.pal b/data/tilesets/secondary/fan_club_daycare/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/14.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/15.pal b/data/tilesets/secondary/fan_club_daycare/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/15.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/2.pal b/data/tilesets/secondary/fan_club_daycare/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/2.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/3.pal b/data/tilesets/secondary/fan_club_daycare/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/3.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/4.pal b/data/tilesets/secondary/fan_club_daycare/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/4.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/5.pal b/data/tilesets/secondary/fan_club_daycare/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/5.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/6.pal b/data/tilesets/secondary/fan_club_daycare/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/6.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/7.pal b/data/tilesets/secondary/fan_club_daycare/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/7.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/8.pal b/data/tilesets/secondary/fan_club_daycare/palettes/8.pal
index 4b7de8012..4b7de8012 100644
--- a/data/tilesets/secondary/82D4F74/palettes/8.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/9.pal b/data/tilesets/secondary/fan_club_daycare/palettes/9.pal
index 8fe0861de..8fe0861de 100644
--- a/data/tilesets/secondary/82D4F74/palettes/9.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F74/tiles.png b/data/tilesets/secondary/fan_club_daycare/tiles.png
index b8a2a1a4f..b8a2a1a4f 100644
--- a/data/tilesets/secondary/82D4F74/tiles.png
+++ b/data/tilesets/secondary/fan_club_daycare/tiles.png
diff --git a/data/tilesets/secondary/82D4B54/metatile_attributes.bin b/data/tilesets/secondary/fuchsia_city/metatile_attributes.bin
index 3e370a747..3e370a747 100644
--- a/data/tilesets/secondary/82D4B54/metatile_attributes.bin
+++ b/data/tilesets/secondary/fuchsia_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B54/metatiles.bin b/data/tilesets/secondary/fuchsia_city/metatiles.bin
index 0e0e722da..0e0e722da 100644
--- a/data/tilesets/secondary/82D4B54/metatiles.bin
+++ b/data/tilesets/secondary/fuchsia_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B54/palettes/0.pal b/data/tilesets/secondary/fuchsia_city/palettes/0.pal
index 5fb8bdb01..5fb8bdb01 100644
--- a/data/tilesets/secondary/82D4B54/palettes/0.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/1.pal b/data/tilesets/secondary/fuchsia_city/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/1.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/10.pal b/data/tilesets/secondary/fuchsia_city/palettes/10.pal
index d82bb0391..d82bb0391 100644
--- a/data/tilesets/secondary/82D4B54/palettes/10.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/11.pal b/data/tilesets/secondary/fuchsia_city/palettes/11.pal
index cc0cf52cf..cc0cf52cf 100644
--- a/data/tilesets/secondary/82D4B54/palettes/11.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/12.pal b/data/tilesets/secondary/fuchsia_city/palettes/12.pal
index ebcfeb596..ebcfeb596 100644
--- a/data/tilesets/secondary/82D4B54/palettes/12.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/13.pal b/data/tilesets/secondary/fuchsia_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/13.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/14.pal b/data/tilesets/secondary/fuchsia_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/14.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/15.pal b/data/tilesets/secondary/fuchsia_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/15.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/2.pal b/data/tilesets/secondary/fuchsia_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/2.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/3.pal b/data/tilesets/secondary/fuchsia_city/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D4B54/palettes/3.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/4.pal b/data/tilesets/secondary/fuchsia_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/4.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/5.pal b/data/tilesets/secondary/fuchsia_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/5.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/6.pal b/data/tilesets/secondary/fuchsia_city/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/6.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/7.pal b/data/tilesets/secondary/fuchsia_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/7.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/8.pal b/data/tilesets/secondary/fuchsia_city/palettes/8.pal
index 8a0a9a1e0..8a0a9a1e0 100644
--- a/data/tilesets/secondary/82D4B54/palettes/8.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/9.pal b/data/tilesets/secondary/fuchsia_city/palettes/9.pal
index d39bbb454..d39bbb454 100644
--- a/data/tilesets/secondary/82D4B54/palettes/9.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B54/tiles.png b/data/tilesets/secondary/fuchsia_city/tiles.png
index a9e9e13e8..a9e9e13e8 100644
--- a/data/tilesets/secondary/82D4B54/tiles.png
+++ b/data/tilesets/secondary/fuchsia_city/tiles.png
diff --git a/data/tilesets/secondary/82D4CA4/metatile_attributes.bin b/data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin
index 1b7a02c1f..1b7a02c1f 100644
--- a/data/tilesets/secondary/82D4CA4/metatile_attributes.bin
+++ b/data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CA4/metatiles.bin b/data/tilesets/secondary/fuchsia_gym/metatiles.bin
index 25e3b6297..25e3b6297 100644
--- a/data/tilesets/secondary/82D4CA4/metatiles.bin
+++ b/data/tilesets/secondary/fuchsia_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C74/palettes/0.pal b/data/tilesets/secondary/fuchsia_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4C74/palettes/0.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/1.pal b/data/tilesets/secondary/fuchsia_gym/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/1.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/10.pal b/data/tilesets/secondary/fuchsia_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/10.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/11.pal b/data/tilesets/secondary/fuchsia_gym/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/11.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/12.pal b/data/tilesets/secondary/fuchsia_gym/palettes/12.pal
index ebfedc7d5..ebfedc7d5 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/12.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/13.pal b/data/tilesets/secondary/fuchsia_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/13.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/14.pal b/data/tilesets/secondary/fuchsia_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/14.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/15.pal b/data/tilesets/secondary/fuchsia_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/15.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/2.pal b/data/tilesets/secondary/fuchsia_gym/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/2.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/3.pal b/data/tilesets/secondary/fuchsia_gym/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/3.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/4.pal b/data/tilesets/secondary/fuchsia_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C74/palettes/4.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/5.pal b/data/tilesets/secondary/fuchsia_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C74/palettes/5.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/6.pal b/data/tilesets/secondary/fuchsia_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/6.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/7.pal b/data/tilesets/secondary/fuchsia_gym/palettes/7.pal
index 9020b628f..9020b628f 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/7.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/8.pal b/data/tilesets/secondary/fuchsia_gym/palettes/8.pal
index 1873ad439..1873ad439 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/8.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/9.pal b/data/tilesets/secondary/fuchsia_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/9.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CA4/tiles.png b/data/tilesets/secondary/fuchsia_gym/tiles.png
index cf2fa4ff7..cf2fa4ff7 100644
--- a/data/tilesets/secondary/82D4CA4/tiles.png
+++ b/data/tilesets/secondary/fuchsia_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4CEC/metatile_attributes.bin b/data/tilesets/secondary/game_corner/metatile_attributes.bin
index a2bcd959e..a2bcd959e 100644
--- a/data/tilesets/secondary/82D4CEC/metatile_attributes.bin
+++ b/data/tilesets/secondary/game_corner/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CEC/metatiles.bin b/data/tilesets/secondary/game_corner/metatiles.bin
index 1529f8582..1529f8582 100644
--- a/data/tilesets/secondary/82D4CEC/metatiles.bin
+++ b/data/tilesets/secondary/game_corner/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CA4/palettes/0.pal b/data/tilesets/secondary/game_corner/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/0.pal
+++ b/data/tilesets/secondary/game_corner/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/1.pal b/data/tilesets/secondary/game_corner/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/1.pal
+++ b/data/tilesets/secondary/game_corner/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/10.pal b/data/tilesets/secondary/game_corner/palettes/10.pal
index 6d76050a9..6d76050a9 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/10.pal
+++ b/data/tilesets/secondary/game_corner/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/11.pal b/data/tilesets/secondary/game_corner/palettes/11.pal
index 9359b8858..9359b8858 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/11.pal
+++ b/data/tilesets/secondary/game_corner/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/12.pal b/data/tilesets/secondary/game_corner/palettes/12.pal
index 61b3764be..61b3764be 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/12.pal
+++ b/data/tilesets/secondary/game_corner/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/13.pal b/data/tilesets/secondary/game_corner/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/13.pal
+++ b/data/tilesets/secondary/game_corner/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/14.pal b/data/tilesets/secondary/game_corner/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/14.pal
+++ b/data/tilesets/secondary/game_corner/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/15.pal b/data/tilesets/secondary/game_corner/palettes/15.pal
index 3bb14e445..3bb14e445 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/15.pal
+++ b/data/tilesets/secondary/game_corner/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/2.pal b/data/tilesets/secondary/game_corner/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/2.pal
+++ b/data/tilesets/secondary/game_corner/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/3.pal b/data/tilesets/secondary/game_corner/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/3.pal
+++ b/data/tilesets/secondary/game_corner/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/4.pal b/data/tilesets/secondary/game_corner/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/4.pal
+++ b/data/tilesets/secondary/game_corner/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/5.pal b/data/tilesets/secondary/game_corner/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/5.pal
+++ b/data/tilesets/secondary/game_corner/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/6.pal b/data/tilesets/secondary/game_corner/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/6.pal
+++ b/data/tilesets/secondary/game_corner/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/7.pal b/data/tilesets/secondary/game_corner/palettes/7.pal
index b3612e537..b3612e537 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/7.pal
+++ b/data/tilesets/secondary/game_corner/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/8.pal b/data/tilesets/secondary/game_corner/palettes/8.pal
index e58f94305..e58f94305 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/8.pal
+++ b/data/tilesets/secondary/game_corner/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/9.pal b/data/tilesets/secondary/game_corner/palettes/9.pal
index 75f1d81b5..75f1d81b5 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/9.pal
+++ b/data/tilesets/secondary/game_corner/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CEC/tiles.png b/data/tilesets/secondary/game_corner/tiles.png
index b5b249d0a..b5b249d0a 100644
--- a/data/tilesets/secondary/82D4CEC/tiles.png
+++ b/data/tilesets/secondary/game_corner/tiles.png
diff --git a/data/tilesets/secondary/82D4C74/metatile_attributes.bin b/data/tilesets/secondary/generic_building1/metatile_attributes.bin
index be95e451c..be95e451c 100644
--- a/data/tilesets/secondary/82D4C74/metatile_attributes.bin
+++ b/data/tilesets/secondary/generic_building1/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C74/metatiles.bin b/data/tilesets/secondary/generic_building1/metatiles.bin
index 806d040ce..806d040ce 100644
--- a/data/tilesets/secondary/82D4C74/metatiles.bin
+++ b/data/tilesets/secondary/generic_building1/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CBC/palettes/0.pal b/data/tilesets/secondary/generic_building1/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/0.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/1.pal b/data/tilesets/secondary/generic_building1/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/1.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/10.pal b/data/tilesets/secondary/generic_building1/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/10.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/11.pal b/data/tilesets/secondary/generic_building1/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/11.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/12.pal b/data/tilesets/secondary/generic_building1/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/12.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/13.pal b/data/tilesets/secondary/generic_building1/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/13.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/14.pal b/data/tilesets/secondary/generic_building1/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/14.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/15.pal b/data/tilesets/secondary/generic_building1/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/15.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/2.pal b/data/tilesets/secondary/generic_building1/palettes/2.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/82D4C74/palettes/2.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/3.pal b/data/tilesets/secondary/generic_building1/palettes/3.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/82D4C74/palettes/3.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/4.pal b/data/tilesets/secondary/generic_building1/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/4.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/5.pal b/data/tilesets/secondary/generic_building1/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/5.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/6.pal b/data/tilesets/secondary/generic_building1/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/6.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/7.pal b/data/tilesets/secondary/generic_building1/palettes/7.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/7.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/8.pal b/data/tilesets/secondary/generic_building1/palettes/8.pal
index 18480092b..18480092b 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/8.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/9.pal b/data/tilesets/secondary/generic_building1/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/9.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C74/tiles.png b/data/tilesets/secondary/generic_building1/tiles.png
index 191287197..191287197 100644
--- a/data/tilesets/secondary/82D4C74/tiles.png
+++ b/data/tilesets/secondary/generic_building1/tiles.png
diff --git a/data/tilesets/secondary/82D4E84/metatile_attributes.bin b/data/tilesets/secondary/generic_building2/metatile_attributes.bin
index 18d7517d9..18d7517d9 100644
--- a/data/tilesets/secondary/82D4E84/metatile_attributes.bin
+++ b/data/tilesets/secondary/generic_building2/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E84/metatiles.bin b/data/tilesets/secondary/generic_building2/metatiles.bin
index 0943dc7af..0943dc7af 100644
--- a/data/tilesets/secondary/82D4E84/metatiles.bin
+++ b/data/tilesets/secondary/generic_building2/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CEC/palettes/0.pal b/data/tilesets/secondary/generic_building2/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/0.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/1.pal b/data/tilesets/secondary/generic_building2/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/1.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/10.pal b/data/tilesets/secondary/generic_building2/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/10.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/11.pal b/data/tilesets/secondary/generic_building2/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/11.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/12.pal b/data/tilesets/secondary/generic_building2/palettes/12.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/82D4E84/palettes/12.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/13.pal b/data/tilesets/secondary/generic_building2/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D04/palettes/13.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/14.pal b/data/tilesets/secondary/generic_building2/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D04/palettes/14.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/15.pal b/data/tilesets/secondary/generic_building2/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/15.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/2.pal b/data/tilesets/secondary/generic_building2/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/2.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/3.pal b/data/tilesets/secondary/generic_building2/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4D34/palettes/3.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/4.pal b/data/tilesets/secondary/generic_building2/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/4.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/5.pal b/data/tilesets/secondary/generic_building2/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/5.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/6.pal b/data/tilesets/secondary/generic_building2/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/6.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/7.pal b/data/tilesets/secondary/generic_building2/palettes/7.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/7.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/8.pal b/data/tilesets/secondary/generic_building2/palettes/8.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/8.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/9.pal b/data/tilesets/secondary/generic_building2/palettes/9.pal
index 25d5d7019..25d5d7019 100644
--- a/data/tilesets/secondary/82D4E84/palettes/9.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E84/tiles.png b/data/tilesets/secondary/generic_building2/tiles.png
index ca6e21f03..ca6e21f03 100644
--- a/data/tilesets/secondary/82D4E84/tiles.png
+++ b/data/tilesets/secondary/generic_building2/tiles.png
diff --git a/data/tilesets/secondary/82D50DC/metatile_attributes.bin b/data/tilesets/secondary/hall_of_fame/metatile_attributes.bin
index 2fa59412a..2fa59412a 100644
--- a/data/tilesets/secondary/82D50DC/metatile_attributes.bin
+++ b/data/tilesets/secondary/hall_of_fame/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50DC/metatiles.bin b/data/tilesets/secondary/hall_of_fame/metatiles.bin
index 6f4e8a22e..6f4e8a22e 100644
--- a/data/tilesets/secondary/82D50DC/metatiles.bin
+++ b/data/tilesets/secondary/hall_of_fame/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D04/palettes/0.pal b/data/tilesets/secondary/hall_of_fame/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D4D04/palettes/0.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/1.pal b/data/tilesets/secondary/hall_of_fame/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4F14/palettes/1.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/1.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/10.pal b/data/tilesets/secondary/hall_of_fame/palettes/10.pal
index 6ea570459..6ea570459 100644
--- a/data/tilesets/secondary/82D50DC/palettes/10.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/10.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/11.pal b/data/tilesets/secondary/hall_of_fame/palettes/11.pal
index 008f150c7..008f150c7 100644
--- a/data/tilesets/secondary/82D50DC/palettes/11.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/11.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/12.pal b/data/tilesets/secondary/hall_of_fame/palettes/12.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D50DC/palettes/12.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/13.pal b/data/tilesets/secondary/hall_of_fame/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/13.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/14.pal b/data/tilesets/secondary/hall_of_fame/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/14.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/15.pal b/data/tilesets/secondary/hall_of_fame/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/15.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/2.pal b/data/tilesets/secondary/hall_of_fame/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/2.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/3.pal b/data/tilesets/secondary/hall_of_fame/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/3.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/4.pal b/data/tilesets/secondary/hall_of_fame/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/4.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/5.pal b/data/tilesets/secondary/hall_of_fame/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D5034/palettes/5.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/6.pal b/data/tilesets/secondary/hall_of_fame/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/6.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/6.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/7.pal b/data/tilesets/secondary/hall_of_fame/palettes/7.pal
index f0c97cf87..f0c97cf87 100644
--- a/data/tilesets/secondary/82D50DC/palettes/7.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/7.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/8.pal b/data/tilesets/secondary/hall_of_fame/palettes/8.pal
index 33b52bbbd..33b52bbbd 100644
--- a/data/tilesets/secondary/82D50DC/palettes/8.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/8.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/9.pal b/data/tilesets/secondary/hall_of_fame/palettes/9.pal
index 3a2cf3b7a..3a2cf3b7a 100644
--- a/data/tilesets/secondary/82D50DC/palettes/9.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/9.pal
diff --git a/data/tilesets/secondary/82D50DC/tiles.png b/data/tilesets/secondary/hall_of_fame/tiles.png
index f5ab3a9cb..f5ab3a9cb 100644
--- a/data/tilesets/secondary/82D50DC/tiles.png
+++ b/data/tilesets/secondary/hall_of_fame/tiles.png
diff --git a/data/tilesets/secondary/82D4CD4/metatile_attributes.bin b/data/tilesets/secondary/hoenn_building/metatile_attributes.bin
index 6c4ffed21..6c4ffed21 100644
--- a/data/tilesets/secondary/82D4CD4/metatile_attributes.bin
+++ b/data/tilesets/secondary/hoenn_building/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CD4/metatiles.bin b/data/tilesets/secondary/hoenn_building/metatiles.bin
index af8effb11..af8effb11 100644
--- a/data/tilesets/secondary/82D4CD4/metatiles.bin
+++ b/data/tilesets/secondary/hoenn_building/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F2C/palettes/0.pal b/data/tilesets/secondary/hoenn_building/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/0.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/1.pal b/data/tilesets/secondary/hoenn_building/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/1.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/10.pal b/data/tilesets/secondary/hoenn_building/palettes/10.pal
index 432f42149..432f42149 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/10.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/11.pal b/data/tilesets/secondary/hoenn_building/palettes/11.pal
index 8c2460403..8c2460403 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/11.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/12.pal b/data/tilesets/secondary/hoenn_building/palettes/12.pal
index 920ad12c9..920ad12c9 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/12.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/13.pal b/data/tilesets/secondary/hoenn_building/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/13.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/14.pal b/data/tilesets/secondary/hoenn_building/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/14.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/15.pal b/data/tilesets/secondary/hoenn_building/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/15.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/2.pal b/data/tilesets/secondary/hoenn_building/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/2.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/3.pal b/data/tilesets/secondary/hoenn_building/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/3.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/4.pal b/data/tilesets/secondary/hoenn_building/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/4.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/5.pal b/data/tilesets/secondary/hoenn_building/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/5.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/6.pal b/data/tilesets/secondary/hoenn_building/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/6.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/7.pal b/data/tilesets/secondary/hoenn_building/palettes/7.pal
index 533778712..533778712 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/7.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/8.pal b/data/tilesets/secondary/hoenn_building/palettes/8.pal
index 0b01f1a0f..0b01f1a0f 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/8.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/9.pal b/data/tilesets/secondary/hoenn_building/palettes/9.pal
index 371e5a211..371e5a211 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/9.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CD4/tiles.png b/data/tilesets/secondary/hoenn_building/tiles.png
index ef8a943fa..ef8a943fa 100644
--- a/data/tilesets/secondary/82D4CD4/tiles.png
+++ b/data/tilesets/secondary/hoenn_building/tiles.png
diff --git a/data/tilesets/secondary/82D4B84/metatile_attributes.bin b/data/tilesets/secondary/indigo_plateau/metatile_attributes.bin
index f840f6486..f840f6486 100644
--- a/data/tilesets/secondary/82D4B84/metatile_attributes.bin
+++ b/data/tilesets/secondary/indigo_plateau/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B84/metatiles.bin b/data/tilesets/secondary/indigo_plateau/metatiles.bin
index bbb7ffbee..bbb7ffbee 100644
--- a/data/tilesets/secondary/82D4B84/metatiles.bin
+++ b/data/tilesets/secondary/indigo_plateau/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B84/palettes/0.pal b/data/tilesets/secondary/indigo_plateau/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4B84/palettes/0.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/1.pal b/data/tilesets/secondary/indigo_plateau/palettes/1.pal
index cf1123812..cf1123812 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/1.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/10.pal b/data/tilesets/secondary/indigo_plateau/palettes/10.pal
index 70ed40322..70ed40322 100644
--- a/data/tilesets/secondary/82D4B84/palettes/10.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/11.pal b/data/tilesets/secondary/indigo_plateau/palettes/11.pal
index 7b47acf60..7b47acf60 100644
--- a/data/tilesets/secondary/82D4B84/palettes/11.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/12.pal b/data/tilesets/secondary/indigo_plateau/palettes/12.pal
index f5ff3dddf..f5ff3dddf 100644
--- a/data/tilesets/secondary/82D4B84/palettes/12.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/13.pal b/data/tilesets/secondary/indigo_plateau/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/13.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/14.pal b/data/tilesets/secondary/indigo_plateau/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/14.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/15.pal b/data/tilesets/secondary/indigo_plateau/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/15.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/2.pal b/data/tilesets/secondary/indigo_plateau/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/2.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/3.pal b/data/tilesets/secondary/indigo_plateau/palettes/3.pal
index 5a5e60211..5a5e60211 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/3.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/4.pal b/data/tilesets/secondary/indigo_plateau/palettes/4.pal
index 229f9132c..229f9132c 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/4.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/5.pal b/data/tilesets/secondary/indigo_plateau/palettes/5.pal
index 215dd1272..215dd1272 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/5.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/6.pal b/data/tilesets/secondary/indigo_plateau/palettes/6.pal
index 7e7862a19..7e7862a19 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/6.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/7.pal b/data/tilesets/secondary/indigo_plateau/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/7.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/8.pal b/data/tilesets/secondary/indigo_plateau/palettes/8.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4B84/palettes/8.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/9.pal b/data/tilesets/secondary/indigo_plateau/palettes/9.pal
index 3ff6139ac..3ff6139ac 100644
--- a/data/tilesets/secondary/82D4B84/palettes/9.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B84/tiles.png b/data/tilesets/secondary/indigo_plateau/tiles.png
index 4a938b4c5..4a938b4c5 100644
--- a/data/tilesets/secondary/82D4B84/tiles.png
+++ b/data/tilesets/secondary/indigo_plateau/tiles.png
diff --git a/data/tilesets/secondary/82D50AC/metatile_attributes.bin b/data/tilesets/secondary/island_harbor/metatile_attributes.bin
index 9dd5f613d..9dd5f613d 100644
--- a/data/tilesets/secondary/82D50AC/metatile_attributes.bin
+++ b/data/tilesets/secondary/island_harbor/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50AC/metatiles.bin b/data/tilesets/secondary/island_harbor/metatiles.bin
index d5916a2cf..d5916a2cf 100644
--- a/data/tilesets/secondary/82D50AC/metatiles.bin
+++ b/data/tilesets/secondary/island_harbor/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BFC/palettes/0.pal b/data/tilesets/secondary/island_harbor/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/0.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/0.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/1.pal b/data/tilesets/secondary/island_harbor/palettes/1.pal
index 22eb1667c..22eb1667c 100644
--- a/data/tilesets/secondary/82D50AC/palettes/1.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/1.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/10.pal b/data/tilesets/secondary/island_harbor/palettes/10.pal
index 3c091df8b..3c091df8b 100644
--- a/data/tilesets/secondary/82D50AC/palettes/10.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/10.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/11.pal b/data/tilesets/secondary/island_harbor/palettes/11.pal
index c42eeb7e1..c42eeb7e1 100644
--- a/data/tilesets/secondary/82D50AC/palettes/11.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/12.pal b/data/tilesets/secondary/island_harbor/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D5004/palettes/12.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/12.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/13.pal b/data/tilesets/secondary/island_harbor/palettes/13.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D50AC/palettes/13.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/14.pal b/data/tilesets/secondary/island_harbor/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D64/palettes/14.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/15.pal b/data/tilesets/secondary/island_harbor/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/15.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/2.pal b/data/tilesets/secondary/island_harbor/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/2.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/3.pal b/data/tilesets/secondary/island_harbor/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4E24/palettes/3.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/4.pal b/data/tilesets/secondary/island_harbor/palettes/4.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/82D4B24/palettes/4.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/5.pal b/data/tilesets/secondary/island_harbor/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4E24/palettes/5.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/6.pal b/data/tilesets/secondary/island_harbor/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/6.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/7.pal b/data/tilesets/secondary/island_harbor/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D5004/palettes/7.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/7.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/8.pal b/data/tilesets/secondary/island_harbor/palettes/8.pal
index 5c1251024..5c1251024 100644
--- a/data/tilesets/secondary/82D50AC/palettes/8.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/8.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/9.pal b/data/tilesets/secondary/island_harbor/palettes/9.pal
index c25501332..c25501332 100644
--- a/data/tilesets/secondary/82D50AC/palettes/9.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/9.pal
diff --git a/data/tilesets/secondary/82D50AC/tiles.png b/data/tilesets/secondary/island_harbor/tiles.png
index 166ae2e18..166ae2e18 100644
--- a/data/tilesets/secondary/82D50AC/tiles.png
+++ b/data/tilesets/secondary/island_harbor/tiles.png
diff --git a/data/tilesets/secondary/82D4C8C/metatile_attributes.bin b/data/tilesets/secondary/lab/metatile_attributes.bin
index 0d685881c..0d685881c 100644
--- a/data/tilesets/secondary/82D4C8C/metatile_attributes.bin
+++ b/data/tilesets/secondary/lab/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C8C/metatiles.bin b/data/tilesets/secondary/lab/metatiles.bin
index a7833446f..a7833446f 100644
--- a/data/tilesets/secondary/82D4C8C/metatiles.bin
+++ b/data/tilesets/secondary/lab/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C8C/palettes/0.pal b/data/tilesets/secondary/lab/palettes/0.pal
index 9fc16da3b..9fc16da3b 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/0.pal
+++ b/data/tilesets/secondary/lab/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/1.pal b/data/tilesets/secondary/lab/palettes/1.pal
index 76403e6d6..76403e6d6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/1.pal
+++ b/data/tilesets/secondary/lab/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/10.pal b/data/tilesets/secondary/lab/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/10.pal
+++ b/data/tilesets/secondary/lab/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/11.pal b/data/tilesets/secondary/lab/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/11.pal
+++ b/data/tilesets/secondary/lab/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/12.pal b/data/tilesets/secondary/lab/palettes/12.pal
index 3c32c9fd4..3c32c9fd4 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/12.pal
+++ b/data/tilesets/secondary/lab/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/13.pal b/data/tilesets/secondary/lab/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D64/palettes/13.pal
+++ b/data/tilesets/secondary/lab/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/14.pal b/data/tilesets/secondary/lab/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/14.pal
+++ b/data/tilesets/secondary/lab/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/15.pal b/data/tilesets/secondary/lab/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/15.pal
+++ b/data/tilesets/secondary/lab/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/2.pal b/data/tilesets/secondary/lab/palettes/2.pal
index b1ecd71dc..b1ecd71dc 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/2.pal
+++ b/data/tilesets/secondary/lab/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/3.pal b/data/tilesets/secondary/lab/palettes/3.pal
index 43d9b60e3..43d9b60e3 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/3.pal
+++ b/data/tilesets/secondary/lab/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/4.pal b/data/tilesets/secondary/lab/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/4.pal
+++ b/data/tilesets/secondary/lab/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/5.pal b/data/tilesets/secondary/lab/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/5.pal
+++ b/data/tilesets/secondary/lab/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/6.pal b/data/tilesets/secondary/lab/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/6.pal
+++ b/data/tilesets/secondary/lab/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/7.pal b/data/tilesets/secondary/lab/palettes/7.pal
index 3d7f8bd89..3d7f8bd89 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/7.pal
+++ b/data/tilesets/secondary/lab/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/8.pal b/data/tilesets/secondary/lab/palettes/8.pal
index 7fce49d06..7fce49d06 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/8.pal
+++ b/data/tilesets/secondary/lab/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/9.pal b/data/tilesets/secondary/lab/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/9.pal
+++ b/data/tilesets/secondary/lab/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C8C/tiles.png b/data/tilesets/secondary/lab/tiles.png
index 6caeac8a8..6caeac8a8 100644
--- a/data/tilesets/secondary/82D4C8C/tiles.png
+++ b/data/tilesets/secondary/lab/tiles.png
diff --git a/data/tilesets/secondary/82D4B0C/metatile_attributes.bin b/data/tilesets/secondary/lavender_town/metatile_attributes.bin
index d103d7155..d103d7155 100644
--- a/data/tilesets/secondary/82D4B0C/metatile_attributes.bin
+++ b/data/tilesets/secondary/lavender_town/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B0C/metatiles.bin b/data/tilesets/secondary/lavender_town/metatiles.bin
index f69885645..f69885645 100644
--- a/data/tilesets/secondary/82D4B0C/metatiles.bin
+++ b/data/tilesets/secondary/lavender_town/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DF4/palettes/0.pal b/data/tilesets/secondary/lavender_town/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/0.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/1.pal b/data/tilesets/secondary/lavender_town/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4E54/palettes/1.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/10.pal b/data/tilesets/secondary/lavender_town/palettes/10.pal
index b97e9df4b..b97e9df4b 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/10.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/11.pal b/data/tilesets/secondary/lavender_town/palettes/11.pal
index f71181976..f71181976 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/11.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/12.pal b/data/tilesets/secondary/lavender_town/palettes/12.pal
index 0cdcab8c2..0cdcab8c2 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/12.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/13.pal b/data/tilesets/secondary/lavender_town/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/13.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/14.pal b/data/tilesets/secondary/lavender_town/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/14.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/15.pal b/data/tilesets/secondary/lavender_town/palettes/15.pal
index 3973e491a..3973e491a 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/15.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/2.pal b/data/tilesets/secondary/lavender_town/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4E24/palettes/2.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/3.pal b/data/tilesets/secondary/lavender_town/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4E54/palettes/3.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/4.pal b/data/tilesets/secondary/lavender_town/palettes/4.pal
index 07dcd957c..07dcd957c 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/4.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/5.pal b/data/tilesets/secondary/lavender_town/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4E54/palettes/5.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/6.pal b/data/tilesets/secondary/lavender_town/palettes/6.pal
index 0dba59a72..0dba59a72 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/6.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/7.pal b/data/tilesets/secondary/lavender_town/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/7.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/8.pal b/data/tilesets/secondary/lavender_town/palettes/8.pal
index 376749664..376749664 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/8.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/9.pal b/data/tilesets/secondary/lavender_town/palettes/9.pal
index 82b469a66..82b469a66 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/9.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B0C/tiles.png b/data/tilesets/secondary/lavender_town/tiles.png
index 66bd81f8b..66bd81f8b 100644
--- a/data/tilesets/secondary/82D4B0C/tiles.png
+++ b/data/tilesets/secondary/lavender_town/tiles.png
diff --git a/data/tilesets/secondary/82D4BCC/metatile_attributes.bin b/data/tilesets/secondary/mart/metatile_attributes.bin
index 31fdb5cc0..31fdb5cc0 100644
--- a/data/tilesets/secondary/82D4BCC/metatile_attributes.bin
+++ b/data/tilesets/secondary/mart/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BCC/metatiles.bin b/data/tilesets/secondary/mart/metatiles.bin
index 1c00836c1..1c00836c1 100644
--- a/data/tilesets/secondary/82D4BCC/metatiles.bin
+++ b/data/tilesets/secondary/mart/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D34/palettes/0.pal b/data/tilesets/secondary/mart/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D34/palettes/0.pal
+++ b/data/tilesets/secondary/mart/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/1.pal b/data/tilesets/secondary/mart/palettes/1.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/1.pal
+++ b/data/tilesets/secondary/mart/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/10.pal b/data/tilesets/secondary/mart/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D34/palettes/10.pal
+++ b/data/tilesets/secondary/mart/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/11.pal b/data/tilesets/secondary/mart/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/11.pal
+++ b/data/tilesets/secondary/mart/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/12.pal b/data/tilesets/secondary/mart/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/12.pal
+++ b/data/tilesets/secondary/mart/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/13.pal b/data/tilesets/secondary/mart/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/13.pal
+++ b/data/tilesets/secondary/mart/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/14.pal b/data/tilesets/secondary/mart/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/14.pal
+++ b/data/tilesets/secondary/mart/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/15.pal b/data/tilesets/secondary/mart/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/15.pal
+++ b/data/tilesets/secondary/mart/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/2.pal b/data/tilesets/secondary/mart/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4D34/palettes/2.pal
+++ b/data/tilesets/secondary/mart/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/3.pal b/data/tilesets/secondary/mart/palettes/3.pal
index e1b56cd57..e1b56cd57 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/3.pal
+++ b/data/tilesets/secondary/mart/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/4.pal b/data/tilesets/secondary/mart/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D34/palettes/4.pal
+++ b/data/tilesets/secondary/mart/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/5.pal b/data/tilesets/secondary/mart/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D34/palettes/5.pal
+++ b/data/tilesets/secondary/mart/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/6.pal b/data/tilesets/secondary/mart/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/6.pal
+++ b/data/tilesets/secondary/mart/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/7.pal b/data/tilesets/secondary/mart/palettes/7.pal
index 0a07057ec..0a07057ec 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/7.pal
+++ b/data/tilesets/secondary/mart/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/8.pal b/data/tilesets/secondary/mart/palettes/8.pal
index 06fcc911b..06fcc911b 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/8.pal
+++ b/data/tilesets/secondary/mart/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/9.pal b/data/tilesets/secondary/mart/palettes/9.pal
index ea018609b..ea018609b 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/9.pal
+++ b/data/tilesets/secondary/mart/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4BCC/tiles.png b/data/tilesets/secondary/mart/tiles.png
index 2bfeb4080..2bfeb4080 100644
--- a/data/tilesets/secondary/82D4BCC/tiles.png
+++ b/data/tilesets/secondary/mart/tiles.png
diff --git a/data/tilesets/secondary/82D4FEC/metatile_attributes.bin b/data/tilesets/secondary/mt_ember/metatile_attributes.bin
index 45432b773..45432b773 100644
--- a/data/tilesets/secondary/82D4FEC/metatile_attributes.bin
+++ b/data/tilesets/secondary/mt_ember/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FEC/metatiles.bin b/data/tilesets/secondary/mt_ember/metatiles.bin
index b80796821..b80796821 100644
--- a/data/tilesets/secondary/82D4FEC/metatiles.bin
+++ b/data/tilesets/secondary/mt_ember/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FEC/palettes/0.pal b/data/tilesets/secondary/mt_ember/palettes/0.pal
index 30ff4070a..30ff4070a 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/0.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/1.pal b/data/tilesets/secondary/mt_ember/palettes/1.pal
index e15d979f1..e15d979f1 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/1.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/10.pal b/data/tilesets/secondary/mt_ember/palettes/10.pal
index fc340ed15..fc340ed15 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/10.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/11.pal b/data/tilesets/secondary/mt_ember/palettes/11.pal
index e07ce6909..e07ce6909 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/11.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/12.pal b/data/tilesets/secondary/mt_ember/palettes/12.pal
index cc53a5940..cc53a5940 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/12.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/13.pal b/data/tilesets/secondary/mt_ember/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/13.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/14.pal b/data/tilesets/secondary/mt_ember/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/14.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/15.pal b/data/tilesets/secondary/mt_ember/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E24/palettes/15.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/2.pal b/data/tilesets/secondary/mt_ember/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4B24/palettes/2.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/3.pal b/data/tilesets/secondary/mt_ember/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/3.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/4.pal b/data/tilesets/secondary/mt_ember/palettes/4.pal
index 91fdcabdf..91fdcabdf 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/4.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/5.pal b/data/tilesets/secondary/mt_ember/palettes/5.pal
index 0edb843f5..0edb843f5 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/5.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/6.pal b/data/tilesets/secondary/mt_ember/palettes/6.pal
index 32afdccbb..32afdccbb 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/6.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/7.pal b/data/tilesets/secondary/mt_ember/palettes/7.pal
index fa9d5d633..fa9d5d633 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/7.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/8.pal b/data/tilesets/secondary/mt_ember/palettes/8.pal
index f4a797b87..f4a797b87 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/8.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/9.pal b/data/tilesets/secondary/mt_ember/palettes/9.pal
index 0a2109195..0a2109195 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/9.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FEC/tiles.png b/data/tilesets/secondary/mt_ember/tiles.png
index 04d2b7b67..04d2b7b67 100644
--- a/data/tilesets/secondary/82D4FEC/tiles.png
+++ b/data/tilesets/secondary/mt_ember/tiles.png
diff --git a/data/tilesets/secondary/82D4C2C/metatile_attributes.bin b/data/tilesets/secondary/museum/metatile_attributes.bin
index 097e93ce1..097e93ce1 100644
--- a/data/tilesets/secondary/82D4C2C/metatile_attributes.bin
+++ b/data/tilesets/secondary/museum/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C2C/metatiles.bin b/data/tilesets/secondary/museum/metatiles.bin
index 993b73cbd..993b73cbd 100644
--- a/data/tilesets/secondary/82D4C2C/metatiles.bin
+++ b/data/tilesets/secondary/museum/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D4C/palettes/0.pal b/data/tilesets/secondary/museum/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/0.pal
+++ b/data/tilesets/secondary/museum/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/1.pal b/data/tilesets/secondary/museum/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/1.pal
+++ b/data/tilesets/secondary/museum/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/10.pal b/data/tilesets/secondary/museum/palettes/10.pal
index fc8da5d40..fc8da5d40 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/10.pal
+++ b/data/tilesets/secondary/museum/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/11.pal b/data/tilesets/secondary/museum/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/11.pal
+++ b/data/tilesets/secondary/museum/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/12.pal b/data/tilesets/secondary/museum/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/12.pal
+++ b/data/tilesets/secondary/museum/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/13.pal b/data/tilesets/secondary/museum/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/13.pal
+++ b/data/tilesets/secondary/museum/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/14.pal b/data/tilesets/secondary/museum/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/14.pal
+++ b/data/tilesets/secondary/museum/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/15.pal b/data/tilesets/secondary/museum/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/15.pal
+++ b/data/tilesets/secondary/museum/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/2.pal b/data/tilesets/secondary/museum/palettes/2.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/2.pal
+++ b/data/tilesets/secondary/museum/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/3.pal b/data/tilesets/secondary/museum/palettes/3.pal
index 1520bed0b..1520bed0b 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/3.pal
+++ b/data/tilesets/secondary/museum/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/4.pal b/data/tilesets/secondary/museum/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/4.pal
+++ b/data/tilesets/secondary/museum/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/5.pal b/data/tilesets/secondary/museum/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/5.pal
+++ b/data/tilesets/secondary/museum/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/6.pal b/data/tilesets/secondary/museum/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/6.pal
+++ b/data/tilesets/secondary/museum/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/7.pal b/data/tilesets/secondary/museum/palettes/7.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/7.pal
+++ b/data/tilesets/secondary/museum/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/8.pal b/data/tilesets/secondary/museum/palettes/8.pal
index 223737ab6..223737ab6 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/8.pal
+++ b/data/tilesets/secondary/museum/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/9.pal b/data/tilesets/secondary/museum/palettes/9.pal
index 6de173f90..6de173f90 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/9.pal
+++ b/data/tilesets/secondary/museum/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C2C/tiles.png b/data/tilesets/secondary/museum/tiles.png
index 9be5ebca9..9be5ebca9 100644
--- a/data/tilesets/secondary/82D4C2C/tiles.png
+++ b/data/tilesets/secondary/museum/tiles.png
diff --git a/data/tilesets/secondary/82D501C/metatile_attributes.bin b/data/tilesets/secondary/navel_rock/metatile_attributes.bin
index 6e3d955e2..6e3d955e2 100644
--- a/data/tilesets/secondary/82D501C/metatile_attributes.bin
+++ b/data/tilesets/secondary/navel_rock/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D501C/metatiles.bin b/data/tilesets/secondary/navel_rock/metatiles.bin
index 7fdc5c55d..7fdc5c55d 100644
--- a/data/tilesets/secondary/82D501C/metatiles.bin
+++ b/data/tilesets/secondary/navel_rock/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E24/palettes/0.pal b/data/tilesets/secondary/navel_rock/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4E24/palettes/0.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/1.pal b/data/tilesets/secondary/navel_rock/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/1.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/1.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/10.pal b/data/tilesets/secondary/navel_rock/palettes/10.pal
index 334da8f23..334da8f23 100644
--- a/data/tilesets/secondary/82D501C/palettes/10.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/10.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/11.pal b/data/tilesets/secondary/navel_rock/palettes/11.pal
index 0c3d2870e..0c3d2870e 100644
--- a/data/tilesets/secondary/82D501C/palettes/11.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/11.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/12.pal b/data/tilesets/secondary/navel_rock/palettes/12.pal
index a68c94c2c..a68c94c2c 100644
--- a/data/tilesets/secondary/82D501C/palettes/12.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/13.pal b/data/tilesets/secondary/navel_rock/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/13.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/14.pal b/data/tilesets/secondary/navel_rock/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/14.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/15.pal b/data/tilesets/secondary/navel_rock/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E54/palettes/15.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/2.pal b/data/tilesets/secondary/navel_rock/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4E54/palettes/2.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/3.pal b/data/tilesets/secondary/navel_rock/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/3.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/4.pal b/data/tilesets/secondary/navel_rock/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4E24/palettes/4.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/5.pal b/data/tilesets/secondary/navel_rock/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/5.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/6.pal b/data/tilesets/secondary/navel_rock/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4F14/palettes/6.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/6.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/7.pal b/data/tilesets/secondary/navel_rock/palettes/7.pal
index 364379ad9..364379ad9 100644
--- a/data/tilesets/secondary/82D501C/palettes/7.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/7.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/8.pal b/data/tilesets/secondary/navel_rock/palettes/8.pal
index 102aaaf2c..102aaaf2c 100644
--- a/data/tilesets/secondary/82D501C/palettes/8.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/8.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/9.pal b/data/tilesets/secondary/navel_rock/palettes/9.pal
index 91329f82e..91329f82e 100644
--- a/data/tilesets/secondary/82D501C/palettes/9.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/9.pal
diff --git a/data/tilesets/secondary/82D501C/tiles.png b/data/tilesets/secondary/navel_rock/tiles.png
index cbce25763..cbce25763 100644
--- a/data/tilesets/secondary/82D501C/tiles.png
+++ b/data/tilesets/secondary/navel_rock/tiles.png
diff --git a/data/tilesets/secondary/82D4AAC/metatile_attributes.bin b/data/tilesets/secondary/pallet_town/metatile_attributes.bin
index 2ba2894bc..2ba2894bc 100644
--- a/data/tilesets/secondary/82D4AAC/metatile_attributes.bin
+++ b/data/tilesets/secondary/pallet_town/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AAC/metatiles.bin b/data/tilesets/secondary/pallet_town/metatiles.bin
index 41db27015..41db27015 100644
--- a/data/tilesets/secondary/82D4AAC/metatiles.bin
+++ b/data/tilesets/secondary/pallet_town/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AAC/palettes/0.pal b/data/tilesets/secondary/pallet_town/palettes/0.pal
index 42246e9ea..42246e9ea 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/0.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/1.pal b/data/tilesets/secondary/pallet_town/palettes/1.pal
index 28db536cb..28db536cb 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/1.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/10.pal b/data/tilesets/secondary/pallet_town/palettes/10.pal
index 1958eff11..1958eff11 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/10.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/11.pal b/data/tilesets/secondary/pallet_town/palettes/11.pal
index 896c79281..896c79281 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/11.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/12.pal b/data/tilesets/secondary/pallet_town/palettes/12.pal
index 2bfc45b6d..2bfc45b6d 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/12.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/13.pal b/data/tilesets/secondary/pallet_town/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/13.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/14.pal b/data/tilesets/secondary/pallet_town/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/14.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/15.pal b/data/tilesets/secondary/pallet_town/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/15.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/2.pal b/data/tilesets/secondary/pallet_town/palettes/2.pal
index 937cec4da..937cec4da 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/2.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/3.pal b/data/tilesets/secondary/pallet_town/palettes/3.pal
index 6d1dfb5af..6d1dfb5af 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/3.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/4.pal b/data/tilesets/secondary/pallet_town/palettes/4.pal
index cde020d4e..cde020d4e 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/4.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/5.pal b/data/tilesets/secondary/pallet_town/palettes/5.pal
index bdcc7b8ed..bdcc7b8ed 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/5.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/6.pal b/data/tilesets/secondary/pallet_town/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D64/palettes/6.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/7.pal b/data/tilesets/secondary/pallet_town/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E54/palettes/7.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/8.pal b/data/tilesets/secondary/pallet_town/palettes/8.pal
index dcecb9c40..dcecb9c40 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/8.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/9.pal b/data/tilesets/secondary/pallet_town/palettes/9.pal
index 90bb77517..90bb77517 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/9.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4AAC/tiles.png b/data/tilesets/secondary/pallet_town/tiles.png
index 771eed906..771eed906 100644
--- a/data/tilesets/secondary/82D4AAC/tiles.png
+++ b/data/tilesets/secondary/pallet_town/tiles.png
diff --git a/data/tilesets/secondary/82D4ADC/metatile_attributes.bin b/data/tilesets/secondary/pewter_city/metatile_attributes.bin
index 4e19ca185..4e19ca185 100644
--- a/data/tilesets/secondary/82D4ADC/metatile_attributes.bin
+++ b/data/tilesets/secondary/pewter_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4ADC/metatiles.bin b/data/tilesets/secondary/pewter_city/metatiles.bin
index a23224773..a23224773 100644
--- a/data/tilesets/secondary/82D4ADC/metatiles.bin
+++ b/data/tilesets/secondary/pewter_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4ADC/palettes/0.pal b/data/tilesets/secondary/pewter_city/palettes/0.pal
index 620015e77..620015e77 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/0.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/1.pal b/data/tilesets/secondary/pewter_city/palettes/1.pal
index 60de8c7ad..60de8c7ad 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/1.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/10.pal b/data/tilesets/secondary/pewter_city/palettes/10.pal
index 76fda8006..76fda8006 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/10.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/11.pal b/data/tilesets/secondary/pewter_city/palettes/11.pal
index 3f8fdc519..3f8fdc519 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/11.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/12.pal b/data/tilesets/secondary/pewter_city/palettes/12.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/12.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/13.pal b/data/tilesets/secondary/pewter_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/13.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/14.pal b/data/tilesets/secondary/pewter_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E24/palettes/14.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/15.pal b/data/tilesets/secondary/pewter_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/15.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/2.pal b/data/tilesets/secondary/pewter_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/2.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/3.pal b/data/tilesets/secondary/pewter_city/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/3.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/4.pal b/data/tilesets/secondary/pewter_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4E54/palettes/4.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/5.pal b/data/tilesets/secondary/pewter_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/5.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/6.pal b/data/tilesets/secondary/pewter_city/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/6.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/7.pal b/data/tilesets/secondary/pewter_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B54/palettes/7.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/8.pal b/data/tilesets/secondary/pewter_city/palettes/8.pal
index d404706ab..d404706ab 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/8.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/9.pal b/data/tilesets/secondary/pewter_city/palettes/9.pal
index cacf892a6..cacf892a6 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/9.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4ADC/tiles.png b/data/tilesets/secondary/pewter_city/tiles.png
index d3148ba5a..d3148ba5a 100644
--- a/data/tilesets/secondary/82D4ADC/tiles.png
+++ b/data/tilesets/secondary/pewter_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D04/metatile_attributes.bin b/data/tilesets/secondary/pewter_gym/metatile_attributes.bin
index ead3610f0..ead3610f0 100644
--- a/data/tilesets/secondary/82D4D04/metatile_attributes.bin
+++ b/data/tilesets/secondary/pewter_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D04/metatiles.bin b/data/tilesets/secondary/pewter_gym/metatiles.bin
index 7034bb6d6..7034bb6d6 100644
--- a/data/tilesets/secondary/82D4D04/metatiles.bin
+++ b/data/tilesets/secondary/pewter_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EFC/palettes/0.pal b/data/tilesets/secondary/pewter_gym/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/0.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/1.pal b/data/tilesets/secondary/pewter_gym/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/1.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/10.pal b/data/tilesets/secondary/pewter_gym/palettes/10.pal
index 131aaa71c..131aaa71c 100644
--- a/data/tilesets/secondary/82D4D04/palettes/10.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/11.pal b/data/tilesets/secondary/pewter_gym/palettes/11.pal
index 131aaa71c..131aaa71c 100644
--- a/data/tilesets/secondary/82D4D04/palettes/11.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/12.pal b/data/tilesets/secondary/pewter_gym/palettes/12.pal
index c8dfac7d2..c8dfac7d2 100644
--- a/data/tilesets/secondary/82D4D04/palettes/12.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/13.pal b/data/tilesets/secondary/pewter_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E24/palettes/13.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/14.pal b/data/tilesets/secondary/pewter_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/14.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/15.pal b/data/tilesets/secondary/pewter_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/15.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/2.pal b/data/tilesets/secondary/pewter_gym/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/2.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/3.pal b/data/tilesets/secondary/pewter_gym/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/3.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/4.pal b/data/tilesets/secondary/pewter_gym/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/4.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/5.pal b/data/tilesets/secondary/pewter_gym/palettes/5.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/5.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/6.pal b/data/tilesets/secondary/pewter_gym/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/6.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/7.pal b/data/tilesets/secondary/pewter_gym/palettes/7.pal
index 34c0ddd17..34c0ddd17 100644
--- a/data/tilesets/secondary/82D4D04/palettes/7.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/8.pal b/data/tilesets/secondary/pewter_gym/palettes/8.pal
index 77e03a48c..77e03a48c 100644
--- a/data/tilesets/secondary/82D4D04/palettes/8.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/9.pal b/data/tilesets/secondary/pewter_gym/palettes/9.pal
index ef91ae987..ef91ae987 100644
--- a/data/tilesets/secondary/82D4D04/palettes/9.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D04/tiles.png b/data/tilesets/secondary/pewter_gym/tiles.png
index 6e97a68a1..6e97a68a1 100644
--- a/data/tilesets/secondary/82D4D04/tiles.png
+++ b/data/tilesets/secondary/pewter_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4BE4/metatile_attributes.bin b/data/tilesets/secondary/pokemon_center/metatile_attributes.bin
index f9bd3d289..f9bd3d289 100644
--- a/data/tilesets/secondary/82D4BE4/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_center/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BE4/metatiles.bin b/data/tilesets/secondary/pokemon_center/metatiles.bin
index 2ec8817bc..2ec8817bc 100644
--- a/data/tilesets/secondary/82D4BE4/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_center/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D64/palettes/0.pal b/data/tilesets/secondary/pokemon_center/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D64/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/1.pal b/data/tilesets/secondary/pokemon_center/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4D34/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/10.pal b/data/tilesets/secondary/pokemon_center/palettes/10.pal
index 62e3e6d6b..62e3e6d6b 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/11.pal b/data/tilesets/secondary/pokemon_center/palettes/11.pal
index 7ba7bccca..7ba7bccca 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/12.pal b/data/tilesets/secondary/pokemon_center/palettes/12.pal
index 0f1f36738..0f1f36738 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/13.pal b/data/tilesets/secondary/pokemon_center/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/14.pal b/data/tilesets/secondary/pokemon_center/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E54/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/15.pal b/data/tilesets/secondary/pokemon_center/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/2.pal b/data/tilesets/secondary/pokemon_center/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/3.pal b/data/tilesets/secondary/pokemon_center/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/4.pal b/data/tilesets/secondary/pokemon_center/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D64/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/5.pal b/data/tilesets/secondary/pokemon_center/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D64/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/6.pal b/data/tilesets/secondary/pokemon_center/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/7.pal b/data/tilesets/secondary/pokemon_center/palettes/7.pal
index 27ca86ca3..27ca86ca3 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/8.pal b/data/tilesets/secondary/pokemon_center/palettes/8.pal
index 6b6a0f25f..6b6a0f25f 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/9.pal b/data/tilesets/secondary/pokemon_center/palettes/9.pal
index 4b279ecf9..4b279ecf9 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4BE4/tiles.png b/data/tilesets/secondary/pokemon_center/tiles.png
index 92d0112f3..92d0112f3 100644
--- a/data/tilesets/secondary/82D4BE4/tiles.png
+++ b/data/tilesets/secondary/pokemon_center/tiles.png
diff --git a/data/tilesets/secondary/82D50C4/metatile_attributes.bin b/data/tilesets/secondary/pokemon_league/metatile_attributes.bin
index bcc2fedb4..bcc2fedb4 100644
--- a/data/tilesets/secondary/82D50C4/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_league/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50C4/metatiles.bin b/data/tilesets/secondary/pokemon_league/metatiles.bin
index 7cdfa846a..7cdfa846a 100644
--- a/data/tilesets/secondary/82D50C4/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_league/metatiles.bin
diff --git a/data/tilesets/secondary/82D5094/palettes/0.pal b/data/tilesets/secondary/pokemon_league/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D5094/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/0.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/1.pal b/data/tilesets/secondary/pokemon_league/palettes/1.pal
index fc945ef6c..fc945ef6c 100644
--- a/data/tilesets/secondary/82D50C4/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/1.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/10.pal b/data/tilesets/secondary/pokemon_league/palettes/10.pal
index 18908d2ef..18908d2ef 100644
--- a/data/tilesets/secondary/82D50C4/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/10.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/11.pal b/data/tilesets/secondary/pokemon_league/palettes/11.pal
index edc05893b..edc05893b 100644
--- a/data/tilesets/secondary/82D50C4/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/11.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/12.pal b/data/tilesets/secondary/pokemon_league/palettes/12.pal
index 36807053a..36807053a 100644
--- a/data/tilesets/secondary/82D50C4/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/13.pal b/data/tilesets/secondary/pokemon_league/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E54/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/14.pal b/data/tilesets/secondary/pokemon_league/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/14.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/15.pal b/data/tilesets/secondary/pokemon_league/palettes/15.pal
index 0b5e86def..0b5e86def 100644
--- a/data/tilesets/secondary/82D50C4/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/2.pal b/data/tilesets/secondary/pokemon_league/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D5034/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/3.pal b/data/tilesets/secondary/pokemon_league/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D5034/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/4.pal b/data/tilesets/secondary/pokemon_league/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D5034/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/4.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/5.pal b/data/tilesets/secondary/pokemon_league/palettes/5.pal
index 34ef2f2d2..34ef2f2d2 100644
--- a/data/tilesets/secondary/82D50C4/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/6.pal b/data/tilesets/secondary/pokemon_league/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D5034/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/6.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/7.pal b/data/tilesets/secondary/pokemon_league/palettes/7.pal
index 6528f9f75..6528f9f75 100644
--- a/data/tilesets/secondary/82D50C4/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/7.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/8.pal b/data/tilesets/secondary/pokemon_league/palettes/8.pal
index 6b56cd49e..6b56cd49e 100644
--- a/data/tilesets/secondary/82D50C4/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/8.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/9.pal b/data/tilesets/secondary/pokemon_league/palettes/9.pal
index 5c2ed43a0..5c2ed43a0 100644
--- a/data/tilesets/secondary/82D50C4/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/9.pal
diff --git a/data/tilesets/secondary/82D50C4/tiles.png b/data/tilesets/secondary/pokemon_league/tiles.png
index 0f65e1ff3..0f65e1ff3 100644
--- a/data/tilesets/secondary/82D50C4/tiles.png
+++ b/data/tilesets/secondary/pokemon_league/tiles.png
diff --git a/data/tilesets/secondary/82D4F2C/metatile_attributes.bin b/data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin
index 91b8105d3..91b8105d3 100644
--- a/data/tilesets/secondary/82D4F2C/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F2C/metatiles.bin b/data/tilesets/secondary/pokemon_mansion/metatiles.bin
index 5caba25a7..5caba25a7 100644
--- a/data/tilesets/secondary/82D4F2C/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_mansion/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F74/palettes/0.pal b/data/tilesets/secondary/pokemon_mansion/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/1.pal b/data/tilesets/secondary/pokemon_mansion/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/10.pal b/data/tilesets/secondary/pokemon_mansion/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/11.pal b/data/tilesets/secondary/pokemon_mansion/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/12.pal b/data/tilesets/secondary/pokemon_mansion/palettes/12.pal
index 9c9a571ef..9c9a571ef 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/13.pal b/data/tilesets/secondary/pokemon_mansion/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/14.pal b/data/tilesets/secondary/pokemon_mansion/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/15.pal b/data/tilesets/secondary/pokemon_mansion/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/2.pal b/data/tilesets/secondary/pokemon_mansion/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/3.pal b/data/tilesets/secondary/pokemon_mansion/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/4.pal b/data/tilesets/secondary/pokemon_mansion/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/5.pal b/data/tilesets/secondary/pokemon_mansion/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/6.pal b/data/tilesets/secondary/pokemon_mansion/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/7.pal b/data/tilesets/secondary/pokemon_mansion/palettes/7.pal
index 4d22869cd..4d22869cd 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/8.pal b/data/tilesets/secondary/pokemon_mansion/palettes/8.pal
index 2a9d791a4..2a9d791a4 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/9.pal b/data/tilesets/secondary/pokemon_mansion/palettes/9.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F2C/tiles.png b/data/tilesets/secondary/pokemon_mansion/tiles.png
index 3e69db5c3..3e69db5c3 100644
--- a/data/tilesets/secondary/82D4F2C/tiles.png
+++ b/data/tilesets/secondary/pokemon_mansion/tiles.png
diff --git a/data/tilesets/secondary/82D4EFC/metatile_attributes.bin b/data/tilesets/secondary/pokemon_tower/metatile_attributes.bin
index 8c16318f0..8c16318f0 100644
--- a/data/tilesets/secondary/82D4EFC/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_tower/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EFC/metatiles.bin b/data/tilesets/secondary/pokemon_tower/metatiles.bin
index d4216989e..d4216989e 100644
--- a/data/tilesets/secondary/82D4EFC/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_tower/metatiles.bin
diff --git a/data/tilesets/secondary/82D50C4/palettes/0.pal b/data/tilesets/secondary/pokemon_tower/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D50C4/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/1.pal b/data/tilesets/secondary/pokemon_tower/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/10.pal b/data/tilesets/secondary/pokemon_tower/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/11.pal b/data/tilesets/secondary/pokemon_tower/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/12.pal b/data/tilesets/secondary/pokemon_tower/palettes/12.pal
index fa56f966e..fa56f966e 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/13.pal b/data/tilesets/secondary/pokemon_tower/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/14.pal b/data/tilesets/secondary/pokemon_tower/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/15.pal b/data/tilesets/secondary/pokemon_tower/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4D64/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/2.pal b/data/tilesets/secondary/pokemon_tower/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/3.pal b/data/tilesets/secondary/pokemon_tower/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/4.pal b/data/tilesets/secondary/pokemon_tower/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/5.pal b/data/tilesets/secondary/pokemon_tower/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/6.pal b/data/tilesets/secondary/pokemon_tower/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/7.pal b/data/tilesets/secondary/pokemon_tower/palettes/7.pal
index 241a2678c..241a2678c 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/8.pal b/data/tilesets/secondary/pokemon_tower/palettes/8.pal
index ebd9e912c..ebd9e912c 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/9.pal b/data/tilesets/secondary/pokemon_tower/palettes/9.pal
index 51daf6701..51daf6701 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4EFC/tiles.png b/data/tilesets/secondary/pokemon_tower/tiles.png
index b8f8c6a4d..b8f8c6a4d 100644
--- a/data/tilesets/secondary/82D4EFC/tiles.png
+++ b/data/tilesets/secondary/pokemon_tower/tiles.png
diff --git a/data/tilesets/secondary/82D4E9C/metatile_attributes.bin b/data/tilesets/secondary/power_plant/metatile_attributes.bin
index 1105056c9..1105056c9 100644
--- a/data/tilesets/secondary/82D4E9C/metatile_attributes.bin
+++ b/data/tilesets/secondary/power_plant/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E9C/metatiles.bin b/data/tilesets/secondary/power_plant/metatiles.bin
index 7d1e15676..7d1e15676 100644
--- a/data/tilesets/secondary/82D4E9C/metatiles.bin
+++ b/data/tilesets/secondary/power_plant/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D7C/palettes/0.pal b/data/tilesets/secondary/power_plant/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/0.pal
+++ b/data/tilesets/secondary/power_plant/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/1.pal b/data/tilesets/secondary/power_plant/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/1.pal
+++ b/data/tilesets/secondary/power_plant/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/10.pal b/data/tilesets/secondary/power_plant/palettes/10.pal
index 2a1743eaa..2a1743eaa 100644
--- a/data/tilesets/secondary/82D4D94/palettes/10.pal
+++ b/data/tilesets/secondary/power_plant/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/11.pal b/data/tilesets/secondary/power_plant/palettes/11.pal
index 307e0ea7e..307e0ea7e 100644
--- a/data/tilesets/secondary/82D4D94/palettes/11.pal
+++ b/data/tilesets/secondary/power_plant/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/12.pal b/data/tilesets/secondary/power_plant/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/12.pal
+++ b/data/tilesets/secondary/power_plant/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/13.pal b/data/tilesets/secondary/power_plant/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/13.pal
+++ b/data/tilesets/secondary/power_plant/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/14.pal b/data/tilesets/secondary/power_plant/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/14.pal
+++ b/data/tilesets/secondary/power_plant/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/15.pal b/data/tilesets/secondary/power_plant/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/15.pal
+++ b/data/tilesets/secondary/power_plant/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/2.pal b/data/tilesets/secondary/power_plant/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/2.pal
+++ b/data/tilesets/secondary/power_plant/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/3.pal b/data/tilesets/secondary/power_plant/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/3.pal
+++ b/data/tilesets/secondary/power_plant/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/4.pal b/data/tilesets/secondary/power_plant/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/4.pal
+++ b/data/tilesets/secondary/power_plant/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/5.pal b/data/tilesets/secondary/power_plant/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/5.pal
+++ b/data/tilesets/secondary/power_plant/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/6.pal b/data/tilesets/secondary/power_plant/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/6.pal
+++ b/data/tilesets/secondary/power_plant/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/7.pal b/data/tilesets/secondary/power_plant/palettes/7.pal
index b69e6cfa4..b69e6cfa4 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/7.pal
+++ b/data/tilesets/secondary/power_plant/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/8.pal b/data/tilesets/secondary/power_plant/palettes/8.pal
index 3cada9fa1..3cada9fa1 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/8.pal
+++ b/data/tilesets/secondary/power_plant/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/9.pal b/data/tilesets/secondary/power_plant/palettes/9.pal
index 2a1743eaa..2a1743eaa 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/9.pal
+++ b/data/tilesets/secondary/power_plant/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E9C/tiles.png b/data/tilesets/secondary/power_plant/tiles.png
index d252dbcd3..d252dbcd3 100644
--- a/data/tilesets/secondary/82D4E9C/tiles.png
+++ b/data/tilesets/secondary/power_plant/tiles.png
diff --git a/data/tilesets/secondary/82D4F44/metatile_attributes.bin b/data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin
index a2ac291b5..a2ac291b5 100644
--- a/data/tilesets/secondary/82D4F44/metatile_attributes.bin
+++ b/data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F44/metatiles.bin b/data/tilesets/secondary/restaurant_hotel/metatiles.bin
index 5cddd954c..5cddd954c 100644
--- a/data/tilesets/secondary/82D4F44/metatiles.bin
+++ b/data/tilesets/secondary/restaurant_hotel/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DDC/palettes/0.pal b/data/tilesets/secondary/restaurant_hotel/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/0.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/1.pal b/data/tilesets/secondary/restaurant_hotel/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4F44/palettes/1.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/10.pal b/data/tilesets/secondary/restaurant_hotel/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F44/palettes/10.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/11.pal b/data/tilesets/secondary/restaurant_hotel/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F44/palettes/11.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/12.pal b/data/tilesets/secondary/restaurant_hotel/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/12.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/13.pal b/data/tilesets/secondary/restaurant_hotel/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/13.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/14.pal b/data/tilesets/secondary/restaurant_hotel/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/14.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/15.pal b/data/tilesets/secondary/restaurant_hotel/palettes/15.pal
index 71b5ee827..71b5ee827 100644
--- a/data/tilesets/secondary/82D4F44/palettes/15.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/2.pal b/data/tilesets/secondary/restaurant_hotel/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4F44/palettes/2.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/3.pal b/data/tilesets/secondary/restaurant_hotel/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4F44/palettes/3.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/4.pal b/data/tilesets/secondary/restaurant_hotel/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/4.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/5.pal b/data/tilesets/secondary/restaurant_hotel/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/5.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/6.pal b/data/tilesets/secondary/restaurant_hotel/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F44/palettes/6.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/7.pal b/data/tilesets/secondary/restaurant_hotel/palettes/7.pal
index 5e3bac102..5e3bac102 100644
--- a/data/tilesets/secondary/82D4F44/palettes/7.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/8.pal b/data/tilesets/secondary/restaurant_hotel/palettes/8.pal
index 2257c0006..2257c0006 100644
--- a/data/tilesets/secondary/82D4F44/palettes/8.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/9.pal b/data/tilesets/secondary/restaurant_hotel/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F44/palettes/9.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F44/tiles.png b/data/tilesets/secondary/restaurant_hotel/tiles.png
index 5c8a38b9e..5c8a38b9e 100644
--- a/data/tilesets/secondary/82D4F44/tiles.png
+++ b/data/tilesets/secondary/restaurant_hotel/tiles.png
diff --git a/data/tilesets/secondary/82D4DF4/metatile_attributes.bin b/data/tilesets/secondary/rock_tunnel/metatile_attributes.bin
index 96ef6a853..96ef6a853 100644
--- a/data/tilesets/secondary/82D4DF4/metatile_attributes.bin
+++ b/data/tilesets/secondary/rock_tunnel/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DF4/metatiles.bin b/data/tilesets/secondary/rock_tunnel/metatiles.bin
index 0ee478c87..0ee478c87 100644
--- a/data/tilesets/secondary/82D4DF4/metatiles.bin
+++ b/data/tilesets/secondary/rock_tunnel/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FBC/palettes/0.pal b/data/tilesets/secondary/rock_tunnel/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/0.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/1.pal b/data/tilesets/secondary/rock_tunnel/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/1.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/10.pal b/data/tilesets/secondary/rock_tunnel/palettes/10.pal
index 4235579fc..4235579fc 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/10.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/11.pal b/data/tilesets/secondary/rock_tunnel/palettes/11.pal
index 277172976..277172976 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/11.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/12.pal b/data/tilesets/secondary/rock_tunnel/palettes/12.pal
index 2fa21e9fb..2fa21e9fb 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/12.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/13.pal b/data/tilesets/secondary/rock_tunnel/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/13.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/14.pal b/data/tilesets/secondary/rock_tunnel/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/14.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/15.pal b/data/tilesets/secondary/rock_tunnel/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/15.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/2.pal b/data/tilesets/secondary/rock_tunnel/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/2.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/3.pal b/data/tilesets/secondary/rock_tunnel/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/3.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/4.pal b/data/tilesets/secondary/rock_tunnel/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4F14/palettes/4.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/5.pal b/data/tilesets/secondary/rock_tunnel/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/5.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/6.pal b/data/tilesets/secondary/rock_tunnel/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/6.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/7.pal b/data/tilesets/secondary/rock_tunnel/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4F14/palettes/7.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/8.pal b/data/tilesets/secondary/rock_tunnel/palettes/8.pal
index 34a637b1a..34a637b1a 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/8.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/9.pal b/data/tilesets/secondary/rock_tunnel/palettes/9.pal
index f10a94f7c..f10a94f7c 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/9.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DF4/tiles.png b/data/tilesets/secondary/rock_tunnel/tiles.png
index cb4078fa9..cb4078fa9 100644
--- a/data/tilesets/secondary/82D4DF4/tiles.png
+++ b/data/tilesets/secondary/rock_tunnel/tiles.png
diff --git a/data/tilesets/secondary/82D4F14/metatile_attributes.bin b/data/tilesets/secondary/safari_zone_building/metatile_attributes.bin
index 9656d8ed7..9656d8ed7 100644
--- a/data/tilesets/secondary/82D4F14/metatile_attributes.bin
+++ b/data/tilesets/secondary/safari_zone_building/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F14/metatiles.bin b/data/tilesets/secondary/safari_zone_building/metatiles.bin
index 3337a5393..3337a5393 100644
--- a/data/tilesets/secondary/82D4F14/metatiles.bin
+++ b/data/tilesets/secondary/safari_zone_building/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F14/palettes/0.pal b/data/tilesets/secondary/safari_zone_building/palettes/0.pal
index 620015e77..620015e77 100644
--- a/data/tilesets/secondary/82D4F14/palettes/0.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/1.pal b/data/tilesets/secondary/safari_zone_building/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/1.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/10.pal b/data/tilesets/secondary/safari_zone_building/palettes/10.pal
index 1f08b0f6f..1f08b0f6f 100644
--- a/data/tilesets/secondary/82D4F14/palettes/10.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/11.pal b/data/tilesets/secondary/safari_zone_building/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/11.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/12.pal b/data/tilesets/secondary/safari_zone_building/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/12.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/13.pal b/data/tilesets/secondary/safari_zone_building/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/13.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/14.pal b/data/tilesets/secondary/safari_zone_building/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/14.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/15.pal b/data/tilesets/secondary/safari_zone_building/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/15.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/2.pal b/data/tilesets/secondary/safari_zone_building/palettes/2.pal
index ddec077d0..ddec077d0 100644
--- a/data/tilesets/secondary/82D4F14/palettes/2.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/3.pal b/data/tilesets/secondary/safari_zone_building/palettes/3.pal
index 6d1dfb5af..6d1dfb5af 100644
--- a/data/tilesets/secondary/82D4F14/palettes/3.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/4.pal b/data/tilesets/secondary/safari_zone_building/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/4.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/5.pal b/data/tilesets/secondary/safari_zone_building/palettes/5.pal
index 9de0ef422..9de0ef422 100644
--- a/data/tilesets/secondary/82D4F14/palettes/5.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/6.pal b/data/tilesets/secondary/safari_zone_building/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/6.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/7.pal b/data/tilesets/secondary/safari_zone_building/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/7.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/8.pal b/data/tilesets/secondary/safari_zone_building/palettes/8.pal
index eed6dbc35..eed6dbc35 100644
--- a/data/tilesets/secondary/82D4F14/palettes/8.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/9.pal b/data/tilesets/secondary/safari_zone_building/palettes/9.pal
index e9b93cfd2..e9b93cfd2 100644
--- a/data/tilesets/secondary/82D4F14/palettes/9.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F14/tiles.png b/data/tilesets/secondary/safari_zone_building/tiles.png
index 6c8d53e34..6c8d53e34 100644
--- a/data/tilesets/secondary/82D4F14/tiles.png
+++ b/data/tilesets/secondary/safari_zone_building/tiles.png
diff --git a/data/tilesets/secondary/82D4B9C/metatile_attributes.bin b/data/tilesets/secondary/saffron_city/metatile_attributes.bin
index c6f6551c0..c6f6551c0 100644
--- a/data/tilesets/secondary/82D4B9C/metatile_attributes.bin
+++ b/data/tilesets/secondary/saffron_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B9C/metatiles.bin b/data/tilesets/secondary/saffron_city/metatiles.bin
index dd43794df..dd43794df 100644
--- a/data/tilesets/secondary/82D4B9C/metatiles.bin
+++ b/data/tilesets/secondary/saffron_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B9C/palettes/0.pal b/data/tilesets/secondary/saffron_city/palettes/0.pal
index 9dcb673aa..9dcb673aa 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/0.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/1.pal b/data/tilesets/secondary/saffron_city/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/1.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/10.pal b/data/tilesets/secondary/saffron_city/palettes/10.pal
index ce671fee4..ce671fee4 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/10.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/11.pal b/data/tilesets/secondary/saffron_city/palettes/11.pal
index d1ae629c8..d1ae629c8 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/11.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/12.pal b/data/tilesets/secondary/saffron_city/palettes/12.pal
index b66bd774a..b66bd774a 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/12.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/13.pal b/data/tilesets/secondary/saffron_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/13.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/14.pal b/data/tilesets/secondary/saffron_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/14.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/15.pal b/data/tilesets/secondary/saffron_city/palettes/15.pal
index 3ffc684ac..3ffc684ac 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/15.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/2.pal b/data/tilesets/secondary/saffron_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D5004/palettes/2.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/3.pal b/data/tilesets/secondary/saffron_city/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/3.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/4.pal b/data/tilesets/secondary/saffron_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/4.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/5.pal b/data/tilesets/secondary/saffron_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/5.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/6.pal b/data/tilesets/secondary/saffron_city/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/6.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/7.pal b/data/tilesets/secondary/saffron_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/7.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/8.pal b/data/tilesets/secondary/saffron_city/palettes/8.pal
index b1e168855..b1e168855 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/8.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/9.pal b/data/tilesets/secondary/saffron_city/palettes/9.pal
index 7a88fdbbf..7a88fdbbf 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/9.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B9C/tiles.png b/data/tilesets/secondary/saffron_city/tiles.png
index ea835f8dd..ea835f8dd 100644
--- a/data/tilesets/secondary/82D4B9C/tiles.png
+++ b/data/tilesets/secondary/saffron_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D64/metatile_attributes.bin b/data/tilesets/secondary/saffron_gym/metatile_attributes.bin
index ee895c35a..ee895c35a 100644
--- a/data/tilesets/secondary/82D4D64/metatile_attributes.bin
+++ b/data/tilesets/secondary/saffron_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D64/metatiles.bin b/data/tilesets/secondary/saffron_gym/metatiles.bin
index e0fdb79fb..e0fdb79fb 100644
--- a/data/tilesets/secondary/82D4D64/metatiles.bin
+++ b/data/tilesets/secondary/saffron_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E3C/palettes/0.pal b/data/tilesets/secondary/saffron_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/0.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/1.pal b/data/tilesets/secondary/saffron_gym/palettes/1.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/1.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/10.pal b/data/tilesets/secondary/saffron_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/10.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/11.pal b/data/tilesets/secondary/saffron_gym/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E84/palettes/11.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/12.pal b/data/tilesets/secondary/saffron_gym/palettes/12.pal
index 702c67ecb..702c67ecb 100644
--- a/data/tilesets/secondary/82D4D64/palettes/12.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/13.pal b/data/tilesets/secondary/saffron_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/13.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/14.pal b/data/tilesets/secondary/saffron_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F44/palettes/14.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/15.pal b/data/tilesets/secondary/saffron_gym/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/15.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/2.pal b/data/tilesets/secondary/saffron_gym/palettes/2.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/2.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/3.pal b/data/tilesets/secondary/saffron_gym/palettes/3.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/3.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/4.pal b/data/tilesets/secondary/saffron_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/4.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/5.pal b/data/tilesets/secondary/saffron_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/5.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/6.pal b/data/tilesets/secondary/saffron_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/6.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/7.pal b/data/tilesets/secondary/saffron_gym/palettes/7.pal
index c66eaedff..c66eaedff 100644
--- a/data/tilesets/secondary/82D4D64/palettes/7.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/8.pal b/data/tilesets/secondary/saffron_gym/palettes/8.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D34/palettes/8.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/9.pal b/data/tilesets/secondary/saffron_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D34/palettes/9.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D64/tiles.png b/data/tilesets/secondary/saffron_gym/tiles.png
index 87641a309..87641a309 100644
--- a/data/tilesets/secondary/82D4D64/tiles.png
+++ b/data/tilesets/secondary/saffron_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4F5C/metatile_attributes.bin b/data/tilesets/secondary/school/metatile_attributes.bin
index cdcb96c53..cdcb96c53 100644
--- a/data/tilesets/secondary/82D4F5C/metatile_attributes.bin
+++ b/data/tilesets/secondary/school/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F5C/metatiles.bin b/data/tilesets/secondary/school/metatiles.bin
index 35009a690..35009a690 100644
--- a/data/tilesets/secondary/82D4F5C/metatiles.bin
+++ b/data/tilesets/secondary/school/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E6C/palettes/0.pal b/data/tilesets/secondary/school/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/0.pal
+++ b/data/tilesets/secondary/school/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/1.pal b/data/tilesets/secondary/school/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/1.pal
+++ b/data/tilesets/secondary/school/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/10.pal b/data/tilesets/secondary/school/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/10.pal
+++ b/data/tilesets/secondary/school/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/11.pal b/data/tilesets/secondary/school/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/11.pal
+++ b/data/tilesets/secondary/school/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/12.pal b/data/tilesets/secondary/school/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/12.pal
+++ b/data/tilesets/secondary/school/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/13.pal b/data/tilesets/secondary/school/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F44/palettes/13.pal
+++ b/data/tilesets/secondary/school/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/14.pal b/data/tilesets/secondary/school/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/14.pal
+++ b/data/tilesets/secondary/school/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/15.pal b/data/tilesets/secondary/school/palettes/15.pal
index 71b5ee827..71b5ee827 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/15.pal
+++ b/data/tilesets/secondary/school/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/2.pal b/data/tilesets/secondary/school/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/2.pal
+++ b/data/tilesets/secondary/school/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/3.pal b/data/tilesets/secondary/school/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/3.pal
+++ b/data/tilesets/secondary/school/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/4.pal b/data/tilesets/secondary/school/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E84/palettes/4.pal
+++ b/data/tilesets/secondary/school/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/5.pal b/data/tilesets/secondary/school/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E84/palettes/5.pal
+++ b/data/tilesets/secondary/school/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/6.pal b/data/tilesets/secondary/school/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/6.pal
+++ b/data/tilesets/secondary/school/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/7.pal b/data/tilesets/secondary/school/palettes/7.pal
index 6c1a5b096..6c1a5b096 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/7.pal
+++ b/data/tilesets/secondary/school/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/8.pal b/data/tilesets/secondary/school/palettes/8.pal
index 1557a55f0..1557a55f0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/8.pal
+++ b/data/tilesets/secondary/school/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/9.pal b/data/tilesets/secondary/school/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/9.pal
+++ b/data/tilesets/secondary/school/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F5C/tiles.png b/data/tilesets/secondary/school/tiles.png
index 935afccd2..935afccd2 100644
--- a/data/tilesets/secondary/82D4F5C/tiles.png
+++ b/data/tilesets/secondary/school/tiles.png
diff --git a/data/tilesets/secondary/82D4EB4/metatile_attributes.bin b/data/tilesets/secondary/sea_cottage/metatile_attributes.bin
index 05caeb58b..05caeb58b 100644
--- a/data/tilesets/secondary/82D4EB4/metatile_attributes.bin
+++ b/data/tilesets/secondary/sea_cottage/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EB4/metatiles.bin b/data/tilesets/secondary/sea_cottage/metatiles.bin
index 6ac3cbf98..6ac3cbf98 100644
--- a/data/tilesets/secondary/82D4EB4/metatiles.bin
+++ b/data/tilesets/secondary/sea_cottage/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EB4/palettes/0.pal b/data/tilesets/secondary/sea_cottage/palettes/0.pal
index ed708dd79..ed708dd79 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/0.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/1.pal b/data/tilesets/secondary/sea_cottage/palettes/1.pal
index 4d2b48991..4d2b48991 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/1.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/10.pal b/data/tilesets/secondary/sea_cottage/palettes/10.pal
index e8624e82f..e8624e82f 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/10.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/11.pal b/data/tilesets/secondary/sea_cottage/palettes/11.pal
index 9cec1272b..9cec1272b 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/11.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/12.pal b/data/tilesets/secondary/sea_cottage/palettes/12.pal
index 600d8f469..600d8f469 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/12.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/13.pal b/data/tilesets/secondary/sea_cottage/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/13.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/14.pal b/data/tilesets/secondary/sea_cottage/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/14.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/15.pal b/data/tilesets/secondary/sea_cottage/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/15.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/2.pal b/data/tilesets/secondary/sea_cottage/palettes/2.pal
index 878c13c95..878c13c95 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/2.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/3.pal b/data/tilesets/secondary/sea_cottage/palettes/3.pal
index bed4c20c3..bed4c20c3 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/3.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/4.pal b/data/tilesets/secondary/sea_cottage/palettes/4.pal
index b77ba3e87..b77ba3e87 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/4.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/5.pal b/data/tilesets/secondary/sea_cottage/palettes/5.pal
index 74a2a9ed0..74a2a9ed0 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/5.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/6.pal b/data/tilesets/secondary/sea_cottage/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/6.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/7.pal b/data/tilesets/secondary/sea_cottage/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/7.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/8.pal b/data/tilesets/secondary/sea_cottage/palettes/8.pal
index 370a3d2db..370a3d2db 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/8.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/9.pal b/data/tilesets/secondary/sea_cottage/palettes/9.pal
index 1193cc807..1193cc807 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/9.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4EB4/tiles.png b/data/tilesets/secondary/sea_cottage/tiles.png
index 42d557bcf..42d557bcf 100644
--- a/data/tilesets/secondary/82D4EB4/tiles.png
+++ b/data/tilesets/secondary/sea_cottage/tiles.png
diff --git a/data/tilesets/secondary/82D4E24/metatile_attributes.bin b/data/tilesets/secondary/seafoam_islands/metatile_attributes.bin
index 87564066c..87564066c 100644
--- a/data/tilesets/secondary/82D4E24/metatile_attributes.bin
+++ b/data/tilesets/secondary/seafoam_islands/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E24/metatiles.bin b/data/tilesets/secondary/seafoam_islands/metatiles.bin
index 8f8bd569b..8f8bd569b 100644
--- a/data/tilesets/secondary/82D4E24/metatiles.bin
+++ b/data/tilesets/secondary/seafoam_islands/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FD4/palettes/0.pal b/data/tilesets/secondary/seafoam_islands/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/0.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/0.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/1.pal b/data/tilesets/secondary/seafoam_islands/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D501C/palettes/1.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/10.pal b/data/tilesets/secondary/seafoam_islands/palettes/10.pal
index 7116e91ff..7116e91ff 100644
--- a/data/tilesets/secondary/82D4E24/palettes/10.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/11.pal b/data/tilesets/secondary/seafoam_islands/palettes/11.pal
index b237ef1c8..b237ef1c8 100644
--- a/data/tilesets/secondary/82D4E24/palettes/11.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/12.pal b/data/tilesets/secondary/seafoam_islands/palettes/12.pal
index ed56edee1..ed56edee1 100644
--- a/data/tilesets/secondary/82D4E24/palettes/12.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/13.pal b/data/tilesets/secondary/seafoam_islands/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/13.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/14.pal b/data/tilesets/secondary/seafoam_islands/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/14.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/15.pal b/data/tilesets/secondary/seafoam_islands/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/15.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/15.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/2.pal b/data/tilesets/secondary/seafoam_islands/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D501C/palettes/2.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/2.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/3.pal b/data/tilesets/secondary/seafoam_islands/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D501C/palettes/3.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/4.pal b/data/tilesets/secondary/seafoam_islands/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D5004/palettes/4.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/4.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/5.pal b/data/tilesets/secondary/seafoam_islands/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D501C/palettes/5.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/5.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/6.pal b/data/tilesets/secondary/seafoam_islands/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D501C/palettes/6.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/7.pal b/data/tilesets/secondary/seafoam_islands/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/7.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/8.pal b/data/tilesets/secondary/seafoam_islands/palettes/8.pal
index d96f3f0fc..d96f3f0fc 100644
--- a/data/tilesets/secondary/82D4E24/palettes/8.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/9.pal b/data/tilesets/secondary/seafoam_islands/palettes/9.pal
index 1a1dc881b..1a1dc881b 100644
--- a/data/tilesets/secondary/82D4E24/palettes/9.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E24/tiles.png b/data/tilesets/secondary/seafoam_islands/tiles.png
index e085d8e33..e085d8e33 100644
--- a/data/tilesets/secondary/82D4E24/tiles.png
+++ b/data/tilesets/secondary/seafoam_islands/tiles.png
diff --git a/data/tilesets/secondary/82D504C/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin
index 62eb1b917..62eb1b917 100644
--- a/data/tilesets/secondary/82D504C/metatile_attributes.bin
+++ b/data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D504C/metatiles.bin b/data/tilesets/secondary/sevii_islands_123/metatiles.bin
index 52d2f020d..52d2f020d 100644
--- a/data/tilesets/secondary/82D504C/metatiles.bin
+++ b/data/tilesets/secondary/sevii_islands_123/metatiles.bin
diff --git a/data/tilesets/secondary/82D501C/palettes/0.pal b/data/tilesets/secondary/sevii_islands_123/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D501C/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/0.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/1.pal b/data/tilesets/secondary/sevii_islands_123/palettes/1.pal
index e15d979f1..e15d979f1 100644
--- a/data/tilesets/secondary/82D504C/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/1.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/10.pal b/data/tilesets/secondary/sevii_islands_123/palettes/10.pal
index 265fb0625..265fb0625 100644
--- a/data/tilesets/secondary/82D504C/palettes/10.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/10.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/11.pal b/data/tilesets/secondary/sevii_islands_123/palettes/11.pal
index 9e1e423c6..9e1e423c6 100644
--- a/data/tilesets/secondary/82D504C/palettes/11.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/11.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/12.pal b/data/tilesets/secondary/sevii_islands_123/palettes/12.pal
index 375e3914b..375e3914b 100644
--- a/data/tilesets/secondary/82D504C/palettes/12.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/13.pal b/data/tilesets/secondary/sevii_islands_123/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/13.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/14.pal b/data/tilesets/secondary/sevii_islands_123/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/14.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/15.pal b/data/tilesets/secondary/sevii_islands_123/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/15.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/2.pal b/data/tilesets/secondary/sevii_islands_123/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4B84/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/2.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/3.pal b/data/tilesets/secondary/sevii_islands_123/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D504C/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/3.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/4.pal b/data/tilesets/secondary/sevii_islands_123/palettes/4.pal
index fca4a2623..fca4a2623 100644
--- a/data/tilesets/secondary/82D504C/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/5.pal b/data/tilesets/secondary/sevii_islands_123/palettes/5.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/82D4D94/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/5.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/6.pal b/data/tilesets/secondary/sevii_islands_123/palettes/6.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/82D504C/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/6.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/7.pal b/data/tilesets/secondary/sevii_islands_123/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D504C/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/7.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/8.pal b/data/tilesets/secondary/sevii_islands_123/palettes/8.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/82D504C/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/8.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/9.pal b/data/tilesets/secondary/sevii_islands_123/palettes/9.pal
index b66fdcdbf..b66fdcdbf 100644
--- a/data/tilesets/secondary/82D504C/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/9.pal
diff --git a/data/tilesets/secondary/82D504C/tiles.png b/data/tilesets/secondary/sevii_islands_123/tiles.png
index ad8f73a2c..ad8f73a2c 100644
--- a/data/tilesets/secondary/82D504C/tiles.png
+++ b/data/tilesets/secondary/sevii_islands_123/tiles.png
diff --git a/data/tilesets/secondary/82D5064/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin
index d67c4690c..d67c4690c 100644
--- a/data/tilesets/secondary/82D5064/metatile_attributes.bin
+++ b/data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5064/metatiles.bin b/data/tilesets/secondary/sevii_islands_45/metatiles.bin
index 7613f3702..7613f3702 100644
--- a/data/tilesets/secondary/82D5064/metatiles.bin
+++ b/data/tilesets/secondary/sevii_islands_45/metatiles.bin
diff --git a/data/tilesets/secondary/82D504C/palettes/0.pal b/data/tilesets/secondary/sevii_islands_45/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D504C/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/1.pal b/data/tilesets/secondary/sevii_islands_45/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D5064/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/10.pal b/data/tilesets/secondary/sevii_islands_45/palettes/10.pal
index 86502dd48..86502dd48 100644
--- a/data/tilesets/secondary/82D5064/palettes/10.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/11.pal b/data/tilesets/secondary/sevii_islands_45/palettes/11.pal
index b05410cba..b05410cba 100644
--- a/data/tilesets/secondary/82D5064/palettes/11.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/12.pal b/data/tilesets/secondary/sevii_islands_45/palettes/12.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D5064/palettes/12.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/13.pal b/data/tilesets/secondary/sevii_islands_45/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/13.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/14.pal b/data/tilesets/secondary/sevii_islands_45/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/14.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/15.pal b/data/tilesets/secondary/sevii_islands_45/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/15.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/2.pal b/data/tilesets/secondary/sevii_islands_45/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/3.pal b/data/tilesets/secondary/sevii_islands_45/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D5064/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/4.pal b/data/tilesets/secondary/sevii_islands_45/palettes/4.pal
index fca4a2623..fca4a2623 100644
--- a/data/tilesets/secondary/82D5064/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/4.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/5.pal b/data/tilesets/secondary/sevii_islands_45/palettes/5.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/82D504C/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/6.pal b/data/tilesets/secondary/sevii_islands_45/palettes/6.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/82D5064/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/7.pal b/data/tilesets/secondary/sevii_islands_45/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D5064/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/8.pal b/data/tilesets/secondary/sevii_islands_45/palettes/8.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/82D5064/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/9.pal b/data/tilesets/secondary/sevii_islands_45/palettes/9.pal
index 5ac617b25..5ac617b25 100644
--- a/data/tilesets/secondary/82D5064/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5064/tiles.png b/data/tilesets/secondary/sevii_islands_45/tiles.png
index 744b38638..744b38638 100644
--- a/data/tilesets/secondary/82D5064/tiles.png
+++ b/data/tilesets/secondary/sevii_islands_45/tiles.png
diff --git a/data/tilesets/secondary/82D507C/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin
index edf192276..edf192276 100644
--- a/data/tilesets/secondary/82D507C/metatile_attributes.bin
+++ b/data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D507C/metatiles.bin b/data/tilesets/secondary/sevii_islands_67/metatiles.bin
index 13f97073b..13f97073b 100644
--- a/data/tilesets/secondary/82D507C/metatiles.bin
+++ b/data/tilesets/secondary/sevii_islands_67/metatiles.bin
diff --git a/data/tilesets/secondary/82D5064/palettes/0.pal b/data/tilesets/secondary/sevii_islands_67/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D5064/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/1.pal b/data/tilesets/secondary/sevii_islands_67/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/1.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/10.pal b/data/tilesets/secondary/sevii_islands_67/palettes/10.pal
index d26d003af..d26d003af 100644
--- a/data/tilesets/secondary/82D507C/palettes/10.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/10.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/11.pal b/data/tilesets/secondary/sevii_islands_67/palettes/11.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D507C/palettes/11.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/11.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/12.pal b/data/tilesets/secondary/sevii_islands_67/palettes/12.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D507C/palettes/12.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/13.pal b/data/tilesets/secondary/sevii_islands_67/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/13.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/14.pal b/data/tilesets/secondary/sevii_islands_67/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/14.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/15.pal b/data/tilesets/secondary/sevii_islands_67/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/15.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/15.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/2.pal b/data/tilesets/secondary/sevii_islands_67/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D507C/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/2.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/3.pal b/data/tilesets/secondary/sevii_islands_67/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D507C/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/3.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/4.pal b/data/tilesets/secondary/sevii_islands_67/palettes/4.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/82D507C/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/4.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/5.pal b/data/tilesets/secondary/sevii_islands_67/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D507C/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/5.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/6.pal b/data/tilesets/secondary/sevii_islands_67/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D507C/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/6.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/7.pal b/data/tilesets/secondary/sevii_islands_67/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/7.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/8.pal b/data/tilesets/secondary/sevii_islands_67/palettes/8.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/82D507C/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/8.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/9.pal b/data/tilesets/secondary/sevii_islands_67/palettes/9.pal
index edc5961bb..edc5961bb 100644
--- a/data/tilesets/secondary/82D507C/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/9.pal
diff --git a/data/tilesets/secondary/82D507C/tiles.png b/data/tilesets/secondary/sevii_islands_67/tiles.png
index d40c92649..d40c92649 100644
--- a/data/tilesets/secondary/82D507C/tiles.png
+++ b/data/tilesets/secondary/sevii_islands_67/tiles.png
diff --git a/data/tilesets/secondary/82D4ECC/metatile_attributes.bin b/data/tilesets/secondary/silph_co/metatile_attributes.bin
index a118a0181..a118a0181 100644
--- a/data/tilesets/secondary/82D4ECC/metatile_attributes.bin
+++ b/data/tilesets/secondary/silph_co/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4ECC/metatiles.bin b/data/tilesets/secondary/silph_co/metatiles.bin
index c86070668..c86070668 100644
--- a/data/tilesets/secondary/82D4ECC/metatiles.bin
+++ b/data/tilesets/secondary/silph_co/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D94/metatile_attributes.bin b/data/tilesets/secondary/ss_anne/metatile_attributes.bin
index 949846f90..949846f90 100644
--- a/data/tilesets/secondary/82D4D94/metatile_attributes.bin
+++ b/data/tilesets/secondary/ss_anne/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D94/metatiles.bin b/data/tilesets/secondary/ss_anne/metatiles.bin
index a976297b3..a976297b3 100644
--- a/data/tilesets/secondary/82D4D94/metatiles.bin
+++ b/data/tilesets/secondary/ss_anne/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D94/palettes/0.pal b/data/tilesets/secondary/ss_anne/palettes/0.pal
index 28232d99e..28232d99e 100644
--- a/data/tilesets/secondary/82D4D94/palettes/0.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/1.pal b/data/tilesets/secondary/ss_anne/palettes/1.pal
index b43532470..b43532470 100644
--- a/data/tilesets/secondary/82D4D94/palettes/1.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/10.pal b/data/tilesets/secondary/ss_anne/palettes/10.pal
index 2a1743eaa..2a1743eaa 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/10.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/11.pal b/data/tilesets/secondary/ss_anne/palettes/11.pal
index 307e0ea7e..307e0ea7e 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/11.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/12.pal b/data/tilesets/secondary/ss_anne/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F44/palettes/12.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/13.pal b/data/tilesets/secondary/ss_anne/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/13.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/14.pal b/data/tilesets/secondary/ss_anne/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/14.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/15.pal b/data/tilesets/secondary/ss_anne/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5004/palettes/15.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/2.pal b/data/tilesets/secondary/ss_anne/palettes/2.pal
index e267ae90e..e267ae90e 100644
--- a/data/tilesets/secondary/82D4D94/palettes/2.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/3.pal b/data/tilesets/secondary/ss_anne/palettes/3.pal
index 503f22878..503f22878 100644
--- a/data/tilesets/secondary/82D4D94/palettes/3.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/4.pal b/data/tilesets/secondary/ss_anne/palettes/4.pal
index cdf1b6190..cdf1b6190 100644
--- a/data/tilesets/secondary/82D4D94/palettes/4.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/5.pal b/data/tilesets/secondary/ss_anne/palettes/5.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/82D5064/palettes/5.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/6.pal b/data/tilesets/secondary/ss_anne/palettes/6.pal
index 0dba59a72..0dba59a72 100644
--- a/data/tilesets/secondary/82D4D94/palettes/6.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/7.pal b/data/tilesets/secondary/ss_anne/palettes/7.pal
index e9848a1c0..e9848a1c0 100644
--- a/data/tilesets/secondary/82D4D94/palettes/7.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/8.pal b/data/tilesets/secondary/ss_anne/palettes/8.pal
index b5c80c8f4..b5c80c8f4 100644
--- a/data/tilesets/secondary/82D4D94/palettes/8.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/9.pal b/data/tilesets/secondary/ss_anne/palettes/9.pal
index b66b2399a..b66b2399a 100644
--- a/data/tilesets/secondary/82D4D94/palettes/9.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D94/tiles.png b/data/tilesets/secondary/ss_anne/tiles.png
index 280f3e227..280f3e227 100644
--- a/data/tilesets/secondary/82D4D94/tiles.png
+++ b/data/tilesets/secondary/ss_anne/tiles.png
diff --git a/data/tilesets/secondary/82D5034/metatile_attributes.bin b/data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin
index 5fe7d59fc..5fe7d59fc 100644
--- a/data/tilesets/secondary/82D5034/metatile_attributes.bin
+++ b/data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5034/metatiles.bin b/data/tilesets/secondary/tanoby_ruins/metatiles.bin
index 2b3a9543e..2b3a9543e 100644
--- a/data/tilesets/secondary/82D5034/metatiles.bin
+++ b/data/tilesets/secondary/tanoby_ruins/metatiles.bin
diff --git a/data/tilesets/secondary/82D5034/palettes/0.pal b/data/tilesets/secondary/tanoby_ruins/palettes/0.pal
index 83b30fc17..83b30fc17 100644
--- a/data/tilesets/secondary/82D5034/palettes/0.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/1.pal b/data/tilesets/secondary/tanoby_ruins/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D5034/palettes/1.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/10.pal b/data/tilesets/secondary/tanoby_ruins/palettes/10.pal
index fb565545b..fb565545b 100644
--- a/data/tilesets/secondary/82D5034/palettes/10.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/11.pal b/data/tilesets/secondary/tanoby_ruins/palettes/11.pal
index e637019c6..e637019c6 100644
--- a/data/tilesets/secondary/82D5034/palettes/11.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/12.pal b/data/tilesets/secondary/tanoby_ruins/palettes/12.pal
index 775369fed..775369fed 100644
--- a/data/tilesets/secondary/82D5034/palettes/12.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/13.pal b/data/tilesets/secondary/tanoby_ruins/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/13.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/14.pal b/data/tilesets/secondary/tanoby_ruins/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5004/palettes/14.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/14.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/15.pal b/data/tilesets/secondary/tanoby_ruins/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D501C/palettes/15.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/2.pal b/data/tilesets/secondary/tanoby_ruins/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D5094/palettes/2.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/3.pal b/data/tilesets/secondary/tanoby_ruins/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D5094/palettes/3.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/4.pal b/data/tilesets/secondary/tanoby_ruins/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D5094/palettes/4.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/5.pal b/data/tilesets/secondary/tanoby_ruins/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D5094/palettes/5.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/6.pal b/data/tilesets/secondary/tanoby_ruins/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D5094/palettes/6.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/7.pal b/data/tilesets/secondary/tanoby_ruins/palettes/7.pal
index dfa779635..dfa779635 100644
--- a/data/tilesets/secondary/82D5034/palettes/7.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/8.pal b/data/tilesets/secondary/tanoby_ruins/palettes/8.pal
index fd7d8a9d7..fd7d8a9d7 100644
--- a/data/tilesets/secondary/82D5034/palettes/8.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/9.pal b/data/tilesets/secondary/tanoby_ruins/palettes/9.pal
index 0d43d6ef9..0d43d6ef9 100644
--- a/data/tilesets/secondary/82D5034/palettes/9.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5034/tiles.png b/data/tilesets/secondary/tanoby_ruins/tiles.png
index c61f91c47..c61f91c47 100644
--- a/data/tilesets/secondary/82D5034/tiles.png
+++ b/data/tilesets/secondary/tanoby_ruins/tiles.png
diff --git a/data/tilesets/secondary/82D5094/metatile_attributes.bin b/data/tilesets/secondary/trainer_tower/metatile_attributes.bin
index 96b25bb0f..96b25bb0f 100644
--- a/data/tilesets/secondary/82D5094/metatile_attributes.bin
+++ b/data/tilesets/secondary/trainer_tower/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5094/metatiles.bin b/data/tilesets/secondary/trainer_tower/metatiles.bin
index f045f57e8..f045f57e8 100644
--- a/data/tilesets/secondary/82D5094/metatiles.bin
+++ b/data/tilesets/secondary/trainer_tower/metatiles.bin
diff --git a/data/tilesets/secondary/82D50DC/palettes/0.pal b/data/tilesets/secondary/trainer_tower/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D50DC/palettes/0.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/1.pal b/data/tilesets/secondary/trainer_tower/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D5094/palettes/1.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/10.pal b/data/tilesets/secondary/trainer_tower/palettes/10.pal
index ab3a7d14f..ab3a7d14f 100644
--- a/data/tilesets/secondary/82D5094/palettes/10.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/11.pal b/data/tilesets/secondary/trainer_tower/palettes/11.pal
index bb88b4d57..bb88b4d57 100644
--- a/data/tilesets/secondary/82D5094/palettes/11.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/12.pal b/data/tilesets/secondary/trainer_tower/palettes/12.pal
index b0d005f21..b0d005f21 100644
--- a/data/tilesets/secondary/82D5094/palettes/12.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/13.pal b/data/tilesets/secondary/trainer_tower/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5004/palettes/13.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/13.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/14.pal b/data/tilesets/secondary/trainer_tower/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D501C/palettes/14.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/15.pal b/data/tilesets/secondary/trainer_tower/palettes/15.pal
index 6a17f18dc..6a17f18dc 100644
--- a/data/tilesets/secondary/82D5094/palettes/15.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/15.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/2.pal b/data/tilesets/secondary/trainer_tower/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D50C4/palettes/2.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/2.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/3.pal b/data/tilesets/secondary/trainer_tower/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D50C4/palettes/3.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/3.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/4.pal b/data/tilesets/secondary/trainer_tower/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D50C4/palettes/4.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/4.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/5.pal b/data/tilesets/secondary/trainer_tower/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D50DC/palettes/5.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/5.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/6.pal b/data/tilesets/secondary/trainer_tower/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D50C4/palettes/6.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/7.pal b/data/tilesets/secondary/trainer_tower/palettes/7.pal
index edc5961bb..edc5961bb 100644
--- a/data/tilesets/secondary/82D5094/palettes/7.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/8.pal b/data/tilesets/secondary/trainer_tower/palettes/8.pal
index 317213c42..317213c42 100644
--- a/data/tilesets/secondary/82D5094/palettes/8.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/9.pal b/data/tilesets/secondary/trainer_tower/palettes/9.pal
index 19dc9a47e..19dc9a47e 100644
--- a/data/tilesets/secondary/82D5094/palettes/9.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5094/tiles.png b/data/tilesets/secondary/trainer_tower/tiles.png
index f74f7c9f7..f74f7c9f7 100644
--- a/data/tilesets/secondary/82D5094/tiles.png
+++ b/data/tilesets/secondary/trainer_tower/tiles.png
diff --git a/data/tilesets/secondary/82D4EE4/metatile_attributes.bin b/data/tilesets/secondary/underground_path/metatile_attributes.bin
index 29caa862d..29caa862d 100644
--- a/data/tilesets/secondary/82D4EE4/metatile_attributes.bin
+++ b/data/tilesets/secondary/underground_path/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EE4/metatiles.bin b/data/tilesets/secondary/underground_path/metatiles.bin
index 2010e1eca..2010e1eca 100644
--- a/data/tilesets/secondary/82D4EE4/metatiles.bin
+++ b/data/tilesets/secondary/underground_path/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FA4/palettes/0.pal b/data/tilesets/secondary/underground_path/palettes/0.pal
index 6d876039d..6d876039d 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/0.pal
+++ b/data/tilesets/secondary/underground_path/palettes/0.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/1.pal b/data/tilesets/secondary/underground_path/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D50DC/palettes/1.pal
+++ b/data/tilesets/secondary/underground_path/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/10.pal b/data/tilesets/secondary/underground_path/palettes/10.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/10.pal
+++ b/data/tilesets/secondary/underground_path/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/11.pal b/data/tilesets/secondary/underground_path/palettes/11.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/11.pal
+++ b/data/tilesets/secondary/underground_path/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/12.pal b/data/tilesets/secondary/underground_path/palettes/12.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/12.pal
+++ b/data/tilesets/secondary/underground_path/palettes/12.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/13.pal b/data/tilesets/secondary/underground_path/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D501C/palettes/13.pal
+++ b/data/tilesets/secondary/underground_path/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/14.pal b/data/tilesets/secondary/underground_path/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5034/palettes/14.pal
+++ b/data/tilesets/secondary/underground_path/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/15.pal b/data/tilesets/secondary/underground_path/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5034/palettes/15.pal
+++ b/data/tilesets/secondary/underground_path/palettes/15.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/2.pal b/data/tilesets/secondary/underground_path/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D50DC/palettes/2.pal
+++ b/data/tilesets/secondary/underground_path/palettes/2.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/3.pal b/data/tilesets/secondary/underground_path/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D50DC/palettes/3.pal
+++ b/data/tilesets/secondary/underground_path/palettes/3.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/4.pal b/data/tilesets/secondary/underground_path/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D50DC/palettes/4.pal
+++ b/data/tilesets/secondary/underground_path/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/5.pal b/data/tilesets/secondary/underground_path/palettes/5.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/5.pal
+++ b/data/tilesets/secondary/underground_path/palettes/5.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/6.pal b/data/tilesets/secondary/underground_path/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D50DC/palettes/6.pal
+++ b/data/tilesets/secondary/underground_path/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/7.pal b/data/tilesets/secondary/underground_path/palettes/7.pal
index 23e995640..23e995640 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/7.pal
+++ b/data/tilesets/secondary/underground_path/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/8.pal b/data/tilesets/secondary/underground_path/palettes/8.pal
index 3ce3570a1..3ce3570a1 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/8.pal
+++ b/data/tilesets/secondary/underground_path/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/9.pal b/data/tilesets/secondary/underground_path/palettes/9.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/9.pal
+++ b/data/tilesets/secondary/underground_path/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4EE4/tiles.png b/data/tilesets/secondary/underground_path/tiles.png
index b8865022d..b8865022d 100644
--- a/data/tilesets/secondary/82D4EE4/tiles.png
+++ b/data/tilesets/secondary/underground_path/tiles.png
diff --git a/data/tilesets/secondary/82D4DDC/metatile_attributes.bin b/data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin
index 3549eaa93..3549eaa93 100644
--- a/data/tilesets/secondary/82D4DDC/metatile_attributes.bin
+++ b/data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DDC/metatiles.bin b/data/tilesets/secondary/unused_gatehouse1/metatiles.bin
index ea1398be3..ea1398be3 100644
--- a/data/tilesets/secondary/82D4DDC/metatiles.bin
+++ b/data/tilesets/secondary/unused_gatehouse1/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E84/palettes/0.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E84/palettes/0.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/1.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/1.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/10.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/10.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/11.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/11.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/12.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/12.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/13.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5034/palettes/13.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/13.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/14.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D504C/palettes/14.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/14.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/15.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D504C/palettes/15.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/2.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/2.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/3.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/3.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/4.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/4.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/5.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/5.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/6.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/6.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/7.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/7.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/8.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/8.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/9.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/9.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DDC/tiles.png b/data/tilesets/secondary/unused_gatehouse1/tiles.png
index 6d376f447..6d376f447 100644
--- a/data/tilesets/secondary/82D4DDC/tiles.png
+++ b/data/tilesets/secondary/unused_gatehouse1/tiles.png
diff --git a/data/tilesets/secondary/82D4E3C/metatile_attributes.bin b/data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin
index 3549eaa93..3549eaa93 100644
--- a/data/tilesets/secondary/82D4E3C/metatile_attributes.bin
+++ b/data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E3C/metatiles.bin b/data/tilesets/secondary/unused_gatehouse2/metatiles.bin
index ea1398be3..ea1398be3 100644
--- a/data/tilesets/secondary/82D4E3C/metatiles.bin
+++ b/data/tilesets/secondary/unused_gatehouse2/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E9C/palettes/0.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/0.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/1.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/1.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/10.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E84/palettes/10.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/11.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4F14/palettes/11.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/12.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/12.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/12.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/13.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D504C/palettes/13.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/14.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5064/palettes/14.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/15.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5064/palettes/15.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/2.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/2.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/3.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/3.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/4.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/4.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/5.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/5.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/6.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/6.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/7.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/82D4E84/palettes/7.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/8.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/82D4E84/palettes/8.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/9.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/9.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E3C/tiles.png b/data/tilesets/secondary/unused_gatehouse2/tiles.png
index 6d376f447..6d376f447 100644
--- a/data/tilesets/secondary/82D4E3C/tiles.png
+++ b/data/tilesets/secondary/unused_gatehouse2/tiles.png
diff --git a/data/tilesets/secondary/82D4B24/metatile_attributes.bin b/data/tilesets/secondary/vermilion_city/metatile_attributes.bin
index 1136f644a..1136f644a 100644
--- a/data/tilesets/secondary/82D4B24/metatile_attributes.bin
+++ b/data/tilesets/secondary/vermilion_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B24/metatiles.bin b/data/tilesets/secondary/vermilion_city/metatiles.bin
index c7978128e..c7978128e 100644
--- a/data/tilesets/secondary/82D4B24/metatiles.bin
+++ b/data/tilesets/secondary/vermilion_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D507C/palettes/0.pal b/data/tilesets/secondary/vermilion_city/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D507C/palettes/0.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/1.pal b/data/tilesets/secondary/vermilion_city/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/82D507C/palettes/1.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/10.pal b/data/tilesets/secondary/vermilion_city/palettes/10.pal
index 892aae6ed..892aae6ed 100644
--- a/data/tilesets/secondary/82D4B24/palettes/10.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/11.pal b/data/tilesets/secondary/vermilion_city/palettes/11.pal
index b2a405273..b2a405273 100644
--- a/data/tilesets/secondary/82D4B24/palettes/11.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/12.pal b/data/tilesets/secondary/vermilion_city/palettes/12.pal
index f124929b4..f124929b4 100644
--- a/data/tilesets/secondary/82D4B24/palettes/12.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/13.pal b/data/tilesets/secondary/vermilion_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5064/palettes/13.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/14.pal b/data/tilesets/secondary/vermilion_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/14.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/15.pal b/data/tilesets/secondary/vermilion_city/palettes/15.pal
index ac0d32eb0..ac0d32eb0 100644
--- a/data/tilesets/secondary/82D4B24/palettes/15.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/2.pal b/data/tilesets/secondary/vermilion_city/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D504C/palettes/2.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/3.pal b/data/tilesets/secondary/vermilion_city/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D50AC/palettes/3.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/4.pal b/data/tilesets/secondary/vermilion_city/palettes/4.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/82D50AC/palettes/4.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/5.pal b/data/tilesets/secondary/vermilion_city/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D50AC/palettes/5.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/6.pal b/data/tilesets/secondary/vermilion_city/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D50AC/palettes/6.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/7.pal b/data/tilesets/secondary/vermilion_city/palettes/7.pal
index 17b1a0ed2..17b1a0ed2 100644
--- a/data/tilesets/secondary/82D4B24/palettes/7.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/8.pal b/data/tilesets/secondary/vermilion_city/palettes/8.pal
index 7179b91bd..7179b91bd 100644
--- a/data/tilesets/secondary/82D4B24/palettes/8.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/9.pal b/data/tilesets/secondary/vermilion_city/palettes/9.pal
index 746dac7da..746dac7da 100644
--- a/data/tilesets/secondary/82D4B24/palettes/9.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B24/tiles.png b/data/tilesets/secondary/vermilion_city/tiles.png
index 8cfa9b4dd..8cfa9b4dd 100644
--- a/data/tilesets/secondary/82D4B24/tiles.png
+++ b/data/tilesets/secondary/vermilion_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D34/metatile_attributes.bin b/data/tilesets/secondary/vermilion_gym/metatile_attributes.bin
index a5e733de0..a5e733de0 100644
--- a/data/tilesets/secondary/82D4D34/metatile_attributes.bin
+++ b/data/tilesets/secondary/vermilion_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D34/metatiles.bin b/data/tilesets/secondary/vermilion_gym/metatiles.bin
index 25a46724b..25a46724b 100644
--- a/data/tilesets/secondary/82D4D34/metatiles.bin
+++ b/data/tilesets/secondary/vermilion_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F44/palettes/0.pal b/data/tilesets/secondary/vermilion_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4F44/palettes/0.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/1.pal b/data/tilesets/secondary/vermilion_gym/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4E84/palettes/1.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/10.pal b/data/tilesets/secondary/vermilion_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/10.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/11.pal b/data/tilesets/secondary/vermilion_gym/palettes/11.pal
index 9fa42f21f..9fa42f21f 100644
--- a/data/tilesets/secondary/82D4D34/palettes/11.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/12.pal b/data/tilesets/secondary/vermilion_gym/palettes/12.pal
index 5e2756cc9..5e2756cc9 100644
--- a/data/tilesets/secondary/82D4D34/palettes/12.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/13.pal b/data/tilesets/secondary/vermilion_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/13.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/14.pal b/data/tilesets/secondary/vermilion_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5094/palettes/14.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/15.pal b/data/tilesets/secondary/vermilion_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/15.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/2.pal b/data/tilesets/secondary/vermilion_gym/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4E84/palettes/2.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/3.pal b/data/tilesets/secondary/vermilion_gym/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4E84/palettes/3.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/4.pal b/data/tilesets/secondary/vermilion_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F44/palettes/4.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/5.pal b/data/tilesets/secondary/vermilion_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F44/palettes/5.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/6.pal b/data/tilesets/secondary/vermilion_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/6.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/7.pal b/data/tilesets/secondary/vermilion_gym/palettes/7.pal
index efd64bcc5..efd64bcc5 100644
--- a/data/tilesets/secondary/82D4D34/palettes/7.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/8.pal b/data/tilesets/secondary/vermilion_gym/palettes/8.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/8.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/9.pal b/data/tilesets/secondary/vermilion_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/9.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D34/tiles.png b/data/tilesets/secondary/vermilion_gym/tiles.png
index 1baac0893..1baac0893 100644
--- a/data/tilesets/secondary/82D4D34/tiles.png
+++ b/data/tilesets/secondary/vermilion_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4AC4/metatile_attributes.bin b/data/tilesets/secondary/viridian_city/metatile_attributes.bin
index ee2d7d5b3..ee2d7d5b3 100644
--- a/data/tilesets/secondary/82D4AC4/metatile_attributes.bin
+++ b/data/tilesets/secondary/viridian_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AC4/metatiles.bin b/data/tilesets/secondary/viridian_city/metatiles.bin
index 297673a4b..297673a4b 100644
--- a/data/tilesets/secondary/82D4AC4/metatiles.bin
+++ b/data/tilesets/secondary/viridian_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D50AC/palettes/0.pal b/data/tilesets/secondary/viridian_city/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D50AC/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/1.pal b/data/tilesets/secondary/viridian_city/palettes/1.pal
index cf1123812..cf1123812 100644
--- a/data/tilesets/secondary/82D4B84/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/10.pal b/data/tilesets/secondary/viridian_city/palettes/10.pal
index 4baf904ae..4baf904ae 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/10.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/11.pal b/data/tilesets/secondary/viridian_city/palettes/11.pal
index 2e92b3cc3..2e92b3cc3 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/11.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/12.pal b/data/tilesets/secondary/viridian_city/palettes/12.pal
index 70ed40322..70ed40322 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/12.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/13.pal b/data/tilesets/secondary/viridian_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5094/palettes/13.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/14.pal b/data/tilesets/secondary/viridian_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50AC/palettes/14.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/15.pal b/data/tilesets/secondary/viridian_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50AC/palettes/15.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/2.pal b/data/tilesets/secondary/viridian_city/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D5064/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/3.pal b/data/tilesets/secondary/viridian_city/palettes/3.pal
index 5a5e60211..5a5e60211 100644
--- a/data/tilesets/secondary/82D4B84/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/4.pal b/data/tilesets/secondary/viridian_city/palettes/4.pal
index 229f9132c..229f9132c 100644
--- a/data/tilesets/secondary/82D4B84/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/5.pal b/data/tilesets/secondary/viridian_city/palettes/5.pal
index 215dd1272..215dd1272 100644
--- a/data/tilesets/secondary/82D4B84/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/6.pal b/data/tilesets/secondary/viridian_city/palettes/6.pal
index 7e7862a19..7e7862a19 100644
--- a/data/tilesets/secondary/82D4B84/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/7.pal b/data/tilesets/secondary/viridian_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/8.pal b/data/tilesets/secondary/viridian_city/palettes/8.pal
index 219129eba..219129eba 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/9.pal b/data/tilesets/secondary/viridian_city/palettes/9.pal
index 0aa2b58dc..0aa2b58dc 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4AC4/tiles.png b/data/tilesets/secondary/viridian_city/tiles.png
index 39b80d8f9..39b80d8f9 100644
--- a/data/tilesets/secondary/82D4AC4/tiles.png
+++ b/data/tilesets/secondary/viridian_city/tiles.png
diff --git a/data/tilesets/secondary/82D4DC4/metatile_attributes.bin b/data/tilesets/secondary/viridian_forest/metatile_attributes.bin
index 990d6861c..990d6861c 100644
--- a/data/tilesets/secondary/82D4DC4/metatile_attributes.bin
+++ b/data/tilesets/secondary/viridian_forest/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DC4/metatiles.bin b/data/tilesets/secondary/viridian_forest/metatiles.bin
index cd0bd5f53..cd0bd5f53 100644
--- a/data/tilesets/secondary/82D4DC4/metatiles.bin
+++ b/data/tilesets/secondary/viridian_forest/metatiles.bin
diff --git a/data/tilesets/secondary/82D5004/palettes/0.pal b/data/tilesets/secondary/viridian_forest/palettes/0.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/82D5004/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/1.pal b/data/tilesets/secondary/viridian_forest/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D5004/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/10.pal b/data/tilesets/secondary/viridian_forest/palettes/10.pal
index 746437492..746437492 100644
--- a/data/tilesets/secondary/82D5004/palettes/10.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/11.pal b/data/tilesets/secondary/viridian_forest/palettes/11.pal
index 410d5193a..410d5193a 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/11.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/11.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/12.pal b/data/tilesets/secondary/viridian_forest/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D50AC/palettes/12.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/12.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/13.pal b/data/tilesets/secondary/viridian_forest/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50C4/palettes/13.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/13.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/14.pal b/data/tilesets/secondary/viridian_forest/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50C4/palettes/14.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/14.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/15.pal b/data/tilesets/secondary/viridian_forest/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50DC/palettes/15.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/15.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/2.pal b/data/tilesets/secondary/viridian_forest/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D50AC/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/3.pal b/data/tilesets/secondary/viridian_forest/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D5004/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/3.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/4.pal b/data/tilesets/secondary/viridian_forest/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D501C/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/5.pal b/data/tilesets/secondary/viridian_forest/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D5004/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/6.pal b/data/tilesets/secondary/viridian_forest/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D5004/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/6.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/7.pal b/data/tilesets/secondary/viridian_forest/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D50AC/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/8.pal b/data/tilesets/secondary/viridian_forest/palettes/8.pal
index 650a35cc8..650a35cc8 100644
--- a/data/tilesets/secondary/82D5004/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/9.pal b/data/tilesets/secondary/viridian_forest/palettes/9.pal
index df2d04037..df2d04037 100644
--- a/data/tilesets/secondary/82D5004/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DC4/tiles.png b/data/tilesets/secondary/viridian_forest/tiles.png
index 451eb8d5a..451eb8d5a 100644
--- a/data/tilesets/secondary/82D4DC4/tiles.png
+++ b/data/tilesets/secondary/viridian_forest/tiles.png
diff --git a/data/tilesets/secondary/82D4CBC/metatile_attributes.bin b/data/tilesets/secondary/viridian_gym/metatile_attributes.bin
index a84364708..a84364708 100644
--- a/data/tilesets/secondary/82D4CBC/metatile_attributes.bin
+++ b/data/tilesets/secondary/viridian_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CBC/metatiles.bin b/data/tilesets/secondary/viridian_gym/metatiles.bin
index 2980877c1..2980877c1 100644
--- a/data/tilesets/secondary/82D4CBC/metatiles.bin
+++ b/data/tilesets/secondary/viridian_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F5C/palettes/0.pal b/data/tilesets/secondary/viridian_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/1.pal b/data/tilesets/secondary/viridian_gym/palettes/1.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/82D4D64/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/10.pal b/data/tilesets/secondary/viridian_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/10.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/11.pal b/data/tilesets/secondary/viridian_gym/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/11.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/12.pal b/data/tilesets/secondary/viridian_gym/palettes/12.pal
index d2c6cb089..d2c6cb089 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/12.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/13.pal b/data/tilesets/secondary/viridian_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50DC/palettes/13.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/14.pal b/data/tilesets/secondary/viridian_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50DC/palettes/14.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/15.pal b/data/tilesets/secondary/viridian_gym/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/15.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/2.pal b/data/tilesets/secondary/viridian_gym/palettes/2.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/82D4D64/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/3.pal b/data/tilesets/secondary/viridian_gym/palettes/3.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/82D4D64/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/4.pal b/data/tilesets/secondary/viridian_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/5.pal b/data/tilesets/secondary/viridian_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/6.pal b/data/tilesets/secondary/viridian_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/7.pal b/data/tilesets/secondary/viridian_gym/palettes/7.pal
index f55e52fe2..f55e52fe2 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/8.pal b/data/tilesets/secondary/viridian_gym/palettes/8.pal
index 3a7dbc274..3a7dbc274 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/9.pal b/data/tilesets/secondary/viridian_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CBC/tiles.png b/data/tilesets/secondary/viridian_gym/tiles.png
index b53b94b96..b53b94b96 100644
--- a/data/tilesets/secondary/82D4CBC/tiles.png
+++ b/data/tilesets/secondary/viridian_gym/tiles.png