60 files changed, 72 insertions, 72 deletions
diff --git a/graphics/battle_terrain/terrain_building_anim.bin b/graphics/battle_terrain/building/anim.bin
index aba49c6f9..aba49c6f9 100644
--- a/graphics/battle_terrain/terrain_building_anim.bin
+++ b/graphics/battle_terrain/building/anim.bin
diff --git a/graphics/battle_terrain/terrain_building_anim.png b/graphics/battle_terrain/building/anim.png
index 443cd98ab..443cd98ab 100644
--- a/graphics/battle_terrain/terrain_building_anim.png
+++ b/graphics/battle_terrain/building/anim.png
diff --git a/graphics/battle_terrain/terrain_building.bin b/graphics/battle_terrain/building/terrain.bin
index 0710427da..0710427da 100644
--- a/graphics/battle_terrain/terrain_building.bin
+++ b/graphics/battle_terrain/building/terrain.bin
diff --git a/graphics/battle_terrain/terrain_building.pal b/graphics/battle_terrain/building/terrain.pal
index 16421567f..16421567f 100644
--- a/graphics/battle_terrain/terrain_building.pal
+++ b/graphics/battle_terrain/building/terrain.pal
diff --git a/graphics/battle_terrain/terrain_building.png b/graphics/battle_terrain/building/terrain.png
index 3b060be4e..3b060be4e 100644
--- a/graphics/battle_terrain/terrain_building.png
+++ b/graphics/battle_terrain/building/terrain.png
diff --git a/graphics/battle_terrain/terrain_cave_anim.bin b/graphics/battle_terrain/cave/anim.bin
index ad7724c67..ad7724c67 100644
--- a/graphics/battle_terrain/terrain_cave_anim.bin
+++ b/graphics/battle_terrain/cave/anim.bin
diff --git a/graphics/battle_terrain/terrain_cave_anim.png b/graphics/battle_terrain/cave/anim.png
index 84f13f8f0..84f13f8f0 100644
--- a/graphics/battle_terrain/terrain_cave_anim.png
+++ b/graphics/battle_terrain/cave/anim.png
diff --git a/graphics/battle_terrain/terrain_cave.bin b/graphics/battle_terrain/cave/terrain.bin
index 255f2953d..255f2953d 100644
--- a/graphics/battle_terrain/terrain_cave.bin
+++ b/graphics/battle_terrain/cave/terrain.bin
diff --git a/graphics/battle_terrain/terrain_cave.pal b/graphics/battle_terrain/cave/terrain.pal
index f17a7bf9d..f17a7bf9d 100644
--- a/graphics/battle_terrain/terrain_cave.pal
+++ b/graphics/battle_terrain/cave/terrain.pal
diff --git a/graphics/battle_terrain/terrain_cave.png b/graphics/battle_terrain/cave/terrain.png
index e2a18ae57..e2a18ae57 100644
--- a/graphics/battle_terrain/terrain_cave.png
+++ b/graphics/battle_terrain/cave/terrain.png
diff --git a/graphics/battle_terrain/terrain_grass_anim.bin b/graphics/battle_terrain/grass/anim.bin
index 03e4194fc..03e4194fc 100644
--- a/graphics/battle_terrain/terrain_grass_anim.bin
+++ b/graphics/battle_terrain/grass/anim.bin
diff --git a/graphics/battle_terrain/terrain_grass_anim.png b/graphics/battle_terrain/grass/anim.png
index f2f2c1bb1..f2f2c1bb1 100644
--- a/graphics/battle_terrain/terrain_grass_anim.png
+++ b/graphics/battle_terrain/grass/anim.png
diff --git a/graphics/battle_terrain/terrain_grass.bin b/graphics/battle_terrain/grass/terrain.bin
index e0da76dc2..e0da76dc2 100644
--- a/graphics/battle_terrain/terrain_grass.bin
+++ b/graphics/battle_terrain/grass/terrain.bin
diff --git a/graphics/battle_terrain/terrain_grass.pal b/graphics/battle_terrain/grass/terrain.pal
index cc00b3dc2..cc00b3dc2 100644
--- a/graphics/battle_terrain/terrain_grass.pal
+++ b/graphics/battle_terrain/grass/terrain.pal
diff --git a/graphics/battle_terrain/terrain_grass.png b/graphics/battle_terrain/grass/terrain.png
index 645796cb1..645796cb1 100644
--- a/graphics/battle_terrain/terrain_grass.png
+++ b/graphics/battle_terrain/grass/terrain.png
diff --git a/graphics/battle_terrain/terrain_indoor_1.pal b/graphics/battle_terrain/indoor/1.pal
index 597647872..597647872 100644
--- a/graphics/battle_terrain/terrain_indoor_1.pal
+++ b/graphics/battle_terrain/indoor/1.pal
diff --git a/graphics/battle_terrain/terrain_indoor_2.pal b/graphics/battle_terrain/indoor/2.pal
index a1bc6b60c..a1bc6b60c 100644
--- a/graphics/battle_terrain/terrain_indoor_2.pal
+++ b/graphics/battle_terrain/indoor/2.pal
diff --git a/graphics/battle_terrain/terrain_indoor_agatha.pal b/graphics/battle_terrain/indoor/agatha.pal
index 8ea1eeae7..8ea1eeae7 100644
--- a/graphics/battle_terrain/terrain_indoor_agatha.pal
+++ b/graphics/battle_terrain/indoor/agatha.pal
diff --git a/graphics/battle_terrain/terrain_indoor_bruno.pal b/graphics/battle_terrain/indoor/bruno.pal
index 21196b3e8..21196b3e8 100644
--- a/graphics/battle_terrain/terrain_indoor_bruno.pal
+++ b/graphics/battle_terrain/indoor/bruno.pal
diff --git a/graphics/battle_terrain/terrain_indoor_champion.pal b/graphics/battle_terrain/indoor/champion.pal
index 9ce470c9f..9ce470c9f 100644
--- a/graphics/battle_terrain/terrain_indoor_champion.pal
+++ b/graphics/battle_terrain/indoor/champion.pal
diff --git a/graphics/battle_terrain/terrain_indoor_gym.pal b/graphics/battle_terrain/indoor/gym.pal
index 187054476..187054476 100644
--- a/graphics/battle_terrain/terrain_indoor_gym.pal
+++ b/graphics/battle_terrain/indoor/gym.pal
diff --git a/graphics/battle_terrain/terrain_indoor_lance.pal b/graphics/battle_terrain/indoor/lance.pal
index c5fb745cf..c5fb745cf 100644
--- a/graphics/battle_terrain/terrain_indoor_lance.pal
+++ b/graphics/battle_terrain/indoor/lance.pal
diff --git a/graphics/battle_terrain/terrain_indoor_leader.pal b/graphics/battle_terrain/indoor/leader.pal
index 581b6d596..581b6d596 100644
--- a/graphics/battle_terrain/terrain_indoor_leader.pal
+++ b/graphics/battle_terrain/indoor/leader.pal
diff --git a/graphics/battle_terrain/terrain_indoor_link.pal b/graphics/battle_terrain/indoor/link.pal
index baa0fdf4f..baa0fdf4f 100644
--- a/graphics/battle_terrain/terrain_indoor_link.pal
+++ b/graphics/battle_terrain/indoor/link.pal
diff --git a/graphics/battle_terrain/terrain_indoor_lorelei.pal b/graphics/battle_terrain/indoor/lorelei.pal
index e63bad165..e63bad165 100644
--- a/graphics/battle_terrain/terrain_indoor_lorelei.pal
+++ b/graphics/battle_terrain/indoor/lorelei.pal
diff --git a/graphics/battle_terrain/terrain_indoor_plain.pal b/graphics/battle_terrain/indoor/plain.pal
index b47dc0a8d..b47dc0a8d 100644
--- a/graphics/battle_terrain/terrain_indoor_plain.pal
+++ b/graphics/battle_terrain/indoor/plain.pal
diff --git a/graphics/battle_terrain/terrain_indoor.bin b/graphics/battle_terrain/indoor/terrain.bin
index 0710427da..0710427da 100644
--- a/graphics/battle_terrain/terrain_indoor.bin
+++ b/graphics/battle_terrain/indoor/terrain.bin
diff --git a/graphics/battle_terrain/terrain_indoor.png b/graphics/battle_terrain/indoor/terrain.png
index 1cbb7c63b..1cbb7c63b 100644
--- a/graphics/battle_terrain/terrain_indoor.png
+++ b/graphics/battle_terrain/indoor/terrain.png
diff --git a/graphics/battle_terrain/terrain_longgrass_anim.bin b/graphics/battle_terrain/longgrass/anim.bin
index 5cb0de868..5cb0de868 100644
--- a/graphics/battle_terrain/terrain_longgrass_anim.bin
+++ b/graphics/battle_terrain/longgrass/anim.bin
diff --git a/graphics/battle_terrain/terrain_longgrass_anim.png b/graphics/battle_terrain/longgrass/anim.png
index c825dd7d2..c825dd7d2 100644
--- a/graphics/battle_terrain/terrain_longgrass_anim.png
+++ b/graphics/battle_terrain/longgrass/anim.png
diff --git a/graphics/battle_terrain/terrain_longgrass.bin b/graphics/battle_terrain/longgrass/terrain.bin
index 2b2634a14..2b2634a14 100644
--- a/graphics/battle_terrain/terrain_longgrass.bin
+++ b/graphics/battle_terrain/longgrass/terrain.bin
diff --git a/graphics/battle_terrain/terrain_longgrass.pal b/graphics/battle_terrain/longgrass/terrain.pal
index c390b8c44..c390b8c44 100644
--- a/graphics/battle_terrain/terrain_longgrass.pal
+++ b/graphics/battle_terrain/longgrass/terrain.pal
diff --git a/graphics/battle_terrain/terrain_longgrass.png b/graphics/battle_terrain/longgrass/terrain.png
index 0d09d739c..0d09d739c 100644
--- a/graphics/battle_terrain/terrain_longgrass.png
+++ b/graphics/battle_terrain/longgrass/terrain.png
diff --git a/graphics/battle_terrain/terrain_mountain_anim.bin b/graphics/battle_terrain/mountain/anim.bin
index 55c5730c0..55c5730c0 100644
--- a/graphics/battle_terrain/terrain_mountain_anim.bin
+++ b/graphics/battle_terrain/mountain/anim.bin
diff --git a/graphics/battle_terrain/terrain_mountain_anim.png b/graphics/battle_terrain/mountain/anim.png
index ab90aaddc..ab90aaddc 100644
--- a/graphics/battle_terrain/terrain_mountain_anim.png
+++ b/graphics/battle_terrain/mountain/anim.png
diff --git a/graphics/battle_terrain/terrain_mountain.bin b/graphics/battle_terrain/mountain/terrain.bin
index 16600f5f8..16600f5f8 100644
--- a/graphics/battle_terrain/terrain_mountain.bin
+++ b/graphics/battle_terrain/mountain/terrain.bin
diff --git a/graphics/battle_terrain/terrain_mountain.pal b/graphics/battle_terrain/mountain/terrain.pal
index bfe75be65..bfe75be65 100644
--- a/graphics/battle_terrain/terrain_mountain.pal
+++ b/graphics/battle_terrain/mountain/terrain.pal
diff --git a/graphics/battle_terrain/terrain_mountain.png b/graphics/battle_terrain/mountain/terrain.png
index 9889a6b62..9889a6b62 100644
--- a/graphics/battle_terrain/terrain_mountain.png
+++ b/graphics/battle_terrain/mountain/terrain.png
diff --git a/graphics/battle_terrain/terrain_pond_anim.bin b/graphics/battle_terrain/pond/anim.bin
index e012f647e..e012f647e 100644
--- a/graphics/battle_terrain/terrain_pond_anim.bin
+++ b/graphics/battle_terrain/pond/anim.bin
diff --git a/graphics/battle_terrain/terrain_pond_anim.png b/graphics/battle_terrain/pond/anim.png
index e0a7025e7..e0a7025e7 100644
--- a/graphics/battle_terrain/terrain_pond_anim.png
+++ b/graphics/battle_terrain/pond/anim.png
diff --git a/graphics/battle_terrain/terrain_pond.bin b/graphics/battle_terrain/pond/terrain.bin
index d4c3dedcb..d4c3dedcb 100644
--- a/graphics/battle_terrain/terrain_pond.bin
+++ b/graphics/battle_terrain/pond/terrain.bin
diff --git a/graphics/battle_terrain/terrain_pond.pal b/graphics/battle_terrain/pond/terrain.pal
index 041560cf4..041560cf4 100644
--- a/graphics/battle_terrain/terrain_pond.pal
+++ b/graphics/battle_terrain/pond/terrain.pal
diff --git a/graphics/battle_terrain/terrain_pond.png b/graphics/battle_terrain/pond/terrain.png
index 161498b2a..161498b2a 100644
--- a/graphics/battle_terrain/terrain_pond.png
+++ b/graphics/battle_terrain/pond/terrain.png
diff --git a/graphics/battle_terrain/terrain_sand_anim.bin b/graphics/battle_terrain/sand/anim.bin
index e4afe99ae..e4afe99ae 100644
--- a/graphics/battle_terrain/terrain_sand_anim.bin
+++ b/graphics/battle_terrain/sand/anim.bin
diff --git a/graphics/battle_terrain/terrain_sand_anim.png b/graphics/battle_terrain/sand/anim.png
index 092b8b42b..092b8b42b 100644
--- a/graphics/battle_terrain/terrain_sand_anim.png
+++ b/graphics/battle_terrain/sand/anim.png
diff --git a/graphics/battle_terrain/terrain_sand.bin b/graphics/battle_terrain/sand/terrain.bin
index 365e1474f..365e1474f 100644
--- a/graphics/battle_terrain/terrain_sand.bin
+++ b/graphics/battle_terrain/sand/terrain.bin
diff --git a/graphics/battle_terrain/terrain_sand.pal b/graphics/battle_terrain/sand/terrain.pal
index dafc3eb7f..dafc3eb7f 100644
--- a/graphics/battle_terrain/terrain_sand.pal
+++ b/graphics/battle_terrain/sand/terrain.pal
diff --git a/graphics/battle_terrain/terrain_sand.png b/graphics/battle_terrain/sand/terrain.png
index e802b34f2..e802b34f2 100644
--- a/graphics/battle_terrain/terrain_sand.png
+++ b/graphics/battle_terrain/sand/terrain.png
diff --git a/graphics/battle_terrain/terrain_underwater_anim.bin b/graphics/battle_terrain/underwater/anim.bin
index 9029c7c9d..9029c7c9d 100644
--- a/graphics/battle_terrain/terrain_underwater_anim.bin
+++ b/graphics/battle_terrain/underwater/anim.bin
diff --git a/graphics/battle_terrain/terrain_underwater_anim.png b/graphics/battle_terrain/underwater/anim.png
index f41eedfb8..f41eedfb8 100644
--- a/graphics/battle_terrain/terrain_underwater_anim.png
+++ b/graphics/battle_terrain/underwater/anim.png
diff --git a/graphics/battle_terrain/terrain_underwater.bin b/graphics/battle_terrain/underwater/terrain.bin
index 29843f17d..29843f17d 100644
--- a/graphics/battle_terrain/terrain_underwater.bin
+++ b/graphics/battle_terrain/underwater/terrain.bin
diff --git a/graphics/battle_terrain/terrain_underwater.pal b/graphics/battle_terrain/underwater/terrain.pal
index 5fa95cf21..5fa95cf21 100644
--- a/graphics/battle_terrain/terrain_underwater.pal
+++ b/graphics/battle_terrain/underwater/terrain.pal
diff --git a/graphics/battle_terrain/terrain_underwater.png b/graphics/battle_terrain/underwater/terrain.png
index 19e115348..19e115348 100644
--- a/graphics/battle_terrain/terrain_underwater.png
+++ b/graphics/battle_terrain/underwater/terrain.png
diff --git a/graphics/battle_terrain/terrain_water_anim.bin b/graphics/battle_terrain/water/anim.bin
index b6661cd3c..b6661cd3c 100644
--- a/graphics/battle_terrain/terrain_water_anim.bin
+++ b/graphics/battle_terrain/water/anim.bin
diff --git a/graphics/battle_terrain/terrain_water_anim.png b/graphics/battle_terrain/water/anim.png
index 1545d85e7..1545d85e7 100644
--- a/graphics/battle_terrain/terrain_water_anim.png
+++ b/graphics/battle_terrain/water/anim.png
diff --git a/graphics/battle_terrain/terrain_water.bin b/graphics/battle_terrain/water/terrain.bin
index 0ee05129a..0ee05129a 100644
--- a/graphics/battle_terrain/terrain_water.bin
+++ b/graphics/battle_terrain/water/terrain.bin
diff --git a/graphics/battle_terrain/terrain_water.pal b/graphics/battle_terrain/water/terrain.pal
index d31dce658..d31dce658 100644
--- a/graphics/battle_terrain/terrain_water.pal
+++ b/graphics/battle_terrain/water/terrain.pal
diff --git a/graphics/battle_terrain/terrain_water.png b/graphics/battle_terrain/water/terrain.png
index 8953e7940..8953e7940 100644
--- a/graphics/battle_terrain/terrain_water.png
+++ b/graphics/battle_terrain/water/terrain.png
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 3ad7cf542..72dd013b0 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -530,46 +530,46 @@ $(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png
 $(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 17
 
-$(BATTLETERRAINGFXDIR)/terrain_building.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/building/terrain.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 77
 
-$(BATTLETERRAINGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/cave/anim.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 106
 
-$(BATTLETERRAINGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/cave/terrain.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 84
 
-$(BATTLETERRAINGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/grass/terrain.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 98
 
-$(BATTLETERRAINGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/indoor/terrain.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 77
 
-$(BATTLETERRAINGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/longgrass/anim.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 133
 
-$(BATTLETERRAINGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/longgrass/terrain.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 98
 
-$(BATTLETERRAINGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/mountain/anim.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 47
 
-$(BATTLETERRAINGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/pond/anim.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 36
 
-$(BATTLETERRAINGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/pond/terrain.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 75
 
-$(BATTLETERRAINGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/sand/terrain.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 83
 
-$(BATTLETERRAINGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/underwater/anim.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 26
 
-$(BATTLETERRAINGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/underwater/terrain.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 85
 
-$(BATTLETERRAINGFXDIR)/terrain_water.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/water/terrain.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 81
 
 $(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 44f26494b..c30f10643 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -343,73 +343,73 @@ static const struct WindowTemplate gUnknown_8248330[] = {
     }, DUMMY_WIN_TEMPLATE
 };
 
-static const u32 sBattleTerrainPalette_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass.gbapal.lz");
-static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass_anim.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass_anim.bin.lz");
+static const u32 sBattleTerrainPalette_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/terrain.gbapal.lz");
+static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/terrain.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/terrain.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/anim.bin.lz");
 
-static const u32 sBattleTerrainPalette_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass.gbapal.lz");
-static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass.4bpp.lz");
-static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass.bin.lz");
-static const u32 sBattleTerrainAnimTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass_anim.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass_anim.bin.lz");
+static const u32 sBattleTerrainPalette_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/terrain.gbapal.lz");
+static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/terrain.4bpp.lz");
+static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/terrain.bin.lz");
+static const u32 sBattleTerrainAnimTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/anim.bin.lz");
 
-static const u32 sBattleTerrainPalette_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand.gbapal.lz");
-static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand_anim.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand_anim.bin.lz");
+static const u32 sBattleTerrainPalette_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/terrain.gbapal.lz");
+static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/terrain.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/terrain.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/anim.bin.lz");
 
-static const u32 sBattleTerrainPalette_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater.gbapal.lz");
-static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater_anim.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater_anim.bin.lz");
+static const u32 sBattleTerrainPalette_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/terrain.gbapal.lz");
+static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/terrain.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/terrain.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/anim.bin.lz");
 
-static const u32 sBattleTerrainPalette_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water.gbapal.lz");
-static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water_anim.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water_anim.bin.lz");
+static const u32 sBattleTerrainPalette_Water[] = INCBIN_U32("graphics/battle_terrain/water/terrain.gbapal.lz");
+static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle_terrain/water/terrain.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/water/terrain.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Water[] = INCBIN_U32("graphics/battle_terrain/water/anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/water/anim.bin.lz");
 
-static const u32 sBattleTerrainPalette_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond.gbapal.lz");
-static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond_anim.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond_anim.bin.lz");
+static const u32 sBattleTerrainPalette_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/terrain.gbapal.lz");
+static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/terrain.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/terrain.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/anim.bin.lz");
 
-static const u32 sBattleTerrainPalette_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain.gbapal.lz");
-static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain_anim.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain_anim.bin.lz");
+static const u32 sBattleTerrainPalette_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/terrain.gbapal.lz");
+static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/terrain.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/terrain.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/anim.bin.lz");
 
-static const u32 sBattleTerrainPalette_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave.gbapal.lz");
-static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave_anim.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave_anim.bin.lz");
+static const u32 sBattleTerrainPalette_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/terrain.gbapal.lz");
+static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/terrain.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/terrain.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/anim.bin.lz");
 
-static const u32 sBattleTerrainPalette_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building.gbapal.lz");
-static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building_anim.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building_anim.bin.lz");
+static const u32 sBattleTerrainPalette_Building[] = INCBIN_U32("graphics/battle_terrain/building/terrain.gbapal.lz");
+static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle_terrain/building/terrain.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/building/terrain.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Building[] = INCBIN_U32("graphics/battle_terrain/building/anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/building/anim.bin.lz");
 
-static const u32 sBattleTerrainPalette_Link[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_link.gbapal.lz");
-static const u32 sBattleTerrainPalette_Gym[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_gym.gbapal.lz");
-static const u32 sBattleTerrainPalette_Leader[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_leader.gbapal.lz");
-static const u32 sBattleTerrainPalette_Indoor2[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_2.gbapal.lz");
-static const u32 sBattleTerrainPalette_Indoor1[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_1.gbapal.lz");
-static const u32 sBattleTerrainPalette_Lorelei[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_lorelei.gbapal.lz");
-static const u32 sBattleTerrainPalette_Bruno[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_bruno.gbapal.lz");
-static const u32 sBattleTerrainPalette_Agatha[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_agatha.gbapal.lz");
-static const u32 sBattleTerrainPalette_Lance[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_lance.gbapal.lz");
-static const u32 sBattleTerrainPalette_Champion[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_champion.gbapal.lz");
-static const u32 sBattleTerrainPalette_Plain[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_plain.gbapal.lz");
-static const u32 sBattleTerrainTiles_Indoor[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Indoor[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor.bin.lz");
+static const u32 sBattleTerrainPalette_Link[] = INCBIN_U32("graphics/battle_terrain/indoor/link.gbapal.lz");
+static const u32 sBattleTerrainPalette_Gym[] = INCBIN_U32("graphics/battle_terrain/indoor/gym.gbapal.lz");
+static const u32 sBattleTerrainPalette_Leader[] = INCBIN_U32("graphics/battle_terrain/indoor/leader.gbapal.lz");
+static const u32 sBattleTerrainPalette_Indoor2[] = INCBIN_U32("graphics/battle_terrain/indoor/2.gbapal.lz");
+static const u32 sBattleTerrainPalette_Indoor1[] = INCBIN_U32("graphics/battle_terrain/indoor/1.gbapal.lz");
+static const u32 sBattleTerrainPalette_Lorelei[] = INCBIN_U32("graphics/battle_terrain/indoor/lorelei.gbapal.lz");
+static const u32 sBattleTerrainPalette_Bruno[] = INCBIN_U32("graphics/battle_terrain/indoor/bruno.gbapal.lz");
+static const u32 sBattleTerrainPalette_Agatha[] = INCBIN_U32("graphics/battle_terrain/indoor/agatha.gbapal.lz");
+static const u32 sBattleTerrainPalette_Lance[] = INCBIN_U32("graphics/battle_terrain/indoor/lance.gbapal.lz");
+static const u32 sBattleTerrainPalette_Champion[] = INCBIN_U32("graphics/battle_terrain/indoor/champion.gbapal.lz");
+static const u32 sBattleTerrainPalette_Plain[] = INCBIN_U32("graphics/battle_terrain/indoor/plain.gbapal.lz");
+static const u32 sBattleTerrainTiles_Indoor[] = INCBIN_U32("graphics/battle_terrain/indoor/terrain.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Indoor[] = INCBIN_U32("graphics/battle_terrain/indoor/terrain.bin.lz");
 
 static const struct BattleBackground sBattleTerrainTable[] = {
     [BATTLE_TERRAIN_GRASS] =