Merge pull request #304 from GriffinRichards/fix-tilesetname

Standardize tileset folder names
This commit is contained in:
PikalaxALT authored and GitHub committed 2020-03-17 08:54:38 -04:00
commit 715c2ff3ad
156 files changed
+160 -160

No files matched your search

+17 -17
View File
@@ -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] =
{