diff --git a/data/data2.s b/data/data2.s
index 98890a7370..20ac292fb5 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -2263,13 +2263,13 @@ gUnknown_08339E00:: @ 8339E00
 	.incbin "base_emerald.gba", 0x339e00, 0x8
 
 @ 8339E08
-	.include "data/graphics/tilesets/tileset_graphics.s"
+	.include "data/tilesets/tileset_graphics.s"
 
 @ 83960F0
-	.include "data/graphics/tilesets/metatiles.s"
+	.include "data/tilesets/metatiles.s"
 
 @ 83DF704
-	.include "data/graphics/tilesets/tilesets.s"
+	.include "data/tilesets/tilesets.s"
 
 @ 83DFE14
 	.incbin "base_emerald.gba", 0x3dfe14, 0xa1fc0
diff --git a/data/graphics.s b/data/graphics.s
index 8ff0f6697c..37028fe563 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -953,27 +953,27 @@ gUnknown_08DD4C4C:: @ 8DD4C4C
 	.align 2, 0
 
 gTilesetPalettes_General:: @ 8DD4E10
-	.incbin "data/graphics/tilesets/primary/general/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/primary/general/palettes/15.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/00.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/01.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/02.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/03.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/04.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/05.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/06.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/07.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/08.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/09.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/15.gbapal"
 
 	.align 2, 0
 
 gTilesetTiles_General:: @ 8DD5010
-	.incbin "data/graphics/tilesets/primary/general/tiles.4bpp.lz"
+	.incbin "data/tilesets/primary/general/tiles.4bpp.lz"
 
 @ 8DD72E0
 	.incbin "base_emerald.gba", 0xdd72e0, 0x20
