Reorganize tileset graphics files

41 files changed, 40 insertions, 41 deletions

diff --git a/graphics/tileset_anims/anim_general_flower_frame0.png b/data/tilesets/primary/general/anim/flower/0.png
index d445b4045..d445b4045 100644
--- a/graphics/tileset_anims/anim_general_flower_frame0.png
+++ b/data/tilesets/primary/general/anim/flower/0.png
diff --git a/graphics/tileset_anims/anim_general_flower_frame1.png b/data/tilesets/primary/general/anim/flower/1.png
index 1aed594f6..1aed594f6 100644
--- a/graphics/tileset_anims/anim_general_flower_frame1.png
+++ b/data/tilesets/primary/general/anim/flower/1.png
diff --git a/graphics/tileset_anims/anim_general_flower_frame2.png b/data/tilesets/primary/general/anim/flower/2.png
index 5e58c29a9..5e58c29a9 100644
--- a/graphics/tileset_anims/anim_general_flower_frame2.png
+++ b/data/tilesets/primary/general/anim/flower/2.png
diff --git a/graphics/tileset_anims/anim_general_flower_frame3.png b/data/tilesets/primary/general/anim/flower/3.png
index bac3d26ff..bac3d26ff 100644
--- a/graphics/tileset_anims/anim_general_flower_frame3.png
+++ b/data/tilesets/primary/general/anim/flower/3.png
diff --git a/graphics/tileset_anims/anim_general_flower_frame4.png b/data/tilesets/primary/general/anim/flower/4.png
index 8e589150a..8e589150a 100644
--- a/graphics/tileset_anims/anim_general_flower_frame4.png
+++ b/data/tilesets/primary/general/anim/flower/4.png
diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame0.png b/data/tilesets/primary/general/anim/sandwatersedge/0.png
index 0ade81d73..0ade81d73 100644
--- a/graphics/tileset_anims/anim_general_sandwatersedge_frame0.png
+++ b/data/tilesets/primary/general/anim/sandwatersedge/0.png
diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame1.png b/data/tilesets/primary/general/anim/sandwatersedge/1.png
index 8dac0eba7..8dac0eba7 100644
--- a/graphics/tileset_anims/anim_general_sandwatersedge_frame1.png
+++ b/data/tilesets/primary/general/anim/sandwatersedge/1.png
diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame2.png b/data/tilesets/primary/general/anim/sandwatersedge/2.png
index ba6e93bc4..ba6e93bc4 100644
--- a/graphics/tileset_anims/anim_general_sandwatersedge_frame2.png
+++ b/data/tilesets/primary/general/anim/sandwatersedge/2.png
diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame3.png b/data/tilesets/primary/general/anim/sandwatersedge/3.png
index 9436601c1..9436601c1 100644
--- a/graphics/tileset_anims/anim_general_sandwatersedge_frame3.png
+++ b/data/tilesets/primary/general/anim/sandwatersedge/3.png
diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame4.png b/data/tilesets/primary/general/anim/sandwatersedge/4.png
index 5b74a16fa..5b74a16fa 100644
--- a/graphics/tileset_anims/anim_general_sandwatersedge_frame4.png
+++ b/data/tilesets/primary/general/anim/sandwatersedge/4.png
diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame5.png b/data/tilesets/primary/general/anim/sandwatersedge/5.png
index 6c72f4e0e..6c72f4e0e 100644
--- a/graphics/tileset_anims/anim_general_sandwatersedge_frame5.png
+++ b/data/tilesets/primary/general/anim/sandwatersedge/5.png
diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame6.png b/data/tilesets/primary/general/anim/sandwatersedge/6.png
index f56c55b04..f56c55b04 100644
--- a/graphics/tileset_anims/anim_general_sandwatersedge_frame6.png
+++ b/data/tilesets/primary/general/anim/sandwatersedge/6.png
diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame7.png b/data/tilesets/primary/general/anim/sandwatersedge/7.png
index 549c44410..549c44410 100644
--- a/graphics/tileset_anims/anim_general_sandwatersedge_frame7.png
+++ b/data/tilesets/primary/general/anim/sandwatersedge/7.png
diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame0.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/0.png
index ce16ac050..ce16ac050 100644
--- a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame0.png
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/0.png
diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame1.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/1.png
index 7e41494c5..7e41494c5 100644
--- a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame1.png
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/1.png
diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame2.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/2.png
index 5765ac477..5765ac477 100644
--- a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame2.png
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/2.png
diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame3.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/3.png
index dbc111a7f..dbc111a7f 100644
--- a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame3.png
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/3.png
diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame4.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/4.png
index a8ee69c1e..a8ee69c1e 100644
--- a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame4.png
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/4.png
diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame5.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/5.png
index 318c7b796..318c7b796 100644
--- a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame5.png
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/5.png
diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame6.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/6.png
index c31713d34..c31713d34 100644
--- a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame6.png
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/6.png
diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame7.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/7.png
index e01c91449..e01c91449 100644
--- a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame7.png
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/7.png
diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame0.png b/data/tilesets/secondary/celadon_city/anim/fountain/0.png
index c5783f481..c5783f481 100644
--- a/graphics/tileset_anims/anim_celadoncity_fountain_frame0.png
+++ b/data/tilesets/secondary/celadon_city/anim/fountain/0.png
diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame1.png b/data/tilesets/secondary/celadon_city/anim/fountain/1.png
index 7d1f6fb2e..7d1f6fb2e 100644
--- a/graphics/tileset_anims/anim_celadoncity_fountain_frame1.png
+++ b/data/tilesets/secondary/celadon_city/anim/fountain/1.png
diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame2.png b/data/tilesets/secondary/celadon_city/anim/fountain/2.png
index 91b54ad6e..91b54ad6e 100644
--- a/graphics/tileset_anims/anim_celadoncity_fountain_frame2.png
+++ b/data/tilesets/secondary/celadon_city/anim/fountain/2.png
diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame3.png b/data/tilesets/secondary/celadon_city/anim/fountain/3.png
index 45f2e40ad..45f2e40ad 100644
--- a/graphics/tileset_anims/anim_celadoncity_fountain_frame3.png
+++ b/data/tilesets/secondary/celadon_city/anim/fountain/3.png
diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame4.png b/data/tilesets/secondary/celadon_city/anim/fountain/4.png
index dd9a94d47..dd9a94d47 100644
--- a/graphics/tileset_anims/anim_celadoncity_fountain_frame4.png
+++ b/data/tilesets/secondary/celadon_city/anim/fountain/4.png
diff --git a/graphics/tileset_anims/anim_celadongym_flowers_frame0.png b/data/tilesets/secondary/celadon_gym/anim/flowers/0.png
index eabff7d8a..eabff7d8a 100644
--- a/graphics/tileset_anims/anim_celadongym_flowers_frame0.png
+++ b/data/tilesets/secondary/celadon_gym/anim/flowers/0.png
diff --git a/graphics/tileset_anims/anim_celadongym_flowers_frame1.png b/data/tilesets/secondary/celadon_gym/anim/flowers/1.png
index fd9eb53f7..fd9eb53f7 100644
--- a/graphics/tileset_anims/anim_celadongym_flowers_frame1.png
+++ b/data/tilesets/secondary/celadon_gym/anim/flowers/1.png
diff --git a/graphics/tileset_anims/anim_celadongym_flowers_frame2.png b/data/tilesets/secondary/celadon_gym/anim/flowers/2.png
index a3edd7ccd..a3edd7ccd 100644
--- a/graphics/tileset_anims/anim_celadongym_flowers_frame2.png
+++ b/data/tilesets/secondary/celadon_gym/anim/flowers/2.png
diff --git a/graphics/tileset_anims/anim_mtember_steam_frame0.png b/data/tilesets/secondary/mt_ember/anim/steam/0.png
index ab0ca2c69..ab0ca2c69 100644
--- a/graphics/tileset_anims/anim_mtember_steam_frame0.png
+++ b/data/tilesets/secondary/mt_ember/anim/steam/0.png
diff --git a/graphics/tileset_anims/anim_mtember_steam_frame1.png b/data/tilesets/secondary/mt_ember/anim/steam/1.png
index 1324c7ad5..1324c7ad5 100644
--- a/graphics/tileset_anims/anim_mtember_steam_frame1.png
+++ b/data/tilesets/secondary/mt_ember/anim/steam/1.png
diff --git a/graphics/tileset_anims/anim_mtember_steam_frame2.png b/data/tilesets/secondary/mt_ember/anim/steam/2.png
index 310aa1ebd..310aa1ebd 100644
--- a/graphics/tileset_anims/anim_mtember_steam_frame2.png
+++ b/data/tilesets/secondary/mt_ember/anim/steam/2.png
diff --git a/graphics/tileset_anims/anim_mtember_steam_frame3.png b/data/tilesets/secondary/mt_ember/anim/steam/3.png
index a6ec412cf..a6ec412cf 100644
--- a/graphics/tileset_anims/anim_mtember_steam_frame3.png
+++ b/data/tilesets/secondary/mt_ember/anim/steam/3.png
diff --git a/graphics/tileset_anims/anim_silphco_fountain_frame0.png b/data/tilesets/secondary/silph_co/anim/fountain/0.png
index 09714447b..09714447b 100644
--- a/graphics/tileset_anims/anim_silphco_fountain_frame0.png
+++ b/data/tilesets/secondary/silph_co/anim/fountain/0.png
diff --git a/graphics/tileset_anims/anim_silphco_fountain_frame1.png b/data/tilesets/secondary/silph_co/anim/fountain/1.png
index 5063c1476..5063c1476 100644
--- a/graphics/tileset_anims/anim_silphco_fountain_frame1.png
+++ b/data/tilesets/secondary/silph_co/anim/fountain/1.png
diff --git a/graphics/tileset_anims/anim_silphco_fountain_frame2.png b/data/tilesets/secondary/silph_co/anim/fountain/2.png
index eb46683ea..eb46683ea 100644
--- a/graphics/tileset_anims/anim_silphco_fountain_frame2.png
+++ b/data/tilesets/secondary/silph_co/anim/fountain/2.png
diff --git a/graphics/tileset_anims/anim_silphco_fountain_frame3.png b/data/tilesets/secondary/silph_co/anim/fountain/3.png
index e582fbce2..e582fbce2 100644
--- a/graphics/tileset_anims/anim_silphco_fountain_frame3.png
+++ b/data/tilesets/secondary/silph_co/anim/fountain/3.png
diff --git a/graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame0.png b/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.png
index a17ad6f5e..a17ad6f5e 100644
--- a/graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame0.png
+++ b/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.png
diff --git a/graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame1.png b/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.png
index bfddebccd..bfddebccd 100644
--- a/graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame1.png
+++ b/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.png
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index d96845bba..dbb583269 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -28,7 +28,6 @@ INTROGFXDIR := graphics/intro
 BATTLETERRAINGFXDIR := graphics/battle_terrain
 BERRYPOUCHGFXDIR := graphics/berry_pouch
 HALLOFFAMEGFXDIR := graphics/hall_of_fame
