diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc index 46ccee45b..5926a88c6 100644 --- a/data/tilesets/graphics.inc +++ b/data/tilesets/graphics.inc @@ -345,26 +345,26 @@ gTilesetPalettes_Cave:: @ 827A1A8 .align 2 gTilesetTiles_Dummy1:: @ 827A3A8 - .incbin "data/tilesets/secondary/dummy1/tiles.4bpp.lz" + .incbin "data/tilesets/secondary/dummy_1/tiles.4bpp.lz" .align 2 gTilesetPalettes_Dummy1:: @ 827A3B8 - .incbin "data/tilesets/secondary/dummy1/palettes/00.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/01.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/02.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/03.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/04.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/05.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/06.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/07.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/08.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/09.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/10.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/11.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/12.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/13.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/14.gbapal" - .incbin "data/tilesets/secondary/dummy1/palettes/15.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/00.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/01.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/02.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/03.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/04.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/05.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/06.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/07.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/08.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/09.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/10.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/11.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/12.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/13.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/14.gbapal" + .incbin "data/tilesets/secondary/dummy_1/palettes/15.gbapal" .align 2 gTilesetTiles_Museum:: @ 827A5B8 @@ -713,26 +713,26 @@ gTilesetPalettes_SSAnne:: @ 8287B80 .align 2 gTilesetTiles_Dummy2:: @ 8287D80 - .incbin "data/tilesets/secondary/dummy2/tiles.4bpp.lz" + .incbin "data/tilesets/secondary/dummy_2/tiles.4bpp.lz" .align 2 gTilesetPalettes_Dummy2:: @ 8287D94 - .incbin "data/tilesets/secondary/dummy2/palettes/00.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/01.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/02.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/03.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/04.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/05.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/06.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/07.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/08.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/09.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/10.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/11.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/12.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/13.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/14.gbapal" - .incbin "data/tilesets/secondary/dummy2/palettes/15.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/00.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/01.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/02.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/03.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/04.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/05.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/06.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/07.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/08.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/09.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/10.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/11.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/12.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/13.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/14.gbapal" + .incbin "data/tilesets/secondary/dummy_2/palettes/15.gbapal" .align 2 gTilesetTiles_ViridianForest:: @ 8287F94 @@ -759,26 +759,26 @@ gTilesetPalettes_ViridianForest:: @ 8288444 .align 2 gTilesetTiles_UnusedGatehouse1:: @ 8288644 - .incbin "data/tilesets/secondary/unused_gatehouse1/tiles.4bpp.lz" + .incbin "data/tilesets/secondary/unused_gatehouse_1/tiles.4bpp.lz" .align 2 gTilesetPalettes_UnusedGatehouse1:: @ 8288C60 - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/00.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/01.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/02.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/03.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/04.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/05.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/06.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/07.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/08.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/09.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/10.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/11.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/12.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/13.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/14.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse1/palettes/15.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/00.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/01.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/02.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/03.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/04.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/05.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/06.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/07.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/08.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/09.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/10.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/11.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/12.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/13.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/14.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/15.gbapal" .align 2 gTilesetTiles_RockTunnel:: @ 8288E60 @@ -851,26 +851,26 @@ gTilesetPalettes_SeafoamIslands:: @ 828CAA0 .align 2 gTilesetTiles_UnusedGatehouse2:: @ 828CCA0 - .incbin "data/tilesets/secondary/unused_gatehouse2/tiles.4bpp.lz" + .incbin "data/tilesets/secondary/unused_gatehouse_2/tiles.4bpp.lz" .align 2 gTilesetPalettes_UnusedGatehouse2:: @ 828D2BC - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/00.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/01.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/02.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/03.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/04.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/05.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/06.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/07.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/08.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/09.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/10.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/11.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/12.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/13.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/14.gbapal" - .incbin "data/tilesets/secondary/unused_gatehouse2/palettes/15.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/00.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/01.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/02.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/03.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/04.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/05.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/06.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/07.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/08.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/09.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/10.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/11.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/12.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/13.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/14.gbapal" + .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/15.gbapal" .align 2 gTilesetTiles_CeruleanCave:: @ 828D4BC @@ -897,26 +897,26 @@ gTilesetPalettes_CeruleanCave:: @ 828E3A4 .align 2 gTilesetTiles_GenericBuilding2:: @ 828E5A4 - .incbin "data/tilesets/secondary/generic_building2/tiles.4bpp.lz" + .incbin "data/tilesets/secondary/generic_building_2/tiles.4bpp.lz" .align 2 gTilesetPalettes_GenericBuilding2:: @ 828EC70 - .incbin "data/tilesets/secondary/generic_building2/palettes/00.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/01.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/02.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/03.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/04.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/05.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/06.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/07.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/08.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/09.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/10.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/11.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/12.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/13.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/14.gbapal" - .incbin "data/tilesets/secondary/generic_building2/palettes/15.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/00.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/01.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/02.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/03.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/04.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/05.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/06.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/07.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/08.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/09.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/10.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/11.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/12.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/13.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/14.gbapal" + .incbin "data/tilesets/secondary/generic_building_2/palettes/15.gbapal" .align 2 gTilesetTiles_PowerPlant:: @ 828EE70 @@ -1173,49 +1173,49 @@ gTilesetPalettes_BurgledHouse:: @ 8294D08 .align 2 gTilesetTiles_Dummy3:: @ 8294F08 - .incbin "data/tilesets/secondary/dummy3/tiles.4bpp.lz" + .incbin "data/tilesets/secondary/dummy_3/tiles.4bpp.lz" .align 2 gTilesetPalettes_Dummy3:: @ 8294F18 - .incbin "data/tilesets/secondary/dummy3/palettes/00.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/01.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/02.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/03.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/04.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/05.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/06.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/07.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/08.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/09.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/10.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/11.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/12.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/13.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/14.gbapal" - .incbin "data/tilesets/secondary/dummy3/palettes/15.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/00.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/01.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/02.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/03.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/04.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/05.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/06.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/07.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/08.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/09.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/10.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/11.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/12.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/13.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/14.gbapal" + .incbin "data/tilesets/secondary/dummy_3/palettes/15.gbapal" .align 2 gTilesetTiles_Dummy4:: @ 8295118 - .incbin "data/tilesets/secondary/dummy4/tiles.4bpp.lz" + .incbin "data/tilesets/secondary/dummy_4/tiles.4bpp.lz" .align 2 gTilesetPalettes_Dummy4:: @ 829512C - .incbin "data/tilesets/secondary/dummy4/palettes/00.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/01.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/02.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/03.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/04.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/05.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/06.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/07.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/08.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/09.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/10.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/11.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/12.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/13.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/14.gbapal" - .incbin "data/tilesets/secondary/dummy4/palettes/15.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/00.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/01.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/02.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/03.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/04.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/05.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/06.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/07.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/08.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/09.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/10.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/11.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/12.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/13.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/14.gbapal" + .incbin "data/tilesets/secondary/dummy_4/palettes/15.gbapal" .align 2 gTilesetTiles_MtEmber:: @ 829532C diff --git a/data/tilesets/metatiles.inc b/data/tilesets/metatiles.inc index 7475f8117..2fd3168c2 100644 --- a/data/tilesets/metatiles.inc +++ b/data/tilesets/metatiles.inc @@ -168,11 +168,11 @@ gMetatileAttributes_Building:: @ Building .align 1 gMetatiles_Dummy1:: @ 82B09B4 - .incbin "data/tilesets/secondary/dummy1/metatiles.bin" + .incbin "data/tilesets/secondary/dummy_1/metatiles.bin" .align 1 gMetatileAttributes_Dummy1:: @ 82B09D4 - .incbin "data/tilesets/secondary/dummy1/metatile_attributes.bin" + .incbin "data/tilesets/secondary/dummy_1/metatile_attributes.bin" .align 1 gMetatiles_HoennBuilding:: @ 82B09DC @@ -208,11 +208,11 @@ gMetatileAttributes_PokemonCenter:: @ 82B4A50 .align 1 gMetatiles_GenericBuilding1:: @ 82B4E4C - .incbin "data/tilesets/secondary/generic_building1/metatiles.bin" + .incbin "data/tilesets/secondary/generic_building_1/metatiles.bin" .align 1 gMetatileAttributes_GenericBuilding1:: @ 82B4FCC - .incbin "data/tilesets/secondary/generic_building1/metatile_attributes.bin" + .incbin "data/tilesets/secondary/generic_building_1/metatile_attributes.bin" .align 1 gMetatiles_Cave:: @ 82B502C @@ -248,11 +248,11 @@ gMetatileAttributes_SSAnne:: @ 82B8B4C .align 1 gMetatiles_Dummy2:: @ 82B908C - .incbin "data/tilesets/secondary/dummy2/metatiles.bin" + .incbin "data/tilesets/secondary/dummy_2/metatiles.bin" .align 1 gMetatileAttributes_Dummy2:: @ 82B90AC - .incbin "data/tilesets/secondary/dummy2/metatile_attributes.bin" + .incbin "data/tilesets/secondary/dummy_2/metatile_attributes.bin" .align 1 gMetatiles_ViridianForest:: @ 82B90B4 @@ -264,11 +264,11 @@ gMetatileAttributes_ViridianForest:: @ 82B9364 .align 1 gMetatiles_UnusedGatehouse1:: @ 82B9410 - .incbin "data/tilesets/secondary/unused_gatehouse1/metatiles.bin" + .incbin "data/tilesets/secondary/unused_gatehouse_1/metatiles.bin" .align 1 gMetatileAttributes_UnusedGatehouse1:: @ 82B9B30 - .incbin "data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin" + .incbin "data/tilesets/secondary/unused_gatehouse_1/metatile_attributes.bin" .align 1 gMetatiles_RockTunnel:: @ 82B9CF8 @@ -296,11 +296,11 @@ gMetatileAttributes_SeafoamIslands:: @ 82BC49C .align 1 gMetatiles_UnusedGatehouse2:: @ 82BC87C - .incbin "data/tilesets/secondary/unused_gatehouse2/metatiles.bin" + .incbin "data/tilesets/secondary/unused_gatehouse_2/metatiles.bin" .align 1 gMetatileAttributes_UnusedGatehouse2:: @ 82BCF9C - .incbin "data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin" + .incbin "data/tilesets/secondary/unused_gatehouse_2/metatile_attributes.bin" .align 1 gMetatiles_CeruleanCave:: @ 82BD164 @@ -320,11 +320,11 @@ gMetatileAttributes_DepartmentStore:: @ 82BEB3C .align 1 gMetatiles_GenericBuilding2:: @ 82BEF14 - .incbin "data/tilesets/secondary/generic_building2/metatiles.bin" + .incbin "data/tilesets/secondary/generic_building_2/metatiles.bin" .align 1 gMetatileAttributes_GenericBuilding2:: @ 82BFA94 - .incbin "data/tilesets/secondary/generic_building2/metatile_attributes.bin" + .incbin "data/tilesets/secondary/generic_building_2/metatile_attributes.bin" .align 1 gMetatiles_PowerPlant:: @ 82BFD74 @@ -440,19 +440,19 @@ gMetatileAttributes_BurgledHouse:: @ 82CA320 .align 1 gMetatiles_Dummy3:: @ 82CA404 - .incbin "data/tilesets/secondary/dummy3/metatiles.bin" + .incbin "data/tilesets/secondary/dummy_3/metatiles.bin" .align 1 gMetatileAttributes_Dummy3:: @ 82CA424 - .incbin "data/tilesets/secondary/dummy3/metatile_attributes.bin" + .incbin "data/tilesets/secondary/dummy_3/metatile_attributes.bin" .align 1 gMetatiles_Dummy4:: @ 82CA42C - .incbin "data/tilesets/secondary/dummy4/metatiles.bin" + .incbin "data/tilesets/secondary/dummy_4/metatiles.bin" .align 1 gMetatileAttributes_Dummy4:: @ 82CA44C - .incbin "data/tilesets/secondary/dummy4/metatile_attributes.bin" + .incbin "data/tilesets/secondary/dummy_4/metatile_attributes.bin" .align 1 gMetatiles_MtEmber:: @ 82CA454 diff --git a/data/tilesets/secondary/dummy1/metatile_attributes.bin b/data/tilesets/secondary/dummy_1/metatile_attributes.bin similarity index 100% rename from data/tilesets/secondary/dummy1/metatile_attributes.bin rename to data/tilesets/secondary/dummy_1/metatile_attributes.bin diff --git a/data/tilesets/secondary/dummy1/metatiles.bin b/data/tilesets/secondary/dummy_1/metatiles.bin similarity index 100% rename from data/tilesets/secondary/dummy1/metatiles.bin rename to data/tilesets/secondary/dummy_1/metatiles.bin diff --git a/data/tilesets/secondary/dummy1/palettes/00.pal b/data/tilesets/secondary/dummy_1/palettes/00.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/00.pal rename to data/tilesets/secondary/dummy_1/palettes/00.pal diff --git a/data/tilesets/secondary/dummy1/palettes/01.pal b/data/tilesets/secondary/dummy_1/palettes/01.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/01.pal rename to data/tilesets/secondary/dummy_1/palettes/01.pal diff --git a/data/tilesets/secondary/dummy1/palettes/02.pal b/data/tilesets/secondary/dummy_1/palettes/02.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/02.pal rename to data/tilesets/secondary/dummy_1/palettes/02.pal diff --git a/data/tilesets/secondary/dummy1/palettes/03.pal b/data/tilesets/secondary/dummy_1/palettes/03.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/03.pal rename to data/tilesets/secondary/dummy_1/palettes/03.pal diff --git a/data/tilesets/secondary/dummy1/palettes/04.pal b/data/tilesets/secondary/dummy_1/palettes/04.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/04.pal rename to data/tilesets/secondary/dummy_1/palettes/04.pal diff --git a/data/tilesets/secondary/dummy1/palettes/05.pal b/data/tilesets/secondary/dummy_1/palettes/05.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/05.pal rename to data/tilesets/secondary/dummy_1/palettes/05.pal diff --git a/data/tilesets/secondary/dummy1/palettes/06.pal b/data/tilesets/secondary/dummy_1/palettes/06.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/06.pal rename to data/tilesets/secondary/dummy_1/palettes/06.pal diff --git a/data/tilesets/secondary/dummy1/palettes/07.pal b/data/tilesets/secondary/dummy_1/palettes/07.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/07.pal rename to data/tilesets/secondary/dummy_1/palettes/07.pal diff --git a/data/tilesets/secondary/dummy1/palettes/08.pal b/data/tilesets/secondary/dummy_1/palettes/08.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/08.pal rename to data/tilesets/secondary/dummy_1/palettes/08.pal diff --git a/data/tilesets/secondary/dummy1/palettes/09.pal b/data/tilesets/secondary/dummy_1/palettes/09.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/09.pal rename to data/tilesets/secondary/dummy_1/palettes/09.pal diff --git a/data/tilesets/secondary/dummy1/palettes/10.pal b/data/tilesets/secondary/dummy_1/palettes/10.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/10.pal rename to data/tilesets/secondary/dummy_1/palettes/10.pal diff --git a/data/tilesets/secondary/dummy1/palettes/11.pal b/data/tilesets/secondary/dummy_1/palettes/11.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/11.pal rename to data/tilesets/secondary/dummy_1/palettes/11.pal diff --git a/data/tilesets/secondary/dummy1/palettes/12.pal b/data/tilesets/secondary/dummy_1/palettes/12.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/12.pal rename to data/tilesets/secondary/dummy_1/palettes/12.pal diff --git a/data/tilesets/secondary/dummy1/palettes/13.pal b/data/tilesets/secondary/dummy_1/palettes/13.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/13.pal rename to data/tilesets/secondary/dummy_1/palettes/13.pal diff --git a/data/tilesets/secondary/dummy1/palettes/14.pal b/data/tilesets/secondary/dummy_1/palettes/14.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/14.pal rename to data/tilesets/secondary/dummy_1/palettes/14.pal diff --git a/data/tilesets/secondary/dummy1/palettes/15.pal b/data/tilesets/secondary/dummy_1/palettes/15.pal similarity index 100% rename from data/tilesets/secondary/dummy1/palettes/15.pal rename to data/tilesets/secondary/dummy_1/palettes/15.pal diff --git a/data/tilesets/secondary/dummy1/tiles.png b/data/tilesets/secondary/dummy_1/tiles.png similarity index 100% rename from data/tilesets/secondary/dummy1/tiles.png rename to data/tilesets/secondary/dummy_1/tiles.png diff --git a/data/tilesets/secondary/dummy2/metatile_attributes.bin b/data/tilesets/secondary/dummy_2/metatile_attributes.bin similarity index 100% rename from data/tilesets/secondary/dummy2/metatile_attributes.bin rename to data/tilesets/secondary/dummy_2/metatile_attributes.bin diff --git a/data/tilesets/secondary/dummy2/metatiles.bin b/data/tilesets/secondary/dummy_2/metatiles.bin similarity index 100% rename from data/tilesets/secondary/dummy2/metatiles.bin rename to data/tilesets/secondary/dummy_2/metatiles.bin diff --git a/data/tilesets/secondary/dummy2/palettes/00.pal b/data/tilesets/secondary/dummy_2/palettes/00.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/00.pal rename to data/tilesets/secondary/dummy_2/palettes/00.pal diff --git a/data/tilesets/secondary/dummy2/palettes/01.pal b/data/tilesets/secondary/dummy_2/palettes/01.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/01.pal rename to data/tilesets/secondary/dummy_2/palettes/01.pal diff --git a/data/tilesets/secondary/dummy2/palettes/02.pal b/data/tilesets/secondary/dummy_2/palettes/02.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/02.pal rename to data/tilesets/secondary/dummy_2/palettes/02.pal diff --git a/data/tilesets/secondary/dummy2/palettes/03.pal b/data/tilesets/secondary/dummy_2/palettes/03.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/03.pal rename to data/tilesets/secondary/dummy_2/palettes/03.pal diff --git a/data/tilesets/secondary/dummy2/palettes/04.pal b/data/tilesets/secondary/dummy_2/palettes/04.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/04.pal rename to data/tilesets/secondary/dummy_2/palettes/04.pal diff --git a/data/tilesets/secondary/dummy2/palettes/05.pal b/data/tilesets/secondary/dummy_2/palettes/05.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/05.pal rename to data/tilesets/secondary/dummy_2/palettes/05.pal diff --git a/data/tilesets/secondary/dummy2/palettes/06.pal b/data/tilesets/secondary/dummy_2/palettes/06.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/06.pal rename to data/tilesets/secondary/dummy_2/palettes/06.pal diff --git a/data/tilesets/secondary/dummy2/palettes/07.pal b/data/tilesets/secondary/dummy_2/palettes/07.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/07.pal rename to data/tilesets/secondary/dummy_2/palettes/07.pal diff --git a/data/tilesets/secondary/dummy2/palettes/08.pal b/data/tilesets/secondary/dummy_2/palettes/08.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/08.pal rename to data/tilesets/secondary/dummy_2/palettes/08.pal diff --git a/data/tilesets/secondary/dummy2/palettes/09.pal b/data/tilesets/secondary/dummy_2/palettes/09.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/09.pal rename to data/tilesets/secondary/dummy_2/palettes/09.pal diff --git a/data/tilesets/secondary/dummy2/palettes/10.pal b/data/tilesets/secondary/dummy_2/palettes/10.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/10.pal rename to data/tilesets/secondary/dummy_2/palettes/10.pal diff --git a/data/tilesets/secondary/dummy2/palettes/11.pal b/data/tilesets/secondary/dummy_2/palettes/11.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/11.pal rename to data/tilesets/secondary/dummy_2/palettes/11.pal diff --git a/data/tilesets/secondary/dummy2/palettes/12.pal b/data/tilesets/secondary/dummy_2/palettes/12.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/12.pal rename to data/tilesets/secondary/dummy_2/palettes/12.pal diff --git a/data/tilesets/secondary/dummy2/palettes/13.pal b/data/tilesets/secondary/dummy_2/palettes/13.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/13.pal rename to data/tilesets/secondary/dummy_2/palettes/13.pal diff --git a/data/tilesets/secondary/dummy2/palettes/14.pal b/data/tilesets/secondary/dummy_2/palettes/14.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/14.pal rename to data/tilesets/secondary/dummy_2/palettes/14.pal diff --git a/data/tilesets/secondary/dummy2/palettes/15.pal b/data/tilesets/secondary/dummy_2/palettes/15.pal similarity index 100% rename from data/tilesets/secondary/dummy2/palettes/15.pal rename to data/tilesets/secondary/dummy_2/palettes/15.pal diff --git a/data/tilesets/secondary/dummy2/tiles.png b/data/tilesets/secondary/dummy_2/tiles.png similarity index 100% rename from data/tilesets/secondary/dummy2/tiles.png rename to data/tilesets/secondary/dummy_2/tiles.png diff --git a/data/tilesets/secondary/dummy3/metatile_attributes.bin b/data/tilesets/secondary/dummy_3/metatile_attributes.bin similarity index 100% rename from data/tilesets/secondary/dummy3/metatile_attributes.bin rename to data/tilesets/secondary/dummy_3/metatile_attributes.bin diff --git a/data/tilesets/secondary/dummy3/metatiles.bin b/data/tilesets/secondary/dummy_3/metatiles.bin similarity index 100% rename from data/tilesets/secondary/dummy3/metatiles.bin rename to data/tilesets/secondary/dummy_3/metatiles.bin diff --git a/data/tilesets/secondary/dummy3/palettes/00.pal b/data/tilesets/secondary/dummy_3/palettes/00.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/00.pal rename to data/tilesets/secondary/dummy_3/palettes/00.pal diff --git a/data/tilesets/secondary/dummy3/palettes/01.pal b/data/tilesets/secondary/dummy_3/palettes/01.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/01.pal rename to data/tilesets/secondary/dummy_3/palettes/01.pal diff --git a/data/tilesets/secondary/dummy3/palettes/02.pal b/data/tilesets/secondary/dummy_3/palettes/02.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/02.pal rename to data/tilesets/secondary/dummy_3/palettes/02.pal diff --git a/data/tilesets/secondary/dummy3/palettes/03.pal b/data/tilesets/secondary/dummy_3/palettes/03.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/03.pal rename to data/tilesets/secondary/dummy_3/palettes/03.pal diff --git a/data/tilesets/secondary/dummy3/palettes/04.pal b/data/tilesets/secondary/dummy_3/palettes/04.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/04.pal rename to data/tilesets/secondary/dummy_3/palettes/04.pal diff --git a/data/tilesets/secondary/dummy3/palettes/05.pal b/data/tilesets/secondary/dummy_3/palettes/05.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/05.pal rename to data/tilesets/secondary/dummy_3/palettes/05.pal diff --git a/data/tilesets/secondary/dummy3/palettes/06.pal b/data/tilesets/secondary/dummy_3/palettes/06.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/06.pal rename to data/tilesets/secondary/dummy_3/palettes/06.pal diff --git a/data/tilesets/secondary/dummy3/palettes/07.pal b/data/tilesets/secondary/dummy_3/palettes/07.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/07.pal rename to data/tilesets/secondary/dummy_3/palettes/07.pal diff --git a/data/tilesets/secondary/dummy3/palettes/08.pal b/data/tilesets/secondary/dummy_3/palettes/08.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/08.pal rename to data/tilesets/secondary/dummy_3/palettes/08.pal diff --git a/data/tilesets/secondary/dummy3/palettes/09.pal b/data/tilesets/secondary/dummy_3/palettes/09.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/09.pal rename to data/tilesets/secondary/dummy_3/palettes/09.pal diff --git a/data/tilesets/secondary/dummy3/palettes/10.pal b/data/tilesets/secondary/dummy_3/palettes/10.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/10.pal rename to data/tilesets/secondary/dummy_3/palettes/10.pal diff --git a/data/tilesets/secondary/dummy3/palettes/11.pal b/data/tilesets/secondary/dummy_3/palettes/11.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/11.pal rename to data/tilesets/secondary/dummy_3/palettes/11.pal diff --git a/data/tilesets/secondary/dummy3/palettes/12.pal b/data/tilesets/secondary/dummy_3/palettes/12.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/12.pal rename to data/tilesets/secondary/dummy_3/palettes/12.pal diff --git a/data/tilesets/secondary/dummy3/palettes/13.pal b/data/tilesets/secondary/dummy_3/palettes/13.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/13.pal rename to data/tilesets/secondary/dummy_3/palettes/13.pal diff --git a/data/tilesets/secondary/dummy3/palettes/14.pal b/data/tilesets/secondary/dummy_3/palettes/14.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/14.pal rename to data/tilesets/secondary/dummy_3/palettes/14.pal diff --git a/data/tilesets/secondary/dummy3/palettes/15.pal b/data/tilesets/secondary/dummy_3/palettes/15.pal similarity index 100% rename from data/tilesets/secondary/dummy3/palettes/15.pal rename to data/tilesets/secondary/dummy_3/palettes/15.pal diff --git a/data/tilesets/secondary/dummy3/tiles.png b/data/tilesets/secondary/dummy_3/tiles.png similarity index 100% rename from data/tilesets/secondary/dummy3/tiles.png rename to data/tilesets/secondary/dummy_3/tiles.png diff --git a/data/tilesets/secondary/dummy4/metatile_attributes.bin b/data/tilesets/secondary/dummy_4/metatile_attributes.bin similarity index 100% rename from data/tilesets/secondary/dummy4/metatile_attributes.bin rename to data/tilesets/secondary/dummy_4/metatile_attributes.bin diff --git a/data/tilesets/secondary/dummy4/metatiles.bin b/data/tilesets/secondary/dummy_4/metatiles.bin similarity index 100% rename from data/tilesets/secondary/dummy4/metatiles.bin rename to data/tilesets/secondary/dummy_4/metatiles.bin diff --git a/data/tilesets/secondary/dummy4/palettes/00.pal b/data/tilesets/secondary/dummy_4/palettes/00.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/00.pal rename to data/tilesets/secondary/dummy_4/palettes/00.pal diff --git a/data/tilesets/secondary/dummy4/palettes/01.pal b/data/tilesets/secondary/dummy_4/palettes/01.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/01.pal rename to data/tilesets/secondary/dummy_4/palettes/01.pal diff --git a/data/tilesets/secondary/dummy4/palettes/02.pal b/data/tilesets/secondary/dummy_4/palettes/02.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/02.pal rename to data/tilesets/secondary/dummy_4/palettes/02.pal diff --git a/data/tilesets/secondary/dummy4/palettes/03.pal b/data/tilesets/secondary/dummy_4/palettes/03.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/03.pal rename to data/tilesets/secondary/dummy_4/palettes/03.pal diff --git a/data/tilesets/secondary/dummy4/palettes/04.pal b/data/tilesets/secondary/dummy_4/palettes/04.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/04.pal rename to data/tilesets/secondary/dummy_4/palettes/04.pal diff --git a/data/tilesets/secondary/dummy4/palettes/05.pal b/data/tilesets/secondary/dummy_4/palettes/05.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/05.pal rename to data/tilesets/secondary/dummy_4/palettes/05.pal diff --git a/data/tilesets/secondary/dummy4/palettes/06.pal b/data/tilesets/secondary/dummy_4/palettes/06.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/06.pal rename to data/tilesets/secondary/dummy_4/palettes/06.pal diff --git a/data/tilesets/secondary/dummy4/palettes/07.pal b/data/tilesets/secondary/dummy_4/palettes/07.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/07.pal rename to data/tilesets/secondary/dummy_4/palettes/07.pal diff --git a/data/tilesets/secondary/dummy4/palettes/08.pal b/data/tilesets/secondary/dummy_4/palettes/08.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/08.pal rename to data/tilesets/secondary/dummy_4/palettes/08.pal diff --git a/data/tilesets/secondary/dummy4/palettes/09.pal b/data/tilesets/secondary/dummy_4/palettes/09.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/09.pal rename to data/tilesets/secondary/dummy_4/palettes/09.pal diff --git a/data/tilesets/secondary/dummy4/palettes/10.pal b/data/tilesets/secondary/dummy_4/palettes/10.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/10.pal rename to data/tilesets/secondary/dummy_4/palettes/10.pal diff --git a/data/tilesets/secondary/dummy4/palettes/11.pal b/data/tilesets/secondary/dummy_4/palettes/11.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/11.pal rename to data/tilesets/secondary/dummy_4/palettes/11.pal diff --git a/data/tilesets/secondary/dummy4/palettes/12.pal b/data/tilesets/secondary/dummy_4/palettes/12.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/12.pal rename to data/tilesets/secondary/dummy_4/palettes/12.pal diff --git a/data/tilesets/secondary/dummy4/palettes/13.pal b/data/tilesets/secondary/dummy_4/palettes/13.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/13.pal rename to data/tilesets/secondary/dummy_4/palettes/13.pal diff --git a/data/tilesets/secondary/dummy4/palettes/14.pal b/data/tilesets/secondary/dummy_4/palettes/14.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/14.pal rename to data/tilesets/secondary/dummy_4/palettes/14.pal diff --git a/data/tilesets/secondary/dummy4/palettes/15.pal b/data/tilesets/secondary/dummy_4/palettes/15.pal similarity index 100% rename from data/tilesets/secondary/dummy4/palettes/15.pal rename to data/tilesets/secondary/dummy_4/palettes/15.pal diff --git a/data/tilesets/secondary/dummy4/tiles.png b/data/tilesets/secondary/dummy_4/tiles.png similarity index 100% rename from data/tilesets/secondary/dummy4/tiles.png rename to data/tilesets/secondary/dummy_4/tiles.png diff --git a/data/tilesets/secondary/generic_building1/metatile_attributes.bin b/data/tilesets/secondary/generic_building_1/metatile_attributes.bin similarity index 100% rename from data/tilesets/secondary/generic_building1/metatile_attributes.bin rename to data/tilesets/secondary/generic_building_1/metatile_attributes.bin diff --git a/data/tilesets/secondary/generic_building1/metatiles.bin b/data/tilesets/secondary/generic_building_1/metatiles.bin similarity index 100% rename from data/tilesets/secondary/generic_building1/metatiles.bin rename to data/tilesets/secondary/generic_building_1/metatiles.bin diff --git a/data/tilesets/secondary/generic_building1/palettes/00.pal b/data/tilesets/secondary/generic_building_1/palettes/00.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/00.pal rename to data/tilesets/secondary/generic_building_1/palettes/00.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/01.pal b/data/tilesets/secondary/generic_building_1/palettes/01.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/01.pal rename to data/tilesets/secondary/generic_building_1/palettes/01.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/02.pal b/data/tilesets/secondary/generic_building_1/palettes/02.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/02.pal rename to data/tilesets/secondary/generic_building_1/palettes/02.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/03.pal b/data/tilesets/secondary/generic_building_1/palettes/03.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/03.pal rename to data/tilesets/secondary/generic_building_1/palettes/03.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/04.pal b/data/tilesets/secondary/generic_building_1/palettes/04.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/04.pal rename to data/tilesets/secondary/generic_building_1/palettes/04.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/05.pal b/data/tilesets/secondary/generic_building_1/palettes/05.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/05.pal rename to data/tilesets/secondary/generic_building_1/palettes/05.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/06.pal b/data/tilesets/secondary/generic_building_1/palettes/06.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/06.pal rename to data/tilesets/secondary/generic_building_1/palettes/06.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/07.pal b/data/tilesets/secondary/generic_building_1/palettes/07.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/07.pal rename to data/tilesets/secondary/generic_building_1/palettes/07.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/08.pal b/data/tilesets/secondary/generic_building_1/palettes/08.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/08.pal rename to data/tilesets/secondary/generic_building_1/palettes/08.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/09.pal b/data/tilesets/secondary/generic_building_1/palettes/09.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/09.pal rename to data/tilesets/secondary/generic_building_1/palettes/09.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/10.pal b/data/tilesets/secondary/generic_building_1/palettes/10.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/10.pal rename to data/tilesets/secondary/generic_building_1/palettes/10.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/11.pal b/data/tilesets/secondary/generic_building_1/palettes/11.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/11.pal rename to data/tilesets/secondary/generic_building_1/palettes/11.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/12.pal b/data/tilesets/secondary/generic_building_1/palettes/12.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/12.pal rename to data/tilesets/secondary/generic_building_1/palettes/12.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/13.pal b/data/tilesets/secondary/generic_building_1/palettes/13.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/13.pal rename to data/tilesets/secondary/generic_building_1/palettes/13.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/14.pal b/data/tilesets/secondary/generic_building_1/palettes/14.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/14.pal rename to data/tilesets/secondary/generic_building_1/palettes/14.pal diff --git a/data/tilesets/secondary/generic_building1/palettes/15.pal b/data/tilesets/secondary/generic_building_1/palettes/15.pal similarity index 100% rename from data/tilesets/secondary/generic_building1/palettes/15.pal rename to data/tilesets/secondary/generic_building_1/palettes/15.pal diff --git a/data/tilesets/secondary/generic_building1/tiles.png b/data/tilesets/secondary/generic_building_1/tiles.png similarity index 100% rename from data/tilesets/secondary/generic_building1/tiles.png rename to data/tilesets/secondary/generic_building_1/tiles.png diff --git a/data/tilesets/secondary/generic_building2/metatile_attributes.bin b/data/tilesets/secondary/generic_building_2/metatile_attributes.bin similarity index 100% rename from data/tilesets/secondary/generic_building2/metatile_attributes.bin rename to data/tilesets/secondary/generic_building_2/metatile_attributes.bin diff --git a/data/tilesets/secondary/generic_building2/metatiles.bin b/data/tilesets/secondary/generic_building_2/metatiles.bin similarity index 100% rename from data/tilesets/secondary/generic_building2/metatiles.bin rename to data/tilesets/secondary/generic_building_2/metatiles.bin diff --git a/data/tilesets/secondary/generic_building2/palettes/00.pal b/data/tilesets/secondary/generic_building_2/palettes/00.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/00.pal rename to data/tilesets/secondary/generic_building_2/palettes/00.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/01.pal b/data/tilesets/secondary/generic_building_2/palettes/01.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/01.pal rename to data/tilesets/secondary/generic_building_2/palettes/01.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/02.pal b/data/tilesets/secondary/generic_building_2/palettes/02.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/02.pal rename to data/tilesets/secondary/generic_building_2/palettes/02.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/03.pal b/data/tilesets/secondary/generic_building_2/palettes/03.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/03.pal rename to data/tilesets/secondary/generic_building_2/palettes/03.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/04.pal b/data/tilesets/secondary/generic_building_2/palettes/04.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/04.pal rename to data/tilesets/secondary/generic_building_2/palettes/04.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/05.pal b/data/tilesets/secondary/generic_building_2/palettes/05.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/05.pal rename to data/tilesets/secondary/generic_building_2/palettes/05.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/06.pal b/data/tilesets/secondary/generic_building_2/palettes/06.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/06.pal rename to data/tilesets/secondary/generic_building_2/palettes/06.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/07.pal b/data/tilesets/secondary/generic_building_2/palettes/07.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/07.pal rename to data/tilesets/secondary/generic_building_2/palettes/07.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/08.pal b/data/tilesets/secondary/generic_building_2/palettes/08.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/08.pal rename to data/tilesets/secondary/generic_building_2/palettes/08.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/09.pal b/data/tilesets/secondary/generic_building_2/palettes/09.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/09.pal rename to data/tilesets/secondary/generic_building_2/palettes/09.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/10.pal b/data/tilesets/secondary/generic_building_2/palettes/10.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/10.pal rename to data/tilesets/secondary/generic_building_2/palettes/10.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/11.pal b/data/tilesets/secondary/generic_building_2/palettes/11.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/11.pal rename to data/tilesets/secondary/generic_building_2/palettes/11.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/12.pal b/data/tilesets/secondary/generic_building_2/palettes/12.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/12.pal rename to data/tilesets/secondary/generic_building_2/palettes/12.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/13.pal b/data/tilesets/secondary/generic_building_2/palettes/13.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/13.pal rename to data/tilesets/secondary/generic_building_2/palettes/13.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/14.pal b/data/tilesets/secondary/generic_building_2/palettes/14.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/14.pal rename to data/tilesets/secondary/generic_building_2/palettes/14.pal diff --git a/data/tilesets/secondary/generic_building2/palettes/15.pal b/data/tilesets/secondary/generic_building_2/palettes/15.pal similarity index 100% rename from data/tilesets/secondary/generic_building2/palettes/15.pal rename to data/tilesets/secondary/generic_building_2/palettes/15.pal diff --git a/data/tilesets/secondary/generic_building2/tiles.png b/data/tilesets/secondary/generic_building_2/tiles.png similarity index 100% rename from data/tilesets/secondary/generic_building2/tiles.png rename to data/tilesets/secondary/generic_building_2/tiles.png diff --git a/data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin b/data/tilesets/secondary/unused_gatehouse_1/metatile_attributes.bin similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin rename to data/tilesets/secondary/unused_gatehouse_1/metatile_attributes.bin diff --git a/data/tilesets/secondary/unused_gatehouse1/metatiles.bin b/data/tilesets/secondary/unused_gatehouse_1/metatiles.bin similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/metatiles.bin rename to data/tilesets/secondary/unused_gatehouse_1/metatiles.bin diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/00.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/00.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/00.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/00.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/01.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/01.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/01.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/01.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/02.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/02.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/02.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/02.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/03.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/03.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/03.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/03.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/04.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/04.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/04.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/04.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/05.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/05.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/05.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/05.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/06.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/06.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/06.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/06.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/07.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/07.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/07.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/07.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/08.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/08.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/08.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/08.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/09.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/09.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/09.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/09.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/10.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/10.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/10.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/10.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/11.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/11.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/11.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/11.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/12.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/12.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/12.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/12.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/13.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/13.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/13.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/13.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/14.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/14.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/14.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/14.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/15.pal b/data/tilesets/secondary/unused_gatehouse_1/palettes/15.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/palettes/15.pal rename to data/tilesets/secondary/unused_gatehouse_1/palettes/15.pal diff --git a/data/tilesets/secondary/unused_gatehouse1/tiles.png b/data/tilesets/secondary/unused_gatehouse_1/tiles.png similarity index 100% rename from data/tilesets/secondary/unused_gatehouse1/tiles.png rename to data/tilesets/secondary/unused_gatehouse_1/tiles.png diff --git a/data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin b/data/tilesets/secondary/unused_gatehouse_2/metatile_attributes.bin similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin rename to data/tilesets/secondary/unused_gatehouse_2/metatile_attributes.bin diff --git a/data/tilesets/secondary/unused_gatehouse2/metatiles.bin b/data/tilesets/secondary/unused_gatehouse_2/metatiles.bin similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/metatiles.bin rename to data/tilesets/secondary/unused_gatehouse_2/metatiles.bin diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/00.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/00.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/00.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/00.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/01.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/01.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/01.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/01.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/02.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/02.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/02.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/02.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/03.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/03.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/03.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/03.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/04.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/04.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/04.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/04.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/05.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/05.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/05.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/05.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/06.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/06.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/06.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/06.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/07.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/07.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/07.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/07.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/08.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/08.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/08.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/08.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/09.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/09.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/09.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/09.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/10.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/10.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/10.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/10.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/11.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/11.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/11.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/11.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/12.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/12.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/12.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/12.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/13.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/13.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/13.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/13.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/14.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/14.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/14.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/14.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/15.pal b/data/tilesets/secondary/unused_gatehouse_2/palettes/15.pal similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/palettes/15.pal rename to data/tilesets/secondary/unused_gatehouse_2/palettes/15.pal diff --git a/data/tilesets/secondary/unused_gatehouse2/tiles.png b/data/tilesets/secondary/unused_gatehouse_2/tiles.png similarity index 100% rename from data/tilesets/secondary/unused_gatehouse2/tiles.png rename to data/tilesets/secondary/unused_gatehouse_2/tiles.png diff --git a/src/graphics.c b/src/graphics.c index 5a802cd35..c8a479efe 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1318,25 +1318,25 @@ const u8 gBerryFixWindow_Tilemap[] = INCBIN_U8("graphics/berry_fix/window.bin.lz const u16 gTilesetPalettes_GenericBuilding1[][16] = { - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/00.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/01.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/02.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/03.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/04.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/05.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/06.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/07.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/08.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/09.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/10.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/11.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/12.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/13.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/14.gbapal"), - INCBIN_U16("data/tilesets/secondary/generic_building1/palettes/15.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/00.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/01.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/02.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/03.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/04.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/05.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/06.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/07.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/08.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/09.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/10.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/11.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/12.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/13.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/14.gbapal"), + INCBIN_U16("data/tilesets/secondary/generic_building_1/palettes/15.gbapal"), }; -const u32 gTilesetTiles_GenericBuilding1[] = INCBIN_U32("data/tilesets/secondary/generic_building1/tiles.4bpp.lz"); +const u32 gTilesetTiles_GenericBuilding1[] = INCBIN_U32("data/tilesets/secondary/generic_building_1/tiles.4bpp.lz"); const u16 gTilesetPalettes_DepartmentStore[][16] = { diff --git a/tileset_rules.mk b/tileset_rules.mk index f20a6dca3..707bceb8d 100644 --- a/tileset_rules.mk +++ b/tileset_rules.mk @@ -36,7 +36,7 @@ $(TILESETGFXDIR)/secondary/viridian_forest/tiles.4bpp: %.4bpp: %.png $(TILESETGFXDIR)/secondary/seafoam_islands/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 318 -$(TILESETGFXDIR)/secondary/generic_building2/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/generic_building_2/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 152 $(TILESETGFXDIR)/secondary/underground_path/tiles.4bpp: %.4bpp: %.png @@ -81,10 +81,10 @@ $(TILESETGFXDIR)/secondary/cerulean_gym/tiles.4bpp: %.4bpp: %.png $(TILESETGFXDIR)/secondary/cinnabar_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 146 -$(TILESETGFXDIR)/secondary/unused_gatehouse1/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/unused_gatehouse_1/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 144 -$(TILESETGFXDIR)/secondary/unused_gatehouse2/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/unused_gatehouse_2/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 144 $(TILESETGFXDIR)/secondary/power_plant/tiles.4bpp: %.4bpp: %.png @@ -96,7 +96,7 @@ $(TILESETGFXDIR)/secondary/pokemon_tower/tiles.4bpp: %.4bpp: %.png $(TILESETGFXDIR)/secondary/school/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 50 -$(TILESETGFXDIR)/secondary/dummy3/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/dummy_3/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 2 $(TILESETGFXDIR)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png @@ -117,10 +117,10 @@ $(TILESETGFXDIR)/secondary/celadon_city/tiles.4bpp: %.4bpp: %.png $(TILESETGFXDIR)/secondary/saffron_city/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 262 -$(TILESETGFXDIR)/secondary/dummy1/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/dummy_1/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 2 -$(TILESETGFXDIR)/secondary/generic_building1/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/generic_building_1/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 63 $(TILESETGFXDIR)/secondary/hoenn_building/tiles.4bpp: %.4bpp: %.png @@ -147,7 +147,7 @@ $(TILESETGFXDIR)/secondary/safari_zone_building/tiles.4bpp: %.4bpp: %.png $(TILESETGFXDIR)/secondary/fan_club_daycare/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 85 -$(TILESETGFXDIR)/secondary/dummy4/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/dummy_4/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 2 $(TILESETGFXDIR)/secondary/tanoby_ruins/tiles.4bpp: %.4bpp: %.png @@ -177,7 +177,7 @@ $(TILESETGFXDIR)/secondary/game_corner/tiles.4bpp: %.4bpp: %.png $(TILESETGFXDIR)/secondary/celadon_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 103 -$(TILESETGFXDIR)/secondary/dummy2/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/dummy_2/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 2 $(TILESETGFXDIR)/secondary/digletts_cave/tiles.4bpp: %.4bpp: %.png