diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-17 08:54:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 08:54:38 -0400 |
| commit | 715c2ff3ad3a7842a97a2b221f4c02135a813139 (patch) | |
| tree | 89629e9234bfcc69830896acca8d6c0491ed8546 /src | |
| parent | 0b1ddd584239d04f08b92cfe66c1aa6e598f4d57 (diff) | |
| parent | 98942449be57bc5cea7420b3d501c3fe05166066 (diff) | |
Merge pull request #304 from GriffinRichards/fix-tilesetname
Standardize tileset folder names
Diffstat (limited to 'src')
| -rw-r--r-- | src/graphics.c | 34 |
1 files changed, 17 insertions, 17 deletions
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] = { |