-TILESETANIMSGFXDIR := graphics/tileset_anims
 
 types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
 contest_types := cool beauty cute smart tough
@@ -592,5 +591,5 @@ $(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png
 $(HALLOFFAMEGFXDIR)/hall_of_fame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 29
 
-$(TILESETANIMSGFXDIR)/anim_general_water_current_landwatersedge_frame7.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/primary/general/anim/water_current_landwatersedge/7.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 47
diff --git a/src/tileset_anims.c b/src/tileset_anims.c
index abd0d80e1..fcf6a6038 100644
--- a/src/tileset_anims.c
+++ b/src/tileset_anims.c
@@ -18,11 +18,11 @@ static void _InitPrimaryTilesetAnimation(void);
 static void _InitSecondaryTilesetAnimation(void);
 
 // palette: general 00
-static const u16 sTilesetAnims_General_Flower_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_general_flower_frame0.4bpp");
-static const u16 sTilesetAnims_General_Flower_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_general_flower_frame1.4bpp");
-static const u16 sTilesetAnims_General_Flower_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_general_flower_frame2.4bpp");
-static const u16 sTilesetAnims_General_Flower_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_general_flower_frame3.4bpp");
-static const u16 sTilesetAnims_General_Flower_Frame4[] = INCBIN_U16("graphics/tileset_anims/anim_general_flower_frame4.4bpp");
+static const u16 sTilesetAnims_General_Flower_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/0.4bpp");
+static const u16 sTilesetAnims_General_Flower_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/1.4bpp");
+static const u16 sTilesetAnims_General_Flower_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/2.4bpp");
+static const u16 sTilesetAnims_General_Flower_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/3.4bpp");
+static const u16 sTilesetAnims_General_Flower_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/4.4bpp");
 
 static const u16 *const sTilesetAnims_General_Flower[] = {
     sTilesetAnims_General_Flower_Frame0,
@@ -33,14 +33,14 @@ static const u16 *const sTilesetAnims_General_Flower[] = {
 };
 
 // palette: general 04
-static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame0.4bpp");
-static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame1.4bpp");
-static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame2.4bpp");
-static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame3.4bpp");
-static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame4[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame4.4bpp");
-static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame5[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame5.4bpp");
-static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame6[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame6.4bpp");
-static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame7[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame7.4bpp");
+static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/0.4bpp");
+static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/1.4bpp");
+static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/2.4bpp");
+static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/3.4bpp");
+static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/4.4bpp");
+static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/5.4bpp");
+static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/6.4bpp");
+static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/7.4bpp");
 
 static const u16 *const sTilesetAnims_General_Water_Current_LandWatersEdge[] = {
     sTilesetAnims_General_Water_Current_LandWatersEdge_Frame0,
@@ -54,14 +54,14 @@ static const u16 *const sTilesetAnims_General_Water_Current_LandWatersEdge[] = {
 };
 
 // palette: general 04
-static const u16 sTilesetAnims_General_SandWatersEdge_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame0.4bpp");
-static const u16 sTilesetAnims_General_SandWatersEdge_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame1.4bpp");
-static const u16 sTilesetAnims_General_SandWatersEdge_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame2.4bpp");
-static const u16 sTilesetAnims_General_SandWatersEdge_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame3.4bpp");
-static const u16 sTilesetAnims_General_SandWatersEdge_Frame4[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame4.4bpp");
-static const u16 sTilesetAnims_General_SandWatersEdge_Frame5[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame5.4bpp");
-static const u16 sTilesetAnims_General_SandWatersEdge_Frame6[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame6.4bpp");
-static const u16 sTilesetAnims_General_SandWatersEdge_Frame7[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame7.4bpp");
+static const u16 sTilesetAnims_General_SandWatersEdge_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/0.4bpp");
+static const u16 sTilesetAnims_General_SandWatersEdge_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/1.4bpp");
+static const u16 sTilesetAnims_General_SandWatersEdge_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/2.4bpp");
+static const u16 sTilesetAnims_General_SandWatersEdge_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/3.4bpp");
+static const u16 sTilesetAnims_General_SandWatersEdge_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/4.4bpp");
+static const u16 sTilesetAnims_General_SandWatersEdge_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/5.4bpp");
+static const u16 sTilesetAnims_General_SandWatersEdge_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/6.4bpp");
+static const u16 sTilesetAnims_General_SandWatersEdge_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/7.4bpp");
 
 static const u16 *const sTilesetAnims_General_SandWatersEdge[] = {
     sTilesetAnims_General_SandWatersEdge_Frame0,
@@ -75,11 +75,11 @@ static const u16 *const sTilesetAnims_General_SandWatersEdge[] = {
 };
 
 // palette: general 00
-static const u16 sTilesetAnims_CeladonCity_Fountain_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_celadoncity_fountain_frame0.4bpp");
-static const u16 sTilesetAnims_CeladonCity_Fountain_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_celadoncity_fountain_frame1.4bpp");
-static const u16 sTilesetAnims_CeladonCity_Fountain_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_celadoncity_fountain_frame2.4bpp");
-static const u16 sTilesetAnims_CeladonCity_Fountain_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_celadoncity_fountain_frame3.4bpp");
-static const u16 sTilesetAnims_CeladonCity_Fountain_Frame4[] = INCBIN_U16("graphics/tileset_anims/anim_celadoncity_fountain_frame4.4bpp");
+static const u16 sTilesetAnims_CeladonCity_Fountain_Frame0[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/0.4bpp");
+static const u16 sTilesetAnims_CeladonCity_Fountain_Frame1[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/1.4bpp");
+static const u16 sTilesetAnims_CeladonCity_Fountain_Frame2[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/2.4bpp");
+static const u16 sTilesetAnims_CeladonCity_Fountain_Frame3[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/3.4bpp");
+static const u16 sTilesetAnims_CeladonCity_Fountain_Frame4[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/4.4bpp");
 static const u16 gUnknown_83ABD94[16] = {};
 
 static const u16 *const sTilesetAnims_CeladonCity_Fountain[] = {
@@ -90,10 +90,10 @@ static const u16 *const sTilesetAnims_CeladonCity_Fountain[] = {
     sTilesetAnims_CeladonCity_Fountain_Frame4
 };
 
-static const u16 sTilesetAnims_SilphCo_Fountain_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_silphco_fountain_frame0.4bpp");
-static const u16 sTilesetAnims_SilphCo_Fountain_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_silphco_fountain_frame1.4bpp");
-static const u16 sTilesetAnims_SilphCo_Fountain_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_silphco_fountain_frame2.4bpp");
-static const u16 sTilesetAnims_SilphCo_Fountain_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_silphco_fountain_frame3.4bpp");
+static const u16 sTilesetAnims_SilphCo_Fountain_Frame0[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/0.4bpp");
+static const u16 sTilesetAnims_SilphCo_Fountain_Frame1[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/1.4bpp");
+static const u16 sTilesetAnims_SilphCo_Fountain_Frame2[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/2.4bpp");
+static const u16 sTilesetAnims_SilphCo_Fountain_Frame3[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/3.4bpp");
 static const u16 gUnknown_83AC1C8[16] = {};
 
 static const u16 *const sTilesetAnims_SilphCo_Fountain[] = {
@@ -103,10 +103,10 @@ static const u16 *const sTilesetAnims_SilphCo_Fountain[] = {
     sTilesetAnims_SilphCo_Fountain_Frame3
 };
 
-static const u16 sTilesetAnims_MtEmber_Steam_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_mtember_steam_frame0.4bpp");
-static const u16 sTilesetAnims_MtEmber_Steam_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_mtember_steam_frame1.4bpp");
-static const u16 sTilesetAnims_MtEmber_Steam_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_mtember_steam_frame2.4bpp");
-static const u16 sTilesetAnims_MtEmber_Steam_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_mtember_steam_frame3.4bpp");
+static const u16 sTilesetAnims_MtEmber_Steam_Frame0[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/0.4bpp");
+static const u16 sTilesetAnims_MtEmber_Steam_Frame1[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/1.4bpp");
+static const u16 sTilesetAnims_MtEmber_Steam_Frame2[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/2.4bpp");
+static const u16 sTilesetAnims_MtEmber_Steam_Frame3[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/3.4bpp");
 
 static const u16 *const sTilesetAnims_MtEmber_Steam[] = {
     sTilesetAnims_MtEmber_Steam_Frame0,
@@ -115,17 +115,17 @@ static const u16 *const sTilesetAnims_MtEmber_Steam[] = {
     sTilesetAnims_MtEmber_Steam_Frame3
 };
 
-static const u16 sTilesetAnims_VermilionGym_MotorizedDoor_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame0.4bpp");
-static const u16 sTilesetAnims_VermilionGym_MotorizedDoor_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame1.4bpp");
+static const u16 sTilesetAnims_VermilionGym_MotorizedDoor_Frame0[] = INCBIN_U16("data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.4bpp");
+static const u16 sTilesetAnims_VermilionGym_MotorizedDoor_Frame1[] = INCBIN_U16("data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.4bpp");
 
 static const u16 *const sTilesetAnims_VermilionGym_MotorizedDoor[] = {
     sTilesetAnims_VermilionGym_MotorizedDoor_Frame0,
     sTilesetAnims_VermilionGym_MotorizedDoor_Frame1
 };
 
-static const u16 sTilesetAnims_CeladonGym_Flowers_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_celadongym_flowers_frame0.4bpp");
-static const u16 sTilesetAnims_CeladonGym_Flowers_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_celadongym_flowers_frame1.4bpp");
-static const u16 sTilesetAnims_CeladonGym_Flowers_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_celadongym_flowers_frame2.4bpp");
+static const u16 sTilesetAnims_CeladonGym_Flowers_Frame0[] = INCBIN_U16("data/tilesets/secondary/celadon_gym/anim/flowers/0.4bpp");
+static const u16 sTilesetAnims_CeladonGym_Flowers_Frame1[] = INCBIN_U16("data/tilesets/secondary/celadon_gym/anim/flowers/1.4bpp");
+static const u16 sTilesetAnims_CeladonGym_Flowers_Frame2[] = INCBIN_U16("data/tilesets/secondary/celadon_gym/anim/flowers/2.4bpp");
 
 static const u16 *const sTilesetAnims_CeladonGym_Flowers[] = {
     sTilesetAnims_CeladonGym_Flowers_Frame0,