128 files changed, 106 insertions, 563 deletions

diff --git a/graphics/battle_terrain/cave/anim_map.bin b/graphics/battle_terrain/cave/anim_map.bin
deleted file mode 100644
index 0ab486890..000000000
--- a/graphics/battle_terrain/cave/anim_map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/cave/anim_tiles.png b/graphics/battle_terrain/cave/anim_tiles.png
deleted file mode 100644
index 464a2058b..000000000
--- a/graphics/battle_terrain/cave/anim_tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/cave/map.bin b/graphics/battle_terrain/cave/map.bin
deleted file mode 100644
index 61f358f53..000000000
--- a/graphics/battle_terrain/cave/map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/cave/palette.pal b/graphics/battle_terrain/cave/palette.pal
deleted file mode 100644
index 64894d62c..000000000
--- a/graphics/battle_terrain/cave/palette.pal
+++ /dev/null
@@ -1,51 +0,0 @@
-JASC-PAL
-0100
-48
-0 0 0
-197 180 131
-205 197 90
-164 139 90
-180 156 106
-189 172 98
-189 164 115
-180 156 90
-197 164 115
-189 172 98
-222 213 106
-172 139 82
-180 148 98
-189 156 106
-197 164 106
-197 172 115
-0 0 0
-197 180 131
-205 197 90
-164 139 90
-180 156 106
-189 172 98
-189 164 115
-180 156 90
-197 164 115
-189 172 98
-222 213 106
-172 139 82
-180 148 98
-189 156 106
-197 164 106
-197 172 115
-0 0 0
-106 74 65
-148 115 82
-180 139 90
-213 180 131
-230 213 156
-0 0 0
-180 139 90
-180 139 90
-180 139 90
-213 180 131
-106 74 65
-148 115 82
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_terrain/cave/tiles.png b/graphics/battle_terrain/cave/tiles.png
deleted file mode 100644
index 27386731f..000000000
--- a/graphics/battle_terrain/cave/tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/long_grass/anim_map.bin b/graphics/battle_terrain/long_grass/anim_map.bin
deleted file mode 100644
index bd86cce6c..000000000
--- a/graphics/battle_terrain/long_grass/anim_map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/long_grass/anim_tiles.png b/graphics/battle_terrain/long_grass/anim_tiles.png
deleted file mode 100644
index e2f1bb2c1..000000000
--- a/graphics/battle_terrain/long_grass/anim_tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/long_grass/map.bin b/graphics/battle_terrain/long_grass/map.bin
deleted file mode 100644
index 61f358f53..000000000
--- a/graphics/battle_terrain/long_grass/map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/long_grass/palette.pal b/graphics/battle_terrain/long_grass/palette.pal
deleted file mode 100644
index 645c3d0e6..000000000
--- a/graphics/battle_terrain/long_grass/palette.pal
+++ /dev/null
@@ -1,51 +0,0 @@
-JASC-PAL
-0100
-48
-0 0 0
-180 238 180
-74 172 98
-115 213 131
-131 230 156
-98 189 131
-156 230 164
-115 197 148
-172 230 180
-0 0 0
-0 0 0
-139 205 90
-148 205 106
-156 222 131
-164 230 156
-172 230 180
-0 0 0
-180 238 180
-74 172 98
-115 213 131
-131 230 156
-98 189 131
-156 230 164
-115 197 148
-172 230 180
-0 0 0
-0 0 0
-139 205 90
-148 205 106
-156 213 131
-164 222 156
-172 230 180
-0 0 0
-115 213 82
-98 180 90
-90 148 74
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_terrain/long_grass/tiles.png b/graphics/battle_terrain/long_grass/tiles.png
deleted file mode 100644
index 8676f2f37..000000000
--- a/graphics/battle_terrain/long_grass/tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/pond_water/anim_map.bin b/graphics/battle_terrain/pond_water/anim_map.bin
deleted file mode 100644
index 00aee5135..000000000
--- a/graphics/battle_terrain/pond_water/anim_map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/pond_water/anim_tiles.png b/graphics/battle_terrain/pond_water/anim_tiles.png
deleted file mode 100644
index 08568455f..000000000
--- a/graphics/battle_terrain/pond_water/anim_tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/pond_water/map.bin b/graphics/battle_terrain/pond_water/map.bin
deleted file mode 100644
index 61f358f53..000000000
--- a/graphics/battle_terrain/pond_water/map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/pond_water/palette.pal b/graphics/battle_terrain/pond_water/palette.pal
deleted file mode 100644
index b0f74a08f..000000000
--- a/graphics/battle_terrain/pond_water/palette.pal
+++ /dev/null
@@ -1,51 +0,0 @@
-JASC-PAL
-0100
-48
-0 0 0
-255 255 255
-98 164 230
-164 246 98
-197 255 139
-115 205 180
-205 255 197
-148 222 148
-230 255 222
-139 213 255
-0 0 0
-222 230 230
-230 230 238
-230 238 238
-238 246 246
-246 246 255
-0 0 0
-255 255 255
-98 164 230
-164 246 98
-197 255 139
-115 205 180
-205 255 197
-148 222 148
-230 255 222
-139 213 255
-0 0 0
-222 230 230
-230 230 238
-230 238 238
-238 246 246
-246 246 255
-0 0 0
-205 246 255
-148 213 238
-123 189 230
-90 148 222
-49 106 189
-16 74 156
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_terrain/pond_water/tiles.png b/graphics/battle_terrain/pond_water/tiles.png
deleted file mode 100644
index 81fac5393..000000000
--- a/graphics/battle_terrain/pond_water/tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/rock/anim_map.bin b/graphics/battle_terrain/rock/anim_map.bin
deleted file mode 100644
index d2a2776bd..000000000
--- a/graphics/battle_terrain/rock/anim_map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/rock/anim_tiles.png b/graphics/battle_terrain/rock/anim_tiles.png
deleted file mode 100644
index 41be70296..000000000
--- a/graphics/battle_terrain/rock/anim_tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/rock/map.bin b/graphics/battle_terrain/rock/map.bin
deleted file mode 100644
index 61f358f53..000000000
--- a/graphics/battle_terrain/rock/map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/rock/palette.pal b/graphics/battle_terrain/rock/palette.pal
deleted file mode 100644
index 1702e3810..000000000
--- a/graphics/battle_terrain/rock/palette.pal
+++ /dev/null
@@ -1,51 +0,0 @@
-JASC-PAL
-0100
-48
-0 0 0
-255 255 255
-189 172 139
-213 213 172
-222 222 213
-205 189 156
-230 230 213
-213 197 172
-238 238 230
-172 156 131
-0 0 0
-222 230 230
-230 230 238
-230 238 238
-238 246 246
-246 246 255
-0 0 0
-255 255 255
-189 172 139
-213 213 172
-222 222 213
-205 189 156
-230 230 213
-213 197 172
-238 238 230
-172 156 131
-0 0 0
-222 230 230
-230 230 238
-230 238 238
-238 246 246
-246 246 255
-0 0 0
-131 98 90
-164 131 98
-197 156 106
-213 180 131
-230 213 156
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_terrain/rock/tiles.png b/graphics/battle_terrain/rock/tiles.png
deleted file mode 100644
index efb139eb6..000000000
--- a/graphics/battle_terrain/rock/tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/sand/anim_map.bin b/graphics/battle_terrain/sand/anim_map.bin
deleted file mode 100644
index 83c6ba8f1..000000000
--- a/graphics/battle_terrain/sand/anim_map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/sand/anim_tiles.png b/graphics/battle_terrain/sand/anim_tiles.png
deleted file mode 100644
index 79c774acf..000000000
--- a/graphics/battle_terrain/sand/anim_tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/sand/palette.pal b/graphics/battle_terrain/sand/palette.pal
deleted file mode 100644
index 20f4c3f7c..000000000
--- a/graphics/battle_terrain/sand/palette.pal
+++ /dev/null
@@ -1,51 +0,0 @@
-JASC-PAL
-0100
-48
-0 0 0
-255 255 205
-213 213 90
-238 238 139
-246 246 172
-230 230 106
-255 255 189
-238 230 131
-255 255 230
-0 0 0
-0 0 0
-238 238 123
-238 238 148
-246 246 172
-246 246 180
-246 246 197
-0 0 0
-255 255 205
-222 213 82
-246 246 148
-246 246 189
-230 230 115
-255 255 197
-238 238 123
-255 255 230
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-197 197 74
-164 156 32
-222 222 131
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_terrain/sand/tiles.png b/graphics/battle_terrain/sand/tiles.png
deleted file mode 100644
index a4f7342be..000000000
--- a/graphics/battle_terrain/sand/tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/sky/anim_map.bin b/graphics/battle_terrain/sky/anim_map.bin
deleted file mode 100644
index c1712cdd8..000000000
--- a/graphics/battle_terrain/sky/anim_map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/sky/anim_tiles.png b/graphics/battle_terrain/sky/anim_tiles.png
deleted file mode 100644
index 246ca2255..000000000
--- a/graphics/battle_terrain/sky/anim_tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/sky/map.bin b/graphics/battle_terrain/sky/map.bin
deleted file mode 100644
index d7bee6035..000000000
--- a/graphics/battle_terrain/sky/map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/sky/palette.pal b/graphics/battle_terrain/sky/palette.pal
deleted file mode 100644
index 1a547d6a1..000000000
--- a/graphics/battle_terrain/sky/palette.pal
+++ /dev/null
@@ -1,51 +0,0 @@
-JASC-PAL
-0100
-48
-0 0 0
-213 238 255
-222 230 255
-148 205 255
-172 213 255
-197 222 255
-197 230 255
-172 213 255
-230 246 255
-205 222 246
-238 246 255
-164 213 255
-180 222 255
-197 230 255
-213 238 255
-230 246 255
-0 0 0
-180 238 255
-222 230 255
-148 205 255
-172 213 255
-197 222 255
-197 230 255
-172 213 255
-230 246 255
-205 222 246
-238 246 255
-148 197 255
-164 205 255
-189 222 255
-205 230 255
-230 246 255
-0 0 0
-222 238 255
-230 238 255
-238 246 255
-246 246 255
-255 255 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-139 172 205
-197 230 255
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_terrain/sky/tiles.png b/graphics/battle_terrain/sky/tiles.png
deleted file mode 100644
index 461bba675..000000000
--- a/graphics/battle_terrain/sky/tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/stadium/map.bin b/graphics/battle_terrain/stadium/map.bin
deleted file mode 100644
index d7bee6035..000000000
--- a/graphics/battle_terrain/stadium/map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/tall_grass/anim_map.bin b/graphics/battle_terrain/tall_grass/anim_map.bin
deleted file mode 100644
index 8e7d784f3..000000000
--- a/graphics/battle_terrain/tall_grass/anim_map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/tall_grass/anim_tiles.png b/graphics/battle_terrain/tall_grass/anim_tiles.png
deleted file mode 100644
index 85aed13bb..000000000
--- a/graphics/battle_terrain/tall_grass/anim_tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/tall_grass/map.bin b/graphics/battle_terrain/tall_grass/map.bin
deleted file mode 100644
index 61f358f53..000000000
--- a/graphics/battle_terrain/tall_grass/map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/tall_grass/palette.pal b/graphics/battle_terrain/tall_grass/palette.pal
deleted file mode 100644
index 11db31cad..000000000
--- a/graphics/battle_terrain/tall_grass/palette.pal
+++ /dev/null
@@ -1,51 +0,0 @@
-JASC-PAL
-0100
-48
-0 0 0
-222 255 213
-123 213 131
-172 246 115
-197 246 189
-139 230 131
-222 255 205
-156 238 123
-0 0 0
-0 0 0
-0 0 0
-180 230 148
-189 238 164
-197 238 189
-205 246 197
-213 246 213
-0 0 0
-222 255 213
-123 213 131
-172 246 115
-197 246 189
-139 230 131
-222 255 205
-156 238 123
-0 0 0
-0 0 0
-0 0 0
-180 230 148
-189 238 164
-197 238 189
-205 246 197
-213 246 213
-0 0 0
-123 205 115
-164 222 148
-82 164 57
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_terrain/tall_grass/tiles.png b/graphics/battle_terrain/tall_grass/tiles.png
deleted file mode 100644
index 2d163d7bb..000000000
--- a/graphics/battle_terrain/tall_grass/tiles.png
+++ /dev/null
diff --git a/graphics/battle/terrain_building.bin b/graphics/battle_terrain/terrain_building.bin
index 0710427da..0710427da 100644
--- a/graphics/battle/terrain_building.bin
+++ b/graphics/battle_terrain/terrain_building.bin
diff --git a/graphics/battle/terrain_building.pal b/graphics/battle_terrain/terrain_building.pal
index 16421567f..16421567f 100644
--- a/graphics/battle/terrain_building.pal
+++ b/graphics/battle_terrain/terrain_building.pal
diff --git a/graphics/battle/terrain_building.png b/graphics/battle_terrain/terrain_building.png
index 3b060be4e..3b060be4e 100644
--- a/graphics/battle/terrain_building.png
+++ b/graphics/battle_terrain/terrain_building.png
diff --git a/graphics/battle/terrain_building_anim.bin b/graphics/battle_terrain/terrain_building_anim.bin
index aba49c6f9..aba49c6f9 100644
--- a/graphics/battle/terrain_building_anim.bin
+++ b/graphics/battle_terrain/terrain_building_anim.bin
diff --git a/graphics/battle/terrain_building_anim.png b/graphics/battle_terrain/terrain_building_anim.png
index 443cd98ab..443cd98ab 100644
--- a/graphics/battle/terrain_building_anim.png
+++ b/graphics/battle_terrain/terrain_building_anim.png
diff --git a/graphics/battle/terrain_cave.bin b/graphics/battle_terrain/terrain_cave.bin
index 255f2953d..255f2953d 100644
--- a/graphics/battle/terrain_cave.bin
+++ b/graphics/battle_terrain/terrain_cave.bin
diff --git a/graphics/battle/terrain_cave.pal b/graphics/battle_terrain/terrain_cave.pal
index f17a7bf9d..f17a7bf9d 100644
--- a/graphics/battle/terrain_cave.pal
+++ b/graphics/battle_terrain/terrain_cave.pal
diff --git a/graphics/battle/terrain_cave.png b/graphics/battle_terrain/terrain_cave.png
index e2a18ae57..e2a18ae57 100644
--- a/graphics/battle/terrain_cave.png
+++ b/graphics/battle_terrain/terrain_cave.png
diff --git a/graphics/battle/terrain_cave_anim.bin b/graphics/battle_terrain/terrain_cave_anim.bin
index ad7724c67..ad7724c67 100644
--- a/graphics/battle/terrain_cave_anim.bin
+++ b/graphics/battle_terrain/terrain_cave_anim.bin
diff --git a/graphics/battle/terrain_cave_anim.png b/graphics/battle_terrain/terrain_cave_anim.png
index 84f13f8f0..84f13f8f0 100644
--- a/graphics/battle/terrain_cave_anim.png
+++ b/graphics/battle_terrain/terrain_cave_anim.png
diff --git a/graphics/battle/terrain_grass.bin b/graphics/battle_terrain/terrain_grass.bin
index e0da76dc2..e0da76dc2 100644
--- a/graphics/battle/terrain_grass.bin
+++ b/graphics/battle_terrain/terrain_grass.bin
diff --git a/graphics/battle/terrain_grass.pal b/graphics/battle_terrain/terrain_grass.pal
index cc00b3dc2..cc00b3dc2 100644
--- a/graphics/battle/terrain_grass.pal
+++ b/graphics/battle_terrain/terrain_grass.pal
diff --git a/graphics/battle/terrain_grass.png b/graphics/battle_terrain/terrain_grass.png
index 645796cb1..645796cb1 100644
--- a/graphics/battle/terrain_grass.png
+++ b/graphics/battle_terrain/terrain_grass.png
diff --git a/graphics/battle/terrain_grass_anim.bin b/graphics/battle_terrain/terrain_grass_anim.bin
index 03e4194fc..03e4194fc 100644
--- a/graphics/battle/terrain_grass_anim.bin
+++ b/graphics/battle_terrain/terrain_grass_anim.bin
diff --git a/graphics/battle/terrain_grass_anim.png b/graphics/battle_terrain/terrain_grass_anim.png
index f2f2c1bb1..f2f2c1bb1 100644
--- a/graphics/battle/terrain_grass_anim.png
+++ b/graphics/battle_terrain/terrain_grass_anim.png
diff --git a/graphics/battle/terrain_indoor.bin b/graphics/battle_terrain/terrain_indoor.bin
index 0710427da..0710427da 100644
--- a/graphics/battle/terrain_indoor.bin
+++ b/graphics/battle_terrain/terrain_indoor.bin
diff --git a/graphics/battle/terrain_indoor.png b/graphics/battle_terrain/terrain_indoor.png
index 1cbb7c63b..1cbb7c63b 100644
--- a/graphics/battle/terrain_indoor.png
+++ b/graphics/battle_terrain/terrain_indoor.png
diff --git a/graphics/battle/terrain_indoor_1.pal b/graphics/battle_terrain/terrain_indoor_1.pal
index 597647872..597647872 100644
--- a/graphics/battle/terrain_indoor_1.pal
+++ b/graphics/battle_terrain/terrain_indoor_1.pal
diff --git a/graphics/battle/terrain_indoor_2.pal b/graphics/battle_terrain/terrain_indoor_2.pal
index a1bc6b60c..a1bc6b60c 100644
--- a/graphics/battle/terrain_indoor_2.pal
+++ b/graphics/battle_terrain/terrain_indoor_2.pal
diff --git a/graphics/battle/terrain_indoor_agatha.pal b/graphics/battle_terrain/terrain_indoor_agatha.pal
index 8ea1eeae7..8ea1eeae7 100644
--- a/graphics/battle/terrain_indoor_agatha.pal
+++ b/graphics/battle_terrain/terrain_indoor_agatha.pal
diff --git a/graphics/battle/terrain_indoor_bruno.pal b/graphics/battle_terrain/terrain_indoor_bruno.pal
index 21196b3e8..21196b3e8 100644
--- a/graphics/battle/terrain_indoor_bruno.pal
+++ b/graphics/battle_terrain/terrain_indoor_bruno.pal
diff --git a/graphics/battle/terrain_indoor_champion.pal b/graphics/battle_terrain/terrain_indoor_champion.pal
index 9ce470c9f..9ce470c9f 100644
--- a/graphics/battle/terrain_indoor_champion.pal
+++ b/graphics/battle_terrain/terrain_indoor_champion.pal
diff --git a/graphics/battle/terrain_indoor_gym.pal b/graphics/battle_terrain/terrain_indoor_gym.pal
index 187054476..187054476 100644
--- a/graphics/battle/terrain_indoor_gym.pal
+++ b/graphics/battle_terrain/terrain_indoor_gym.pal
diff --git a/graphics/battle/terrain_indoor_lance.pal b/graphics/battle_terrain/terrain_indoor_lance.pal
index c5fb745cf..c5fb745cf 100644
--- a/graphics/battle/terrain_indoor_lance.pal
+++ b/graphics/battle_terrain/terrain_indoor_lance.pal
diff --git a/graphics/battle/terrain_indoor_leader.pal b/graphics/battle_terrain/terrain_indoor_leader.pal
index 581b6d596..581b6d596 100644
--- a/graphics/battle/terrain_indoor_leader.pal
+++ b/graphics/battle_terrain/terrain_indoor_leader.pal
diff --git a/graphics/battle/terrain_indoor_link.pal b/graphics/battle_terrain/terrain_indoor_link.pal
index baa0fdf4f..baa0fdf4f 100644
--- a/graphics/battle/terrain_indoor_link.pal
+++ b/graphics/battle_terrain/terrain_indoor_link.pal
diff --git a/graphics/battle/terrain_indoor_lorelei.pal b/graphics/battle_terrain/terrain_indoor_lorelei.pal
index e63bad165..e63bad165 100644
--- a/graphics/battle/terrain_indoor_lorelei.pal
+++ b/graphics/battle_terrain/terrain_indoor_lorelei.pal
diff --git a/graphics/battle/terrain_indoor_plain.pal b/graphics/battle_terrain/terrain_indoor_plain.pal
index b47dc0a8d..b47dc0a8d 100644
--- a/graphics/battle/terrain_indoor_plain.pal
+++ b/graphics/battle_terrain/terrain_indoor_plain.pal
diff --git a/graphics/battle/terrain_longgrass.bin b/graphics/battle_terrain/terrain_longgrass.bin
index 2b2634a14..2b2634a14 100644
--- a/graphics/battle/terrain_longgrass.bin
+++ b/graphics/battle_terrain/terrain_longgrass.bin
diff --git a/graphics/battle/terrain_longgrass.pal b/graphics/battle_terrain/terrain_longgrass.pal
index c390b8c44..c390b8c44 100644
--- a/graphics/battle/terrain_longgrass.pal
+++ b/graphics/battle_terrain/terrain_longgrass.pal
diff --git a/graphics/battle/terrain_longgrass.png b/graphics/battle_terrain/terrain_longgrass.png
index 0d09d739c..0d09d739c 100644
--- a/graphics/battle/terrain_longgrass.png
+++ b/graphics/battle_terrain/terrain_longgrass.png
diff --git a/graphics/battle/terrain_longgrass_anim.bin b/graphics/battle_terrain/terrain_longgrass_anim.bin
index 5cb0de868..5cb0de868 100644
--- a/graphics/battle/terrain_longgrass_anim.bin
+++ b/graphics/battle_terrain/terrain_longgrass_anim.bin
diff --git a/graphics/battle/terrain_longgrass_anim.png b/graphics/battle_terrain/terrain_longgrass_anim.png
index c825dd7d2..c825dd7d2 100644
--- a/graphics/battle/terrain_longgrass_anim.png
+++ b/graphics/battle_terrain/terrain_longgrass_anim.png
diff --git a/graphics/battle/terrain_mountain.bin b/graphics/battle_terrain/terrain_mountain.bin
index 16600f5f8..16600f5f8 100644
--- a/graphics/battle/terrain_mountain.bin
+++ b/graphics/battle_terrain/terrain_mountain.bin
diff --git a/graphics/battle/terrain_mountain.pal b/graphics/battle_terrain/terrain_mountain.pal
index bfe75be65..bfe75be65 100644
--- a/graphics/battle/terrain_mountain.pal
+++ b/graphics/battle_terrain/terrain_mountain.pal
diff --git a/graphics/battle/terrain_mountain.png b/graphics/battle_terrain/terrain_mountain.png
index 9889a6b62..9889a6b62 100644
--- a/graphics/battle/terrain_mountain.png
+++ b/graphics/battle_terrain/terrain_mountain.png
diff --git a/graphics/battle/terrain_mountain_anim.bin b/graphics/battle_terrain/terrain_mountain_anim.bin
index 55c5730c0..55c5730c0 100644
--- a/graphics/battle/terrain_mountain_anim.bin
+++ b/graphics/battle_terrain/terrain_mountain_anim.bin
diff --git a/graphics/battle/terrain_mountain_anim.png b/graphics/battle_terrain/terrain_mountain_anim.png
index ab90aaddc..ab90aaddc 100644
--- a/graphics/battle/terrain_mountain_anim.png
+++ b/graphics/battle_terrain/terrain_mountain_anim.png
diff --git a/graphics/battle/terrain_pond.bin b/graphics/battle_terrain/terrain_pond.bin
index d4c3dedcb..d4c3dedcb 100644
--- a/graphics/battle/terrain_pond.bin
+++ b/graphics/battle_terrain/terrain_pond.bin
diff --git a/graphics/battle/terrain_pond.pal b/graphics/battle_terrain/terrain_pond.pal
index 041560cf4..041560cf4 100644
--- a/graphics/battle/terrain_pond.pal
+++ b/graphics/battle_terrain/terrain_pond.pal
diff --git a/graphics/battle/terrain_pond.png b/graphics/battle_terrain/terrain_pond.png
index 161498b2a..161498b2a 100644
--- a/graphics/battle/terrain_pond.png
+++ b/graphics/battle_terrain/terrain_pond.png
diff --git a/graphics/battle/terrain_pond_anim.bin b/graphics/battle_terrain/terrain_pond_anim.bin
index e012f647e..e012f647e 100644
--- a/graphics/battle/terrain_pond_anim.bin
+++ b/graphics/battle_terrain/terrain_pond_anim.bin
diff --git a/graphics/battle/terrain_pond_anim.png b/graphics/battle_terrain/terrain_pond_anim.png
index e0a7025e7..e0a7025e7 100644
--- a/graphics/battle/terrain_pond_anim.png
+++ b/graphics/battle_terrain/terrain_pond_anim.png
diff --git a/graphics/battle/terrain_sand.bin b/graphics/battle_terrain/terrain_sand.bin
index 365e1474f..365e1474f 100644
--- a/graphics/battle/terrain_sand.bin
+++ b/graphics/battle_terrain/terrain_sand.bin
diff --git a/graphics/battle/terrain_sand.pal b/graphics/battle_terrain/terrain_sand.pal
index dafc3eb7f..dafc3eb7f 100644
--- a/graphics/battle/terrain_sand.pal
+++ b/graphics/battle_terrain/terrain_sand.pal
diff --git a/graphics/battle/terrain_sand.png b/graphics/battle_terrain/terrain_sand.png
index e802b34f2..e802b34f2 100644
--- a/graphics/battle/terrain_sand.png
+++ b/graphics/battle_terrain/terrain_sand.png
diff --git a/graphics/battle/terrain_sand_anim.bin b/graphics/battle_terrain/terrain_sand_anim.bin
index e4afe99ae..e4afe99ae 100644
--- a/graphics/battle/terrain_sand_anim.bin
+++ b/graphics/battle_terrain/terrain_sand_anim.bin
diff --git a/graphics/battle/terrain_sand_anim.png b/graphics/battle_terrain/terrain_sand_anim.png
index 092b8b42b..092b8b42b 100644
--- a/graphics/battle/terrain_sand_anim.png
+++ b/graphics/battle_terrain/terrain_sand_anim.png
diff --git a/graphics/battle/terrain_underwater.bin b/graphics/battle_terrain/terrain_underwater.bin
index 29843f17d..29843f17d 100644
--- a/graphics/battle/terrain_underwater.bin
+++ b/graphics/battle_terrain/terrain_underwater.bin
diff --git a/graphics/battle/terrain_underwater.pal b/graphics/battle_terrain/terrain_underwater.pal
index 5fa95cf21..5fa95cf21 100644
--- a/graphics/battle/terrain_underwater.pal
+++ b/graphics/battle_terrain/terrain_underwater.pal
diff --git a/graphics/battle/terrain_underwater.png b/graphics/battle_terrain/terrain_underwater.png
index 19e115348..19e115348 100644
--- a/graphics/battle/terrain_underwater.png
+++ b/graphics/battle_terrain/terrain_underwater.png
diff --git a/graphics/battle/terrain_underwater_anim.bin b/graphics/battle_terrain/terrain_underwater_anim.bin
index 9029c7c9d..9029c7c9d 100644
--- a/graphics/battle/terrain_underwater_anim.bin
+++ b/graphics/battle_terrain/terrain_underwater_anim.bin
diff --git a/graphics/battle/terrain_underwater_anim.png b/graphics/battle_terrain/terrain_underwater_anim.png
index f41eedfb8..f41eedfb8 100644
--- a/graphics/battle/terrain_underwater_anim.png
+++ b/graphics/battle_terrain/terrain_underwater_anim.png
diff --git a/graphics/battle/terrain_water.bin b/graphics/battle_terrain/terrain_water.bin
index 0ee05129a..0ee05129a 100644
--- a/graphics/battle/terrain_water.bin
+++ b/graphics/battle_terrain/terrain_water.bin
diff --git a/graphics/battle/terrain_water.pal b/graphics/battle_terrain/terrain_water.pal
index d31dce658..d31dce658 100644
--- a/graphics/battle/terrain_water.pal
+++ b/graphics/battle_terrain/terrain_water.pal
diff --git a/graphics/battle/terrain_water.png b/graphics/battle_terrain/terrain_water.png
index 8953e7940..8953e7940 100644
--- a/graphics/battle/terrain_water.png
+++ b/graphics/battle_terrain/terrain_water.png
diff --git a/graphics/battle/terrain_water_anim.bin b/graphics/battle_terrain/terrain_water_anim.bin
index b6661cd3c..b6661cd3c 100644
--- a/graphics/battle/terrain_water_anim.bin
+++ b/graphics/battle_terrain/terrain_water_anim.bin
diff --git a/graphics/battle/terrain_water_anim.png b/graphics/battle_terrain/terrain_water_anim.png
index 1545d85e7..1545d85e7 100644
--- a/graphics/battle/terrain_water_anim.png
+++ b/graphics/battle_terrain/terrain_water_anim.png
diff --git a/graphics/battle_terrain/underwater/anim_map.bin b/graphics/battle_terrain/underwater/anim_map.bin
deleted file mode 100644
index 616c2a242..000000000
--- a/graphics/battle_terrain/underwater/anim_map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/underwater/anim_tiles.png b/graphics/battle_terrain/underwater/anim_tiles.png
deleted file mode 100644
index 3e75434db..000000000
--- a/graphics/battle_terrain/underwater/anim_tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/underwater/map.bin b/graphics/battle_terrain/underwater/map.bin
deleted file mode 100644
index 61f358f53..000000000
--- a/graphics/battle_terrain/underwater/map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/underwater/palette.pal b/graphics/battle_terrain/underwater/palette.pal
deleted file mode 100644
index b5859af6e..000000000
--- a/graphics/battle_terrain/underwater/palette.pal
+++ /dev/null
@@ -1,51 +0,0 @@
-JASC-PAL
-0100
-48
-0 0 0
-197 230 255
-131 139 197
-148 197 246
-172 205 255
-131 164 213
-189 213 255
-148 180 222
-205 222 255
-197 230 255
-0 0 0
-148 164 238
-156 189 238
-172 205 238
-189 213 246
-197 222 255
-0 0 0
-197 230 255
-131 139 197
-148 197 246
-172 205 255
-131 164 213
-189 213 255
-148 180 222
-205 222 255
-197 230 255
-0 0 0
-148 164 238
-156 189 238
-172 205 238
-189 213 246
-197 222 255
-0 0 0
-98 164 230
-131 197 255
-172 238 255
-255 255 255
-205 255 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-98 98 172
-131 131 230
-172 172 255
-255 255 255
diff --git a/graphics/battle_terrain/underwater/tiles.png b/graphics/battle_terrain/underwater/tiles.png
deleted file mode 100644
index b0d49a9cc..000000000
--- a/graphics/battle_terrain/underwater/tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/building/anim_map.bin b/graphics/battle_terrain/unused/building/anim_map.bin
index 432e41c2f..432e41c2f 100644
--- a/graphics/battle_terrain/building/anim_map.bin
+++ b/graphics/battle_terrain/unused/building/anim_map.bin
diff --git a/graphics/battle_terrain/building/anim_tiles.png b/graphics/battle_terrain/unused/building/anim_tiles.png
index a627523d8..a627523d8 100644
--- a/graphics/battle_terrain/building/anim_tiles.png
+++ b/graphics/battle_terrain/unused/building/anim_tiles.png
diff --git a/graphics/battle_terrain/building/map.bin b/graphics/battle_terrain/unused/building/map.bin
index d7bee6035..d7bee6035 100644
--- a/graphics/battle_terrain/building/map.bin
+++ b/graphics/battle_terrain/unused/building/map.bin
diff --git a/graphics/battle_terrain/building/palette.pal b/graphics/battle_terrain/unused/building/palette.pal
index 219cef565..219cef565 100644
--- a/graphics/battle_terrain/building/palette.pal
+++ b/graphics/battle_terrain/unused/building/palette.pal
diff --git a/graphics/battle_terrain/building/palette2.pal b/graphics/battle_terrain/unused/building/palette2.pal
index 3ca2e0b0c..3ca2e0b0c 100644
--- a/graphics/battle_terrain/building/palette2.pal
+++ b/graphics/battle_terrain/unused/building/palette2.pal
diff --git a/graphics/battle_terrain/building/palette3.pal b/graphics/battle_terrain/unused/building/palette3.pal
index cebf5e687..cebf5e687 100644
--- a/graphics/battle_terrain/building/palette3.pal
+++ b/graphics/battle_terrain/unused/building/palette3.pal
diff --git a/graphics/battle_terrain/building/tiles.png b/graphics/battle_terrain/unused/building/tiles.png
index 9a031c297..9a031c297 100644
--- a/graphics/battle_terrain/building/tiles.png
+++ b/graphics/battle_terrain/unused/building/tiles.png
diff --git a/graphics/battle_terrain/cave/groudon.pal b/graphics/battle_terrain/unused/groudon.pal
index 73021c957..73021c957 100644
--- a/graphics/battle_terrain/cave/groudon.pal
+++ b/graphics/battle_terrain/unused/groudon.pal
diff --git a/graphics/battle_terrain/water/kyogre.pal b/graphics/battle_terrain/unused/kyogre.pal
index eaa19730f..eaa19730f 100644
--- a/graphics/battle_terrain/water/kyogre.pal
+++ b/graphics/battle_terrain/unused/kyogre.pal
diff --git a/graphics/battle_terrain/plain/palette.pal b/graphics/battle_terrain/unused/plain.pal
index 2377b7729..2377b7729 100644
--- a/graphics/battle_terrain/plain/palette.pal
+++ b/graphics/battle_terrain/unused/plain.pal
diff --git a/graphics/battle_terrain/stadium/battle_frontier.pal b/graphics/battle_terrain/unused/stadium/battle_frontier.pal
index 10a842bcc..10a842bcc 100644
--- a/graphics/battle_terrain/stadium/battle_frontier.pal
+++ b/graphics/battle_terrain/unused/stadium/battle_frontier.pal
diff --git a/graphics/battle_terrain/sand/map.bin b/graphics/battle_terrain/unused/stadium/map.bin
index d7bee6035..d7bee6035 100644
--- a/graphics/battle_terrain/sand/map.bin
+++ b/graphics/battle_terrain/unused/stadium/map.bin
diff --git a/graphics/battle_terrain/stadium/palette1.pal b/graphics/battle_terrain/unused/stadium/palette1.pal
index 8252e3c5e..8252e3c5e 100644
--- a/graphics/battle_terrain/stadium/palette1.pal
+++ b/graphics/battle_terrain/unused/stadium/palette1.pal
diff --git a/graphics/battle_terrain/stadium/palette2.pal b/graphics/battle_terrain/unused/stadium/palette2.pal
index 48b2d851b..48b2d851b 100644
--- a/graphics/battle_terrain/stadium/palette2.pal
+++ b/graphics/battle_terrain/unused/stadium/palette2.pal
diff --git a/graphics/battle_terrain/stadium/palette3.pal b/graphics/battle_terrain/unused/stadium/palette3.pal
index 10c5b50d6..10c5b50d6 100644
--- a/graphics/battle_terrain/stadium/palette3.pal
+++ b/graphics/battle_terrain/unused/stadium/palette3.pal
diff --git a/graphics/battle_terrain/stadium/palette4.pal b/graphics/battle_terrain/unused/stadium/palette4.pal
index 201de5471..201de5471 100644
--- a/graphics/battle_terrain/stadium/palette4.pal
+++ b/graphics/battle_terrain/unused/stadium/palette4.pal
diff --git a/graphics/battle_terrain/stadium/palette5.pal b/graphics/battle_terrain/unused/stadium/palette5.pal
index 16f50d89b..16f50d89b 100644
--- a/graphics/battle_terrain/stadium/palette5.pal
+++ b/graphics/battle_terrain/unused/stadium/palette5.pal
diff --git a/graphics/battle_terrain/stadium/palette6.pal b/graphics/battle_terrain/unused/stadium/palette6.pal
index 118a6a3bb..118a6a3bb 100644
--- a/graphics/battle_terrain/stadium/palette6.pal
+++ b/graphics/battle_terrain/unused/stadium/palette6.pal
diff --git a/graphics/battle_terrain/stadium/palette7.pal b/graphics/battle_terrain/unused/stadium/palette7.pal
index b0c050be5..b0c050be5 100644
--- a/graphics/battle_terrain/stadium/palette7.pal
+++ b/graphics/battle_terrain/unused/stadium/palette7.pal
diff --git a/graphics/battle_terrain/stadium/tiles.png b/graphics/battle_terrain/unused/stadium/tiles.png
index ece531ec0..ece531ec0 100644
--- a/graphics/battle_terrain/stadium/tiles.png
+++ b/graphics/battle_terrain/unused/stadium/tiles.png
diff --git a/graphics/battle_terrain/water/anim_map.bin b/graphics/battle_terrain/water/anim_map.bin
deleted file mode 100644
index 2b5f7a548..000000000
--- a/graphics/battle_terrain/water/anim_map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/water/anim_tiles.png b/graphics/battle_terrain/water/anim_tiles.png
deleted file mode 100644
index b50564029..000000000
--- a/graphics/battle_terrain/water/anim_tiles.png
+++ /dev/null
diff --git a/graphics/battle_terrain/water/map.bin b/graphics/battle_terrain/water/map.bin
deleted file mode 100644
index 61f358f53..000000000
--- a/graphics/battle_terrain/water/map.bin
+++ /dev/null
diff --git a/graphics/battle_terrain/water/palette.pal b/graphics/battle_terrain/water/palette.pal
deleted file mode 100644
index cbef92774..000000000
--- a/graphics/battle_terrain/water/palette.pal
+++ /dev/null
@@ -1,51 +0,0 @@
-JASC-PAL
-0100
-48
-0 0 0
-255 255 255
-90 148 222
-148 213 238
-180 230 246
-106 172 230
-197 238 255
-123 189 230
-222 246 255
-0 0 0
-0 0 0
-205 222 246
-222 230 238
-230 238 238
-238 246 246
-246 246 255
-0 0 0
-255 255 255
-90 148 222
-148 213 238
-180 230 246
-106 172 230
-197 238 255
-123 189 230
-222 246 255
-0 0 0
-0 0 0
-205 222 246
-222 230 238
-230 238 238
-238 246 246
-246 246 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-197 238 255
-148 213 238
-123 189 230
-90 148 222
-49 106 189
-16 74 156
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_terrain/water/tiles.png b/graphics/battle_terrain/water/tiles.png
deleted file mode 100644
index 902047875..000000000
--- a/graphics/battle_terrain/water/tiles.png
+++ /dev/null
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 3fc4b3b7b..f3bed2da7 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -24,7 +24,7 @@ TITLESCREENGFXDIR := graphics/title_screen
 CREDITSGFXDIR := graphics/credits
 ITEMMENUGFXDIR := graphics/item_menu
 INTROGFXDIR := graphics/intro