diff --git a/data/graphics/tilesets/tileset_graphics.s b/data/graphics/tilesets/tileset_graphics.s
deleted file mode 100644
index 2d6f8f4e6a..0000000000
--- a/data/graphics/tilesets/tileset_graphics.s
+++ /dev/null
@@ -1,1887 +0,0 @@
-	.align 2, 0
-
-gTilesetTiles_Petalburg:: @ 8339E08
-	.incbin "data/graphics/tilesets/secondary/petalburg/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Petalburg:: @ 833A704
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Rustboro:: @ 833A904
-	.incbin "data/graphics/tilesets/secondary/rustboro/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Rustboro:: @ 833BEC0
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Dewford:: @ 833C0C0
-	.incbin "data/graphics/tilesets/secondary/dewford/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Dewford:: @ 833D540
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Slateport:: @ 833D740
-	.incbin "data/graphics/tilesets/secondary/slateport/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Slateport:: @ 833F708
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/slateport/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Mauville:: @ 833F908
-	.incbin "data/graphics/tilesets/secondary/mauville/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Mauville:: @ 834172C
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Lavaridge:: @ 834192C
-	.incbin "data/graphics/tilesets/secondary/lavaridge/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Lavaridge:: @ 8342E28
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Fallarbor:: @ 8343028
-	.incbin "data/graphics/tilesets/secondary/fallarbor/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Fallarbor:: @ 83447A0
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Fortree:: @ 83449A0
-	.incbin "data/graphics/tilesets/secondary/fortree/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Fortree:: @ 8346020
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Lilycove:: @ 8346220
-	.incbin "data/graphics/tilesets/secondary/lilycove/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Lilycove:: @ 83475C0
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Mossdeep:: @ 83477C0
-	.incbin "data/graphics/tilesets/secondary/mossdeep/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Mossdeep:: @ 8348E10
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_EverGrande:: @ 8349010
-	.incbin "data/graphics/tilesets/secondary/ever_grande/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_EverGrande:: @ 8349C28
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Pacifidlog:: @ 8349E28
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Pacifidlog:: @ 834B5B4
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Sootopolis:: @ 834B7B4
-	.incbin "data/graphics/tilesets/secondary/sootopolis/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Sootopolis:: @ 834C6B4
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_BattleFrontierOutsideWest:: @ 834C8B4
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_BattleFrontierOutsideWest:: @ 834E3E4
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_BattleFrontierOutsideEast:: @ 834E5E4
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_BattleFrontierOutsideEast:: @ 834F984
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_InsideBuilding:: @ 834FB84
-	.incbin "data/graphics/tilesets/primary/inside_building/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_InsideBuilding:: @ 83508BC
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/primary/inside_building/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Shop:: @ 8350ABC
-	.incbin "data/graphics/tilesets/secondary/shop/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Shop:: @ 83520DC
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/shop/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_PokemonCenter:: @ 83522DC
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_PokemonCenter:: @ 8353574
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Cave:: @ 8353774
-	.incbin "data/graphics/tilesets/secondary/cave/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Cave:: @ 8355260
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cave/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_PokemonSchool:: @ 8355460
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_PokemonSchool:: @ 8355BA8
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_PokemonFanClub:: @ 8355DA8
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_PokemonFanClub:: @ 83566D4
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Unused1:: @ 83568D4
-	.incbin "data/graphics/tilesets/secondary/unused_1/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Unused1:: @ 8356920
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_MeteorFalls:: @ 8356B20
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_MeteorFalls:: @ 8358840
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_OceanicMuseum:: @ 8358A40
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_OceanicMuseum:: @ 83599CC
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_CableClub:: @ 8359BCC
-	.incbin "data/graphics/tilesets/secondary/cable_club/tiles.4bpp"
-
-	.align 2, 0
-
-	.incbin "data/graphics/tilesets/secondary/cable_club/unknown_tiles.4bpp"
-
-	.align 2, 0
-
-gTilesetPalettes_CableClub:: @ 835EACC
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_SeashoreHouse:: @ 835ECCC
-	.incbin "data/graphics/tilesets/secondary/seashore_house/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_SeashoreHouse:: @ 835F5A8
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_PrettyPetalFlowerShop:: @ 835F7A8
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_PrettyPetalFlowerShop:: @ 83603A0
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_PokemonDayCare:: @ 83605A0
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_PokemonDayCare:: @ 8360FDC
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Facility:: @ 83611DC
-	.incbin "data/graphics/tilesets/secondary/facility/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Facility:: @ 8362E90
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/facility/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_BikeShop:: @ 8363090
-	.incbin "data/graphics/tilesets/secondary/bike_shop/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_BikeShop:: @ 83643C0
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_RusturfTunnel:: @ 83645C0
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_RusturfTunnel:: @ 8365008
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/15.gbapal"
-
-	.align 2, 0
-
-@ unused compressed copy of tiles
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/unused_tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_SecretBaseBrownCave:: @ 8365788
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/15.gbapal"
-
-	.align 2, 0
-
-@ unused compressed copy of tiles
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/unused_tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_SecretBaseTree:: @ 8365EAC
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/15.gbapal"
-
-	.align 2, 0
-
-@ unused compressed copy of tiles
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/unused_tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_SecretBaseShrub:: @ 8366614
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/15.gbapal"
-
-	.align 2, 0
-
-@ unused compressed copy of tiles
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/unused_tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_SecretBaseBlueCave:: @ 8366C30
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/15.gbapal"
-
-	.align 2, 0
-
-@ unused compressed copy of tiles
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/unused_tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_SecretBaseYellowCave:: @ 8367368
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/15.gbapal"
-
-	.align 2, 0
-
-@ unused compressed copy of tiles
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/unused_tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_SecretBaseRedCave:: @ 83679A0
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_SecretBaseBrownCave:: @ 8367BA0
-	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/tiles.4bpp"
-
-	.align 2, 0
-
-gTilesetTiles_SecretBaseTree:: @ 8368600
-	.incbin "data/graphics/tilesets/secondary/secret_base/tree/tiles.4bpp"
-
-	.align 2, 0
-
-gTilesetTiles_SecretBaseShrub:: @ 8369060
-	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/tiles.4bpp"
-
-	.align 2, 0
-
-gTilesetTiles_SecretBaseBlueCave:: @ 8369AC0
-	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/tiles.4bpp"
-
-	.align 2, 0
-
-gTilesetTiles_SecretBaseYellowCave:: @ 836A520
-	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/tiles.4bpp"
-
-	.align 2, 0
-
-gTilesetTiles_SecretBaseRedCave:: @ 836AF80
-	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/tiles.4bpp"
-
-	.align 2, 0
-
-gTilesetTiles_InsideOfTruck:: @ 836B9E0
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_InsideOfTruck:: @ 836BC3C
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Contest:: @ 836BE3C
-	.incbin "data/graphics/tilesets/secondary/contest/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Contest:: @ 836C990
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/contest/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_LilycoveMuseum:: @ 836CB90
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_LilycoveMuseum:: @ 836DEAC
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_BrendansMaysHouse:: @ 836E0AC
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_BrendansMaysHouse:: @ 836F178
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Lab:: @ 836F378
-	.incbin "data/graphics/tilesets/secondary/lab/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Lab:: @ 83703DC
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lab/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Underwater:: @ 83705DC
-	.incbin "data/graphics/tilesets/secondary/underwater/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Underwater:: @ 8371798
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/underwater/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_GenericBuilding:: @ 8371998
-	.incbin "data/graphics/tilesets/secondary/generic_building/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_GenericBuilding:: @ 83733C4
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_MauvilleGameCorner:: @ 83735C4
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_MauvilleGameCorner:: @ 8374288
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_Unused2:: @ 8374488
-	.incbin "data/graphics/tilesets/secondary/unused_2/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_Unused2:: @ 83749B0
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_RustboroGym:: @ 8374BB0
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_RustboroGym:: @ 8374F34
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_DewfordGym:: @ 8375134
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_DewfordGym:: @ 8375400
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_MauvilleGym:: @ 8375600
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_MauvilleGym:: @ 8375D84
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_LavaridgeGym:: @ 8375F84
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_LavaridgeGym:: @ 83762AC
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_PetalburgGym:: @ 83764AC
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_PetalburgGym:: @ 8376B50
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_FortreeGym:: @ 8376D50
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_FortreeGym:: @ 83770C4
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_MossdeepGym:: @ 83772C4
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_MossdeepGym:: @ 8377730
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_SootopolisGym:: @ 8377930
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_SootopolisGym:: @ 8378AC4
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_TrickHousePuzzle:: @ 8378CC4
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_TrickHousePuzzle:: @ 8379A78
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_InsideShip:: @ 8379C78
-	.incbin "data/graphics/tilesets/secondary/inside_ship/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_InsideShip:: @ 837A848
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_SecretBase:: @ 837AA48
-	.incbin "data/graphics/tilesets/primary/secret_base/tiles.4bpp"
-
-	.align 2, 0
-
-	.incbin "data/graphics/tilesets/primary/secret_base/unknown_tiles.4bpp"
-
-	.align 2, 0
-
-gTilesetPalettes_SecretBase:: @ 8382A48
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/primary/secret_base/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_EliteFour:: @ 8382C48
-	.incbin "data/graphics/tilesets/secondary/elite_four/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_EliteFour:: @ 8383CC4
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_BattleFrontier:: @ 8383EC4
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_BattleFrontier:: @ 8384BC8
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_BattlePalace:: @ 8384DC8
-	.incbin "data/graphics/tilesets/secondary/battle_palace/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_BattlePalace:: @ 8385540
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_BattleDome:: @ 8385740
-	.incbin "data/graphics/tilesets/secondary/battle_dome/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_BattleDome:: @ 8386990
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_BattleFactory:: @ 8386B90
-	.incbin "data/graphics/tilesets/secondary/battle_factory/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_BattleFactory:: @ 8387D7C
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_BattlePike:: @ 8387F7C
-	.incbin "data/graphics/tilesets/secondary/battle_pike/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_BattlePike:: @ 8389250
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_BattleArena:: @ 8389450
-	.incbin "data/graphics/tilesets/secondary/battle_arena/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_BattleArena:: @ 8389F8C
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_BattlePyramid:: @ 838A18C
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_BattlePyramid:: @ 838B39C
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_MirageTower:: @ 838B59C
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_MirageTower:: @ 838CFE4
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_MossdeepGameCorner:: @ 838D1E4
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_MossdeepGameCorner:: @ 838D604
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_IslandHarbor:: @ 838D804
-	.incbin "data/graphics/tilesets/secondary/island_harbor/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_IslandHarbor:: @ 838F1D4
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_TrainerHill:: @ 838F3D4
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_TrainerHill:: @ 83904C4
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_NavelRock:: @ 83906C4
-	.incbin "data/graphics/tilesets/secondary/navel_rock/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_NavelRock:: @ 8392258
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_BattleFrontierRankingHall:: @ 8392458
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_BattleFrontierRankingHall:: @ 8392CAC
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_BattleTent:: @ 8392EAC
-	.incbin "data/graphics/tilesets/secondary/battle_tent/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_BattleTent:: @ 8393910
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_MysteryEventsHouse:: @ 8393B10
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/tiles.4bpp.lz"
-
-	.align 2, 0
-
-gTilesetPalettes_MysteryEventsHouse:: @ 8395478
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetPalettes_UnionRoom:: @ 8395678
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/00.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/01.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/02.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/03.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/04.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/05.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/06.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/07.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/08.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/09.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/10.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/11.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/12.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/13.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/14.gbapal"
-	.incbin "data/graphics/tilesets/secondary/union_room/palettes/15.gbapal"
-
-	.align 2, 0
-
-gTilesetTiles_UnionRoom:: @ 8395878
-	.incbin "data/graphics/tilesets/secondary/union_room/tiles.4bpp.lz"
diff --git a/data/graphics/tilesets/metatiles.s b/data/tilesets/metatiles.s
similarity index 100%
rename from data/graphics/tilesets/metatiles.s
rename to data/tilesets/metatiles.s
diff --git a/data/graphics/tilesets/primary/general/palettes/00.pal b/data/tilesets/primary/general/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/00.pal
rename to data/tilesets/primary/general/palettes/00.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/01.pal b/data/tilesets/primary/general/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/01.pal
rename to data/tilesets/primary/general/palettes/01.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/02.pal b/data/tilesets/primary/general/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/02.pal
rename to data/tilesets/primary/general/palettes/02.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/03.pal b/data/tilesets/primary/general/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/03.pal
rename to data/tilesets/primary/general/palettes/03.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/04.pal b/data/tilesets/primary/general/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/04.pal
rename to data/tilesets/primary/general/palettes/04.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/05.pal b/data/tilesets/primary/general/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/05.pal
rename to data/tilesets/primary/general/palettes/05.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/06.pal b/data/tilesets/primary/general/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/06.pal
rename to data/tilesets/primary/general/palettes/06.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/07.pal b/data/tilesets/primary/general/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/07.pal
rename to data/tilesets/primary/general/palettes/07.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/08.pal b/data/tilesets/primary/general/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/08.pal
rename to data/tilesets/primary/general/palettes/08.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/09.pal b/data/tilesets/primary/general/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/09.pal
rename to data/tilesets/primary/general/palettes/09.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/10.pal b/data/tilesets/primary/general/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/10.pal
rename to data/tilesets/primary/general/palettes/10.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/11.pal b/data/tilesets/primary/general/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/11.pal
rename to data/tilesets/primary/general/palettes/11.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/12.pal b/data/tilesets/primary/general/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/12.pal
rename to data/tilesets/primary/general/palettes/12.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/13.pal b/data/tilesets/primary/general/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/13.pal
rename to data/tilesets/primary/general/palettes/13.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/14.pal b/data/tilesets/primary/general/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/14.pal
rename to data/tilesets/primary/general/palettes/14.pal
diff --git a/data/graphics/tilesets/primary/general/palettes/15.pal b/data/tilesets/primary/general/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/primary/general/palettes/15.pal
rename to data/tilesets/primary/general/palettes/15.pal
diff --git a/data/graphics/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png
similarity index 100%
rename from data/graphics/tilesets/primary/general/tiles.png
rename to data/tilesets/primary/general/tiles.png
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/00.pal b/data/tilesets/primary/inside_building/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/00.pal
rename to data/tilesets/primary/inside_building/palettes/00.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/01.pal b/data/tilesets/primary/inside_building/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/01.pal
rename to data/tilesets/primary/inside_building/palettes/01.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/02.pal b/data/tilesets/primary/inside_building/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/02.pal
rename to data/tilesets/primary/inside_building/palettes/02.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/03.pal b/data/tilesets/primary/inside_building/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/03.pal
rename to data/tilesets/primary/inside_building/palettes/03.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/04.pal b/data/tilesets/primary/inside_building/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/04.pal
rename to data/tilesets/primary/inside_building/palettes/04.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/05.pal b/data/tilesets/primary/inside_building/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/05.pal
rename to data/tilesets/primary/inside_building/palettes/05.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/06.pal b/data/tilesets/primary/inside_building/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/06.pal
rename to data/tilesets/primary/inside_building/palettes/06.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/07.pal b/data/tilesets/primary/inside_building/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/07.pal
rename to data/tilesets/primary/inside_building/palettes/07.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/08.pal b/data/tilesets/primary/inside_building/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/08.pal
rename to data/tilesets/primary/inside_building/palettes/08.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/09.pal b/data/tilesets/primary/inside_building/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/09.pal
rename to data/tilesets/primary/inside_building/palettes/09.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/10.pal b/data/tilesets/primary/inside_building/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/10.pal
rename to data/tilesets/primary/inside_building/palettes/10.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/11.pal b/data/tilesets/primary/inside_building/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/11.pal
rename to data/tilesets/primary/inside_building/palettes/11.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/12.pal b/data/tilesets/primary/inside_building/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/12.pal
rename to data/tilesets/primary/inside_building/palettes/12.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/13.pal b/data/tilesets/primary/inside_building/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/13.pal
rename to data/tilesets/primary/inside_building/palettes/13.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/14.pal b/data/tilesets/primary/inside_building/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/14.pal
rename to data/tilesets/primary/inside_building/palettes/14.pal
diff --git a/data/graphics/tilesets/primary/inside_building/palettes/15.pal b/data/tilesets/primary/inside_building/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/palettes/15.pal
rename to data/tilesets/primary/inside_building/palettes/15.pal
diff --git a/data/graphics/tilesets/primary/inside_building/tiles.png b/data/tilesets/primary/inside_building/tiles.png
similarity index 100%
rename from data/graphics/tilesets/primary/inside_building/tiles.png
rename to data/tilesets/primary/inside_building/tiles.png
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/00.pal b/data/tilesets/primary/secret_base/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/00.pal
rename to data/tilesets/primary/secret_base/palettes/00.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/01.pal b/data/tilesets/primary/secret_base/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/01.pal
rename to data/tilesets/primary/secret_base/palettes/01.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/02.pal b/data/tilesets/primary/secret_base/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/02.pal
rename to data/tilesets/primary/secret_base/palettes/02.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/03.pal b/data/tilesets/primary/secret_base/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/03.pal
rename to data/tilesets/primary/secret_base/palettes/03.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/04.pal b/data/tilesets/primary/secret_base/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/04.pal
rename to data/tilesets/primary/secret_base/palettes/04.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/05.pal b/data/tilesets/primary/secret_base/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/05.pal
rename to data/tilesets/primary/secret_base/palettes/05.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/06.pal b/data/tilesets/primary/secret_base/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/06.pal
rename to data/tilesets/primary/secret_base/palettes/06.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/07.pal b/data/tilesets/primary/secret_base/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/07.pal
rename to data/tilesets/primary/secret_base/palettes/07.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/08.pal b/data/tilesets/primary/secret_base/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/08.pal
rename to data/tilesets/primary/secret_base/palettes/08.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/09.pal b/data/tilesets/primary/secret_base/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/09.pal
rename to data/tilesets/primary/secret_base/palettes/09.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/10.pal b/data/tilesets/primary/secret_base/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/10.pal
rename to data/tilesets/primary/secret_base/palettes/10.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/11.pal b/data/tilesets/primary/secret_base/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/11.pal
rename to data/tilesets/primary/secret_base/palettes/11.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/12.pal b/data/tilesets/primary/secret_base/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/12.pal
rename to data/tilesets/primary/secret_base/palettes/12.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/13.pal b/data/tilesets/primary/secret_base/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/13.pal
rename to data/tilesets/primary/secret_base/palettes/13.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/14.pal b/data/tilesets/primary/secret_base/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/14.pal
rename to data/tilesets/primary/secret_base/palettes/14.pal
diff --git a/data/graphics/tilesets/primary/secret_base/palettes/15.pal b/data/tilesets/primary/secret_base/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/palettes/15.pal
rename to data/tilesets/primary/secret_base/palettes/15.pal
diff --git a/data/graphics/tilesets/primary/secret_base/tiles.png b/data/tilesets/primary/secret_base/tiles.png
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/tiles.png
rename to data/tilesets/primary/secret_base/tiles.png
diff --git a/data/graphics/tilesets/primary/secret_base/unknown_tiles.png b/data/tilesets/primary/secret_base/unknown_tiles.png
similarity index 100%
rename from data/graphics/tilesets/primary/secret_base/unknown_tiles.png
rename to data/tilesets/primary/secret_base/unknown_tiles.png
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/00.pal b/data/tilesets/secondary/battle_arena/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/00.pal
rename to data/tilesets/secondary/battle_arena/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/01.pal b/data/tilesets/secondary/battle_arena/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/01.pal
rename to data/tilesets/secondary/battle_arena/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/02.pal b/data/tilesets/secondary/battle_arena/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/02.pal
rename to data/tilesets/secondary/battle_arena/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/03.pal b/data/tilesets/secondary/battle_arena/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/03.pal
rename to data/tilesets/secondary/battle_arena/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/04.pal b/data/tilesets/secondary/battle_arena/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/04.pal
rename to data/tilesets/secondary/battle_arena/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/05.pal b/data/tilesets/secondary/battle_arena/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/05.pal
rename to data/tilesets/secondary/battle_arena/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/06.pal b/data/tilesets/secondary/battle_arena/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/06.pal
rename to data/tilesets/secondary/battle_arena/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/07.pal b/data/tilesets/secondary/battle_arena/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/07.pal
rename to data/tilesets/secondary/battle_arena/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/08.pal b/data/tilesets/secondary/battle_arena/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/08.pal
rename to data/tilesets/secondary/battle_arena/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/09.pal b/data/tilesets/secondary/battle_arena/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/09.pal
rename to data/tilesets/secondary/battle_arena/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/10.pal b/data/tilesets/secondary/battle_arena/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/10.pal
rename to data/tilesets/secondary/battle_arena/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/11.pal b/data/tilesets/secondary/battle_arena/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/11.pal
rename to data/tilesets/secondary/battle_arena/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/12.pal b/data/tilesets/secondary/battle_arena/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/12.pal
rename to data/tilesets/secondary/battle_arena/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/13.pal b/data/tilesets/secondary/battle_arena/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/13.pal
rename to data/tilesets/secondary/battle_arena/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/14.pal b/data/tilesets/secondary/battle_arena/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/14.pal
rename to data/tilesets/secondary/battle_arena/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/palettes/15.pal b/data/tilesets/secondary/battle_arena/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/palettes/15.pal
rename to data/tilesets/secondary/battle_arena/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/battle_arena/tiles.png b/data/tilesets/secondary/battle_arena/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_arena/tiles.png
rename to data/tilesets/secondary/battle_arena/tiles.png
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/00.pal b/data/tilesets/secondary/battle_dome/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/00.pal
rename to data/tilesets/secondary/battle_dome/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/01.pal b/data/tilesets/secondary/battle_dome/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/01.pal
rename to data/tilesets/secondary/battle_dome/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/02.pal b/data/tilesets/secondary/battle_dome/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/02.pal
rename to data/tilesets/secondary/battle_dome/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/03.pal b/data/tilesets/secondary/battle_dome/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/03.pal
rename to data/tilesets/secondary/battle_dome/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/04.pal b/data/tilesets/secondary/battle_dome/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/04.pal
rename to data/tilesets/secondary/battle_dome/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/05.pal b/data/tilesets/secondary/battle_dome/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/05.pal
rename to data/tilesets/secondary/battle_dome/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/06.pal b/data/tilesets/secondary/battle_dome/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/06.pal
rename to data/tilesets/secondary/battle_dome/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/07.pal b/data/tilesets/secondary/battle_dome/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/07.pal
rename to data/tilesets/secondary/battle_dome/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/08.pal b/data/tilesets/secondary/battle_dome/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/08.pal
rename to data/tilesets/secondary/battle_dome/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/09.pal b/data/tilesets/secondary/battle_dome/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/09.pal
rename to data/tilesets/secondary/battle_dome/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/10.pal b/data/tilesets/secondary/battle_dome/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/10.pal
rename to data/tilesets/secondary/battle_dome/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/11.pal b/data/tilesets/secondary/battle_dome/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/11.pal
rename to data/tilesets/secondary/battle_dome/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/12.pal b/data/tilesets/secondary/battle_dome/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/12.pal
rename to data/tilesets/secondary/battle_dome/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/13.pal b/data/tilesets/secondary/battle_dome/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/13.pal
rename to data/tilesets/secondary/battle_dome/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/14.pal b/data/tilesets/secondary/battle_dome/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/14.pal
rename to data/tilesets/secondary/battle_dome/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/palettes/15.pal b/data/tilesets/secondary/battle_dome/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/palettes/15.pal
rename to data/tilesets/secondary/battle_dome/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/battle_dome/tiles.png b/data/tilesets/secondary/battle_dome/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_dome/tiles.png
rename to data/tilesets/secondary/battle_dome/tiles.png
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/00.pal b/data/tilesets/secondary/battle_factory/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/00.pal
rename to data/tilesets/secondary/battle_factory/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/01.pal b/data/tilesets/secondary/battle_factory/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/01.pal
rename to data/tilesets/secondary/battle_factory/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/02.pal b/data/tilesets/secondary/battle_factory/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/02.pal
rename to data/tilesets/secondary/battle_factory/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/03.pal b/data/tilesets/secondary/battle_factory/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/03.pal
rename to data/tilesets/secondary/battle_factory/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/04.pal b/data/tilesets/secondary/battle_factory/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/04.pal
rename to data/tilesets/secondary/battle_factory/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/05.pal b/data/tilesets/secondary/battle_factory/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/05.pal
rename to data/tilesets/secondary/battle_factory/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/06.pal b/data/tilesets/secondary/battle_factory/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/06.pal
rename to data/tilesets/secondary/battle_factory/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/07.pal b/data/tilesets/secondary/battle_factory/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/07.pal
rename to data/tilesets/secondary/battle_factory/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/08.pal b/data/tilesets/secondary/battle_factory/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/08.pal
rename to data/tilesets/secondary/battle_factory/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/09.pal b/data/tilesets/secondary/battle_factory/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/09.pal
rename to data/tilesets/secondary/battle_factory/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/10.pal b/data/tilesets/secondary/battle_factory/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/10.pal
rename to data/tilesets/secondary/battle_factory/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/11.pal b/data/tilesets/secondary/battle_factory/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/11.pal
rename to data/tilesets/secondary/battle_factory/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/12.pal b/data/tilesets/secondary/battle_factory/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/12.pal
rename to data/tilesets/secondary/battle_factory/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/13.pal b/data/tilesets/secondary/battle_factory/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/13.pal
rename to data/tilesets/secondary/battle_factory/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/14.pal b/data/tilesets/secondary/battle_factory/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/14.pal
rename to data/tilesets/secondary/battle_factory/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/palettes/15.pal b/data/tilesets/secondary/battle_factory/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/palettes/15.pal
rename to data/tilesets/secondary/battle_factory/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/battle_factory/tiles.png b/data/tilesets/secondary/battle_factory/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_factory/tiles.png
rename to data/tilesets/secondary/battle_factory/tiles.png
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/00.pal b/data/tilesets/secondary/battle_frontier/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/00.pal
rename to data/tilesets/secondary/battle_frontier/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/01.pal b/data/tilesets/secondary/battle_frontier/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/01.pal
rename to data/tilesets/secondary/battle_frontier/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/02.pal b/data/tilesets/secondary/battle_frontier/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/02.pal
rename to data/tilesets/secondary/battle_frontier/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/03.pal b/data/tilesets/secondary/battle_frontier/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/03.pal
rename to data/tilesets/secondary/battle_frontier/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/04.pal b/data/tilesets/secondary/battle_frontier/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/04.pal
rename to data/tilesets/secondary/battle_frontier/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/05.pal b/data/tilesets/secondary/battle_frontier/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/05.pal
rename to data/tilesets/secondary/battle_frontier/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/06.pal b/data/tilesets/secondary/battle_frontier/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/06.pal
rename to data/tilesets/secondary/battle_frontier/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/07.pal b/data/tilesets/secondary/battle_frontier/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/07.pal
rename to data/tilesets/secondary/battle_frontier/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/08.pal b/data/tilesets/secondary/battle_frontier/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/08.pal
rename to data/tilesets/secondary/battle_frontier/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/09.pal b/data/tilesets/secondary/battle_frontier/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/09.pal
rename to data/tilesets/secondary/battle_frontier/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/10.pal b/data/tilesets/secondary/battle_frontier/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/10.pal
rename to data/tilesets/secondary/battle_frontier/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/11.pal b/data/tilesets/secondary/battle_frontier/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/11.pal
rename to data/tilesets/secondary/battle_frontier/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/12.pal b/data/tilesets/secondary/battle_frontier/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/12.pal
rename to data/tilesets/secondary/battle_frontier/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/13.pal b/data/tilesets/secondary/battle_frontier/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/13.pal
rename to data/tilesets/secondary/battle_frontier/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/14.pal b/data/tilesets/secondary/battle_frontier/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/14.pal
rename to data/tilesets/secondary/battle_frontier/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/palettes/15.pal b/data/tilesets/secondary/battle_frontier/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/palettes/15.pal
rename to data/tilesets/secondary/battle_frontier/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier/tiles.png b/data/tilesets/secondary/battle_frontier/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier/tiles.png
rename to data/tilesets/secondary/battle_frontier/tiles.png
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/00.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/00.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/01.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/01.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/02.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/02.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/03.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/03.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/04.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/04.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/05.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/05.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/06.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/06.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/07.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/07.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/08.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/08.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/09.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/09.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/10.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/10.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/11.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/11.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/12.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/12.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/13.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/13.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/14.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/14.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/15.pal b/data/tilesets/secondary/battle_frontier_outside_east/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/15.pal
rename to data/tilesets/secondary/battle_frontier_outside_east/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_east/tiles.png b/data/tilesets/secondary/battle_frontier_outside_east/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_east/tiles.png
rename to data/tilesets/secondary/battle_frontier_outside_east/tiles.png
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/00.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/00.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/01.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/01.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/02.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/02.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/03.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/03.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/04.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/04.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/05.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/05.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/06.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/06.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/07.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/07.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/08.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/08.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/09.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/09.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/10.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/10.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/11.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/11.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/12.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/12.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/13.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/13.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/14.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/14.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/15.pal b/data/tilesets/secondary/battle_frontier_outside_west/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/15.pal
rename to data/tilesets/secondary/battle_frontier_outside_west/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_outside_west/tiles.png b/data/tilesets/secondary/battle_frontier_outside_west/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_outside_west/tiles.png
rename to data/tilesets/secondary/battle_frontier_outside_west/tiles.png
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/00.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/00.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/01.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/01.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/02.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/02.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/03.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/03.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/04.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/04.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/05.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/05.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/06.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/06.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/07.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/07.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/08.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/08.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/09.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/09.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/10.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/10.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/11.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/11.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/12.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/12.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/13.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/13.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/14.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/14.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/15.pal b/data/tilesets/secondary/battle_frontier_ranking_hall/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/15.pal
rename to data/tilesets/secondary/battle_frontier_ranking_hall/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/battle_frontier_ranking_hall/tiles.png b/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_frontier_ranking_hall/tiles.png
rename to data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/00.pal b/data/tilesets/secondary/battle_palace/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/00.pal
rename to data/tilesets/secondary/battle_palace/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/01.pal b/data/tilesets/secondary/battle_palace/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/01.pal
rename to data/tilesets/secondary/battle_palace/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/02.pal b/data/tilesets/secondary/battle_palace/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/02.pal
rename to data/tilesets/secondary/battle_palace/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/03.pal b/data/tilesets/secondary/battle_palace/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/03.pal
rename to data/tilesets/secondary/battle_palace/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/04.pal b/data/tilesets/secondary/battle_palace/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/04.pal
rename to data/tilesets/secondary/battle_palace/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/05.pal b/data/tilesets/secondary/battle_palace/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/05.pal
rename to data/tilesets/secondary/battle_palace/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/06.pal b/data/tilesets/secondary/battle_palace/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/06.pal
rename to data/tilesets/secondary/battle_palace/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/07.pal b/data/tilesets/secondary/battle_palace/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/07.pal
rename to data/tilesets/secondary/battle_palace/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/08.pal b/data/tilesets/secondary/battle_palace/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/08.pal
rename to data/tilesets/secondary/battle_palace/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/09.pal b/data/tilesets/secondary/battle_palace/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/09.pal
rename to data/tilesets/secondary/battle_palace/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/10.pal b/data/tilesets/secondary/battle_palace/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/10.pal
rename to data/tilesets/secondary/battle_palace/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/11.pal b/data/tilesets/secondary/battle_palace/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/11.pal
rename to data/tilesets/secondary/battle_palace/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/12.pal b/data/tilesets/secondary/battle_palace/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/12.pal
rename to data/tilesets/secondary/battle_palace/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/13.pal b/data/tilesets/secondary/battle_palace/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/13.pal
rename to data/tilesets/secondary/battle_palace/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/14.pal b/data/tilesets/secondary/battle_palace/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/14.pal
rename to data/tilesets/secondary/battle_palace/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/palettes/15.pal b/data/tilesets/secondary/battle_palace/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/palettes/15.pal
rename to data/tilesets/secondary/battle_palace/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/battle_palace/tiles.png b/data/tilesets/secondary/battle_palace/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_palace/tiles.png
rename to data/tilesets/secondary/battle_palace/tiles.png
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/00.pal b/data/tilesets/secondary/battle_pike/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/00.pal
rename to data/tilesets/secondary/battle_pike/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/01.pal b/data/tilesets/secondary/battle_pike/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/01.pal
rename to data/tilesets/secondary/battle_pike/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/02.pal b/data/tilesets/secondary/battle_pike/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/02.pal
rename to data/tilesets/secondary/battle_pike/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/03.pal b/data/tilesets/secondary/battle_pike/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/03.pal
rename to data/tilesets/secondary/battle_pike/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/04.pal b/data/tilesets/secondary/battle_pike/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/04.pal
rename to data/tilesets/secondary/battle_pike/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/05.pal b/data/tilesets/secondary/battle_pike/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/05.pal
rename to data/tilesets/secondary/battle_pike/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/06.pal b/data/tilesets/secondary/battle_pike/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/06.pal
rename to data/tilesets/secondary/battle_pike/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/07.pal b/data/tilesets/secondary/battle_pike/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/07.pal
rename to data/tilesets/secondary/battle_pike/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/08.pal b/data/tilesets/secondary/battle_pike/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/08.pal
rename to data/tilesets/secondary/battle_pike/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/09.pal b/data/tilesets/secondary/battle_pike/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/09.pal
rename to data/tilesets/secondary/battle_pike/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/10.pal b/data/tilesets/secondary/battle_pike/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/10.pal
rename to data/tilesets/secondary/battle_pike/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/11.pal b/data/tilesets/secondary/battle_pike/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/11.pal
rename to data/tilesets/secondary/battle_pike/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/12.pal b/data/tilesets/secondary/battle_pike/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/12.pal
rename to data/tilesets/secondary/battle_pike/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/13.pal b/data/tilesets/secondary/battle_pike/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/13.pal
rename to data/tilesets/secondary/battle_pike/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/14.pal b/data/tilesets/secondary/battle_pike/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/14.pal
rename to data/tilesets/secondary/battle_pike/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/palettes/15.pal b/data/tilesets/secondary/battle_pike/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/palettes/15.pal
rename to data/tilesets/secondary/battle_pike/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/battle_pike/tiles.png b/data/tilesets/secondary/battle_pike/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pike/tiles.png
rename to data/tilesets/secondary/battle_pike/tiles.png
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/00.pal b/data/tilesets/secondary/battle_pyramid/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/00.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/01.pal b/data/tilesets/secondary/battle_pyramid/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/01.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/02.pal b/data/tilesets/secondary/battle_pyramid/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/02.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/03.pal b/data/tilesets/secondary/battle_pyramid/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/03.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/04.pal b/data/tilesets/secondary/battle_pyramid/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/04.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/05.pal b/data/tilesets/secondary/battle_pyramid/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/05.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/06.pal b/data/tilesets/secondary/battle_pyramid/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/06.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/07.pal b/data/tilesets/secondary/battle_pyramid/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/07.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/08.pal b/data/tilesets/secondary/battle_pyramid/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/08.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/09.pal b/data/tilesets/secondary/battle_pyramid/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/09.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/10.pal b/data/tilesets/secondary/battle_pyramid/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/10.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/11.pal b/data/tilesets/secondary/battle_pyramid/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/11.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/12.pal b/data/tilesets/secondary/battle_pyramid/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/12.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/13.pal b/data/tilesets/secondary/battle_pyramid/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/13.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/14.pal b/data/tilesets/secondary/battle_pyramid/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/14.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/palettes/15.pal b/data/tilesets/secondary/battle_pyramid/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/palettes/15.pal
rename to data/tilesets/secondary/battle_pyramid/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/battle_pyramid/tiles.png b/data/tilesets/secondary/battle_pyramid/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_pyramid/tiles.png
rename to data/tilesets/secondary/battle_pyramid/tiles.png
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/00.pal b/data/tilesets/secondary/battle_tent/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/00.pal
rename to data/tilesets/secondary/battle_tent/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/01.pal b/data/tilesets/secondary/battle_tent/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/01.pal
rename to data/tilesets/secondary/battle_tent/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/02.pal b/data/tilesets/secondary/battle_tent/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/02.pal
rename to data/tilesets/secondary/battle_tent/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/03.pal b/data/tilesets/secondary/battle_tent/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/03.pal
rename to data/tilesets/secondary/battle_tent/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/04.pal b/data/tilesets/secondary/battle_tent/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/04.pal
rename to data/tilesets/secondary/battle_tent/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/05.pal b/data/tilesets/secondary/battle_tent/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/05.pal
rename to data/tilesets/secondary/battle_tent/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/06.pal b/data/tilesets/secondary/battle_tent/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/06.pal
rename to data/tilesets/secondary/battle_tent/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/07.pal b/data/tilesets/secondary/battle_tent/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/07.pal
rename to data/tilesets/secondary/battle_tent/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/08.pal b/data/tilesets/secondary/battle_tent/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/08.pal
rename to data/tilesets/secondary/battle_tent/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/09.pal b/data/tilesets/secondary/battle_tent/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/09.pal
rename to data/tilesets/secondary/battle_tent/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/10.pal b/data/tilesets/secondary/battle_tent/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/10.pal
rename to data/tilesets/secondary/battle_tent/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/11.pal b/data/tilesets/secondary/battle_tent/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/11.pal
rename to data/tilesets/secondary/battle_tent/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/12.pal b/data/tilesets/secondary/battle_tent/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/12.pal
rename to data/tilesets/secondary/battle_tent/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/13.pal b/data/tilesets/secondary/battle_tent/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/13.pal
rename to data/tilesets/secondary/battle_tent/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/14.pal b/data/tilesets/secondary/battle_tent/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/14.pal
rename to data/tilesets/secondary/battle_tent/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/palettes/15.pal b/data/tilesets/secondary/battle_tent/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/palettes/15.pal
rename to data/tilesets/secondary/battle_tent/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/battle_tent/tiles.png b/data/tilesets/secondary/battle_tent/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/battle_tent/tiles.png
rename to data/tilesets/secondary/battle_tent/tiles.png
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/00.pal b/data/tilesets/secondary/bike_shop/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/00.pal
rename to data/tilesets/secondary/bike_shop/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/01.pal b/data/tilesets/secondary/bike_shop/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/01.pal
rename to data/tilesets/secondary/bike_shop/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/02.pal b/data/tilesets/secondary/bike_shop/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/02.pal
rename to data/tilesets/secondary/bike_shop/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/03.pal b/data/tilesets/secondary/bike_shop/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/03.pal
rename to data/tilesets/secondary/bike_shop/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/04.pal b/data/tilesets/secondary/bike_shop/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/04.pal
rename to data/tilesets/secondary/bike_shop/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/05.pal b/data/tilesets/secondary/bike_shop/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/05.pal
rename to data/tilesets/secondary/bike_shop/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/06.pal b/data/tilesets/secondary/bike_shop/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/06.pal
rename to data/tilesets/secondary/bike_shop/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/07.pal b/data/tilesets/secondary/bike_shop/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/07.pal
rename to data/tilesets/secondary/bike_shop/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/08.pal b/data/tilesets/secondary/bike_shop/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/08.pal
rename to data/tilesets/secondary/bike_shop/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/09.pal b/data/tilesets/secondary/bike_shop/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/09.pal
rename to data/tilesets/secondary/bike_shop/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/10.pal b/data/tilesets/secondary/bike_shop/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/10.pal
rename to data/tilesets/secondary/bike_shop/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/11.pal b/data/tilesets/secondary/bike_shop/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/11.pal
rename to data/tilesets/secondary/bike_shop/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/12.pal b/data/tilesets/secondary/bike_shop/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/12.pal
rename to data/tilesets/secondary/bike_shop/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/13.pal b/data/tilesets/secondary/bike_shop/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/13.pal
rename to data/tilesets/secondary/bike_shop/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/14.pal b/data/tilesets/secondary/bike_shop/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/14.pal
rename to data/tilesets/secondary/bike_shop/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/palettes/15.pal b/data/tilesets/secondary/bike_shop/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/palettes/15.pal
rename to data/tilesets/secondary/bike_shop/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/bike_shop/tiles.png b/data/tilesets/secondary/bike_shop/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/bike_shop/tiles.png
rename to data/tilesets/secondary/bike_shop/tiles.png
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/00.pal b/data/tilesets/secondary/brendans_mays_house/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/00.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/01.pal b/data/tilesets/secondary/brendans_mays_house/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/01.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/02.pal b/data/tilesets/secondary/brendans_mays_house/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/02.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/03.pal b/data/tilesets/secondary/brendans_mays_house/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/03.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/04.pal b/data/tilesets/secondary/brendans_mays_house/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/04.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/05.pal b/data/tilesets/secondary/brendans_mays_house/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/05.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/06.pal b/data/tilesets/secondary/brendans_mays_house/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/06.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/07.pal b/data/tilesets/secondary/brendans_mays_house/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/07.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/08.pal b/data/tilesets/secondary/brendans_mays_house/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/08.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/09.pal b/data/tilesets/secondary/brendans_mays_house/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/09.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/10.pal b/data/tilesets/secondary/brendans_mays_house/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/10.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/11.pal b/data/tilesets/secondary/brendans_mays_house/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/11.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/12.pal b/data/tilesets/secondary/brendans_mays_house/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/12.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/13.pal b/data/tilesets/secondary/brendans_mays_house/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/13.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/14.pal b/data/tilesets/secondary/brendans_mays_house/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/14.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/palettes/15.pal b/data/tilesets/secondary/brendans_mays_house/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/palettes/15.pal
rename to data/tilesets/secondary/brendans_mays_house/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/brendans_mays_house/tiles.png b/data/tilesets/secondary/brendans_mays_house/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/brendans_mays_house/tiles.png
rename to data/tilesets/secondary/brendans_mays_house/tiles.png
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/00.pal b/data/tilesets/secondary/cable_club/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/00.pal
rename to data/tilesets/secondary/cable_club/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/01.pal b/data/tilesets/secondary/cable_club/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/01.pal
rename to data/tilesets/secondary/cable_club/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/02.pal b/data/tilesets/secondary/cable_club/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/02.pal
rename to data/tilesets/secondary/cable_club/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/03.pal b/data/tilesets/secondary/cable_club/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/03.pal
rename to data/tilesets/secondary/cable_club/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/04.pal b/data/tilesets/secondary/cable_club/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/04.pal
rename to data/tilesets/secondary/cable_club/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/05.pal b/data/tilesets/secondary/cable_club/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/05.pal
rename to data/tilesets/secondary/cable_club/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/06.pal b/data/tilesets/secondary/cable_club/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/06.pal
rename to data/tilesets/secondary/cable_club/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/07.pal b/data/tilesets/secondary/cable_club/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/07.pal
rename to data/tilesets/secondary/cable_club/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/08.pal b/data/tilesets/secondary/cable_club/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/08.pal
rename to data/tilesets/secondary/cable_club/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/09.pal b/data/tilesets/secondary/cable_club/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/09.pal
rename to data/tilesets/secondary/cable_club/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/10.pal b/data/tilesets/secondary/cable_club/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/10.pal
rename to data/tilesets/secondary/cable_club/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/11.pal b/data/tilesets/secondary/cable_club/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/11.pal
rename to data/tilesets/secondary/cable_club/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/12.pal b/data/tilesets/secondary/cable_club/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/12.pal
rename to data/tilesets/secondary/cable_club/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/13.pal b/data/tilesets/secondary/cable_club/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/13.pal
rename to data/tilesets/secondary/cable_club/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/14.pal b/data/tilesets/secondary/cable_club/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/14.pal
rename to data/tilesets/secondary/cable_club/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/palettes/15.pal b/data/tilesets/secondary/cable_club/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/palettes/15.pal
rename to data/tilesets/secondary/cable_club/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/cable_club/tiles.png b/data/tilesets/secondary/cable_club/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/tiles.png
rename to data/tilesets/secondary/cable_club/tiles.png
diff --git a/data/graphics/tilesets/secondary/cable_club/unknown_tiles.png b/data/tilesets/secondary/cable_club/unknown_tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/cable_club/unknown_tiles.png
rename to data/tilesets/secondary/cable_club/unknown_tiles.png
diff --git a/data/graphics/tilesets/secondary/cave/palettes/00.pal b/data/tilesets/secondary/cave/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/00.pal
rename to data/tilesets/secondary/cave/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/01.pal b/data/tilesets/secondary/cave/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/01.pal
rename to data/tilesets/secondary/cave/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/02.pal b/data/tilesets/secondary/cave/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/02.pal
rename to data/tilesets/secondary/cave/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/03.pal b/data/tilesets/secondary/cave/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/03.pal
rename to data/tilesets/secondary/cave/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/04.pal b/data/tilesets/secondary/cave/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/04.pal
rename to data/tilesets/secondary/cave/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/05.pal b/data/tilesets/secondary/cave/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/05.pal
rename to data/tilesets/secondary/cave/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/06.pal b/data/tilesets/secondary/cave/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/06.pal
rename to data/tilesets/secondary/cave/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/07.pal b/data/tilesets/secondary/cave/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/07.pal
rename to data/tilesets/secondary/cave/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/08.pal b/data/tilesets/secondary/cave/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/08.pal
rename to data/tilesets/secondary/cave/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/09.pal b/data/tilesets/secondary/cave/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/09.pal
rename to data/tilesets/secondary/cave/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/10.pal b/data/tilesets/secondary/cave/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/10.pal
rename to data/tilesets/secondary/cave/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/11.pal b/data/tilesets/secondary/cave/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/11.pal
rename to data/tilesets/secondary/cave/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/12.pal b/data/tilesets/secondary/cave/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/12.pal
rename to data/tilesets/secondary/cave/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/13.pal b/data/tilesets/secondary/cave/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/13.pal
rename to data/tilesets/secondary/cave/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/14.pal b/data/tilesets/secondary/cave/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/14.pal
rename to data/tilesets/secondary/cave/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/cave/palettes/15.pal b/data/tilesets/secondary/cave/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/palettes/15.pal
rename to data/tilesets/secondary/cave/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/cave/tiles.png b/data/tilesets/secondary/cave/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/cave/tiles.png
rename to data/tilesets/secondary/cave/tiles.png
diff --git a/data/graphics/tilesets/secondary/contest/palettes/00.pal b/data/tilesets/secondary/contest/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/00.pal
rename to data/tilesets/secondary/contest/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/01.pal b/data/tilesets/secondary/contest/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/01.pal
rename to data/tilesets/secondary/contest/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/02.pal b/data/tilesets/secondary/contest/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/02.pal
rename to data/tilesets/secondary/contest/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/03.pal b/data/tilesets/secondary/contest/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/03.pal
rename to data/tilesets/secondary/contest/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/04.pal b/data/tilesets/secondary/contest/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/04.pal
rename to data/tilesets/secondary/contest/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/05.pal b/data/tilesets/secondary/contest/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/05.pal
rename to data/tilesets/secondary/contest/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/06.pal b/data/tilesets/secondary/contest/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/06.pal
rename to data/tilesets/secondary/contest/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/07.pal b/data/tilesets/secondary/contest/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/07.pal
rename to data/tilesets/secondary/contest/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/08.pal b/data/tilesets/secondary/contest/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/08.pal
rename to data/tilesets/secondary/contest/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/09.pal b/data/tilesets/secondary/contest/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/09.pal
rename to data/tilesets/secondary/contest/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/10.pal b/data/tilesets/secondary/contest/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/10.pal
rename to data/tilesets/secondary/contest/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/11.pal b/data/tilesets/secondary/contest/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/11.pal
rename to data/tilesets/secondary/contest/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/12.pal b/data/tilesets/secondary/contest/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/12.pal
rename to data/tilesets/secondary/contest/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/13.pal b/data/tilesets/secondary/contest/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/13.pal
rename to data/tilesets/secondary/contest/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/14.pal b/data/tilesets/secondary/contest/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/14.pal
rename to data/tilesets/secondary/contest/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/contest/palettes/15.pal b/data/tilesets/secondary/contest/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/palettes/15.pal
rename to data/tilesets/secondary/contest/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/contest/tiles.png b/data/tilesets/secondary/contest/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/contest/tiles.png
rename to data/tilesets/secondary/contest/tiles.png
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/00.pal b/data/tilesets/secondary/dewford/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/00.pal
rename to data/tilesets/secondary/dewford/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/01.pal b/data/tilesets/secondary/dewford/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/01.pal
rename to data/tilesets/secondary/dewford/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/02.pal b/data/tilesets/secondary/dewford/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/02.pal
rename to data/tilesets/secondary/dewford/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/03.pal b/data/tilesets/secondary/dewford/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/03.pal
rename to data/tilesets/secondary/dewford/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/04.pal b/data/tilesets/secondary/dewford/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/04.pal
rename to data/tilesets/secondary/dewford/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/05.pal b/data/tilesets/secondary/dewford/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/05.pal
rename to data/tilesets/secondary/dewford/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/06.pal b/data/tilesets/secondary/dewford/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/06.pal
rename to data/tilesets/secondary/dewford/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/07.pal b/data/tilesets/secondary/dewford/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/07.pal
rename to data/tilesets/secondary/dewford/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/08.pal b/data/tilesets/secondary/dewford/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/08.pal
rename to data/tilesets/secondary/dewford/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/09.pal b/data/tilesets/secondary/dewford/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/09.pal
rename to data/tilesets/secondary/dewford/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/10.pal b/data/tilesets/secondary/dewford/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/10.pal
rename to data/tilesets/secondary/dewford/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/11.pal b/data/tilesets/secondary/dewford/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/11.pal
rename to data/tilesets/secondary/dewford/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/12.pal b/data/tilesets/secondary/dewford/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/12.pal
rename to data/tilesets/secondary/dewford/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/13.pal b/data/tilesets/secondary/dewford/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/13.pal
rename to data/tilesets/secondary/dewford/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/14.pal b/data/tilesets/secondary/dewford/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/14.pal
rename to data/tilesets/secondary/dewford/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/dewford/palettes/15.pal b/data/tilesets/secondary/dewford/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/palettes/15.pal
rename to data/tilesets/secondary/dewford/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/dewford/tiles.png b/data/tilesets/secondary/dewford/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford/tiles.png
rename to data/tilesets/secondary/dewford/tiles.png
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/00.pal b/data/tilesets/secondary/dewford_gym/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/00.pal
rename to data/tilesets/secondary/dewford_gym/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/01.pal b/data/tilesets/secondary/dewford_gym/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/01.pal
rename to data/tilesets/secondary/dewford_gym/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/02.pal b/data/tilesets/secondary/dewford_gym/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/02.pal
rename to data/tilesets/secondary/dewford_gym/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/03.pal b/data/tilesets/secondary/dewford_gym/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/03.pal
rename to data/tilesets/secondary/dewford_gym/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/04.pal b/data/tilesets/secondary/dewford_gym/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/04.pal
rename to data/tilesets/secondary/dewford_gym/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/05.pal b/data/tilesets/secondary/dewford_gym/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/05.pal
rename to data/tilesets/secondary/dewford_gym/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/06.pal b/data/tilesets/secondary/dewford_gym/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/06.pal
rename to data/tilesets/secondary/dewford_gym/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/07.pal b/data/tilesets/secondary/dewford_gym/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/07.pal
rename to data/tilesets/secondary/dewford_gym/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/08.pal b/data/tilesets/secondary/dewford_gym/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/08.pal
rename to data/tilesets/secondary/dewford_gym/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/09.pal b/data/tilesets/secondary/dewford_gym/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/09.pal
rename to data/tilesets/secondary/dewford_gym/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/10.pal b/data/tilesets/secondary/dewford_gym/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/10.pal
rename to data/tilesets/secondary/dewford_gym/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/11.pal b/data/tilesets/secondary/dewford_gym/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/11.pal
rename to data/tilesets/secondary/dewford_gym/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/12.pal b/data/tilesets/secondary/dewford_gym/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/12.pal
rename to data/tilesets/secondary/dewford_gym/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/13.pal b/data/tilesets/secondary/dewford_gym/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/13.pal
rename to data/tilesets/secondary/dewford_gym/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/14.pal b/data/tilesets/secondary/dewford_gym/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/14.pal
rename to data/tilesets/secondary/dewford_gym/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/palettes/15.pal b/data/tilesets/secondary/dewford_gym/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/palettes/15.pal
rename to data/tilesets/secondary/dewford_gym/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/dewford_gym/tiles.png b/data/tilesets/secondary/dewford_gym/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/dewford_gym/tiles.png
rename to data/tilesets/secondary/dewford_gym/tiles.png
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/00.pal b/data/tilesets/secondary/elite_four/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/00.pal
rename to data/tilesets/secondary/elite_four/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/01.pal b/data/tilesets/secondary/elite_four/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/01.pal
rename to data/tilesets/secondary/elite_four/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/02.pal b/data/tilesets/secondary/elite_four/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/02.pal
rename to data/tilesets/secondary/elite_four/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/03.pal b/data/tilesets/secondary/elite_four/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/03.pal
rename to data/tilesets/secondary/elite_four/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/04.pal b/data/tilesets/secondary/elite_four/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/04.pal
rename to data/tilesets/secondary/elite_four/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/05.pal b/data/tilesets/secondary/elite_four/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/05.pal
rename to data/tilesets/secondary/elite_four/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/06.pal b/data/tilesets/secondary/elite_four/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/06.pal
rename to data/tilesets/secondary/elite_four/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/07.pal b/data/tilesets/secondary/elite_four/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/07.pal
rename to data/tilesets/secondary/elite_four/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/08.pal b/data/tilesets/secondary/elite_four/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/08.pal
rename to data/tilesets/secondary/elite_four/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/09.pal b/data/tilesets/secondary/elite_four/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/09.pal
rename to data/tilesets/secondary/elite_four/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/10.pal b/data/tilesets/secondary/elite_four/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/10.pal
rename to data/tilesets/secondary/elite_four/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/11.pal b/data/tilesets/secondary/elite_four/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/11.pal
rename to data/tilesets/secondary/elite_four/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/12.pal b/data/tilesets/secondary/elite_four/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/12.pal
rename to data/tilesets/secondary/elite_four/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/13.pal b/data/tilesets/secondary/elite_four/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/13.pal
rename to data/tilesets/secondary/elite_four/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/14.pal b/data/tilesets/secondary/elite_four/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/14.pal
rename to data/tilesets/secondary/elite_four/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/palettes/15.pal b/data/tilesets/secondary/elite_four/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/palettes/15.pal
rename to data/tilesets/secondary/elite_four/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/elite_four/tiles.png b/data/tilesets/secondary/elite_four/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/elite_four/tiles.png
rename to data/tilesets/secondary/elite_four/tiles.png
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/00.pal b/data/tilesets/secondary/ever_grande/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/00.pal
rename to data/tilesets/secondary/ever_grande/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/01.pal b/data/tilesets/secondary/ever_grande/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/01.pal
rename to data/tilesets/secondary/ever_grande/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/02.pal b/data/tilesets/secondary/ever_grande/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/02.pal
rename to data/tilesets/secondary/ever_grande/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/03.pal b/data/tilesets/secondary/ever_grande/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/03.pal
rename to data/tilesets/secondary/ever_grande/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/04.pal b/data/tilesets/secondary/ever_grande/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/04.pal
rename to data/tilesets/secondary/ever_grande/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/05.pal b/data/tilesets/secondary/ever_grande/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/05.pal
rename to data/tilesets/secondary/ever_grande/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/06.pal b/data/tilesets/secondary/ever_grande/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/06.pal
rename to data/tilesets/secondary/ever_grande/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/07.pal b/data/tilesets/secondary/ever_grande/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/07.pal
rename to data/tilesets/secondary/ever_grande/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/08.pal b/data/tilesets/secondary/ever_grande/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/08.pal
rename to data/tilesets/secondary/ever_grande/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/09.pal b/data/tilesets/secondary/ever_grande/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/09.pal
rename to data/tilesets/secondary/ever_grande/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/10.pal b/data/tilesets/secondary/ever_grande/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/10.pal
rename to data/tilesets/secondary/ever_grande/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/11.pal b/data/tilesets/secondary/ever_grande/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/11.pal
rename to data/tilesets/secondary/ever_grande/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/12.pal b/data/tilesets/secondary/ever_grande/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/12.pal
rename to data/tilesets/secondary/ever_grande/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/13.pal b/data/tilesets/secondary/ever_grande/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/13.pal
rename to data/tilesets/secondary/ever_grande/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/14.pal b/data/tilesets/secondary/ever_grande/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/14.pal
rename to data/tilesets/secondary/ever_grande/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/palettes/15.pal b/data/tilesets/secondary/ever_grande/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/palettes/15.pal
rename to data/tilesets/secondary/ever_grande/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/ever_grande/tiles.png b/data/tilesets/secondary/ever_grande/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/ever_grande/tiles.png
rename to data/tilesets/secondary/ever_grande/tiles.png
diff --git a/data/graphics/tilesets/secondary/facility/palettes/00.pal b/data/tilesets/secondary/facility/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/00.pal
rename to data/tilesets/secondary/facility/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/01.pal b/data/tilesets/secondary/facility/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/01.pal
rename to data/tilesets/secondary/facility/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/02.pal b/data/tilesets/secondary/facility/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/02.pal
rename to data/tilesets/secondary/facility/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/03.pal b/data/tilesets/secondary/facility/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/03.pal
rename to data/tilesets/secondary/facility/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/04.pal b/data/tilesets/secondary/facility/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/04.pal
rename to data/tilesets/secondary/facility/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/05.pal b/data/tilesets/secondary/facility/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/05.pal
rename to data/tilesets/secondary/facility/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/06.pal b/data/tilesets/secondary/facility/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/06.pal
rename to data/tilesets/secondary/facility/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/07.pal b/data/tilesets/secondary/facility/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/07.pal
rename to data/tilesets/secondary/facility/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/08.pal b/data/tilesets/secondary/facility/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/08.pal
rename to data/tilesets/secondary/facility/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/09.pal b/data/tilesets/secondary/facility/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/09.pal
rename to data/tilesets/secondary/facility/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/10.pal b/data/tilesets/secondary/facility/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/10.pal
rename to data/tilesets/secondary/facility/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/11.pal b/data/tilesets/secondary/facility/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/11.pal
rename to data/tilesets/secondary/facility/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/12.pal b/data/tilesets/secondary/facility/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/12.pal
rename to data/tilesets/secondary/facility/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/13.pal b/data/tilesets/secondary/facility/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/13.pal
rename to data/tilesets/secondary/facility/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/14.pal b/data/tilesets/secondary/facility/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/14.pal
rename to data/tilesets/secondary/facility/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/facility/palettes/15.pal b/data/tilesets/secondary/facility/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/palettes/15.pal
rename to data/tilesets/secondary/facility/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/facility/tiles.png b/data/tilesets/secondary/facility/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/facility/tiles.png
rename to data/tilesets/secondary/facility/tiles.png
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/00.pal b/data/tilesets/secondary/fallarbor/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/00.pal
rename to data/tilesets/secondary/fallarbor/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/01.pal b/data/tilesets/secondary/fallarbor/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/01.pal
rename to data/tilesets/secondary/fallarbor/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/02.pal b/data/tilesets/secondary/fallarbor/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/02.pal
rename to data/tilesets/secondary/fallarbor/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/03.pal b/data/tilesets/secondary/fallarbor/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/03.pal
rename to data/tilesets/secondary/fallarbor/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/04.pal b/data/tilesets/secondary/fallarbor/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/04.pal
rename to data/tilesets/secondary/fallarbor/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/05.pal b/data/tilesets/secondary/fallarbor/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/05.pal
rename to data/tilesets/secondary/fallarbor/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/06.pal b/data/tilesets/secondary/fallarbor/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/06.pal
rename to data/tilesets/secondary/fallarbor/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/07.pal b/data/tilesets/secondary/fallarbor/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/07.pal
rename to data/tilesets/secondary/fallarbor/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/08.pal b/data/tilesets/secondary/fallarbor/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/08.pal
rename to data/tilesets/secondary/fallarbor/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/09.pal b/data/tilesets/secondary/fallarbor/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/09.pal
rename to data/tilesets/secondary/fallarbor/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/10.pal b/data/tilesets/secondary/fallarbor/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/10.pal
rename to data/tilesets/secondary/fallarbor/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/11.pal b/data/tilesets/secondary/fallarbor/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/11.pal
rename to data/tilesets/secondary/fallarbor/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/12.pal b/data/tilesets/secondary/fallarbor/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/12.pal
rename to data/tilesets/secondary/fallarbor/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/13.pal b/data/tilesets/secondary/fallarbor/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/13.pal
rename to data/tilesets/secondary/fallarbor/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/14.pal b/data/tilesets/secondary/fallarbor/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/14.pal
rename to data/tilesets/secondary/fallarbor/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/palettes/15.pal b/data/tilesets/secondary/fallarbor/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/palettes/15.pal
rename to data/tilesets/secondary/fallarbor/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/fallarbor/tiles.png b/data/tilesets/secondary/fallarbor/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/fallarbor/tiles.png
rename to data/tilesets/secondary/fallarbor/tiles.png
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/00.pal b/data/tilesets/secondary/fortree/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/00.pal
rename to data/tilesets/secondary/fortree/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/01.pal b/data/tilesets/secondary/fortree/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/01.pal
rename to data/tilesets/secondary/fortree/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/02.pal b/data/tilesets/secondary/fortree/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/02.pal
rename to data/tilesets/secondary/fortree/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/03.pal b/data/tilesets/secondary/fortree/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/03.pal
rename to data/tilesets/secondary/fortree/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/04.pal b/data/tilesets/secondary/fortree/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/04.pal
rename to data/tilesets/secondary/fortree/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/05.pal b/data/tilesets/secondary/fortree/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/05.pal
rename to data/tilesets/secondary/fortree/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/06.pal b/data/tilesets/secondary/fortree/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/06.pal
rename to data/tilesets/secondary/fortree/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/07.pal b/data/tilesets/secondary/fortree/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/07.pal
rename to data/tilesets/secondary/fortree/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/08.pal b/data/tilesets/secondary/fortree/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/08.pal
rename to data/tilesets/secondary/fortree/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/09.pal b/data/tilesets/secondary/fortree/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/09.pal
rename to data/tilesets/secondary/fortree/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/10.pal b/data/tilesets/secondary/fortree/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/10.pal
rename to data/tilesets/secondary/fortree/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/11.pal b/data/tilesets/secondary/fortree/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/11.pal
rename to data/tilesets/secondary/fortree/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/12.pal b/data/tilesets/secondary/fortree/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/12.pal
rename to data/tilesets/secondary/fortree/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/13.pal b/data/tilesets/secondary/fortree/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/13.pal
rename to data/tilesets/secondary/fortree/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/14.pal b/data/tilesets/secondary/fortree/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/14.pal
rename to data/tilesets/secondary/fortree/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/fortree/palettes/15.pal b/data/tilesets/secondary/fortree/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/palettes/15.pal
rename to data/tilesets/secondary/fortree/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/fortree/tiles.png b/data/tilesets/secondary/fortree/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree/tiles.png
rename to data/tilesets/secondary/fortree/tiles.png
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/00.pal b/data/tilesets/secondary/fortree_gym/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/00.pal
rename to data/tilesets/secondary/fortree_gym/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/01.pal b/data/tilesets/secondary/fortree_gym/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/01.pal
rename to data/tilesets/secondary/fortree_gym/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/02.pal b/data/tilesets/secondary/fortree_gym/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/02.pal
rename to data/tilesets/secondary/fortree_gym/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/03.pal b/data/tilesets/secondary/fortree_gym/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/03.pal
rename to data/tilesets/secondary/fortree_gym/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/04.pal b/data/tilesets/secondary/fortree_gym/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/04.pal
rename to data/tilesets/secondary/fortree_gym/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/05.pal b/data/tilesets/secondary/fortree_gym/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/05.pal
rename to data/tilesets/secondary/fortree_gym/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/06.pal b/data/tilesets/secondary/fortree_gym/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/06.pal
rename to data/tilesets/secondary/fortree_gym/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/07.pal b/data/tilesets/secondary/fortree_gym/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/07.pal
rename to data/tilesets/secondary/fortree_gym/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/08.pal b/data/tilesets/secondary/fortree_gym/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/08.pal
rename to data/tilesets/secondary/fortree_gym/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/09.pal b/data/tilesets/secondary/fortree_gym/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/09.pal
rename to data/tilesets/secondary/fortree_gym/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/10.pal b/data/tilesets/secondary/fortree_gym/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/10.pal
rename to data/tilesets/secondary/fortree_gym/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/11.pal b/data/tilesets/secondary/fortree_gym/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/11.pal
rename to data/tilesets/secondary/fortree_gym/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/12.pal b/data/tilesets/secondary/fortree_gym/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/12.pal
rename to data/tilesets/secondary/fortree_gym/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/13.pal b/data/tilesets/secondary/fortree_gym/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/13.pal
rename to data/tilesets/secondary/fortree_gym/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/14.pal b/data/tilesets/secondary/fortree_gym/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/14.pal
rename to data/tilesets/secondary/fortree_gym/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/palettes/15.pal b/data/tilesets/secondary/fortree_gym/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/palettes/15.pal
rename to data/tilesets/secondary/fortree_gym/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/fortree_gym/tiles.png b/data/tilesets/secondary/fortree_gym/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/fortree_gym/tiles.png
rename to data/tilesets/secondary/fortree_gym/tiles.png
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/00.pal b/data/tilesets/secondary/generic_building/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/00.pal
rename to data/tilesets/secondary/generic_building/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/01.pal b/data/tilesets/secondary/generic_building/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/01.pal
rename to data/tilesets/secondary/generic_building/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/02.pal b/data/tilesets/secondary/generic_building/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/02.pal
rename to data/tilesets/secondary/generic_building/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/03.pal b/data/tilesets/secondary/generic_building/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/03.pal
rename to data/tilesets/secondary/generic_building/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/04.pal b/data/tilesets/secondary/generic_building/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/04.pal
rename to data/tilesets/secondary/generic_building/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/05.pal b/data/tilesets/secondary/generic_building/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/05.pal
rename to data/tilesets/secondary/generic_building/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/06.pal b/data/tilesets/secondary/generic_building/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/06.pal
rename to data/tilesets/secondary/generic_building/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/07.pal b/data/tilesets/secondary/generic_building/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/07.pal
rename to data/tilesets/secondary/generic_building/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/08.pal b/data/tilesets/secondary/generic_building/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/08.pal
rename to data/tilesets/secondary/generic_building/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/09.pal b/data/tilesets/secondary/generic_building/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/09.pal
rename to data/tilesets/secondary/generic_building/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/10.pal b/data/tilesets/secondary/generic_building/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/10.pal
rename to data/tilesets/secondary/generic_building/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/11.pal b/data/tilesets/secondary/generic_building/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/11.pal
rename to data/tilesets/secondary/generic_building/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/12.pal b/data/tilesets/secondary/generic_building/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/12.pal
rename to data/tilesets/secondary/generic_building/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/13.pal b/data/tilesets/secondary/generic_building/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/13.pal
rename to data/tilesets/secondary/generic_building/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/14.pal b/data/tilesets/secondary/generic_building/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/14.pal
rename to data/tilesets/secondary/generic_building/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/palettes/15.pal b/data/tilesets/secondary/generic_building/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/palettes/15.pal
rename to data/tilesets/secondary/generic_building/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/generic_building/tiles.png b/data/tilesets/secondary/generic_building/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/generic_building/tiles.png
rename to data/tilesets/secondary/generic_building/tiles.png
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/00.pal b/data/tilesets/secondary/inside_of_truck/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/00.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/01.pal b/data/tilesets/secondary/inside_of_truck/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/01.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/02.pal b/data/tilesets/secondary/inside_of_truck/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/02.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/03.pal b/data/tilesets/secondary/inside_of_truck/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/03.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/04.pal b/data/tilesets/secondary/inside_of_truck/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/04.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/05.pal b/data/tilesets/secondary/inside_of_truck/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/05.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/06.pal b/data/tilesets/secondary/inside_of_truck/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/06.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/07.pal b/data/tilesets/secondary/inside_of_truck/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/07.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/08.pal b/data/tilesets/secondary/inside_of_truck/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/08.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/09.pal b/data/tilesets/secondary/inside_of_truck/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/09.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/10.pal b/data/tilesets/secondary/inside_of_truck/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/10.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/11.pal b/data/tilesets/secondary/inside_of_truck/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/11.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/12.pal b/data/tilesets/secondary/inside_of_truck/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/12.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/13.pal b/data/tilesets/secondary/inside_of_truck/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/13.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/14.pal b/data/tilesets/secondary/inside_of_truck/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/14.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/palettes/15.pal b/data/tilesets/secondary/inside_of_truck/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/palettes/15.pal
rename to data/tilesets/secondary/inside_of_truck/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/inside_of_truck/tiles.png b/data/tilesets/secondary/inside_of_truck/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_of_truck/tiles.png
rename to data/tilesets/secondary/inside_of_truck/tiles.png
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/00.pal b/data/tilesets/secondary/inside_ship/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/00.pal
rename to data/tilesets/secondary/inside_ship/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/01.pal b/data/tilesets/secondary/inside_ship/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/01.pal
rename to data/tilesets/secondary/inside_ship/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/02.pal b/data/tilesets/secondary/inside_ship/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/02.pal
rename to data/tilesets/secondary/inside_ship/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/03.pal b/data/tilesets/secondary/inside_ship/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/03.pal
rename to data/tilesets/secondary/inside_ship/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/04.pal b/data/tilesets/secondary/inside_ship/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/04.pal
rename to data/tilesets/secondary/inside_ship/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/05.pal b/data/tilesets/secondary/inside_ship/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/05.pal
rename to data/tilesets/secondary/inside_ship/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/06.pal b/data/tilesets/secondary/inside_ship/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/06.pal
rename to data/tilesets/secondary/inside_ship/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/07.pal b/data/tilesets/secondary/inside_ship/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/07.pal
rename to data/tilesets/secondary/inside_ship/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/08.pal b/data/tilesets/secondary/inside_ship/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/08.pal
rename to data/tilesets/secondary/inside_ship/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/09.pal b/data/tilesets/secondary/inside_ship/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/09.pal
rename to data/tilesets/secondary/inside_ship/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/10.pal b/data/tilesets/secondary/inside_ship/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/10.pal
rename to data/tilesets/secondary/inside_ship/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/11.pal b/data/tilesets/secondary/inside_ship/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/11.pal
rename to data/tilesets/secondary/inside_ship/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/12.pal b/data/tilesets/secondary/inside_ship/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/12.pal
rename to data/tilesets/secondary/inside_ship/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/13.pal b/data/tilesets/secondary/inside_ship/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/13.pal
rename to data/tilesets/secondary/inside_ship/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/14.pal b/data/tilesets/secondary/inside_ship/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/14.pal
rename to data/tilesets/secondary/inside_ship/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/palettes/15.pal b/data/tilesets/secondary/inside_ship/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/palettes/15.pal
rename to data/tilesets/secondary/inside_ship/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/inside_ship/tiles.png b/data/tilesets/secondary/inside_ship/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/inside_ship/tiles.png
rename to data/tilesets/secondary/inside_ship/tiles.png
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/00.pal b/data/tilesets/secondary/island_harbor/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/00.pal
rename to data/tilesets/secondary/island_harbor/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/01.pal b/data/tilesets/secondary/island_harbor/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/01.pal
rename to data/tilesets/secondary/island_harbor/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/02.pal b/data/tilesets/secondary/island_harbor/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/02.pal
rename to data/tilesets/secondary/island_harbor/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/03.pal b/data/tilesets/secondary/island_harbor/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/03.pal
rename to data/tilesets/secondary/island_harbor/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/04.pal b/data/tilesets/secondary/island_harbor/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/04.pal
rename to data/tilesets/secondary/island_harbor/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/05.pal b/data/tilesets/secondary/island_harbor/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/05.pal
rename to data/tilesets/secondary/island_harbor/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/06.pal b/data/tilesets/secondary/island_harbor/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/06.pal
rename to data/tilesets/secondary/island_harbor/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/07.pal b/data/tilesets/secondary/island_harbor/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/07.pal
rename to data/tilesets/secondary/island_harbor/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/08.pal b/data/tilesets/secondary/island_harbor/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/08.pal
rename to data/tilesets/secondary/island_harbor/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/09.pal b/data/tilesets/secondary/island_harbor/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/09.pal
rename to data/tilesets/secondary/island_harbor/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/10.pal b/data/tilesets/secondary/island_harbor/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/10.pal
rename to data/tilesets/secondary/island_harbor/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/11.pal b/data/tilesets/secondary/island_harbor/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/11.pal
rename to data/tilesets/secondary/island_harbor/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/12.pal b/data/tilesets/secondary/island_harbor/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/12.pal
rename to data/tilesets/secondary/island_harbor/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/13.pal b/data/tilesets/secondary/island_harbor/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/13.pal
rename to data/tilesets/secondary/island_harbor/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/14.pal b/data/tilesets/secondary/island_harbor/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/14.pal
rename to data/tilesets/secondary/island_harbor/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/15.pal b/data/tilesets/secondary/island_harbor/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/palettes/15.pal
rename to data/tilesets/secondary/island_harbor/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/island_harbor/tiles.png b/data/tilesets/secondary/island_harbor/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/island_harbor/tiles.png
rename to data/tilesets/secondary/island_harbor/tiles.png
diff --git a/data/graphics/tilesets/secondary/lab/palettes/00.pal b/data/tilesets/secondary/lab/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/00.pal
rename to data/tilesets/secondary/lab/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/01.pal b/data/tilesets/secondary/lab/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/01.pal
rename to data/tilesets/secondary/lab/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/02.pal b/data/tilesets/secondary/lab/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/02.pal
rename to data/tilesets/secondary/lab/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/03.pal b/data/tilesets/secondary/lab/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/03.pal
rename to data/tilesets/secondary/lab/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/04.pal b/data/tilesets/secondary/lab/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/04.pal
rename to data/tilesets/secondary/lab/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/05.pal b/data/tilesets/secondary/lab/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/05.pal
rename to data/tilesets/secondary/lab/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/06.pal b/data/tilesets/secondary/lab/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/06.pal
rename to data/tilesets/secondary/lab/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/07.pal b/data/tilesets/secondary/lab/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/07.pal
rename to data/tilesets/secondary/lab/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/08.pal b/data/tilesets/secondary/lab/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/08.pal
rename to data/tilesets/secondary/lab/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/09.pal b/data/tilesets/secondary/lab/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/09.pal
rename to data/tilesets/secondary/lab/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/10.pal b/data/tilesets/secondary/lab/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/10.pal
rename to data/tilesets/secondary/lab/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/11.pal b/data/tilesets/secondary/lab/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/11.pal
rename to data/tilesets/secondary/lab/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/12.pal b/data/tilesets/secondary/lab/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/12.pal
rename to data/tilesets/secondary/lab/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/13.pal b/data/tilesets/secondary/lab/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/13.pal
rename to data/tilesets/secondary/lab/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/14.pal b/data/tilesets/secondary/lab/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/14.pal
rename to data/tilesets/secondary/lab/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/lab/palettes/15.pal b/data/tilesets/secondary/lab/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/palettes/15.pal
rename to data/tilesets/secondary/lab/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/lab/tiles.png b/data/tilesets/secondary/lab/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/lab/tiles.png
rename to data/tilesets/secondary/lab/tiles.png
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/00.pal b/data/tilesets/secondary/lavaridge/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/00.pal
rename to data/tilesets/secondary/lavaridge/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/01.pal b/data/tilesets/secondary/lavaridge/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/01.pal
rename to data/tilesets/secondary/lavaridge/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/02.pal b/data/tilesets/secondary/lavaridge/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/02.pal
rename to data/tilesets/secondary/lavaridge/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/03.pal b/data/tilesets/secondary/lavaridge/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/03.pal
rename to data/tilesets/secondary/lavaridge/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/04.pal b/data/tilesets/secondary/lavaridge/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/04.pal
rename to data/tilesets/secondary/lavaridge/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/05.pal b/data/tilesets/secondary/lavaridge/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/05.pal
rename to data/tilesets/secondary/lavaridge/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/06.pal b/data/tilesets/secondary/lavaridge/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/06.pal
rename to data/tilesets/secondary/lavaridge/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/07.pal b/data/tilesets/secondary/lavaridge/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/07.pal
rename to data/tilesets/secondary/lavaridge/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/08.pal b/data/tilesets/secondary/lavaridge/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/08.pal
rename to data/tilesets/secondary/lavaridge/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/09.pal b/data/tilesets/secondary/lavaridge/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/09.pal
rename to data/tilesets/secondary/lavaridge/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/10.pal b/data/tilesets/secondary/lavaridge/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/10.pal
rename to data/tilesets/secondary/lavaridge/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/11.pal b/data/tilesets/secondary/lavaridge/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/11.pal
rename to data/tilesets/secondary/lavaridge/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/12.pal b/data/tilesets/secondary/lavaridge/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/12.pal
rename to data/tilesets/secondary/lavaridge/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/13.pal b/data/tilesets/secondary/lavaridge/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/13.pal
rename to data/tilesets/secondary/lavaridge/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/14.pal b/data/tilesets/secondary/lavaridge/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/14.pal
rename to data/tilesets/secondary/lavaridge/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/palettes/15.pal b/data/tilesets/secondary/lavaridge/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/palettes/15.pal
rename to data/tilesets/secondary/lavaridge/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge/tiles.png b/data/tilesets/secondary/lavaridge/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge/tiles.png
rename to data/tilesets/secondary/lavaridge/tiles.png
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/00.pal b/data/tilesets/secondary/lavaridge_gym/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/00.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/01.pal b/data/tilesets/secondary/lavaridge_gym/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/01.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/02.pal b/data/tilesets/secondary/lavaridge_gym/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/02.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/03.pal b/data/tilesets/secondary/lavaridge_gym/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/03.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/04.pal b/data/tilesets/secondary/lavaridge_gym/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/04.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/05.pal b/data/tilesets/secondary/lavaridge_gym/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/05.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/06.pal b/data/tilesets/secondary/lavaridge_gym/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/06.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/07.pal b/data/tilesets/secondary/lavaridge_gym/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/07.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/08.pal b/data/tilesets/secondary/lavaridge_gym/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/08.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/09.pal b/data/tilesets/secondary/lavaridge_gym/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/09.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/10.pal b/data/tilesets/secondary/lavaridge_gym/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/10.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/11.pal b/data/tilesets/secondary/lavaridge_gym/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/11.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/12.pal b/data/tilesets/secondary/lavaridge_gym/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/12.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/13.pal b/data/tilesets/secondary/lavaridge_gym/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/13.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/14.pal b/data/tilesets/secondary/lavaridge_gym/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/14.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/palettes/15.pal b/data/tilesets/secondary/lavaridge_gym/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/palettes/15.pal
rename to data/tilesets/secondary/lavaridge_gym/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/lavaridge_gym/tiles.png b/data/tilesets/secondary/lavaridge_gym/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/lavaridge_gym/tiles.png
rename to data/tilesets/secondary/lavaridge_gym/tiles.png
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/00.pal b/data/tilesets/secondary/lilycove/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/00.pal
rename to data/tilesets/secondary/lilycove/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/01.pal b/data/tilesets/secondary/lilycove/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/01.pal
rename to data/tilesets/secondary/lilycove/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/02.pal b/data/tilesets/secondary/lilycove/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/02.pal
rename to data/tilesets/secondary/lilycove/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/03.pal b/data/tilesets/secondary/lilycove/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/03.pal
rename to data/tilesets/secondary/lilycove/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/04.pal b/data/tilesets/secondary/lilycove/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/04.pal
rename to data/tilesets/secondary/lilycove/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/05.pal b/data/tilesets/secondary/lilycove/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/05.pal
rename to data/tilesets/secondary/lilycove/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/06.pal b/data/tilesets/secondary/lilycove/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/06.pal
rename to data/tilesets/secondary/lilycove/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/07.pal b/data/tilesets/secondary/lilycove/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/07.pal
rename to data/tilesets/secondary/lilycove/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/08.pal b/data/tilesets/secondary/lilycove/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/08.pal
rename to data/tilesets/secondary/lilycove/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/09.pal b/data/tilesets/secondary/lilycove/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/09.pal
rename to data/tilesets/secondary/lilycove/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/10.pal b/data/tilesets/secondary/lilycove/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/10.pal
rename to data/tilesets/secondary/lilycove/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/11.pal b/data/tilesets/secondary/lilycove/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/11.pal
rename to data/tilesets/secondary/lilycove/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/12.pal b/data/tilesets/secondary/lilycove/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/12.pal
rename to data/tilesets/secondary/lilycove/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/13.pal b/data/tilesets/secondary/lilycove/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/13.pal
rename to data/tilesets/secondary/lilycove/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/14.pal b/data/tilesets/secondary/lilycove/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/14.pal
rename to data/tilesets/secondary/lilycove/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/palettes/15.pal b/data/tilesets/secondary/lilycove/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/palettes/15.pal
rename to data/tilesets/secondary/lilycove/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/lilycove/tiles.png b/data/tilesets/secondary/lilycove/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove/tiles.png
rename to data/tilesets/secondary/lilycove/tiles.png
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/00.pal b/data/tilesets/secondary/lilycove_museum/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/00.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/01.pal b/data/tilesets/secondary/lilycove_museum/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/01.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/02.pal b/data/tilesets/secondary/lilycove_museum/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/02.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/03.pal b/data/tilesets/secondary/lilycove_museum/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/03.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/04.pal b/data/tilesets/secondary/lilycove_museum/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/04.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/05.pal b/data/tilesets/secondary/lilycove_museum/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/05.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/06.pal b/data/tilesets/secondary/lilycove_museum/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/06.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/07.pal b/data/tilesets/secondary/lilycove_museum/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/07.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/08.pal b/data/tilesets/secondary/lilycove_museum/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/08.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/09.pal b/data/tilesets/secondary/lilycove_museum/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/09.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/10.pal b/data/tilesets/secondary/lilycove_museum/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/10.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/11.pal b/data/tilesets/secondary/lilycove_museum/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/11.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/12.pal b/data/tilesets/secondary/lilycove_museum/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/12.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/13.pal b/data/tilesets/secondary/lilycove_museum/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/13.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/14.pal b/data/tilesets/secondary/lilycove_museum/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/14.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/palettes/15.pal b/data/tilesets/secondary/lilycove_museum/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/palettes/15.pal
rename to data/tilesets/secondary/lilycove_museum/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/lilycove_museum/tiles.png b/data/tilesets/secondary/lilycove_museum/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/lilycove_museum/tiles.png
rename to data/tilesets/secondary/lilycove_museum/tiles.png
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/00.pal b/data/tilesets/secondary/mauville/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/00.pal
rename to data/tilesets/secondary/mauville/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/01.pal b/data/tilesets/secondary/mauville/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/01.pal
rename to data/tilesets/secondary/mauville/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/02.pal b/data/tilesets/secondary/mauville/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/02.pal
rename to data/tilesets/secondary/mauville/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/03.pal b/data/tilesets/secondary/mauville/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/03.pal
rename to data/tilesets/secondary/mauville/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/04.pal b/data/tilesets/secondary/mauville/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/04.pal
rename to data/tilesets/secondary/mauville/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/05.pal b/data/tilesets/secondary/mauville/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/05.pal
rename to data/tilesets/secondary/mauville/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/06.pal b/data/tilesets/secondary/mauville/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/06.pal
rename to data/tilesets/secondary/mauville/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/07.pal b/data/tilesets/secondary/mauville/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/07.pal
rename to data/tilesets/secondary/mauville/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/08.pal b/data/tilesets/secondary/mauville/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/08.pal
rename to data/tilesets/secondary/mauville/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/09.pal b/data/tilesets/secondary/mauville/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/09.pal
rename to data/tilesets/secondary/mauville/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/10.pal b/data/tilesets/secondary/mauville/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/10.pal
rename to data/tilesets/secondary/mauville/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/11.pal b/data/tilesets/secondary/mauville/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/11.pal
rename to data/tilesets/secondary/mauville/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/12.pal b/data/tilesets/secondary/mauville/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/12.pal
rename to data/tilesets/secondary/mauville/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/13.pal b/data/tilesets/secondary/mauville/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/13.pal
rename to data/tilesets/secondary/mauville/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/14.pal b/data/tilesets/secondary/mauville/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/14.pal
rename to data/tilesets/secondary/mauville/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/mauville/palettes/15.pal b/data/tilesets/secondary/mauville/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/palettes/15.pal
rename to data/tilesets/secondary/mauville/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/mauville/tiles.png b/data/tilesets/secondary/mauville/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville/tiles.png
rename to data/tilesets/secondary/mauville/tiles.png
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/00.pal b/data/tilesets/secondary/mauville_game_corner/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/00.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/01.pal b/data/tilesets/secondary/mauville_game_corner/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/01.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/02.pal b/data/tilesets/secondary/mauville_game_corner/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/02.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/03.pal b/data/tilesets/secondary/mauville_game_corner/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/03.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/04.pal b/data/tilesets/secondary/mauville_game_corner/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/04.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/05.pal b/data/tilesets/secondary/mauville_game_corner/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/05.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/06.pal b/data/tilesets/secondary/mauville_game_corner/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/06.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/07.pal b/data/tilesets/secondary/mauville_game_corner/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/07.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/08.pal b/data/tilesets/secondary/mauville_game_corner/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/08.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/09.pal b/data/tilesets/secondary/mauville_game_corner/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/09.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/10.pal b/data/tilesets/secondary/mauville_game_corner/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/10.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/11.pal b/data/tilesets/secondary/mauville_game_corner/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/11.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/12.pal b/data/tilesets/secondary/mauville_game_corner/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/12.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/13.pal b/data/tilesets/secondary/mauville_game_corner/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/13.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/14.pal b/data/tilesets/secondary/mauville_game_corner/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/14.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/palettes/15.pal b/data/tilesets/secondary/mauville_game_corner/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/palettes/15.pal
rename to data/tilesets/secondary/mauville_game_corner/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/mauville_game_corner/tiles.png b/data/tilesets/secondary/mauville_game_corner/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_game_corner/tiles.png
rename to data/tilesets/secondary/mauville_game_corner/tiles.png
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/00.pal b/data/tilesets/secondary/mauville_gym/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/00.pal
rename to data/tilesets/secondary/mauville_gym/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/01.pal b/data/tilesets/secondary/mauville_gym/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/01.pal
rename to data/tilesets/secondary/mauville_gym/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/02.pal b/data/tilesets/secondary/mauville_gym/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/02.pal
rename to data/tilesets/secondary/mauville_gym/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/03.pal b/data/tilesets/secondary/mauville_gym/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/03.pal
rename to data/tilesets/secondary/mauville_gym/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/04.pal b/data/tilesets/secondary/mauville_gym/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/04.pal
rename to data/tilesets/secondary/mauville_gym/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/05.pal b/data/tilesets/secondary/mauville_gym/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/05.pal
rename to data/tilesets/secondary/mauville_gym/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/06.pal b/data/tilesets/secondary/mauville_gym/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/06.pal
rename to data/tilesets/secondary/mauville_gym/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/07.pal b/data/tilesets/secondary/mauville_gym/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/07.pal
rename to data/tilesets/secondary/mauville_gym/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/08.pal b/data/tilesets/secondary/mauville_gym/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/08.pal
rename to data/tilesets/secondary/mauville_gym/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/09.pal b/data/tilesets/secondary/mauville_gym/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/09.pal
rename to data/tilesets/secondary/mauville_gym/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/10.pal b/data/tilesets/secondary/mauville_gym/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/10.pal
rename to data/tilesets/secondary/mauville_gym/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/11.pal b/data/tilesets/secondary/mauville_gym/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/11.pal
rename to data/tilesets/secondary/mauville_gym/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/12.pal b/data/tilesets/secondary/mauville_gym/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/12.pal
rename to data/tilesets/secondary/mauville_gym/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/13.pal b/data/tilesets/secondary/mauville_gym/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/13.pal
rename to data/tilesets/secondary/mauville_gym/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/14.pal b/data/tilesets/secondary/mauville_gym/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/14.pal
rename to data/tilesets/secondary/mauville_gym/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/palettes/15.pal b/data/tilesets/secondary/mauville_gym/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/palettes/15.pal
rename to data/tilesets/secondary/mauville_gym/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/mauville_gym/tiles.png b/data/tilesets/secondary/mauville_gym/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/mauville_gym/tiles.png
rename to data/tilesets/secondary/mauville_gym/tiles.png
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/00.pal b/data/tilesets/secondary/meteor_falls/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/00.pal
rename to data/tilesets/secondary/meteor_falls/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/01.pal b/data/tilesets/secondary/meteor_falls/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/01.pal
rename to data/tilesets/secondary/meteor_falls/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/02.pal b/data/tilesets/secondary/meteor_falls/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/02.pal
rename to data/tilesets/secondary/meteor_falls/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/03.pal b/data/tilesets/secondary/meteor_falls/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/03.pal
rename to data/tilesets/secondary/meteor_falls/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/04.pal b/data/tilesets/secondary/meteor_falls/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/04.pal
rename to data/tilesets/secondary/meteor_falls/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/05.pal b/data/tilesets/secondary/meteor_falls/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/05.pal
rename to data/tilesets/secondary/meteor_falls/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/06.pal b/data/tilesets/secondary/meteor_falls/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/06.pal
rename to data/tilesets/secondary/meteor_falls/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/07.pal b/data/tilesets/secondary/meteor_falls/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/07.pal
rename to data/tilesets/secondary/meteor_falls/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/08.pal b/data/tilesets/secondary/meteor_falls/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/08.pal
rename to data/tilesets/secondary/meteor_falls/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/09.pal b/data/tilesets/secondary/meteor_falls/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/09.pal
rename to data/tilesets/secondary/meteor_falls/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/10.pal b/data/tilesets/secondary/meteor_falls/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/10.pal
rename to data/tilesets/secondary/meteor_falls/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/11.pal b/data/tilesets/secondary/meteor_falls/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/11.pal
rename to data/tilesets/secondary/meteor_falls/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/12.pal b/data/tilesets/secondary/meteor_falls/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/12.pal
rename to data/tilesets/secondary/meteor_falls/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/13.pal b/data/tilesets/secondary/meteor_falls/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/13.pal
rename to data/tilesets/secondary/meteor_falls/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/14.pal b/data/tilesets/secondary/meteor_falls/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/14.pal
rename to data/tilesets/secondary/meteor_falls/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/palettes/15.pal b/data/tilesets/secondary/meteor_falls/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/palettes/15.pal
rename to data/tilesets/secondary/meteor_falls/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/meteor_falls/tiles.png b/data/tilesets/secondary/meteor_falls/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/meteor_falls/tiles.png
rename to data/tilesets/secondary/meteor_falls/tiles.png
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/00.pal b/data/tilesets/secondary/mirage_tower/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/00.pal
rename to data/tilesets/secondary/mirage_tower/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/01.pal b/data/tilesets/secondary/mirage_tower/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/01.pal
rename to data/tilesets/secondary/mirage_tower/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/02.pal b/data/tilesets/secondary/mirage_tower/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/02.pal
rename to data/tilesets/secondary/mirage_tower/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/03.pal b/data/tilesets/secondary/mirage_tower/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/03.pal
rename to data/tilesets/secondary/mirage_tower/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/04.pal b/data/tilesets/secondary/mirage_tower/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/04.pal
rename to data/tilesets/secondary/mirage_tower/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/05.pal b/data/tilesets/secondary/mirage_tower/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/05.pal
rename to data/tilesets/secondary/mirage_tower/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/06.pal b/data/tilesets/secondary/mirage_tower/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/06.pal
rename to data/tilesets/secondary/mirage_tower/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/07.pal b/data/tilesets/secondary/mirage_tower/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/07.pal
rename to data/tilesets/secondary/mirage_tower/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/08.pal b/data/tilesets/secondary/mirage_tower/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/08.pal
rename to data/tilesets/secondary/mirage_tower/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/09.pal b/data/tilesets/secondary/mirage_tower/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/09.pal
rename to data/tilesets/secondary/mirage_tower/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/10.pal b/data/tilesets/secondary/mirage_tower/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/10.pal
rename to data/tilesets/secondary/mirage_tower/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/11.pal b/data/tilesets/secondary/mirage_tower/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/11.pal
rename to data/tilesets/secondary/mirage_tower/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/12.pal b/data/tilesets/secondary/mirage_tower/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/12.pal
rename to data/tilesets/secondary/mirage_tower/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/13.pal b/data/tilesets/secondary/mirage_tower/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/13.pal
rename to data/tilesets/secondary/mirage_tower/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/14.pal b/data/tilesets/secondary/mirage_tower/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/14.pal
rename to data/tilesets/secondary/mirage_tower/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/palettes/15.pal b/data/tilesets/secondary/mirage_tower/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/palettes/15.pal
rename to data/tilesets/secondary/mirage_tower/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/mirage_tower/tiles.png b/data/tilesets/secondary/mirage_tower/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/mirage_tower/tiles.png
rename to data/tilesets/secondary/mirage_tower/tiles.png
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/00.pal b/data/tilesets/secondary/mossdeep/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/00.pal
rename to data/tilesets/secondary/mossdeep/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/01.pal b/data/tilesets/secondary/mossdeep/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/01.pal
rename to data/tilesets/secondary/mossdeep/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/02.pal b/data/tilesets/secondary/mossdeep/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/02.pal
rename to data/tilesets/secondary/mossdeep/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/03.pal b/data/tilesets/secondary/mossdeep/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/03.pal
rename to data/tilesets/secondary/mossdeep/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/04.pal b/data/tilesets/secondary/mossdeep/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/04.pal
rename to data/tilesets/secondary/mossdeep/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/05.pal b/data/tilesets/secondary/mossdeep/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/05.pal
rename to data/tilesets/secondary/mossdeep/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/06.pal b/data/tilesets/secondary/mossdeep/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/06.pal
rename to data/tilesets/secondary/mossdeep/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/07.pal b/data/tilesets/secondary/mossdeep/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/07.pal
rename to data/tilesets/secondary/mossdeep/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/08.pal b/data/tilesets/secondary/mossdeep/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/08.pal
rename to data/tilesets/secondary/mossdeep/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/09.pal b/data/tilesets/secondary/mossdeep/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/09.pal
rename to data/tilesets/secondary/mossdeep/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/10.pal b/data/tilesets/secondary/mossdeep/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/10.pal
rename to data/tilesets/secondary/mossdeep/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/11.pal b/data/tilesets/secondary/mossdeep/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/11.pal
rename to data/tilesets/secondary/mossdeep/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/12.pal b/data/tilesets/secondary/mossdeep/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/12.pal
rename to data/tilesets/secondary/mossdeep/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/13.pal b/data/tilesets/secondary/mossdeep/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/13.pal
rename to data/tilesets/secondary/mossdeep/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/14.pal b/data/tilesets/secondary/mossdeep/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/14.pal
rename to data/tilesets/secondary/mossdeep/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/palettes/15.pal b/data/tilesets/secondary/mossdeep/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/palettes/15.pal
rename to data/tilesets/secondary/mossdeep/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep/tiles.png b/data/tilesets/secondary/mossdeep/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep/tiles.png
rename to data/tilesets/secondary/mossdeep/tiles.png
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/00.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/00.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/01.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/01.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/02.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/02.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/03.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/03.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/04.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/04.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/05.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/05.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/06.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/06.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/07.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/07.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/08.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/08.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/09.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/09.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/10.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/10.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/11.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/11.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/12.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/12.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/13.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/13.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/14.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/14.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/15.pal b/data/tilesets/secondary/mossdeep_game_corner/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/15.pal
rename to data/tilesets/secondary/mossdeep_game_corner/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_game_corner/tiles.png b/data/tilesets/secondary/mossdeep_game_corner/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_game_corner/tiles.png
rename to data/tilesets/secondary/mossdeep_game_corner/tiles.png
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/00.pal b/data/tilesets/secondary/mossdeep_gym/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/00.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/01.pal b/data/tilesets/secondary/mossdeep_gym/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/01.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/02.pal b/data/tilesets/secondary/mossdeep_gym/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/02.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/03.pal b/data/tilesets/secondary/mossdeep_gym/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/03.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/04.pal b/data/tilesets/secondary/mossdeep_gym/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/04.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/05.pal b/data/tilesets/secondary/mossdeep_gym/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/05.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/06.pal b/data/tilesets/secondary/mossdeep_gym/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/06.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/07.pal b/data/tilesets/secondary/mossdeep_gym/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/07.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/08.pal b/data/tilesets/secondary/mossdeep_gym/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/08.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/09.pal b/data/tilesets/secondary/mossdeep_gym/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/09.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/10.pal b/data/tilesets/secondary/mossdeep_gym/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/10.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/11.pal b/data/tilesets/secondary/mossdeep_gym/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/11.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/12.pal b/data/tilesets/secondary/mossdeep_gym/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/12.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/13.pal b/data/tilesets/secondary/mossdeep_gym/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/13.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/14.pal b/data/tilesets/secondary/mossdeep_gym/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/14.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/palettes/15.pal b/data/tilesets/secondary/mossdeep_gym/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/palettes/15.pal
rename to data/tilesets/secondary/mossdeep_gym/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/mossdeep_gym/tiles.png b/data/tilesets/secondary/mossdeep_gym/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/mossdeep_gym/tiles.png
rename to data/tilesets/secondary/mossdeep_gym/tiles.png
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/00.pal b/data/tilesets/secondary/mystery_events_house/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/00.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/01.pal b/data/tilesets/secondary/mystery_events_house/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/01.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/02.pal b/data/tilesets/secondary/mystery_events_house/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/02.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/03.pal b/data/tilesets/secondary/mystery_events_house/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/03.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/04.pal b/data/tilesets/secondary/mystery_events_house/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/04.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/05.pal b/data/tilesets/secondary/mystery_events_house/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/05.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/06.pal b/data/tilesets/secondary/mystery_events_house/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/06.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/07.pal b/data/tilesets/secondary/mystery_events_house/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/07.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/08.pal b/data/tilesets/secondary/mystery_events_house/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/08.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/09.pal b/data/tilesets/secondary/mystery_events_house/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/09.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/10.pal b/data/tilesets/secondary/mystery_events_house/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/10.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/11.pal b/data/tilesets/secondary/mystery_events_house/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/11.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/12.pal b/data/tilesets/secondary/mystery_events_house/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/12.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/13.pal b/data/tilesets/secondary/mystery_events_house/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/13.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/14.pal b/data/tilesets/secondary/mystery_events_house/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/14.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/palettes/15.pal b/data/tilesets/secondary/mystery_events_house/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/palettes/15.pal
rename to data/tilesets/secondary/mystery_events_house/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/mystery_events_house/tiles.png b/data/tilesets/secondary/mystery_events_house/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/mystery_events_house/tiles.png
rename to data/tilesets/secondary/mystery_events_house/tiles.png
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/00.pal b/data/tilesets/secondary/navel_rock/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/00.pal
rename to data/tilesets/secondary/navel_rock/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/01.pal b/data/tilesets/secondary/navel_rock/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/01.pal
rename to data/tilesets/secondary/navel_rock/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/02.pal b/data/tilesets/secondary/navel_rock/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/02.pal
rename to data/tilesets/secondary/navel_rock/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/03.pal b/data/tilesets/secondary/navel_rock/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/03.pal
rename to data/tilesets/secondary/navel_rock/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/04.pal b/data/tilesets/secondary/navel_rock/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/04.pal
rename to data/tilesets/secondary/navel_rock/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/05.pal b/data/tilesets/secondary/navel_rock/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/05.pal
rename to data/tilesets/secondary/navel_rock/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/06.pal b/data/tilesets/secondary/navel_rock/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/06.pal
rename to data/tilesets/secondary/navel_rock/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/07.pal b/data/tilesets/secondary/navel_rock/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/07.pal
rename to data/tilesets/secondary/navel_rock/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/08.pal b/data/tilesets/secondary/navel_rock/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/08.pal
rename to data/tilesets/secondary/navel_rock/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/09.pal b/data/tilesets/secondary/navel_rock/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/09.pal
rename to data/tilesets/secondary/navel_rock/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/10.pal b/data/tilesets/secondary/navel_rock/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/10.pal
rename to data/tilesets/secondary/navel_rock/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/11.pal b/data/tilesets/secondary/navel_rock/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/11.pal
rename to data/tilesets/secondary/navel_rock/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/12.pal b/data/tilesets/secondary/navel_rock/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/12.pal
rename to data/tilesets/secondary/navel_rock/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/13.pal b/data/tilesets/secondary/navel_rock/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/13.pal
rename to data/tilesets/secondary/navel_rock/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/14.pal b/data/tilesets/secondary/navel_rock/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/14.pal
rename to data/tilesets/secondary/navel_rock/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/palettes/15.pal b/data/tilesets/secondary/navel_rock/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/palettes/15.pal
rename to data/tilesets/secondary/navel_rock/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/navel_rock/tiles.png b/data/tilesets/secondary/navel_rock/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/navel_rock/tiles.png
rename to data/tilesets/secondary/navel_rock/tiles.png
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/00.pal b/data/tilesets/secondary/oceanic_museum/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/00.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/01.pal b/data/tilesets/secondary/oceanic_museum/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/01.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/02.pal b/data/tilesets/secondary/oceanic_museum/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/02.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/03.pal b/data/tilesets/secondary/oceanic_museum/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/03.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/04.pal b/data/tilesets/secondary/oceanic_museum/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/04.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/05.pal b/data/tilesets/secondary/oceanic_museum/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/05.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/06.pal b/data/tilesets/secondary/oceanic_museum/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/06.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/07.pal b/data/tilesets/secondary/oceanic_museum/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/07.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/08.pal b/data/tilesets/secondary/oceanic_museum/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/08.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/09.pal b/data/tilesets/secondary/oceanic_museum/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/09.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/10.pal b/data/tilesets/secondary/oceanic_museum/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/10.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/11.pal b/data/tilesets/secondary/oceanic_museum/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/11.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/12.pal b/data/tilesets/secondary/oceanic_museum/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/12.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/13.pal b/data/tilesets/secondary/oceanic_museum/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/13.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/14.pal b/data/tilesets/secondary/oceanic_museum/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/14.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/palettes/15.pal b/data/tilesets/secondary/oceanic_museum/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/palettes/15.pal
rename to data/tilesets/secondary/oceanic_museum/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/oceanic_museum/tiles.png b/data/tilesets/secondary/oceanic_museum/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/oceanic_museum/tiles.png
rename to data/tilesets/secondary/oceanic_museum/tiles.png
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/00.pal b/data/tilesets/secondary/pacifidlog/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/00.pal
rename to data/tilesets/secondary/pacifidlog/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/01.pal b/data/tilesets/secondary/pacifidlog/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/01.pal
rename to data/tilesets/secondary/pacifidlog/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/02.pal b/data/tilesets/secondary/pacifidlog/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/02.pal
rename to data/tilesets/secondary/pacifidlog/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/03.pal b/data/tilesets/secondary/pacifidlog/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/03.pal
rename to data/tilesets/secondary/pacifidlog/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/04.pal b/data/tilesets/secondary/pacifidlog/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/04.pal
rename to data/tilesets/secondary/pacifidlog/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/05.pal b/data/tilesets/secondary/pacifidlog/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/05.pal
rename to data/tilesets/secondary/pacifidlog/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/06.pal b/data/tilesets/secondary/pacifidlog/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/06.pal
rename to data/tilesets/secondary/pacifidlog/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/07.pal b/data/tilesets/secondary/pacifidlog/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/07.pal
rename to data/tilesets/secondary/pacifidlog/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/08.pal b/data/tilesets/secondary/pacifidlog/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/08.pal
rename to data/tilesets/secondary/pacifidlog/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/09.pal b/data/tilesets/secondary/pacifidlog/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/09.pal
rename to data/tilesets/secondary/pacifidlog/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/10.pal b/data/tilesets/secondary/pacifidlog/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/10.pal
rename to data/tilesets/secondary/pacifidlog/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/11.pal b/data/tilesets/secondary/pacifidlog/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/11.pal
rename to data/tilesets/secondary/pacifidlog/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/12.pal b/data/tilesets/secondary/pacifidlog/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/12.pal
rename to data/tilesets/secondary/pacifidlog/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/13.pal b/data/tilesets/secondary/pacifidlog/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/13.pal
rename to data/tilesets/secondary/pacifidlog/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/14.pal b/data/tilesets/secondary/pacifidlog/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/14.pal
rename to data/tilesets/secondary/pacifidlog/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/palettes/15.pal b/data/tilesets/secondary/pacifidlog/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/palettes/15.pal
rename to data/tilesets/secondary/pacifidlog/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/pacifidlog/tiles.png b/data/tilesets/secondary/pacifidlog/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/pacifidlog/tiles.png
rename to data/tilesets/secondary/pacifidlog/tiles.png
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/00.pal b/data/tilesets/secondary/petalburg/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/00.pal
rename to data/tilesets/secondary/petalburg/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/01.pal b/data/tilesets/secondary/petalburg/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/01.pal
rename to data/tilesets/secondary/petalburg/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/02.pal b/data/tilesets/secondary/petalburg/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/02.pal
rename to data/tilesets/secondary/petalburg/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/03.pal b/data/tilesets/secondary/petalburg/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/03.pal
rename to data/tilesets/secondary/petalburg/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/04.pal b/data/tilesets/secondary/petalburg/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/04.pal
rename to data/tilesets/secondary/petalburg/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/05.pal b/data/tilesets/secondary/petalburg/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/05.pal
rename to data/tilesets/secondary/petalburg/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/06.pal b/data/tilesets/secondary/petalburg/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/06.pal
rename to data/tilesets/secondary/petalburg/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/07.pal b/data/tilesets/secondary/petalburg/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/07.pal
rename to data/tilesets/secondary/petalburg/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/08.pal b/data/tilesets/secondary/petalburg/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/08.pal
rename to data/tilesets/secondary/petalburg/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/09.pal b/data/tilesets/secondary/petalburg/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/09.pal
rename to data/tilesets/secondary/petalburg/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/10.pal b/data/tilesets/secondary/petalburg/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/10.pal
rename to data/tilesets/secondary/petalburg/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/11.pal b/data/tilesets/secondary/petalburg/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/11.pal
rename to data/tilesets/secondary/petalburg/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/12.pal b/data/tilesets/secondary/petalburg/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/12.pal
rename to data/tilesets/secondary/petalburg/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/13.pal b/data/tilesets/secondary/petalburg/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/13.pal
rename to data/tilesets/secondary/petalburg/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/14.pal b/data/tilesets/secondary/petalburg/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/14.pal
rename to data/tilesets/secondary/petalburg/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/palettes/15.pal b/data/tilesets/secondary/petalburg/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/palettes/15.pal
rename to data/tilesets/secondary/petalburg/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/petalburg/tiles.png b/data/tilesets/secondary/petalburg/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg/tiles.png
rename to data/tilesets/secondary/petalburg/tiles.png
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/00.pal b/data/tilesets/secondary/petalburg_gym/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/00.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/01.pal b/data/tilesets/secondary/petalburg_gym/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/01.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/02.pal b/data/tilesets/secondary/petalburg_gym/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/02.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/03.pal b/data/tilesets/secondary/petalburg_gym/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/03.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/04.pal b/data/tilesets/secondary/petalburg_gym/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/04.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/05.pal b/data/tilesets/secondary/petalburg_gym/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/05.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/06.pal b/data/tilesets/secondary/petalburg_gym/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/06.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/07.pal b/data/tilesets/secondary/petalburg_gym/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/07.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/08.pal b/data/tilesets/secondary/petalburg_gym/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/08.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/09.pal b/data/tilesets/secondary/petalburg_gym/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/09.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/10.pal b/data/tilesets/secondary/petalburg_gym/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/10.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/11.pal b/data/tilesets/secondary/petalburg_gym/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/11.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/12.pal b/data/tilesets/secondary/petalburg_gym/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/12.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/13.pal b/data/tilesets/secondary/petalburg_gym/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/13.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/14.pal b/data/tilesets/secondary/petalburg_gym/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/14.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/palettes/15.pal b/data/tilesets/secondary/petalburg_gym/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/palettes/15.pal
rename to data/tilesets/secondary/petalburg_gym/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/petalburg_gym/tiles.png b/data/tilesets/secondary/petalburg_gym/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/petalburg_gym/tiles.png
rename to data/tilesets/secondary/petalburg_gym/tiles.png
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/00.pal b/data/tilesets/secondary/pokemon_center/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/00.pal
rename to data/tilesets/secondary/pokemon_center/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/01.pal b/data/tilesets/secondary/pokemon_center/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/01.pal
rename to data/tilesets/secondary/pokemon_center/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/02.pal b/data/tilesets/secondary/pokemon_center/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/02.pal
rename to data/tilesets/secondary/pokemon_center/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/03.pal b/data/tilesets/secondary/pokemon_center/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/03.pal
rename to data/tilesets/secondary/pokemon_center/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/04.pal b/data/tilesets/secondary/pokemon_center/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/04.pal
rename to data/tilesets/secondary/pokemon_center/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/05.pal b/data/tilesets/secondary/pokemon_center/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/05.pal
rename to data/tilesets/secondary/pokemon_center/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/06.pal b/data/tilesets/secondary/pokemon_center/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/06.pal
rename to data/tilesets/secondary/pokemon_center/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/07.pal b/data/tilesets/secondary/pokemon_center/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/07.pal
rename to data/tilesets/secondary/pokemon_center/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/08.pal b/data/tilesets/secondary/pokemon_center/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/08.pal
rename to data/tilesets/secondary/pokemon_center/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/09.pal b/data/tilesets/secondary/pokemon_center/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/09.pal
rename to data/tilesets/secondary/pokemon_center/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/10.pal b/data/tilesets/secondary/pokemon_center/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/10.pal
rename to data/tilesets/secondary/pokemon_center/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/11.pal b/data/tilesets/secondary/pokemon_center/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/11.pal
rename to data/tilesets/secondary/pokemon_center/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/12.pal b/data/tilesets/secondary/pokemon_center/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/12.pal
rename to data/tilesets/secondary/pokemon_center/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/13.pal b/data/tilesets/secondary/pokemon_center/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/13.pal
rename to data/tilesets/secondary/pokemon_center/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/14.pal b/data/tilesets/secondary/pokemon_center/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/14.pal
rename to data/tilesets/secondary/pokemon_center/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/palettes/15.pal b/data/tilesets/secondary/pokemon_center/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/palettes/15.pal
rename to data/tilesets/secondary/pokemon_center/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_center/tiles.png b/data/tilesets/secondary/pokemon_center/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_center/tiles.png
rename to data/tilesets/secondary/pokemon_center/tiles.png
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/00.pal b/data/tilesets/secondary/pokemon_day_care/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/00.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/01.pal b/data/tilesets/secondary/pokemon_day_care/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/01.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/02.pal b/data/tilesets/secondary/pokemon_day_care/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/02.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/03.pal b/data/tilesets/secondary/pokemon_day_care/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/03.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/04.pal b/data/tilesets/secondary/pokemon_day_care/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/04.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/05.pal b/data/tilesets/secondary/pokemon_day_care/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/05.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/06.pal b/data/tilesets/secondary/pokemon_day_care/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/06.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/07.pal b/data/tilesets/secondary/pokemon_day_care/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/07.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/08.pal b/data/tilesets/secondary/pokemon_day_care/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/08.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/09.pal b/data/tilesets/secondary/pokemon_day_care/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/09.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/10.pal b/data/tilesets/secondary/pokemon_day_care/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/10.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/11.pal b/data/tilesets/secondary/pokemon_day_care/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/11.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/12.pal b/data/tilesets/secondary/pokemon_day_care/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/12.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/13.pal b/data/tilesets/secondary/pokemon_day_care/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/13.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/14.pal b/data/tilesets/secondary/pokemon_day_care/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/14.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/palettes/15.pal b/data/tilesets/secondary/pokemon_day_care/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/palettes/15.pal
rename to data/tilesets/secondary/pokemon_day_care/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_day_care/tiles.png b/data/tilesets/secondary/pokemon_day_care/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_day_care/tiles.png
rename to data/tilesets/secondary/pokemon_day_care/tiles.png
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/00.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/00.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/01.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/01.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/02.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/02.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/03.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/03.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/04.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/04.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/05.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/05.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/06.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/06.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/07.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/07.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/08.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/08.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/09.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/09.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/10.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/10.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/11.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/11.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/12.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/12.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/13.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/13.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/14.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/14.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/palettes/15.pal b/data/tilesets/secondary/pokemon_fan_club/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/palettes/15.pal
rename to data/tilesets/secondary/pokemon_fan_club/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_fan_club/tiles.png b/data/tilesets/secondary/pokemon_fan_club/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_fan_club/tiles.png
rename to data/tilesets/secondary/pokemon_fan_club/tiles.png
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/00.pal b/data/tilesets/secondary/pokemon_school/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/00.pal
rename to data/tilesets/secondary/pokemon_school/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/01.pal b/data/tilesets/secondary/pokemon_school/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/01.pal
rename to data/tilesets/secondary/pokemon_school/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/02.pal b/data/tilesets/secondary/pokemon_school/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/02.pal
rename to data/tilesets/secondary/pokemon_school/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/03.pal b/data/tilesets/secondary/pokemon_school/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/03.pal
rename to data/tilesets/secondary/pokemon_school/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/04.pal b/data/tilesets/secondary/pokemon_school/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/04.pal
rename to data/tilesets/secondary/pokemon_school/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/05.pal b/data/tilesets/secondary/pokemon_school/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/05.pal
rename to data/tilesets/secondary/pokemon_school/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/06.pal b/data/tilesets/secondary/pokemon_school/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/06.pal
rename to data/tilesets/secondary/pokemon_school/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/07.pal b/data/tilesets/secondary/pokemon_school/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/07.pal
rename to data/tilesets/secondary/pokemon_school/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/08.pal b/data/tilesets/secondary/pokemon_school/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/08.pal
rename to data/tilesets/secondary/pokemon_school/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/09.pal b/data/tilesets/secondary/pokemon_school/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/09.pal
rename to data/tilesets/secondary/pokemon_school/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/10.pal b/data/tilesets/secondary/pokemon_school/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/10.pal
rename to data/tilesets/secondary/pokemon_school/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/11.pal b/data/tilesets/secondary/pokemon_school/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/11.pal
rename to data/tilesets/secondary/pokemon_school/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/12.pal b/data/tilesets/secondary/pokemon_school/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/12.pal
rename to data/tilesets/secondary/pokemon_school/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/13.pal b/data/tilesets/secondary/pokemon_school/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/13.pal
rename to data/tilesets/secondary/pokemon_school/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/14.pal b/data/tilesets/secondary/pokemon_school/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/14.pal
rename to data/tilesets/secondary/pokemon_school/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/palettes/15.pal b/data/tilesets/secondary/pokemon_school/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/palettes/15.pal
rename to data/tilesets/secondary/pokemon_school/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/pokemon_school/tiles.png b/data/tilesets/secondary/pokemon_school/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/pokemon_school/tiles.png
rename to data/tilesets/secondary/pokemon_school/tiles.png
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/00.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/00.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/01.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/01.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/02.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/02.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/03.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/03.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/04.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/04.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/05.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/05.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/06.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/06.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/07.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/07.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/08.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/08.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/09.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/09.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/10.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/10.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/11.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/11.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/12.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/12.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/13.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/13.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/14.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/14.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/15.pal b/data/tilesets/secondary/pretty_petal_flower_shop/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/15.pal
rename to data/tilesets/secondary/pretty_petal_flower_shop/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/pretty_petal_flower_shop/tiles.png b/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/pretty_petal_flower_shop/tiles.png
rename to data/tilesets/secondary/pretty_petal_flower_shop/tiles.png
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/00.pal b/data/tilesets/secondary/rustboro/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/00.pal
rename to data/tilesets/secondary/rustboro/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/01.pal b/data/tilesets/secondary/rustboro/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/01.pal
rename to data/tilesets/secondary/rustboro/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/02.pal b/data/tilesets/secondary/rustboro/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/02.pal
rename to data/tilesets/secondary/rustboro/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/03.pal b/data/tilesets/secondary/rustboro/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/03.pal
rename to data/tilesets/secondary/rustboro/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/04.pal b/data/tilesets/secondary/rustboro/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/04.pal
rename to data/tilesets/secondary/rustboro/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/05.pal b/data/tilesets/secondary/rustboro/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/05.pal
rename to data/tilesets/secondary/rustboro/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/06.pal b/data/tilesets/secondary/rustboro/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/06.pal
rename to data/tilesets/secondary/rustboro/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/07.pal b/data/tilesets/secondary/rustboro/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/07.pal
rename to data/tilesets/secondary/rustboro/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/08.pal b/data/tilesets/secondary/rustboro/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/08.pal
rename to data/tilesets/secondary/rustboro/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/09.pal b/data/tilesets/secondary/rustboro/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/09.pal
rename to data/tilesets/secondary/rustboro/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/10.pal b/data/tilesets/secondary/rustboro/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/10.pal
rename to data/tilesets/secondary/rustboro/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/11.pal b/data/tilesets/secondary/rustboro/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/11.pal
rename to data/tilesets/secondary/rustboro/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/12.pal b/data/tilesets/secondary/rustboro/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/12.pal
rename to data/tilesets/secondary/rustboro/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/13.pal b/data/tilesets/secondary/rustboro/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/13.pal
rename to data/tilesets/secondary/rustboro/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/14.pal b/data/tilesets/secondary/rustboro/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/14.pal
rename to data/tilesets/secondary/rustboro/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/palettes/15.pal b/data/tilesets/secondary/rustboro/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/palettes/15.pal
rename to data/tilesets/secondary/rustboro/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/rustboro/tiles.png b/data/tilesets/secondary/rustboro/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro/tiles.png
rename to data/tilesets/secondary/rustboro/tiles.png
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/00.pal b/data/tilesets/secondary/rustboro_gym/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/00.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/01.pal b/data/tilesets/secondary/rustboro_gym/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/01.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/02.pal b/data/tilesets/secondary/rustboro_gym/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/02.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/03.pal b/data/tilesets/secondary/rustboro_gym/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/03.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/04.pal b/data/tilesets/secondary/rustboro_gym/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/04.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/05.pal b/data/tilesets/secondary/rustboro_gym/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/05.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/06.pal b/data/tilesets/secondary/rustboro_gym/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/06.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/07.pal b/data/tilesets/secondary/rustboro_gym/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/07.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/08.pal b/data/tilesets/secondary/rustboro_gym/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/08.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/09.pal b/data/tilesets/secondary/rustboro_gym/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/09.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/10.pal b/data/tilesets/secondary/rustboro_gym/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/10.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/11.pal b/data/tilesets/secondary/rustboro_gym/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/11.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/12.pal b/data/tilesets/secondary/rustboro_gym/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/12.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/13.pal b/data/tilesets/secondary/rustboro_gym/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/13.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/14.pal b/data/tilesets/secondary/rustboro_gym/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/14.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/palettes/15.pal b/data/tilesets/secondary/rustboro_gym/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/palettes/15.pal
rename to data/tilesets/secondary/rustboro_gym/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/rustboro_gym/tiles.png b/data/tilesets/secondary/rustboro_gym/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/rustboro_gym/tiles.png
rename to data/tilesets/secondary/rustboro_gym/tiles.png
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/00.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/00.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/01.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/01.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/02.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/02.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/03.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/03.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/04.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/04.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/05.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/05.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/06.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/06.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/07.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/07.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/08.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/08.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/09.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/09.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/10.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/10.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/11.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/11.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/12.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/12.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/13.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/13.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/14.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/14.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/palettes/15.pal b/data/tilesets/secondary/rusturf_tunnel/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/palettes/15.pal
rename to data/tilesets/secondary/rusturf_tunnel/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/rusturf_tunnel/tiles.png b/data/tilesets/secondary/rusturf_tunnel/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/rusturf_tunnel/tiles.png
rename to data/tilesets/secondary/rusturf_tunnel/tiles.png
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/00.pal b/data/tilesets/secondary/seashore_house/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/00.pal
rename to data/tilesets/secondary/seashore_house/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/01.pal b/data/tilesets/secondary/seashore_house/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/01.pal
rename to data/tilesets/secondary/seashore_house/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/02.pal b/data/tilesets/secondary/seashore_house/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/02.pal
rename to data/tilesets/secondary/seashore_house/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/03.pal b/data/tilesets/secondary/seashore_house/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/03.pal
rename to data/tilesets/secondary/seashore_house/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/04.pal b/data/tilesets/secondary/seashore_house/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/04.pal
rename to data/tilesets/secondary/seashore_house/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/05.pal b/data/tilesets/secondary/seashore_house/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/05.pal
rename to data/tilesets/secondary/seashore_house/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/06.pal b/data/tilesets/secondary/seashore_house/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/06.pal
rename to data/tilesets/secondary/seashore_house/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/07.pal b/data/tilesets/secondary/seashore_house/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/07.pal
rename to data/tilesets/secondary/seashore_house/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/08.pal b/data/tilesets/secondary/seashore_house/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/08.pal
rename to data/tilesets/secondary/seashore_house/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/09.pal b/data/tilesets/secondary/seashore_house/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/09.pal
rename to data/tilesets/secondary/seashore_house/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/10.pal b/data/tilesets/secondary/seashore_house/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/10.pal
rename to data/tilesets/secondary/seashore_house/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/11.pal b/data/tilesets/secondary/seashore_house/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/11.pal
rename to data/tilesets/secondary/seashore_house/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/12.pal b/data/tilesets/secondary/seashore_house/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/12.pal
rename to data/tilesets/secondary/seashore_house/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/13.pal b/data/tilesets/secondary/seashore_house/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/13.pal
rename to data/tilesets/secondary/seashore_house/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/14.pal b/data/tilesets/secondary/seashore_house/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/14.pal
rename to data/tilesets/secondary/seashore_house/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/palettes/15.pal b/data/tilesets/secondary/seashore_house/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/palettes/15.pal
rename to data/tilesets/secondary/seashore_house/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/seashore_house/tiles.png b/data/tilesets/secondary/seashore_house/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/seashore_house/tiles.png
rename to data/tilesets/secondary/seashore_house/tiles.png
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/00.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/00.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/01.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/01.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/02.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/02.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/03.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/03.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/04.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/04.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/05.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/05.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/06.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/06.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/07.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/07.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/08.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/08.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/09.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/09.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/10.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/10.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/11.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/11.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/12.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/12.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/13.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/13.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/14.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/14.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/15.pal b/data/tilesets/secondary/secret_base/blue_cave/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/15.pal
rename to data/tilesets/secondary/secret_base/blue_cave/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/blue_cave/tiles.png b/data/tilesets/secondary/secret_base/blue_cave/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/blue_cave/tiles.png
rename to data/tilesets/secondary/secret_base/blue_cave/tiles.png
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/00.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/00.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/01.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/01.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/02.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/02.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/03.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/03.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/04.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/04.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/05.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/05.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/06.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/06.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/07.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/07.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/08.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/08.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/09.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/09.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/10.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/10.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/11.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/11.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/12.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/12.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/13.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/13.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/14.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/14.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/15.pal b/data/tilesets/secondary/secret_base/brown_cave/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/15.pal
rename to data/tilesets/secondary/secret_base/brown_cave/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/brown_cave/tiles.png b/data/tilesets/secondary/secret_base/brown_cave/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/brown_cave/tiles.png
rename to data/tilesets/secondary/secret_base/brown_cave/tiles.png
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/00.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/00.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/01.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/01.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/02.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/02.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/03.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/03.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/04.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/04.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/05.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/05.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/06.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/06.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/07.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/07.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/08.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/08.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/09.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/09.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/10.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/10.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/11.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/11.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/12.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/12.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/13.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/13.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/14.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/14.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/palettes/15.pal b/data/tilesets/secondary/secret_base/red_cave/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/palettes/15.pal
rename to data/tilesets/secondary/secret_base/red_cave/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/red_cave/tiles.png b/data/tilesets/secondary/secret_base/red_cave/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/red_cave/tiles.png
rename to data/tilesets/secondary/secret_base/red_cave/tiles.png
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/00.pal b/data/tilesets/secondary/secret_base/shrub/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/00.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/01.pal b/data/tilesets/secondary/secret_base/shrub/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/01.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/02.pal b/data/tilesets/secondary/secret_base/shrub/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/02.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/03.pal b/data/tilesets/secondary/secret_base/shrub/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/03.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/04.pal b/data/tilesets/secondary/secret_base/shrub/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/04.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/05.pal b/data/tilesets/secondary/secret_base/shrub/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/05.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/06.pal b/data/tilesets/secondary/secret_base/shrub/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/06.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/07.pal b/data/tilesets/secondary/secret_base/shrub/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/07.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/08.pal b/data/tilesets/secondary/secret_base/shrub/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/08.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/09.pal b/data/tilesets/secondary/secret_base/shrub/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/09.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/10.pal b/data/tilesets/secondary/secret_base/shrub/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/10.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/11.pal b/data/tilesets/secondary/secret_base/shrub/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/11.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/12.pal b/data/tilesets/secondary/secret_base/shrub/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/12.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/13.pal b/data/tilesets/secondary/secret_base/shrub/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/13.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/14.pal b/data/tilesets/secondary/secret_base/shrub/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/14.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/palettes/15.pal b/data/tilesets/secondary/secret_base/shrub/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/palettes/15.pal
rename to data/tilesets/secondary/secret_base/shrub/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/shrub/tiles.png b/data/tilesets/secondary/secret_base/shrub/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/shrub/tiles.png
rename to data/tilesets/secondary/secret_base/shrub/tiles.png
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/00.pal b/data/tilesets/secondary/secret_base/tree/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/00.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/01.pal b/data/tilesets/secondary/secret_base/tree/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/01.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/02.pal b/data/tilesets/secondary/secret_base/tree/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/02.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/03.pal b/data/tilesets/secondary/secret_base/tree/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/03.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/04.pal b/data/tilesets/secondary/secret_base/tree/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/04.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/05.pal b/data/tilesets/secondary/secret_base/tree/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/05.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/06.pal b/data/tilesets/secondary/secret_base/tree/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/06.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/07.pal b/data/tilesets/secondary/secret_base/tree/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/07.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/08.pal b/data/tilesets/secondary/secret_base/tree/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/08.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/09.pal b/data/tilesets/secondary/secret_base/tree/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/09.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/10.pal b/data/tilesets/secondary/secret_base/tree/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/10.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/11.pal b/data/tilesets/secondary/secret_base/tree/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/11.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/12.pal b/data/tilesets/secondary/secret_base/tree/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/12.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/13.pal b/data/tilesets/secondary/secret_base/tree/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/13.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/14.pal b/data/tilesets/secondary/secret_base/tree/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/14.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/palettes/15.pal b/data/tilesets/secondary/secret_base/tree/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/palettes/15.pal
rename to data/tilesets/secondary/secret_base/tree/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/tree/tiles.png b/data/tilesets/secondary/secret_base/tree/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/tree/tiles.png
rename to data/tilesets/secondary/secret_base/tree/tiles.png
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/00.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/00.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/01.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/01.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/02.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/02.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/03.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/03.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/04.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/04.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/05.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/05.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/06.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/06.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/07.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/07.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/08.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/08.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/09.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/09.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/10.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/10.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/11.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/11.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/12.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/12.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/13.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/13.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/14.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/14.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/15.pal b/data/tilesets/secondary/secret_base/yellow_cave/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/15.pal
rename to data/tilesets/secondary/secret_base/yellow_cave/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/secret_base/yellow_cave/tiles.png b/data/tilesets/secondary/secret_base/yellow_cave/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/secret_base/yellow_cave/tiles.png
rename to data/tilesets/secondary/secret_base/yellow_cave/tiles.png
diff --git a/data/graphics/tilesets/secondary/shop/palettes/00.pal b/data/tilesets/secondary/shop/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/00.pal
rename to data/tilesets/secondary/shop/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/01.pal b/data/tilesets/secondary/shop/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/01.pal
rename to data/tilesets/secondary/shop/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/02.pal b/data/tilesets/secondary/shop/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/02.pal
rename to data/tilesets/secondary/shop/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/03.pal b/data/tilesets/secondary/shop/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/03.pal
rename to data/tilesets/secondary/shop/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/04.pal b/data/tilesets/secondary/shop/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/04.pal
rename to data/tilesets/secondary/shop/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/05.pal b/data/tilesets/secondary/shop/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/05.pal
rename to data/tilesets/secondary/shop/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/06.pal b/data/tilesets/secondary/shop/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/06.pal
rename to data/tilesets/secondary/shop/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/07.pal b/data/tilesets/secondary/shop/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/07.pal
rename to data/tilesets/secondary/shop/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/08.pal b/data/tilesets/secondary/shop/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/08.pal
rename to data/tilesets/secondary/shop/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/09.pal b/data/tilesets/secondary/shop/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/09.pal
rename to data/tilesets/secondary/shop/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/10.pal b/data/tilesets/secondary/shop/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/10.pal
rename to data/tilesets/secondary/shop/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/11.pal b/data/tilesets/secondary/shop/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/11.pal
rename to data/tilesets/secondary/shop/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/12.pal b/data/tilesets/secondary/shop/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/12.pal
rename to data/tilesets/secondary/shop/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/13.pal b/data/tilesets/secondary/shop/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/13.pal
rename to data/tilesets/secondary/shop/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/14.pal b/data/tilesets/secondary/shop/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/14.pal
rename to data/tilesets/secondary/shop/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/shop/palettes/15.pal b/data/tilesets/secondary/shop/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/palettes/15.pal
rename to data/tilesets/secondary/shop/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/shop/tiles.png b/data/tilesets/secondary/shop/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/shop/tiles.png
rename to data/tilesets/secondary/shop/tiles.png
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/00.pal b/data/tilesets/secondary/slateport/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/00.pal
rename to data/tilesets/secondary/slateport/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/01.pal b/data/tilesets/secondary/slateport/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/01.pal
rename to data/tilesets/secondary/slateport/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/02.pal b/data/tilesets/secondary/slateport/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/02.pal
rename to data/tilesets/secondary/slateport/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/03.pal b/data/tilesets/secondary/slateport/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/03.pal
rename to data/tilesets/secondary/slateport/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/04.pal b/data/tilesets/secondary/slateport/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/04.pal
rename to data/tilesets/secondary/slateport/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/05.pal b/data/tilesets/secondary/slateport/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/05.pal
rename to data/tilesets/secondary/slateport/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/06.pal b/data/tilesets/secondary/slateport/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/06.pal
rename to data/tilesets/secondary/slateport/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/07.pal b/data/tilesets/secondary/slateport/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/07.pal
rename to data/tilesets/secondary/slateport/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/08.pal b/data/tilesets/secondary/slateport/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/08.pal
rename to data/tilesets/secondary/slateport/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/09.pal b/data/tilesets/secondary/slateport/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/09.pal
rename to data/tilesets/secondary/slateport/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/10.pal b/data/tilesets/secondary/slateport/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/10.pal
rename to data/tilesets/secondary/slateport/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/11.pal b/data/tilesets/secondary/slateport/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/11.pal
rename to data/tilesets/secondary/slateport/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/12.pal b/data/tilesets/secondary/slateport/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/12.pal
rename to data/tilesets/secondary/slateport/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/13.pal b/data/tilesets/secondary/slateport/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/13.pal
rename to data/tilesets/secondary/slateport/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/14.pal b/data/tilesets/secondary/slateport/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/14.pal
rename to data/tilesets/secondary/slateport/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/slateport/palettes/15.pal b/data/tilesets/secondary/slateport/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/palettes/15.pal
rename to data/tilesets/secondary/slateport/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/slateport/tiles.png b/data/tilesets/secondary/slateport/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/slateport/tiles.png
rename to data/tilesets/secondary/slateport/tiles.png
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/00.pal b/data/tilesets/secondary/sootopolis/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/00.pal
rename to data/tilesets/secondary/sootopolis/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/01.pal b/data/tilesets/secondary/sootopolis/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/01.pal
rename to data/tilesets/secondary/sootopolis/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/02.pal b/data/tilesets/secondary/sootopolis/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/02.pal
rename to data/tilesets/secondary/sootopolis/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/03.pal b/data/tilesets/secondary/sootopolis/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/03.pal
rename to data/tilesets/secondary/sootopolis/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/04.pal b/data/tilesets/secondary/sootopolis/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/04.pal
rename to data/tilesets/secondary/sootopolis/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/05.pal b/data/tilesets/secondary/sootopolis/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/05.pal
rename to data/tilesets/secondary/sootopolis/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/06.pal b/data/tilesets/secondary/sootopolis/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/06.pal
rename to data/tilesets/secondary/sootopolis/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/07.pal b/data/tilesets/secondary/sootopolis/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/07.pal
rename to data/tilesets/secondary/sootopolis/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/08.pal b/data/tilesets/secondary/sootopolis/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/08.pal
rename to data/tilesets/secondary/sootopolis/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/09.pal b/data/tilesets/secondary/sootopolis/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/09.pal
rename to data/tilesets/secondary/sootopolis/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/10.pal b/data/tilesets/secondary/sootopolis/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/10.pal
rename to data/tilesets/secondary/sootopolis/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/11.pal b/data/tilesets/secondary/sootopolis/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/11.pal
rename to data/tilesets/secondary/sootopolis/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/12.pal b/data/tilesets/secondary/sootopolis/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/12.pal
rename to data/tilesets/secondary/sootopolis/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/13.pal b/data/tilesets/secondary/sootopolis/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/13.pal
rename to data/tilesets/secondary/sootopolis/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/14.pal b/data/tilesets/secondary/sootopolis/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/14.pal
rename to data/tilesets/secondary/sootopolis/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/palettes/15.pal b/data/tilesets/secondary/sootopolis/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/palettes/15.pal
rename to data/tilesets/secondary/sootopolis/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis/tiles.png b/data/tilesets/secondary/sootopolis/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis/tiles.png
rename to data/tilesets/secondary/sootopolis/tiles.png
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/00.pal b/data/tilesets/secondary/sootopolis_gym/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/00.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/01.pal b/data/tilesets/secondary/sootopolis_gym/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/01.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/02.pal b/data/tilesets/secondary/sootopolis_gym/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/02.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/03.pal b/data/tilesets/secondary/sootopolis_gym/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/03.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/04.pal b/data/tilesets/secondary/sootopolis_gym/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/04.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/05.pal b/data/tilesets/secondary/sootopolis_gym/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/05.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/06.pal b/data/tilesets/secondary/sootopolis_gym/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/06.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/07.pal b/data/tilesets/secondary/sootopolis_gym/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/07.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/08.pal b/data/tilesets/secondary/sootopolis_gym/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/08.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/09.pal b/data/tilesets/secondary/sootopolis_gym/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/09.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/10.pal b/data/tilesets/secondary/sootopolis_gym/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/10.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/11.pal b/data/tilesets/secondary/sootopolis_gym/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/11.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/12.pal b/data/tilesets/secondary/sootopolis_gym/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/12.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/13.pal b/data/tilesets/secondary/sootopolis_gym/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/13.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/14.pal b/data/tilesets/secondary/sootopolis_gym/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/14.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/palettes/15.pal b/data/tilesets/secondary/sootopolis_gym/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/palettes/15.pal
rename to data/tilesets/secondary/sootopolis_gym/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/sootopolis_gym/tiles.png b/data/tilesets/secondary/sootopolis_gym/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/sootopolis_gym/tiles.png
rename to data/tilesets/secondary/sootopolis_gym/tiles.png
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/00.pal b/data/tilesets/secondary/trainer_hill/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/00.pal
rename to data/tilesets/secondary/trainer_hill/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/01.pal b/data/tilesets/secondary/trainer_hill/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/01.pal
rename to data/tilesets/secondary/trainer_hill/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/02.pal b/data/tilesets/secondary/trainer_hill/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/02.pal
rename to data/tilesets/secondary/trainer_hill/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/03.pal b/data/tilesets/secondary/trainer_hill/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/03.pal
rename to data/tilesets/secondary/trainer_hill/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/04.pal b/data/tilesets/secondary/trainer_hill/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/04.pal
rename to data/tilesets/secondary/trainer_hill/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/05.pal b/data/tilesets/secondary/trainer_hill/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/05.pal
rename to data/tilesets/secondary/trainer_hill/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/06.pal b/data/tilesets/secondary/trainer_hill/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/06.pal
rename to data/tilesets/secondary/trainer_hill/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/07.pal b/data/tilesets/secondary/trainer_hill/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/07.pal
rename to data/tilesets/secondary/trainer_hill/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/08.pal b/data/tilesets/secondary/trainer_hill/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/08.pal
rename to data/tilesets/secondary/trainer_hill/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/09.pal b/data/tilesets/secondary/trainer_hill/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/09.pal
rename to data/tilesets/secondary/trainer_hill/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/10.pal b/data/tilesets/secondary/trainer_hill/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/10.pal
rename to data/tilesets/secondary/trainer_hill/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/11.pal b/data/tilesets/secondary/trainer_hill/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/11.pal
rename to data/tilesets/secondary/trainer_hill/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/12.pal b/data/tilesets/secondary/trainer_hill/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/12.pal
rename to data/tilesets/secondary/trainer_hill/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/13.pal b/data/tilesets/secondary/trainer_hill/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/13.pal
rename to data/tilesets/secondary/trainer_hill/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/14.pal b/data/tilesets/secondary/trainer_hill/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/14.pal
rename to data/tilesets/secondary/trainer_hill/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/palettes/15.pal b/data/tilesets/secondary/trainer_hill/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/palettes/15.pal
rename to data/tilesets/secondary/trainer_hill/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/trainer_hill/tiles.png b/data/tilesets/secondary/trainer_hill/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/trainer_hill/tiles.png
rename to data/tilesets/secondary/trainer_hill/tiles.png
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/00.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/00.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/01.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/01.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/02.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/02.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/03.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/03.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/04.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/04.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/05.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/05.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/06.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/06.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/07.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/07.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/08.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/08.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/09.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/09.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/10.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/10.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/11.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/11.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/12.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/12.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/13.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/13.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/14.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/14.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/palettes/15.pal b/data/tilesets/secondary/trick_house_puzzle/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/palettes/15.pal
rename to data/tilesets/secondary/trick_house_puzzle/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/trick_house_puzzle/tiles.png b/data/tilesets/secondary/trick_house_puzzle/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/trick_house_puzzle/tiles.png
rename to data/tilesets/secondary/trick_house_puzzle/tiles.png
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/00.pal b/data/tilesets/secondary/underwater/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/00.pal
rename to data/tilesets/secondary/underwater/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/01.pal b/data/tilesets/secondary/underwater/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/01.pal
rename to data/tilesets/secondary/underwater/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/02.pal b/data/tilesets/secondary/underwater/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/02.pal
rename to data/tilesets/secondary/underwater/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/03.pal b/data/tilesets/secondary/underwater/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/03.pal
rename to data/tilesets/secondary/underwater/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/04.pal b/data/tilesets/secondary/underwater/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/04.pal
rename to data/tilesets/secondary/underwater/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/05.pal b/data/tilesets/secondary/underwater/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/05.pal
rename to data/tilesets/secondary/underwater/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/06.pal b/data/tilesets/secondary/underwater/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/06.pal
rename to data/tilesets/secondary/underwater/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/07.pal b/data/tilesets/secondary/underwater/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/07.pal
rename to data/tilesets/secondary/underwater/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/08.pal b/data/tilesets/secondary/underwater/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/08.pal
rename to data/tilesets/secondary/underwater/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/09.pal b/data/tilesets/secondary/underwater/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/09.pal
rename to data/tilesets/secondary/underwater/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/10.pal b/data/tilesets/secondary/underwater/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/10.pal
rename to data/tilesets/secondary/underwater/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/11.pal b/data/tilesets/secondary/underwater/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/11.pal
rename to data/tilesets/secondary/underwater/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/12.pal b/data/tilesets/secondary/underwater/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/12.pal
rename to data/tilesets/secondary/underwater/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/13.pal b/data/tilesets/secondary/underwater/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/13.pal
rename to data/tilesets/secondary/underwater/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/14.pal b/data/tilesets/secondary/underwater/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/14.pal
rename to data/tilesets/secondary/underwater/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/underwater/palettes/15.pal b/data/tilesets/secondary/underwater/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/palettes/15.pal
rename to data/tilesets/secondary/underwater/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/underwater/tiles.png b/data/tilesets/secondary/underwater/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/underwater/tiles.png
rename to data/tilesets/secondary/underwater/tiles.png
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/00.pal b/data/tilesets/secondary/union_room/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/00.pal
rename to data/tilesets/secondary/union_room/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/01.pal b/data/tilesets/secondary/union_room/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/01.pal
rename to data/tilesets/secondary/union_room/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/02.pal b/data/tilesets/secondary/union_room/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/02.pal
rename to data/tilesets/secondary/union_room/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/03.pal b/data/tilesets/secondary/union_room/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/03.pal
rename to data/tilesets/secondary/union_room/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/04.pal b/data/tilesets/secondary/union_room/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/04.pal
rename to data/tilesets/secondary/union_room/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/05.pal b/data/tilesets/secondary/union_room/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/05.pal
rename to data/tilesets/secondary/union_room/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/06.pal b/data/tilesets/secondary/union_room/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/06.pal
rename to data/tilesets/secondary/union_room/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/07.pal b/data/tilesets/secondary/union_room/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/07.pal
rename to data/tilesets/secondary/union_room/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/08.pal b/data/tilesets/secondary/union_room/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/08.pal
rename to data/tilesets/secondary/union_room/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/09.pal b/data/tilesets/secondary/union_room/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/09.pal
rename to data/tilesets/secondary/union_room/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/10.pal b/data/tilesets/secondary/union_room/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/10.pal
rename to data/tilesets/secondary/union_room/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/11.pal b/data/tilesets/secondary/union_room/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/11.pal
rename to data/tilesets/secondary/union_room/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/12.pal b/data/tilesets/secondary/union_room/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/12.pal
rename to data/tilesets/secondary/union_room/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/13.pal b/data/tilesets/secondary/union_room/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/13.pal
rename to data/tilesets/secondary/union_room/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/14.pal b/data/tilesets/secondary/union_room/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/14.pal
rename to data/tilesets/secondary/union_room/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/union_room/palettes/15.pal b/data/tilesets/secondary/union_room/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/palettes/15.pal
rename to data/tilesets/secondary/union_room/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/union_room/tiles.png b/data/tilesets/secondary/union_room/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/union_room/tiles.png
rename to data/tilesets/secondary/union_room/tiles.png
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/00.pal b/data/tilesets/secondary/unused_1/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/00.pal
rename to data/tilesets/secondary/unused_1/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/01.pal b/data/tilesets/secondary/unused_1/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/01.pal
rename to data/tilesets/secondary/unused_1/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/02.pal b/data/tilesets/secondary/unused_1/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/02.pal
rename to data/tilesets/secondary/unused_1/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/03.pal b/data/tilesets/secondary/unused_1/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/03.pal
rename to data/tilesets/secondary/unused_1/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/04.pal b/data/tilesets/secondary/unused_1/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/04.pal
rename to data/tilesets/secondary/unused_1/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/05.pal b/data/tilesets/secondary/unused_1/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/05.pal
rename to data/tilesets/secondary/unused_1/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/06.pal b/data/tilesets/secondary/unused_1/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/06.pal
rename to data/tilesets/secondary/unused_1/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/07.pal b/data/tilesets/secondary/unused_1/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/07.pal
rename to data/tilesets/secondary/unused_1/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/08.pal b/data/tilesets/secondary/unused_1/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/08.pal
rename to data/tilesets/secondary/unused_1/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/09.pal b/data/tilesets/secondary/unused_1/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/09.pal
rename to data/tilesets/secondary/unused_1/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/10.pal b/data/tilesets/secondary/unused_1/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/10.pal
rename to data/tilesets/secondary/unused_1/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/11.pal b/data/tilesets/secondary/unused_1/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/11.pal
rename to data/tilesets/secondary/unused_1/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/12.pal b/data/tilesets/secondary/unused_1/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/12.pal
rename to data/tilesets/secondary/unused_1/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/13.pal b/data/tilesets/secondary/unused_1/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/13.pal
rename to data/tilesets/secondary/unused_1/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/14.pal b/data/tilesets/secondary/unused_1/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/14.pal
rename to data/tilesets/secondary/unused_1/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/palettes/15.pal b/data/tilesets/secondary/unused_1/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/palettes/15.pal
rename to data/tilesets/secondary/unused_1/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/unused_1/tiles.png b/data/tilesets/secondary/unused_1/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_1/tiles.png
rename to data/tilesets/secondary/unused_1/tiles.png
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/00.pal b/data/tilesets/secondary/unused_2/palettes/00.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/00.pal
rename to data/tilesets/secondary/unused_2/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/01.pal b/data/tilesets/secondary/unused_2/palettes/01.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/01.pal
rename to data/tilesets/secondary/unused_2/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/02.pal b/data/tilesets/secondary/unused_2/palettes/02.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/02.pal
rename to data/tilesets/secondary/unused_2/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/03.pal b/data/tilesets/secondary/unused_2/palettes/03.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/03.pal
rename to data/tilesets/secondary/unused_2/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/04.pal b/data/tilesets/secondary/unused_2/palettes/04.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/04.pal
rename to data/tilesets/secondary/unused_2/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/05.pal b/data/tilesets/secondary/unused_2/palettes/05.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/05.pal
rename to data/tilesets/secondary/unused_2/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/06.pal b/data/tilesets/secondary/unused_2/palettes/06.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/06.pal
rename to data/tilesets/secondary/unused_2/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/07.pal b/data/tilesets/secondary/unused_2/palettes/07.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/07.pal
rename to data/tilesets/secondary/unused_2/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/08.pal b/data/tilesets/secondary/unused_2/palettes/08.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/08.pal
rename to data/tilesets/secondary/unused_2/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/09.pal b/data/tilesets/secondary/unused_2/palettes/09.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/09.pal
rename to data/tilesets/secondary/unused_2/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/10.pal b/data/tilesets/secondary/unused_2/palettes/10.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/10.pal
rename to data/tilesets/secondary/unused_2/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/11.pal b/data/tilesets/secondary/unused_2/palettes/11.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/11.pal
rename to data/tilesets/secondary/unused_2/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/12.pal b/data/tilesets/secondary/unused_2/palettes/12.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/12.pal
rename to data/tilesets/secondary/unused_2/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/13.pal b/data/tilesets/secondary/unused_2/palettes/13.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/13.pal
rename to data/tilesets/secondary/unused_2/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/14.pal b/data/tilesets/secondary/unused_2/palettes/14.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/14.pal
rename to data/tilesets/secondary/unused_2/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/palettes/15.pal b/data/tilesets/secondary/unused_2/palettes/15.pal
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/palettes/15.pal
rename to data/tilesets/secondary/unused_2/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/unused_2/tiles.png b/data/tilesets/secondary/unused_2/tiles.png
similarity index 100%
rename from data/graphics/tilesets/secondary/unused_2/tiles.png
rename to data/tilesets/secondary/unused_2/tiles.png
diff --git a/data/tilesets/tileset_graphics.s b/data/tilesets/tileset_graphics.s
new file mode 100644
index 0000000000..bc94104773
--- /dev/null
+++ b/data/tilesets/tileset_graphics.s
@@ -0,0 +1,1887 @@
+	.align 2, 0
+
+gTilesetTiles_Petalburg:: @ 8339E08
+	.incbin "data/tilesets/secondary/petalburg/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Petalburg:: @ 833A704
+	.incbin "data/tilesets/secondary/petalburg/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/petalburg/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Rustboro:: @ 833A904
+	.incbin "data/tilesets/secondary/rustboro/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Rustboro:: @ 833BEC0
+	.incbin "data/tilesets/secondary/rustboro/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/rustboro/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Dewford:: @ 833C0C0
+	.incbin "data/tilesets/secondary/dewford/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Dewford:: @ 833D540
+	.incbin "data/tilesets/secondary/dewford/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/dewford/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Slateport:: @ 833D740
+	.incbin "data/tilesets/secondary/slateport/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Slateport:: @ 833F708
+	.incbin "data/tilesets/secondary/slateport/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/slateport/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Mauville:: @ 833F908
+	.incbin "data/tilesets/secondary/mauville/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Mauville:: @ 834172C
+	.incbin "data/tilesets/secondary/mauville/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/mauville/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Lavaridge:: @ 834192C
+	.incbin "data/tilesets/secondary/lavaridge/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Lavaridge:: @ 8342E28
+	.incbin "data/tilesets/secondary/lavaridge/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Fallarbor:: @ 8343028
+	.incbin "data/tilesets/secondary/fallarbor/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Fallarbor:: @ 83447A0
+	.incbin "data/tilesets/secondary/fallarbor/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/fallarbor/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Fortree:: @ 83449A0
+	.incbin "data/tilesets/secondary/fortree/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Fortree:: @ 8346020
+	.incbin "data/tilesets/secondary/fortree/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/fortree/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Lilycove:: @ 8346220
+	.incbin "data/tilesets/secondary/lilycove/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Lilycove:: @ 83475C0
+	.incbin "data/tilesets/secondary/lilycove/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/lilycove/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Mossdeep:: @ 83477C0
+	.incbin "data/tilesets/secondary/mossdeep/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Mossdeep:: @ 8348E10
+	.incbin "data/tilesets/secondary/mossdeep/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_EverGrande:: @ 8349010
+	.incbin "data/tilesets/secondary/ever_grande/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_EverGrande:: @ 8349C28
+	.incbin "data/tilesets/secondary/ever_grande/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/ever_grande/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Pacifidlog:: @ 8349E28
+	.incbin "data/tilesets/secondary/pacifidlog/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Pacifidlog:: @ 834B5B4
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pacifidlog/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Sootopolis:: @ 834B7B4
+	.incbin "data/tilesets/secondary/sootopolis/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Sootopolis:: @ 834C6B4
+	.incbin "data/tilesets/secondary/sootopolis/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_BattleFrontierOutsideWest:: @ 834C8B4
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_BattleFrontierOutsideWest:: @ 834E3E4
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_BattleFrontierOutsideEast:: @ 834E5E4
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_BattleFrontierOutsideEast:: @ 834F984
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_InsideBuilding:: @ 834FB84
+	.incbin "data/tilesets/primary/inside_building/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_InsideBuilding:: @ 83508BC
+	.incbin "data/tilesets/primary/inside_building/palettes/00.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/01.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/02.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/03.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/04.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/05.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/06.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/07.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/08.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/09.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/inside_building/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Shop:: @ 8350ABC
+	.incbin "data/tilesets/secondary/shop/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Shop:: @ 83520DC
+	.incbin "data/tilesets/secondary/shop/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/shop/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_PokemonCenter:: @ 83522DC
+	.incbin "data/tilesets/secondary/pokemon_center/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_PokemonCenter:: @ 8353574
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Cave:: @ 8353774
+	.incbin "data/tilesets/secondary/cave/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Cave:: @ 8355260
+	.incbin "data/tilesets/secondary/cave/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_PokemonSchool:: @ 8355460
+	.incbin "data/tilesets/secondary/pokemon_school/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_PokemonSchool:: @ 8355BA8
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_school/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_PokemonFanClub:: @ 8355DA8
+	.incbin "data/tilesets/secondary/pokemon_fan_club/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_PokemonFanClub:: @ 83566D4
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Unused1:: @ 83568D4
+	.incbin "data/tilesets/secondary/unused_1/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Unused1:: @ 8356920
+	.incbin "data/tilesets/secondary/unused_1/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/unused_1/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_MeteorFalls:: @ 8356B20
+	.incbin "data/tilesets/secondary/meteor_falls/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_MeteorFalls:: @ 8358840
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/meteor_falls/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_OceanicMuseum:: @ 8358A40
+	.incbin "data/tilesets/secondary/oceanic_museum/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_OceanicMuseum:: @ 83599CC
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/oceanic_museum/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_CableClub:: @ 8359BCC
+	.incbin "data/tilesets/secondary/cable_club/tiles.4bpp"
+
+	.align 2, 0
+
+	.incbin "data/tilesets/secondary/cable_club/unknown_tiles.4bpp"
+
+	.align 2, 0
+
+gTilesetPalettes_CableClub:: @ 835EACC
+	.incbin "data/tilesets/secondary/cable_club/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_SeashoreHouse:: @ 835ECCC
+	.incbin "data/tilesets/secondary/seashore_house/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_SeashoreHouse:: @ 835F5A8
+	.incbin "data/tilesets/secondary/seashore_house/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/seashore_house/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_PrettyPetalFlowerShop:: @ 835F7A8
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_PrettyPetalFlowerShop:: @ 83603A0
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_PokemonDayCare:: @ 83605A0
+	.incbin "data/tilesets/secondary/pokemon_day_care/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_PokemonDayCare:: @ 8360FDC
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Facility:: @ 83611DC
+	.incbin "data/tilesets/secondary/facility/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Facility:: @ 8362E90
+	.incbin "data/tilesets/secondary/facility/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/facility/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_BikeShop:: @ 8363090
+	.incbin "data/tilesets/secondary/bike_shop/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_BikeShop:: @ 83643C0
+	.incbin "data/tilesets/secondary/bike_shop/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_RusturfTunnel:: @ 83645C0
+	.incbin "data/tilesets/secondary/rusturf_tunnel/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_RusturfTunnel:: @ 8365008
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/15.gbapal"
+
+	.align 2, 0
+
+@ unused compressed copy of tiles
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/unused_tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_SecretBaseBrownCave:: @ 8365788
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/15.gbapal"
+
+	.align 2, 0
+
+@ unused compressed copy of tiles
+	.incbin "data/tilesets/secondary/secret_base/tree/unused_tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_SecretBaseTree:: @ 8365EAC
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/tree/palettes/15.gbapal"
+
+	.align 2, 0
+
+@ unused compressed copy of tiles
+	.incbin "data/tilesets/secondary/secret_base/shrub/unused_tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_SecretBaseShrub:: @ 8366614
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/15.gbapal"
+
+	.align 2, 0
+
+@ unused compressed copy of tiles
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/unused_tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_SecretBaseBlueCave:: @ 8366C30
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/15.gbapal"
+
+	.align 2, 0
+
+@ unused compressed copy of tiles
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_SecretBaseYellowCave:: @ 8367368
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/15.gbapal"
+
+	.align 2, 0
+
+@ unused compressed copy of tiles
+	.incbin "data/tilesets/secondary/secret_base/red_cave/unused_tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_SecretBaseRedCave:: @ 83679A0
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_SecretBaseBrownCave:: @ 8367BA0
+	.incbin "data/tilesets/secondary/secret_base/brown_cave/tiles.4bpp"
+
+	.align 2, 0
+
+gTilesetTiles_SecretBaseTree:: @ 8368600
+	.incbin "data/tilesets/secondary/secret_base/tree/tiles.4bpp"
+
+	.align 2, 0
+
+gTilesetTiles_SecretBaseShrub:: @ 8369060
+	.incbin "data/tilesets/secondary/secret_base/shrub/tiles.4bpp"
+
+	.align 2, 0
+
+gTilesetTiles_SecretBaseBlueCave:: @ 8369AC0
+	.incbin "data/tilesets/secondary/secret_base/blue_cave/tiles.4bpp"
+
+	.align 2, 0
+
+gTilesetTiles_SecretBaseYellowCave:: @ 836A520
+	.incbin "data/tilesets/secondary/secret_base/yellow_cave/tiles.4bpp"
+
+	.align 2, 0
+
+gTilesetTiles_SecretBaseRedCave:: @ 836AF80
+	.incbin "data/tilesets/secondary/secret_base/red_cave/tiles.4bpp"
+
+	.align 2, 0
+
+gTilesetTiles_InsideOfTruck:: @ 836B9E0
+	.incbin "data/tilesets/secondary/inside_of_truck/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_InsideOfTruck:: @ 836BC3C
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/inside_of_truck/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Contest:: @ 836BE3C
+	.incbin "data/tilesets/secondary/contest/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Contest:: @ 836C990
+	.incbin "data/tilesets/secondary/contest/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/contest/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_LilycoveMuseum:: @ 836CB90
+	.incbin "data/tilesets/secondary/lilycove_museum/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_LilycoveMuseum:: @ 836DEAC
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/lilycove_museum/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_BrendansMaysHouse:: @ 836E0AC
+	.incbin "data/tilesets/secondary/brendans_mays_house/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_BrendansMaysHouse:: @ 836F178
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Lab:: @ 836F378
+	.incbin "data/tilesets/secondary/lab/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Lab:: @ 83703DC
+	.incbin "data/tilesets/secondary/lab/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Underwater:: @ 83705DC
+	.incbin "data/tilesets/secondary/underwater/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Underwater:: @ 8371798
+	.incbin "data/tilesets/secondary/underwater/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/underwater/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_GenericBuilding:: @ 8371998
+	.incbin "data/tilesets/secondary/generic_building/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_GenericBuilding:: @ 83733C4
+	.incbin "data/tilesets/secondary/generic_building/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/generic_building/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_MauvilleGameCorner:: @ 83735C4
+	.incbin "data/tilesets/secondary/mauville_game_corner/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_MauvilleGameCorner:: @ 8374288
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_Unused2:: @ 8374488
+	.incbin "data/tilesets/secondary/unused_2/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_Unused2:: @ 83749B0
+	.incbin "data/tilesets/secondary/unused_2/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/unused_2/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_RustboroGym:: @ 8374BB0
+	.incbin "data/tilesets/secondary/rustboro_gym/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_RustboroGym:: @ 8374F34
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/rustboro_gym/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_DewfordGym:: @ 8375134
+	.incbin "data/tilesets/secondary/dewford_gym/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_DewfordGym:: @ 8375400
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/dewford_gym/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_MauvilleGym:: @ 8375600
+	.incbin "data/tilesets/secondary/mauville_gym/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_MauvilleGym:: @ 8375D84
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/mauville_gym/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_LavaridgeGym:: @ 8375F84
+	.incbin "data/tilesets/secondary/lavaridge_gym/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_LavaridgeGym:: @ 83762AC
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_PetalburgGym:: @ 83764AC
+	.incbin "data/tilesets/secondary/petalburg_gym/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_PetalburgGym:: @ 8376B50
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/petalburg_gym/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_FortreeGym:: @ 8376D50
+	.incbin "data/tilesets/secondary/fortree_gym/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_FortreeGym:: @ 83770C4
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/fortree_gym/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_MossdeepGym:: @ 83772C4
+	.incbin "data/tilesets/secondary/mossdeep_gym/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_MossdeepGym:: @ 8377730
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_SootopolisGym:: @ 8377930
+	.incbin "data/tilesets/secondary/sootopolis_gym/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_SootopolisGym:: @ 8378AC4
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_TrickHousePuzzle:: @ 8378CC4
+	.incbin "data/tilesets/secondary/trick_house_puzzle/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_TrickHousePuzzle:: @ 8379A78
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_InsideShip:: @ 8379C78
+	.incbin "data/tilesets/secondary/inside_ship/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_InsideShip:: @ 837A848
+	.incbin "data/tilesets/secondary/inside_ship/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/inside_ship/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_SecretBase:: @ 837AA48
+	.incbin "data/tilesets/primary/secret_base/tiles.4bpp"
+
+	.align 2, 0
+
+	.incbin "data/tilesets/primary/secret_base/unknown_tiles.4bpp"
+
+	.align 2, 0
+
+gTilesetPalettes_SecretBase:: @ 8382A48
+	.incbin "data/tilesets/primary/secret_base/palettes/00.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/01.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/02.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/03.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/04.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/05.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/06.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/07.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/08.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/09.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/secret_base/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_EliteFour:: @ 8382C48
+	.incbin "data/tilesets/secondary/elite_four/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_EliteFour:: @ 8383CC4
+	.incbin "data/tilesets/secondary/elite_four/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/elite_four/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_BattleFrontier:: @ 8383EC4
+	.incbin "data/tilesets/secondary/battle_frontier/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_BattleFrontier:: @ 8384BC8
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_BattlePalace:: @ 8384DC8
+	.incbin "data/tilesets/secondary/battle_palace/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_BattlePalace:: @ 8385540
+	.incbin "data/tilesets/secondary/battle_palace/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/battle_palace/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_BattleDome:: @ 8385740
+	.incbin "data/tilesets/secondary/battle_dome/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_BattleDome:: @ 8386990
+	.incbin "data/tilesets/secondary/battle_dome/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/battle_dome/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_BattleFactory:: @ 8386B90
+	.incbin "data/tilesets/secondary/battle_factory/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_BattleFactory:: @ 8387D7C
+	.incbin "data/tilesets/secondary/battle_factory/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/battle_factory/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_BattlePike:: @ 8387F7C
+	.incbin "data/tilesets/secondary/battle_pike/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_BattlePike:: @ 8389250
+	.incbin "data/tilesets/secondary/battle_pike/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/battle_pike/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_BattleArena:: @ 8389450
+	.incbin "data/tilesets/secondary/battle_arena/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_BattleArena:: @ 8389F8C
+	.incbin "data/tilesets/secondary/battle_arena/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/battle_arena/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_BattlePyramid:: @ 838A18C
+	.incbin "data/tilesets/secondary/battle_pyramid/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_BattlePyramid:: @ 838B39C
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/battle_pyramid/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_MirageTower:: @ 838B59C
+	.incbin "data/tilesets/secondary/mirage_tower/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_MirageTower:: @ 838CFE4
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/mirage_tower/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_MossdeepGameCorner:: @ 838D1E4
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_MossdeepGameCorner:: @ 838D604
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_IslandHarbor:: @ 838D804
+	.incbin "data/tilesets/secondary/island_harbor/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_IslandHarbor:: @ 838F1D4
+	.incbin "data/tilesets/secondary/island_harbor/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_TrainerHill:: @ 838F3D4
+	.incbin "data/tilesets/secondary/trainer_hill/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_TrainerHill:: @ 83904C4
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/trainer_hill/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_NavelRock:: @ 83906C4
+	.incbin "data/tilesets/secondary/navel_rock/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_NavelRock:: @ 8392258
+	.incbin "data/tilesets/secondary/navel_rock/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_BattleFrontierRankingHall:: @ 8392458
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_BattleFrontierRankingHall:: @ 8392CAC
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_BattleTent:: @ 8392EAC
+	.incbin "data/tilesets/secondary/battle_tent/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_BattleTent:: @ 8393910
+	.incbin "data/tilesets/secondary/battle_tent/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/battle_tent/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_MysteryEventsHouse:: @ 8393B10
+	.incbin "data/tilesets/secondary/mystery_events_house/tiles.4bpp.lz"
+
+	.align 2, 0
+
+gTilesetPalettes_MysteryEventsHouse:: @ 8395478
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/mystery_events_house/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetPalettes_UnionRoom:: @ 8395678
+	.incbin "data/tilesets/secondary/union_room/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/09.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/union_room/palettes/15.gbapal"
+
+	.align 2, 0
+
+gTilesetTiles_UnionRoom:: @ 8395878
+	.incbin "data/tilesets/secondary/union_room/tiles.4bpp.lz"
diff --git a/data/graphics/tilesets/tilesets.s b/data/tilesets/tilesets.s
similarity index 100%
rename from data/graphics/tilesets/tilesets.s
rename to data/tilesets/tilesets.s