move tilesets to match pokeruby

2024-12-26 03:34:15 +01:00 · 2016-09-03 10:32:18 -07:00 · 2016-09-03 10:32:18 -07:00 · 513a162994
commit 513a162994
parent deb6d7c6ba
1283 changed files with 1907 additions and 1907 deletions
--- 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
--- 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
--- a/data/graphics/tilesets/tileset_graphics.s
+++ b/data/graphics/tilesets/tileset_graphics.s
--- a/data/graphics/tilesets/metatiles.s
+++ b/data/graphics/tilesets/metatiles.s
--- a/data/graphics/tilesets/primary/general/palettes/00.pal
+++ b/data/graphics/tilesets/primary/general/palettes/00.pal
--- a/data/graphics/tilesets/primary/general/palettes/01.pal
+++ b/data/graphics/tilesets/primary/general/palettes/01.pal
--- a/data/graphics/tilesets/primary/general/palettes/02.pal
+++ b/data/graphics/tilesets/primary/general/palettes/02.pal
--- a/data/graphics/tilesets/primary/general/palettes/03.pal
+++ b/data/graphics/tilesets/primary/general/palettes/03.pal
--- a/data/graphics/tilesets/primary/general/palettes/04.pal
+++ b/data/graphics/tilesets/primary/general/palettes/04.pal
--- a/data/graphics/tilesets/primary/general/palettes/05.pal
+++ b/data/graphics/tilesets/primary/general/palettes/05.pal
--- a/data/graphics/tilesets/primary/general/palettes/06.pal
+++ b/data/graphics/tilesets/primary/general/palettes/06.pal
--- a/data/graphics/tilesets/primary/general/palettes/07.pal
+++ b/data/graphics/tilesets/primary/general/palettes/07.pal
--- a/data/graphics/tilesets/primary/general/palettes/08.pal
+++ b/data/graphics/tilesets/primary/general/palettes/08.pal
--- a/data/graphics/tilesets/primary/general/palettes/09.pal
+++ b/data/graphics/tilesets/primary/general/palettes/09.pal
--- a/data/graphics/tilesets/primary/general/palettes/10.pal
+++ b/data/graphics/tilesets/primary/general/palettes/10.pal
--- a/data/graphics/tilesets/primary/general/palettes/11.pal
+++ b/data/graphics/tilesets/primary/general/palettes/11.pal
--- a/data/graphics/tilesets/primary/general/palettes/12.pal
+++ b/data/graphics/tilesets/primary/general/palettes/12.pal
--- a/data/graphics/tilesets/primary/general/palettes/13.pal
+++ b/data/graphics/tilesets/primary/general/palettes/13.pal
--- a/data/graphics/tilesets/primary/general/palettes/14.pal
+++ b/data/graphics/tilesets/primary/general/palettes/14.pal
--- a/data/graphics/tilesets/primary/general/palettes/15.pal
+++ b/data/graphics/tilesets/primary/general/palettes/15.pal
--- a/data/graphics/tilesets/primary/general/tiles.png
+++ b/data/graphics/tilesets/primary/general/tiles.png
--- a/data/graphics/tilesets/primary/inside_building/palettes/00.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/00.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/01.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/01.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/02.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/02.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/03.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/03.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/04.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/04.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/05.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/05.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/06.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/06.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/07.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/07.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/08.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/08.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/09.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/09.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/10.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/10.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/11.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/11.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/12.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/12.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/13.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/13.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/14.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/14.pal
--- a/data/graphics/tilesets/primary/inside_building/palettes/15.pal
+++ b/data/graphics/tilesets/primary/inside_building/palettes/15.pal
--- a/data/graphics/tilesets/primary/inside_building/tiles.png
+++ b/data/graphics/tilesets/primary/inside_building/tiles.png
--- a/data/graphics/tilesets/primary/secret_base/palettes/00.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/00.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/01.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/01.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/02.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/02.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/03.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/03.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/04.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/04.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/05.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/05.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/06.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/06.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/07.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/07.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/08.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/08.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/09.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/09.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/10.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/10.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/11.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/11.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/12.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/12.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/13.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/13.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/14.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/14.pal
--- a/data/graphics/tilesets/primary/secret_base/palettes/15.pal
+++ b/data/graphics/tilesets/primary/secret_base/palettes/15.pal
--- a/data/graphics/tilesets/primary/secret_base/tiles.png
+++ b/data/graphics/tilesets/primary/secret_base/tiles.png
--- a/data/graphics/tilesets/primary/secret_base/unknown_tiles.png
+++ b/data/graphics/tilesets/primary/secret_base/unknown_tiles.png
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/00.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/00.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/01.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/01.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/02.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/02.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/03.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/03.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/04.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/04.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/05.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/05.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/06.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/06.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/07.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/07.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/08.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/08.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/09.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/09.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/10.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/10.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/11.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/11.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/12.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/12.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/13.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/13.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/14.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/14.pal
--- a/data/graphics/tilesets/secondary/battle_arena/palettes/15.pal
+++ b/data/graphics/tilesets/secondary/battle_arena/palettes/15.pal
--- a/data/graphics/tilesets/secondary/battle_arena/tiles.png
+++ b/data/graphics/tilesets/secondary/battle_arena/tiles.png
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/00.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/00.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/01.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/01.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/02.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/02.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/03.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/03.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/04.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/04.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/05.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/05.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/06.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/06.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/07.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/07.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/08.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/08.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/09.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/09.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/10.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/10.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/11.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/11.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/12.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/12.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/13.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/13.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/14.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/14.pal
--- a/data/graphics/tilesets/secondary/battle_dome/palettes/15.pal
+++ b/data/graphics/tilesets/secondary/battle_dome/palettes/15.pal
--- a/data/graphics/tilesets/secondary/battle_dome/tiles.png
+++ b/data/graphics/tilesets/secondary/battle_dome/tiles.png
--- a/data/graphics/tilesets/secondary/battle_factory/palettes/00.pal
+++ b/data/graphics/tilesets/secondary/battle_factory/palettes/00.pal
--- a/data/graphics/tilesets/secondary/battle_factory/palettes/01.pal
+++ b/data/graphics/tilesets/secondary/battle_factory/palettes/01.pal
--- a/data/graphics/tilesets/secondary/battle_factory/palettes/02.pal
+++ b/data/graphics/tilesets/secondary/battle_factory/palettes/02.pal
--- a/data/graphics/tilesets/secondary/battle_factory/palettes/03.pal
+++ b/data/graphics/tilesets/secondary/battle_factory/palettes/03.pal
--- a/data/graphics/tilesets/secondary/battle_factory/palettes/04.pal
+++ b/data/graphics/tilesets/secondary/battle_factory/palettes/04.pal
--- a/data/graphics/tilesets/secondary/battle_factory/palettes/05.pal
+++ b/data/graphics/tilesets/secondary/battle_factory/palettes/05.pal
--- a/data/graphics/tilesets/secondary/battle_factory/palettes/06.pal
+++ b/data/graphics/tilesets/secondary/battle_factory/palettes/06.pal
--- a/data/graphics/tilesets/secondary/battle_factory/palettes/07.pal
+++ b/data/graphics/tilesets/secondary/battle_factory/palettes/07.pal
--- a/data/graphics/tilesets/secondary/battle_factory/palettes/08.pal
+++ b/data/graphics/tilesets/secondary/battle_factory/palettes/08.pal
--- a/data/graphics/tilesets/secondary/battle_factory/palettes/09.pal
+++ b/data/graphics/tilesets/secondary/battle_factory/palettes/09.pal
--- a/Show More
+++ b/Show More