-BATTLEGFXDIR := graphics/battle
+BATTLETERRAINGFXDIR := graphics/battle_terrain
 
 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
@@ -528,44 +528,44 @@ $(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png
 $(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 17
 
-$(BATTLEGFXDIR)/terrain_building.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/terrain_building.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 77
 
-$(BATTLEGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 106
 
-$(BATTLEGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 84
 
-$(BATTLEGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 98
 
-$(BATTLEGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 77
 
-$(BATTLEGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 133
 
-$(BATTLEGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 98
 
-$(BATTLEGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 47
 
-$(BATTLEGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 36
 
-$(BATTLEGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 75
 
-$(BATTLEGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 83
 
-$(BATTLEGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 26
 
-$(BATTLEGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 85
 
-$(BATTLEGFXDIR)/terrain_water.4bpp: %.4bpp: %.png
+$(BATTLETERRAINGFXDIR)/terrain_water.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 81
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 05a6babe2..44f26494b 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_grass.gbapal.lz");
-static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle/terrain_grass.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle/terrain_grass.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_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_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass.gbapal.lz");
-static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass.4bpp.lz");
-static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass.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_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_Sand[] = INCBIN_U32("graphics/battle/terrain_sand.gbapal.lz");
-static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle/terrain_sand.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle/terrain_sand.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_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_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater.gbapal.lz");
-static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater.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_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_Water[] = INCBIN_U32("graphics/battle/terrain_water.gbapal.lz");
-static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle/terrain_water.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle/terrain_water.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_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_Pond[] = INCBIN_U32("graphics/battle/terrain_pond.gbapal.lz");
-static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle/terrain_pond.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle/terrain_pond.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_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_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain.gbapal.lz");
-static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain.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_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_Cave[] = INCBIN_U32("graphics/battle/terrain_cave.gbapal.lz");
-static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle/terrain_cave.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle/terrain_cave.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_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_Building[] = INCBIN_U32("graphics/battle/terrain_building.gbapal.lz");
-static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle/terrain_building.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle/terrain_building.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_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_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.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Indoor[] = INCBIN_U32("graphics/battle/terrain_indoor.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 struct BattleBackground sBattleTerrainTable[] = {
     [BATTLE_TERRAIN_GRASS] =
diff --git a/src/data/graphics/battle_terrain.h b/src/data/graphics/battle_terrain.h
deleted file mode 100644
index f91c2d0d9..000000000
--- a/src/data/graphics/battle_terrain.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-const u32 gFile_graphics_battle_terrain_plain_palette_palette[] = INCBIN_U32("graphics/battle_terrain/plain/palette.gbapal.lz");
-
-const u32 gFile_graphics_battle_terrain_building_tiles_sheet[] = INCBIN_U32("graphics/battle_terrain/building/tiles.4bpp.lz");
-
-const u32 gFile_graphics_battle_terrain_stadium_battle_frontier_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/battle_frontier.gbapal.lz");
-
-const u32 gFile_graphics_battle_terrain_building_map_tilemap[] = INCBIN_U32("graphics/battle_terrain/building/map.bin.lz");
-
-const u32 gFile_graphics_battle_terrain_stadium_tiles_sheet[] = INCBIN_U32("graphics/battle_terrain/stadium/tiles.4bpp.lz");
-const u32 gFile_graphics_battle_terrain_stadium_map_tilemap[] = INCBIN_U32("graphics/battle_terrain/stadium/map.bin.lz");
-
-const u32 gFile_graphics_battle_terrain_building_palette_palette[] = INCBIN_U32("graphics/battle_terrain/building/palette.gbapal.lz");
-
-const u32 gFile_graphics_battle_terrain_water_kyogre_palette[] = INCBIN_U32("graphics/battle_terrain/water/kyogre.gbapal.lz");
-const u32 gFile_graphics_battle_terrain_cave_groudon_palette[] = INCBIN_U32("graphics/battle_terrain/cave/groudon.gbapal.lz");
-
-const u32 gFile_graphics_battle_terrain_building_palette2_palette[] = INCBIN_U32("graphics/battle_terrain/building/palette2.gbapal.lz");
-const u32 gFile_graphics_battle_terrain_building_palette3_palette[] = INCBIN_U32("graphics/battle_terrain/building/palette3.gbapal.lz");
-
-const u32 gFile_graphics_battle_terrain_stadium_palette1_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette1.gbapal.lz");
-const u32 gFile_graphics_battle_terrain_stadium_palette2_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette2.gbapal.lz");
-const u32 gFile_graphics_battle_terrain_stadium_palette3_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette3.gbapal.lz");
-const u32 gFile_graphics_battle_terrain_stadium_palette4_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette4.gbapal.lz");
-const u32 gFile_graphics_battle_terrain_stadium_palette5_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette5.gbapal.lz");
-const u32 gFile_graphics_battle_terrain_stadium_palette6_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette6.gbapal.lz");
-const u32 gFile_graphics_battle_terrain_stadium_palette7_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette7.gbapal.lz");
-
-const u32 gFile_graphics_battle_terrain_building_anim_tiles_sheet[] = INCBIN_U32("graphics/battle_terrain/building/anim_tiles.4bpp.lz");
-const u32 gFile_graphics_battle_terrain_building_anim_map_tilemap[] = INCBIN_U32("graphics/battle_terrain/building/anim_map.bin.lz");
diff --git a/src/data/graphics/battle_terrain_unused.h b/src/data/graphics/battle_terrain_unused.h
new file mode 100644
index 000000000..b2024a8c2
--- /dev/null
+++ b/src/data/graphics/battle_terrain_unused.h
@@ -0,0 +1,32 @@
+
+// All graphics in this file go completely unused.
+
+const u32 gUnusedBattleTerrain_Plain_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/plain.gbapal.lz");
+
+const u32 gUnusedBattleTerrain_Building_Tiles_Sheet[] = INCBIN_U32("graphics/battle_terrain/unused/building/tiles.4bpp.lz");
+
+const u32 gUnusedBattleTerrain_Stadium_Battle_Frontier_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/battle_frontier.gbapal.lz");
+
+const u32 gUnusedBattleTerrain_Building_Map_Tilemap[] = INCBIN_U32("graphics/battle_terrain/unused/building/map.bin.lz");
+
+const u32 gUnusedBattleTerrain_Stadium_Tiles_Sheet[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/tiles.4bpp.lz");
+const u32 gUnusedBattleTerrain_Stadium_Map_Tilemap[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/map.bin.lz");
+
+const u32 gUnusedBattleTerrain_Building_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/building/palette.gbapal.lz");
+
+const u32 gUnusedBattleTerrain_Kyogre_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/kyogre.gbapal.lz");
+const u32 gUnusedBattleTerrain_Groudon_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/groudon.gbapal.lz");
+
+const u32 gUnusedBattleTerrain_Building_Palette2[] = INCBIN_U32("graphics/battle_terrain/unused/building/palette2.gbapal.lz");
+const u32 gUnusedBattleTerrain_Building_Palette3[] = INCBIN_U32("graphics/battle_terrain/unused/building/palette3.gbapal.lz");
+
+const u32 gUnusedBattleTerrain_Stadium_Palette1[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette1.gbapal.lz");
+const u32 gUnusedBattleTerrain_Stadium_Palette2[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette2.gbapal.lz");
+const u32 gUnusedBattleTerrain_Stadium_Palette3[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette3.gbapal.lz");
+const u32 gUnusedBattleTerrain_Stadium_Palette4[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette4.gbapal.lz");
+const u32 gUnusedBattleTerrain_Stadium_Palette5[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette5.gbapal.lz");
+const u32 gUnusedBattleTerrain_Stadium_Palette6[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette6.gbapal.lz");
+const u32 gUnusedBattleTerrain_Stadium_Palette7[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette7.gbapal.lz");
+
+const u32 gUnusedBattleTerrain_Building_Anim_Tiles_Sheet[] = INCBIN_U32("graphics/battle_terrain/unused/building/anim_tiles.4bpp.lz");
+const u32 gUnusedBattleTerrain_Building_Anim_Map_Tilemap[] = INCBIN_U32("graphics/battle_terrain/unused/building/anim_map.bin.lz");
diff --git a/src/graphics.c b/src/graphics.c
index 56faf0b60..57fde9290 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -964,7 +964,7 @@ const u32 gFile_graphics_battle_transitions_vs_frame_palette[] = INCBIN_U32("gra
 
 const u32 gVsLettersGfx[] = INCBIN_U32("graphics/battle_transitions/vs.4bpp.lz");
 
-#include "data/graphics/battle_terrain.h"
+#include "data/graphics/battle_terrain_unused.h"
 
 const u32 gBattleAnimSpriteGfx_FlyingDirt[] = INCBIN_U32("graphics/battle_anims/sprites/flying_dirt.4bpp.lz");