217 files changed, 223 insertions, 806 deletions

diff --git a/graphics/battle/unk_824844C.png b/graphics/battle/unk_824844C.png
deleted file mode 100644
index 3c4a3f733..000000000
--- a/graphics/battle/unk_824844C.png
+++ /dev/null
diff --git a/graphics/battle/unk_8248C68.png b/graphics/battle/unk_8248C68.png
deleted file mode 100644
index e927c982c..000000000
--- a/graphics/battle/unk_8248C68.png
+++ /dev/null
diff --git a/graphics/battle/unk_82490C4.png b/graphics/battle/unk_82490C4.png
deleted file mode 100644
index 3c4a3f733..000000000
--- a/graphics/battle/unk_82490C4.png
+++ /dev/null
diff --git a/graphics/battle/unk_82498DC.png b/graphics/battle/unk_82498DC.png
deleted file mode 100644
index a1f3cca52..000000000
--- a/graphics/battle/unk_82498DC.png
+++ /dev/null
diff --git a/graphics/battle/unk_8249FE4.png b/graphics/battle/unk_8249FE4.png
deleted file mode 100644
index b96c73fbd..000000000
--- a/graphics/battle/unk_8249FE4.png
+++ /dev/null
diff --git a/graphics/battle/unk_824A618.png b/graphics/battle/unk_824A618.png
deleted file mode 100644
index cc9a3ebef..000000000
--- a/graphics/battle/unk_824A618.png
+++ /dev/null
diff --git a/graphics/battle/unk_824A990.png b/graphics/battle/unk_824A990.png
deleted file mode 100644
index f8f483342..000000000
--- a/graphics/battle/unk_824A990.png
+++ /dev/null
diff --git a/graphics/battle/unk_824AF70.png b/graphics/battle/unk_824AF70.png
deleted file mode 100644
index 9d8af70b8..000000000
--- a/graphics/battle/unk_824AF70.png
+++ /dev/null
diff --git a/graphics/battle/unk_824B1EC.png b/graphics/battle/unk_824B1EC.png
deleted file mode 100644
index 91819a570..000000000
--- a/graphics/battle/unk_824B1EC.png
+++ /dev/null
diff --git a/graphics/battle/unk_824B8A8.png b/graphics/battle/unk_824B8A8.png
deleted file mode 100644
index f8323d44f..000000000
--- a/graphics/battle/unk_824B8A8.png
+++ /dev/null
diff --git a/graphics/battle/unk_824BD38.png b/graphics/battle/unk_824BD38.png
deleted file mode 100644
index c6a1d3c07..000000000
--- a/graphics/battle/unk_824BD38.png
+++ /dev/null
diff --git a/graphics/battle/unk_824C314.png b/graphics/battle/unk_824C314.png
deleted file mode 100644
index 8ebb6f162..000000000
--- a/graphics/battle/unk_824C314.png
+++ /dev/null
diff --git a/graphics/battle/unk_824C624.png b/graphics/battle/unk_824C624.png
deleted file mode 100644
index 90bc93e39..000000000
--- a/graphics/battle/unk_824C624.png
+++ /dev/null
diff --git a/graphics/battle/unk_824CBF8.png b/graphics/battle/unk_824CBF8.png
deleted file mode 100644
index 598697bdb..000000000
--- a/graphics/battle/unk_824CBF8.png
+++ /dev/null
diff --git a/graphics/battle/unk_824CFEC.png b/graphics/battle/unk_824CFEC.png
deleted file mode 100644
index 87969aafc..000000000
--- a/graphics/battle/unk_824CFEC.png
+++ /dev/null
diff --git a/graphics/battle/unk_824D6B8.png b/graphics/battle/unk_824D6B8.png
deleted file mode 100644
index 799facfeb..000000000
--- a/graphics/battle/unk_824D6B8.png
+++ /dev/null
diff --git a/graphics/battle/unk_824DE34.png b/graphics/battle/unk_824DE34.png
deleted file mode 100644
index b4ec20536..000000000
--- a/graphics/battle/unk_824DE34.png
+++ /dev/null
diff --git a/graphics/battle/unk_824E410.png b/graphics/battle/unk_824E410.png
deleted file mode 100644
index ae71f8f2a..000000000
--- a/graphics/battle/unk_824E410.png
+++ /dev/null
diff --git a/graphics/battle/unk_824E858.png b/graphics/battle/unk_824E858.png
deleted file mode 100644
index b4ec20536..000000000
--- a/graphics/battle/unk_824E858.png
+++ /dev/null
diff --git a/graphics/battle_anims/unk_83E44F4.png b/graphics/battle_anims/unk_83E44F4.png
new file mode 100644
index 000000000..d63b338d3
--- /dev/null
+++ b/graphics/battle_anims/unk_83E44F4.png
diff --git a/graphics/battle_anims/unk_83E4874.png b/graphics/battle_anims/unk_83E4874.png
deleted file mode 100644
index c4a27b929..000000000
--- a/graphics/battle_anims/unk_83E4874.png
+++ /dev/null
diff --git a/graphics/battle_interface/ball_display_unused_extra.png b/graphics/battle_interface/ball_display_unused_extra.png
index d75b86b54..d7c1958d4 100644
--- a/graphics/battle_interface/ball_display_unused_extra.png
+++ b/graphics/battle_interface/ball_display_unused_extra.png
diff --git a/graphics/battle_interface/unk_battlebox.pal b/graphics/battle_interface/unk_battlebox.pal
deleted file mode 100644
index 862165f3f..000000000
--- a/graphics/battle_interface/unk_battlebox.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 255 255
-255 255 255
-106 90 115
-0 0 0
-213 230 255
-189 205 238
-238 238 255
-106 172 197
-90 139 180
-123 197 205
-0 0 0
-0 0 0
-123 197 255
-0 0 139
-255 131 131
-164 0 0
diff --git a/graphics/battle_interface/unk_battlebox.png b/graphics/battle_interface/unk_battlebox.png
index 9f136c3af..9ccf3b26b 100644
--- a/graphics/battle_interface/unk_battlebox.png
+++ b/graphics/battle_interface/unk_battlebox.png
diff --git a/graphics/battle_interface/unk_826404C.png b/graphics/battle_interface/unused.png
index 8672ac614..8672ac614 100644
--- a/graphics/battle_interface/unk_826404C.png
+++ b/graphics/battle_interface/unused.png
diff --git a/graphics/battle_interface/unused_window2.png b/graphics/battle_interface/unused_window2.png
index 32f3da0b0..d381d3683 100644
--- a/graphics/battle_interface/unused_window2.png
+++ b/graphics/battle_interface/unused_window2.png
diff --git a/graphics/battle_interface/unused_window3.png b/graphics/battle_interface/unused_window3.png
index e93b2ff88..de2f046f9 100644
--- a/graphics/battle_interface/unused_window3.png
+++ b/graphics/battle_interface/unused_window3.png
diff --git a/graphics/battle_interface/unused_window4.png b/graphics/battle_interface/unused_window4.png
index 6c249c96d..39ea78e94 100644
--- a/graphics/battle_interface/unused_window4.png
+++ b/graphics/battle_interface/unused_window4.png
diff --git a/graphics/battle_interface/window.png b/graphics/battle_interface/window.png
index 5167ce2c5..a3f50feda 100644
--- a/graphics/battle_interface/window.png
+++ b/graphics/battle_interface/window.png
diff --git a/graphics/battle_records/tilemap.bin b/graphics/battle_records/bg_tiles.bin
index a3691cfd7..a3691cfd7 100644
--- a/graphics/battle_records/tilemap.bin
+++ b/graphics/battle_records/bg_tiles.bin
diff --git a/graphics/battle_records/bg_tiles.png b/graphics/battle_records/bg_tiles.png
index bbe9de321..824ec68b0 100644
--- a/graphics/battle_records/bg_tiles.png
+++ b/graphics/battle_records/bg_tiles.png
diff --git a/graphics/battle_records/palette.pal b/graphics/battle_records/palette.pal
deleted file mode 100644
index d6994a324..000000000
--- a/graphics/battle_records/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-74 74 74
-189 131 156
-230 156 213
-222 238 255
-230 246 255
-148 115 139
-197 213 222
-172 164 189
-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/unk_824E490.bin b/graphics/battle_terrain/building/anim.bin
index aba49c6f9..aba49c6f9 100644
--- a/graphics/battle/unk_824E490.bin
+++ b/graphics/battle_terrain/building/anim.bin
diff --git a/graphics/battle_terrain/building/anim.png b/graphics/battle_terrain/building/anim.png
new file mode 100644
index 000000000..443cd98ab
--- /dev/null
+++ b/graphics/battle_terrain/building/anim.png
diff --git a/graphics/battle/unk_824E16C.bin b/graphics/battle_terrain/building/terrain.bin
index 0710427da..0710427da 100644
--- a/graphics/battle/unk_824E16C.bin
+++ b/graphics/battle_terrain/building/terrain.bin
diff --git a/graphics/battle/unk_824DDF0.pal b/graphics/battle_terrain/building/terrain.pal
index 16421567f..16421567f 100644
--- a/graphics/battle/unk_824DDF0.pal
+++ b/graphics/battle_terrain/building/terrain.pal
diff --git a/graphics/battle_terrain/building/terrain.png b/graphics/battle_terrain/building/terrain.png
new file mode 100644
index 000000000..3b060be4e
--- /dev/null
+++ b/graphics/battle_terrain/building/terrain.png
diff --git a/graphics/battle/unk_824DC98.bin b/graphics/battle_terrain/cave/anim.bin
index ad7724c67..ad7724c67 100644
--- a/graphics/battle/unk_824DC98.bin
+++ b/graphics/battle_terrain/cave/anim.bin
diff --git a/graphics/battle_terrain/cave/anim.png b/graphics/battle_terrain/cave/anim.png
new file mode 100644
index 000000000..84f13f8f0
--- /dev/null
+++ b/graphics/battle_terrain/cave/anim.png
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/unk_824D418.bin b/graphics/battle_terrain/cave/terrain.bin
index 255f2953d..255f2953d 100644
--- a/graphics/battle/unk_824D418.bin
+++ b/graphics/battle_terrain/cave/terrain.bin
diff --git a/graphics/battle/unk_824CF98.pal b/graphics/battle_terrain/cave/terrain.pal
index f17a7bf9d..f17a7bf9d 100644
--- a/graphics/battle/unk_824CF98.pal
+++ b/graphics/battle_terrain/cave/terrain.pal
diff --git a/graphics/battle_terrain/cave/terrain.png b/graphics/battle_terrain/cave/terrain.png
new file mode 100644
index 000000000..e2a18ae57
--- /dev/null
+++ b/graphics/battle_terrain/cave/terrain.png
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/unk_8248F58.bin b/graphics/battle_terrain/grass/anim.bin
index 03e4194fc..03e4194fc 100644
--- a/graphics/battle/unk_8248F58.bin
+++ b/graphics/battle_terrain/grass/anim.bin
diff --git a/graphics/battle_terrain/grass/anim.png b/graphics/battle_terrain/grass/anim.png
new file mode 100644
index 000000000..f2f2c1bb1
--- /dev/null
+++ b/graphics/battle_terrain/grass/anim.png
diff --git a/graphics/battle/unk_82489A8.bin b/graphics/battle_terrain/grass/terrain.bin
index e0da76dc2..e0da76dc2 100644
--- a/graphics/battle/unk_82489A8.bin
+++ b/graphics/battle_terrain/grass/terrain.bin
diff --git a/graphics/battle/unk_8248400.pal b/graphics/battle_terrain/grass/terrain.pal
index cc00b3dc2..cc00b3dc2 100644
--- a/graphics/battle/unk_8248400.pal
+++ b/graphics/battle_terrain/grass/terrain.pal
diff --git a/graphics/battle_terrain/grass/terrain.png b/graphics/battle_terrain/grass/terrain.png
new file mode 100644
index 000000000..645796cb1
--- /dev/null
+++ b/graphics/battle_terrain/grass/terrain.png
diff --git a/graphics/battle/unk_824E650.pal b/graphics/battle_terrain/indoor/1.pal
index 597647872..597647872 100644
--- a/graphics/battle/unk_824E650.pal
+++ b/graphics/battle_terrain/indoor/1.pal
diff --git a/graphics/battle/unk_824E604.pal b/graphics/battle_terrain/indoor/2.pal
index a1bc6b60c..a1bc6b60c 100644
--- a/graphics/battle/unk_824E604.pal
+++ b/graphics/battle_terrain/indoor/2.pal
diff --git a/graphics/battle/unk_824E740.pal b/graphics/battle_terrain/indoor/agatha.pal
index 8ea1eeae7..8ea1eeae7 100644
--- a/graphics/battle/unk_824E740.pal
+++ b/graphics/battle_terrain/indoor/agatha.pal
diff --git a/graphics/battle/unk_824E6F0.pal b/graphics/battle_terrain/indoor/bruno.pal
index 21196b3e8..21196b3e8 100644
--- a/graphics/battle/unk_824E6F0.pal
+++ b/graphics/battle_terrain/indoor/bruno.pal
diff --git a/graphics/battle/unk_824E7DC.pal b/graphics/battle_terrain/indoor/champion.pal
index 9ce470c9f..9ce470c9f 100644
--- a/graphics/battle/unk_824E7DC.pal
+++ b/graphics/battle_terrain/indoor/champion.pal
diff --git a/graphics/battle/unk_824E56C.pal b/graphics/battle_terrain/indoor/gym.pal
index 187054476..187054476 100644
--- a/graphics/battle/unk_824E56C.pal
+++ b/graphics/battle_terrain/indoor/gym.pal
diff --git a/graphics/battle/unk_824E78C.pal b/graphics/battle_terrain/indoor/lance.pal
index c5fb745cf..c5fb745cf 100644
--- a/graphics/battle/unk_824E78C.pal
+++ b/graphics/battle_terrain/indoor/lance.pal
diff --git a/graphics/battle/unk_824E5B8.pal b/graphics/battle_terrain/indoor/leader.pal
index 581b6d596..581b6d596 100644
--- a/graphics/battle/unk_824E5B8.pal
+++ b/graphics/battle_terrain/indoor/leader.pal
diff --git a/graphics/battle/unk_824E528.pal b/graphics/battle_terrain/indoor/link.pal
index baa0fdf4f..baa0fdf4f 100644
--- a/graphics/battle/unk_824E528.pal
+++ b/graphics/battle_terrain/indoor/link.pal
diff --git a/graphics/battle/unk_824E6A4.pal b/graphics/battle_terrain/indoor/lorelei.pal
index e63bad165..e63bad165 100644
--- a/graphics/battle/unk_824E6A4.pal
+++ b/graphics/battle_terrain/indoor/lorelei.pal
diff --git a/graphics/battle/unk_824E81C.pal b/graphics/battle_terrain/indoor/plain.pal
index b47dc0a8d..b47dc0a8d 100644
--- a/graphics/battle/unk_824E81C.pal
+++ b/graphics/battle_terrain/indoor/plain.pal
diff --git a/graphics/battle/unk_824EB90.bin b/graphics/battle_terrain/indoor/terrain.bin
index 0710427da..0710427da 100644
--- a/graphics/battle/unk_824EB90.bin
+++ b/graphics/battle_terrain/indoor/terrain.bin
diff --git a/graphics/battle_terrain/indoor/terrain.png b/graphics/battle_terrain/indoor/terrain.png
new file mode 100644
index 000000000..1cbb7c63b
--- /dev/null
+++ b/graphics/battle_terrain/indoor/terrain.png
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/unk_8249E10.bin b/graphics/battle_terrain/longgrass/anim.bin
index 5cb0de868..5cb0de868 100644
--- a/graphics/battle/unk_8249E10.bin
+++ b/graphics/battle_terrain/longgrass/anim.bin
diff --git a/graphics/battle_terrain/longgrass/anim.png b/graphics/battle_terrain/longgrass/anim.png
new file mode 100644
index 000000000..c825dd7d2
--- /dev/null
+++ b/graphics/battle_terrain/longgrass/anim.png
diff --git a/graphics/battle/unk_8249620.bin b/graphics/battle_terrain/longgrass/terrain.bin
index 2b2634a14..2b2634a14 100644
--- a/graphics/battle/unk_8249620.bin
+++ b/graphics/battle_terrain/longgrass/terrain.bin
diff --git a/graphics/battle/unk_8249074.pal b/graphics/battle_terrain/longgrass/terrain.pal
index c390b8c44..c390b8c44 100644
--- a/graphics/battle/unk_8249074.pal
+++ b/graphics/battle_terrain/longgrass/terrain.pal
diff --git a/graphics/battle_terrain/longgrass/terrain.png b/graphics/battle_terrain/longgrass/terrain.png
new file mode 100644
index 000000000..0d09d739c
--- /dev/null
+++ b/graphics/battle_terrain/longgrass/terrain.png
diff --git a/graphics/battle/unk_824CEC8.bin b/graphics/battle_terrain/mountain/anim.bin
index 55c5730c0..55c5730c0 100644
--- a/graphics/battle/unk_824CEC8.bin
+++ b/graphics/battle_terrain/mountain/anim.bin
diff --git a/graphics/battle_terrain/mountain/anim.png b/graphics/battle_terrain/mountain/anim.png
new file mode 100644
index 000000000..ab90aaddc
--- /dev/null
+++ b/graphics/battle_terrain/mountain/anim.png
diff --git a/graphics/battle/unk_824C958.bin b/graphics/battle_terrain/mountain/terrain.bin
index 16600f5f8..16600f5f8 100644
--- a/graphics/battle/unk_824C958.bin
+++ b/graphics/battle_terrain/mountain/terrain.bin
diff --git a/graphics/battle/unk_824C5D8.pal b/graphics/battle_terrain/mountain/terrain.pal
index bfe75be65..bfe75be65 100644
--- a/graphics/battle/unk_824C5D8.pal
+++ b/graphics/battle_terrain/mountain/terrain.pal
diff --git a/graphics/battle_terrain/mountain/terrain.png b/graphics/battle_terrain/mountain/terrain.png
new file mode 100644
index 000000000..9889a6b62
--- /dev/null
+++ b/graphics/battle_terrain/mountain/terrain.png
diff --git a/graphics/battle/unk_824C520.bin b/graphics/battle_terrain/pond/anim.bin
index e012f647e..e012f647e 100644
--- a/graphics/battle/unk_824C520.bin
+++ b/graphics/battle_terrain/pond/anim.bin
diff --git a/graphics/battle_terrain/pond/anim.png b/graphics/battle_terrain/pond/anim.png
new file mode 100644
index 000000000..e0a7025e7
--- /dev/null
+++ b/graphics/battle_terrain/pond/anim.png
diff --git a/graphics/battle/unk_824C07C.bin b/graphics/battle_terrain/pond/terrain.bin
index d4c3dedcb..d4c3dedcb 100644
--- a/graphics/battle/unk_824C07C.bin
+++ b/graphics/battle_terrain/pond/terrain.bin
diff --git a/graphics/battle/unk_824BCE0.pal b/graphics/battle_terrain/pond/terrain.pal
index 041560cf4..041560cf4 100644
--- a/graphics/battle/unk_824BCE0.pal
+++ b/graphics/battle_terrain/pond/terrain.pal
diff --git a/graphics/battle_terrain/pond/terrain.png b/graphics/battle_terrain/pond/terrain.png
new file mode 100644
index 000000000..161498b2a
--- /dev/null
+++ b/graphics/battle_terrain/pond/terrain.png
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/unk_824A844.bin b/graphics/battle_terrain/sand/anim.bin
index e4afe99ae..e4afe99ae 100644
--- a/graphics/battle/unk_824A844.bin
+++ b/graphics/battle_terrain/sand/anim.bin
diff --git a/graphics/battle_terrain/sand/anim.png b/graphics/battle_terrain/sand/anim.png
new file mode 100644
index 000000000..092b8b42b
--- /dev/null
+++ b/graphics/battle_terrain/sand/anim.png
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/unk_824A37C.bin b/graphics/battle_terrain/sand/terrain.bin
index 365e1474f..365e1474f 100644
--- a/graphics/battle/unk_824A37C.bin
+++ b/graphics/battle_terrain/sand/terrain.bin
diff --git a/graphics/battle/unk_8249F98.pal b/graphics/battle_terrain/sand/terrain.pal
index dafc3eb7f..dafc3eb7f 100644
--- a/graphics/battle/unk_8249F98.pal
+++ b/graphics/battle_terrain/sand/terrain.pal
diff --git a/graphics/battle_terrain/sand/terrain.png b/graphics/battle_terrain/sand/terrain.png
new file mode 100644
index 000000000..e802b34f2
--- /dev/null
+++ b/graphics/battle_terrain/sand/terrain.png
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/unk_824B0DC.bin b/graphics/battle_terrain/underwater/anim.bin
index 9029c7c9d..9029c7c9d 100644
--- a/graphics/battle/unk_824B0DC.bin
+++ b/graphics/battle_terrain/underwater/anim.bin
diff --git a/graphics/battle_terrain/underwater/anim.png b/graphics/battle_terrain/underwater/anim.png
new file mode 100644
index 000000000..f41eedfb8
--- /dev/null
+++ b/graphics/battle_terrain/underwater/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/unk_824ACD0.bin b/graphics/battle_terrain/underwater/terrain.bin
index 29843f17d..29843f17d 100644
--- a/graphics/battle/unk_824ACD0.bin
+++ b/graphics/battle_terrain/underwater/terrain.bin
diff --git a/graphics/battle/unk_824A940.pal b/graphics/battle_terrain/underwater/terrain.pal
index 5fa95cf21..5fa95cf21 100644
--- a/graphics/battle/unk_824A940.pal
+++ b/graphics/battle_terrain/underwater/terrain.pal
diff --git a/graphics/battle_terrain/underwater/terrain.png b/graphics/battle_terrain/underwater/terrain.png
new file mode 100644
index 000000000..19e115348
--- /dev/null
+++ b/graphics/battle_terrain/underwater/terrain.png
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/unk_824BBE0.bin b/graphics/battle_terrain/water/anim.bin
index b6661cd3c..b6661cd3c 100644
--- a/graphics/battle/unk_824BBE0.bin
+++ b/graphics/battle_terrain/water/anim.bin
diff --git a/graphics/battle_terrain/water/anim.png b/graphics/battle_terrain/water/anim.png
new file mode 100644
index 000000000..1545d85e7
--- /dev/null
+++ b/graphics/battle_terrain/water/anim.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/unk_824B608.bin b/graphics/battle_terrain/water/terrain.bin
index 0ee05129a..0ee05129a 100644
--- a/graphics/battle/unk_824B608.bin
+++ b/graphics/battle_terrain/water/terrain.bin
diff --git a/graphics/battle/unk_824B19C.pal b/graphics/battle_terrain/water/terrain.pal
index d31dce658..d31dce658 100644
--- a/graphics/battle/unk_824B19C.pal
+++ b/graphics/battle_terrain/water/terrain.pal
diff --git a/graphics/battle_terrain/water/terrain.png b/graphics/battle_terrain/water/terrain.png
new file mode 100644
index 000000000..8953e7940
--- /dev/null
+++ b/graphics/battle_terrain/water/terrain.png
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/berry_fix/gba_small.png b/graphics/berry_fix/gba_small.png
index 59bfaf4d5..63f79cb49 100644
--- a/graphics/berry_fix/gba_small.png
+++ b/graphics/berry_fix/gba_small.png
diff --git a/graphics/berry_fix/gba_transfer.png b/graphics/berry_fix/gba_transfer.png
index a741fe1b9..f8d49db21 100644
--- a/graphics/berry_fix/gba_transfer.png
+++ b/graphics/berry_fix/gba_transfer.png
diff --git a/graphics/berry_fix/gba_transfer_error.png b/graphics/berry_fix/gba_transfer_error.png
index 766b9f28e..6c5f69ff5 100644
--- a/graphics/berry_fix/gba_transfer_error.png
+++ b/graphics/berry_fix/gba_transfer_error.png
diff --git a/graphics/berry_fix/gba_transfer_highlight.png b/graphics/berry_fix/gba_transfer_highlight.png
index 25b47d036..e763bd62b 100644
--- a/graphics/berry_fix/gba_transfer_highlight.png
+++ b/graphics/berry_fix/gba_transfer_highlight.png
diff --git a/graphics/berry_fix/logo.png b/graphics/berry_fix/logo.png
index ab91d5a26..120dd0f52 100644
--- a/graphics/berry_fix/logo.png
+++ b/graphics/berry_fix/logo.png
diff --git a/graphics/berry_fix/window.png b/graphics/berry_fix/window.png
index 5e437e727..0ba517a6b 100644
--- a/graphics/berry_fix/window.png
+++ b/graphics/berry_fix/window.png
diff --git a/graphics/berry_pouch/unk_8E85C44.bin b/graphics/berry_pouch/background.bin
index 7c89a8bf0..7c89a8bf0 100644
--- a/graphics/berry_pouch/unk_8E85C44.bin
+++ b/graphics/berry_pouch/background.bin
diff --git a/graphics/berry_pouch/unk_8E85BA4.pal b/graphics/berry_pouch/background.pal
index 3398ff143..3398ff143 100644
--- a/graphics/berry_pouch/unk_8E85BA4.pal
+++ b/graphics/berry_pouch/background.pal
diff --git a/graphics/berry_pouch/background.png b/graphics/berry_pouch/background.png
new file mode 100644
index 000000000..14113b2f9
--- /dev/null
+++ b/graphics/berry_pouch/background.png
diff --git a/graphics/berry_pouch/unk_8E85BF4.pal b/graphics/berry_pouch/background_female.pal
index e7bd18cbf..e7bd18cbf 100644
--- a/graphics/berry_pouch/unk_8E85BF4.pal
+++ b/graphics/berry_pouch/background_female.pal
diff --git a/graphics/berry_pouch/unk_8E8560C.png b/graphics/berry_pouch/berry_pouch.png
index bb714c130..bb714c130 100644
--- a/graphics/berry_pouch/unk_8E8560C.png
+++ b/graphics/berry_pouch/berry_pouch.png
diff --git a/graphics/berry_pouch/unk_8E859D0.png b/graphics/berry_pouch/unk_8E859D0.png
deleted file mode 100644
index 094b4ef39..000000000
--- a/graphics/berry_pouch/unk_8E859D0.png
+++ /dev/null
diff --git a/graphics/berry_pouch/unk_8E85C1C.pal b/graphics/berry_pouch/unk_8E85C1C.pal
deleted file mode 100644
index 87d0fc7fb..000000000
--- a/graphics/berry_pouch/unk_8E85C1C.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-222 222 90
-98 115 123
-255 205 156
-230 189 139
-213 164 115
-189 139 90
-156 82 0
-115 57 0
-197 205 213
-246 115 0
-222 57 0
-230 148 98
-255 172 123
-222 230 230
-49 57 57
-255 255 255
diff --git a/graphics/contest/misc_2.pal b/graphics/contest/misc.pal
index 869aef9e1..869aef9e1 100644
--- a/graphics/contest/misc_2.pal
+++ b/graphics/contest/misc.pal
diff --git a/graphics/contest/misc.png b/graphics/contest/misc.png
index 73f8054db..a8fdb3e0f 100644
--- a/graphics/contest/misc.png
+++ b/graphics/contest/misc.png
diff --git a/graphics/contest/misc_2.png b/graphics/contest/misc_2.png
index 92dd92bf7..2d599d0ec 100644
--- a/graphics/contest/misc_2.png
+++ b/graphics/contest/misc_2.png
diff --git a/graphics/diploma/unk_84154E8.bin b/graphics/diploma/diploma.bin
index 38c32e5b2..38c32e5b2 100644
--- a/graphics/diploma/unk_84154E8.bin
+++ b/graphics/diploma/diploma.bin
diff --git a/graphics/diploma/unk_8415954.pal b/graphics/diploma/diploma.pal
index 3ba0bc65d..3ba0bc65d 100644
--- a/graphics/diploma/unk_8415954.pal
+++ b/graphics/diploma/diploma.pal
diff --git a/graphics/diploma/diploma.png b/graphics/diploma/diploma.png
new file mode 100644
index 000000000..2bf9cb27a
--- /dev/null
+++ b/graphics/diploma/diploma.png
diff --git a/graphics/diploma/unk_84147C0.png b/graphics/diploma/unk_84147C0.png
deleted file mode 100644
index ac6e113f8..000000000
--- a/graphics/diploma/unk_84147C0.png
+++ /dev/null
diff --git a/graphics/door_anims/cable_club.png b/graphics/door_anims/cable_club.png
index 792c23715..0d8b53505 100644
--- a/graphics/door_anims/cable_club.png
+++ b/graphics/door_anims/cable_club.png
diff --git a/graphics/door_anims/cerulean.png b/graphics/door_anims/cerulean.png
index 51278be20..fe7b5cdac 100644
--- a/graphics/door_anims/cerulean.png
+++ b/graphics/door_anims/cerulean.png
diff --git a/graphics/door_anims/cinnabar_lab.png b/graphics/door_anims/cinnabar_lab.png
index 3d0e00e7f..bf05d510d 100644
--- a/graphics/door_anims/cinnabar_lab.png
+++ b/graphics/door_anims/cinnabar_lab.png
diff --git a/graphics/door_anims/dept_store_elevator.png b/graphics/door_anims/dept_store_elevator.png
index 0afbb9e2c..c9c948394 100644
--- a/graphics/door_anims/dept_store_elevator.png
+++ b/graphics/door_anims/dept_store_elevator.png
diff --git a/graphics/door_anims/four_island_day_care.png b/graphics/door_anims/four_island_day_care.png
index 38af4eff8..a92b060dc 100644
--- a/graphics/door_anims/four_island_day_care.png
+++ b/graphics/door_anims/four_island_day_care.png
diff --git a/graphics/door_anims/fuchsia.png b/graphics/door_anims/fuchsia.png
index ce1ef667d..1be60c3c2 100644
--- a/graphics/door_anims/fuchsia.png
+++ b/graphics/door_anims/fuchsia.png
diff --git a/graphics/door_anims/lavender.png b/graphics/door_anims/lavender.png
index a650aaf27..00ad381fe 100644
--- a/graphics/door_anims/lavender.png
+++ b/graphics/door_anims/lavender.png
diff --git a/graphics/door_anims/oaks_lab.png b/graphics/door_anims/oaks_lab.png
index 7e49b6266..c8bc9ebea 100644
--- a/graphics/door_anims/oaks_lab.png
+++ b/graphics/door_anims/oaks_lab.png
diff --git a/graphics/evolution_scene/bg.png b/graphics/evolution_scene/bg.png
index c9e84c58e..673077feb 100644
--- a/graphics/evolution_scene/bg.png
+++ b/graphics/evolution_scene/bg.png
diff --git a/graphics/evolution_scene/unknown_5B4114.pal b/graphics/evolution_scene/unused.pal
index 2cd4981fd..2cd4981fd 100644
--- a/graphics/evolution_scene/unknown_5B4114.pal
+++ b/graphics/evolution_scene/unused.pal
diff --git a/graphics/evolution_scene/unref_83F7D80.bin b/graphics/evolution_scene/unused_tilemap.bin
index b2b300184..b2b300184 100644
--- a/graphics/evolution_scene/unref_83F7D80.bin
+++ b/graphics/evolution_scene/unused_tilemap.bin
diff --git a/graphics/fame_checker/bg.png b/graphics/fame_checker/bg.png
index ed1a9a0f8..5116e4480 100644
--- a/graphics/fame_checker/bg.png
+++ b/graphics/fame_checker/bg.png
diff --git a/graphics/fame_checker/bill.pal b/graphics/fame_checker/bill.pal
deleted file mode 100644
index 485e27c48..000000000
--- a/graphics/fame_checker/bill.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 230 205
-230 189 156
-205 156 115
-106 74 57
-180 139 213
-139 98 172
-98 65 106
-213 189 131
-189 164 98
-139 123 74
-180 139 115
-156 106 82
-90 74 49
-255 255 255
-0 0 0
diff --git a/graphics/fame_checker/cursor.pal b/graphics/fame_checker/cursor.pal
deleted file mode 100644
index 212d9eb69..000000000
--- a/graphics/fame_checker/cursor.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-246 222 82
-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
-0 0 0
-246 148 41
-255 82 0
diff --git a/graphics/fame_checker/daisy.pal b/graphics/fame_checker/daisy.pal
deleted file mode 100644
index adf46bf14..000000000
--- a/graphics/fame_checker/daisy.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-172 123 98
-213 172 115
-156 123 74
-90 82 65
-205 115 98
-164 213 156
-115 172 106
-90 123 82
-222 230 255
-164 172 197
-255 255 255
-0 0 0
diff --git a/graphics/fame_checker/mr_fuji.pal b/graphics/fame_checker/mr_fuji.pal
deleted file mode 100644
index e6dcabf2f..000000000
--- a/graphics/fame_checker/mr_fuji.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-115 90 65
-222 164 82
-180 139 65
-148 106 57
-172 164 189
-255 230 131
-230 205 106
-238 131 90
-90 90 106
-213 205 213
-255 255 255
-0 0 0
diff --git a/graphics/fame_checker/prof_oak.pal b/graphics/fame_checker/prof_oak.pal
deleted file mode 100644
index eb6f2f18b..000000000
--- a/graphics/fame_checker/prof_oak.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-139 156 164
-205 164 205
-164 123 164
-82 82 57
-213 213 222
-123 123 82
-115 115 115
-197 189 131
-156 156 90
-255 255 255
-0 0 0
diff --git a/graphics/fame_checker/spinning_pokeball.pal b/graphics/fame_checker/spinning_pokeball.pal
deleted file mode 100644
index dac232f78..000000000
--- a/graphics/fame_checker/spinning_pokeball.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-106 106 106
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-139 139 139
-189 189 189
-205 205 205
-238 238 238
-230 230 230
-222 222 222
-180 180 180
-255 255 255
-106 106 106
diff --git a/graphics/fame_checker/spinning_pokeball.png b/graphics/fame_checker/spinning_pokeball.png
index 0d692439a..fbc8a1c09 100644
--- a/graphics/fame_checker/spinning_pokeball.png
+++ b/graphics/fame_checker/spinning_pokeball.png
diff --git a/graphics/field_effects/flash_effect_tiles.png b/graphics/field_effects/flash_effect_tiles.png
index 4079a5a84..05d4d3b2e 100644
--- a/graphics/field_effects/flash_effect_tiles.png
+++ b/graphics/field_effects/flash_effect_tiles.png
diff --git a/graphics/field_effects/unk_83CA770.png b/graphics/field_effects/new_game_oak.png
index d3ca87183..d3ca87183 100644
--- a/graphics/field_effects/unk_83CA770.png
+++ b/graphics/field_effects/new_game_oak.png
diff --git a/graphics/field_effects/pokeball.png b/graphics/field_effects/pokeball.png
new file mode 100644
index 000000000..eb2e56faf
--- /dev/null
+++ b/graphics/field_effects/pokeball.png
diff --git a/graphics/field_effects/unk_83CAF90.png b/graphics/field_effects/unk_83CAF90.png
deleted file mode 100644
index c6c456817..000000000
--- a/graphics/field_effects/unk_83CAF90.png
+++ /dev/null
diff --git a/graphics/field_effects/unk_83CAFB0.pal b/graphics/field_effects/unk_83CAFB0.pal
deleted file mode 100644
index 5e2face1d..000000000
--- a/graphics/field_effects/unk_83CAFB0.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-255 255 255
-156 180 172
-106 115 115
-57 57 57
-156 24 24
-255 0 0
-255 123 123
-255 255 255
-82 82 106
-123 123 123
-255 255 255
-189 230 255
-164 197 230
-156 189 213
-90 131 180
diff --git a/graphics/hall_of_fame/hall_of_fame.png b/graphics/hall_of_fame/hall_of_fame.png
new file mode 100644
index 000000000..769ca4b35
--- /dev/null
+++ b/graphics/hall_of_fame/hall_of_fame.png
diff --git a/graphics/hall_of_fame/unk_840C3BC.png b/graphics/hall_of_fame/unk_840C3BC.png
deleted file mode 100644
index 567665495..000000000
--- a/graphics/hall_of_fame/unk_840C3BC.png
+++ /dev/null
diff --git a/graphics/help_system/unk_845BCB0.bin b/graphics/help_system/unused.bin
index b7ceb5080..b7ceb5080 100644
--- a/graphics/help_system/unk_845BCB0.bin
+++ b/graphics/help_system/unused.bin
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 64e173aa4..72dd013b0 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -24,6 +24,9 @@ TITLESCREENGFXDIR := graphics/title_screen
 CREDITSGFXDIR := graphics/credits
 ITEMMENUGFXDIR := graphics/item_menu
 INTROGFXDIR := graphics/intro
+BATTLETERRAINGFXDIR := graphics/battle_terrain
+BERRYPOUCHGFXDIR := graphics/berry_pouch
+HALLOFFAMEGFXDIR := graphics/hall_of_fame
 
 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
@@ -147,7 +150,10 @@ $(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png
 
 $(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 5
-    
+
+$(BATINTGFXDIR)/unk_battlebox.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 36
+
 $(BATINTGFXDIR)/window.gbapal: $(BATINTGFXDIR)/window1.gbapal $(BATINTGFXDIR)/window2.gbapal
 	cat $^ > $@
 
@@ -523,3 +529,51 @@ $(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png
 
 $(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 17
+
+$(BATTLETERRAINGFXDIR)/building/terrain.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 77
+
+$(BATTLETERRAINGFXDIR)/cave/anim.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 106
+
+$(BATTLETERRAINGFXDIR)/cave/terrain.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 84
+
+$(BATTLETERRAINGFXDIR)/grass/terrain.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 98
+
+$(BATTLETERRAINGFXDIR)/indoor/terrain.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 77
+
+$(BATTLETERRAINGFXDIR)/longgrass/anim.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 133
+
+$(BATTLETERRAINGFXDIR)/longgrass/terrain.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 98
+
+$(BATTLETERRAINGFXDIR)/mountain/anim.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 47
+
+$(BATTLETERRAINGFXDIR)/pond/anim.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 36
+
+$(BATTLETERRAINGFXDIR)/pond/terrain.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 75
+
+$(BATTLETERRAINGFXDIR)/sand/terrain.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 83
+
+$(BATTLETERRAINGFXDIR)/underwater/anim.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 26
+
+$(BATTLETERRAINGFXDIR)/underwater/terrain.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 85
+
+$(BATTLETERRAINGFXDIR)/water/terrain.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 81
+
+$(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 52
+
+$(HALLOFFAMEGFXDIR)/hall_of_fame.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 29
diff --git a/include/graphics.h b/include/graphics.h
index 533b88b4b..6b2c87bad 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4861,7 +4861,7 @@ extern const u32 gFile_graphics_battle_interface_ball_status_bar_sheet[];
 extern const u8 gHealthboxElementsGfxTable[][32];
 extern const u16 gBattleInterface_BallStatusBarPal[];
 extern const u16 gBattleInterface_BallDisplayPal[];
-extern const u16 gUnknown_8D12404[];
+extern const u16 gBattleInterface_SummaryBallDisplayGfx[];
 
 // item_menu
 extern const u32 gUnknown_8E830CC[];
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 32d3e017a..c30f10643 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -343,64 +343,73 @@ static const struct WindowTemplate gUnknown_8248330[] = {
     }, DUMMY_WIN_TEMPLATE
 };
 
-static const u32 sBattleTerrainPalette_Grass[] = INCBIN_U32("graphics/battle/unk_8248400.gbapal.lz");
-static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle/unk_824844C.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle/unk_82489A8.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Grass[] = INCBIN_U32("graphics/battle/unk_8248C68.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Grass[] = INCBIN_U32("graphics/battle/unk_8248F58.bin.lz");
-static const u32 sBattleTerrainPalette_LongGrass[] = INCBIN_U32("graphics/battle/unk_8249074.gbapal.lz");
-static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle/unk_82490C4.4bpp.lz");
-static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle/unk_8249620.bin.lz");
-static const u32 sBattleTerrainAnimTiles_LongGrass[] = INCBIN_U32("graphics/battle/unk_82498DC.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U32("graphics/battle/unk_8249E10.bin.lz");
-static const u32 sBattleTerrainPalette_Sand[] = INCBIN_U32("graphics/battle/unk_8249F98.gbapal.lz");
-static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle/unk_8249FE4.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle/unk_824A37C.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Sand[] = INCBIN_U32("graphics/battle/unk_824A618.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Sand[] = INCBIN_U32("graphics/battle/unk_824A844.bin.lz");
-static const u32 sBattleTerrainPalette_Underwater[] = INCBIN_U32("graphics/battle/unk_824A940.gbapal.lz");
-static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle/unk_824A990.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle/unk_824ACD0.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Underwater[] = INCBIN_U32("graphics/battle/unk_824AF70.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Underwater[] = INCBIN_U32("graphics/battle/unk_824B0DC.bin.lz");
-static const u32 sBattleTerrainPalette_Water[] = INCBIN_U32("graphics/battle/unk_824B19C.gbapal.lz");
-static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle/unk_824B1EC.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle/unk_824B608.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Water[] = INCBIN_U32("graphics/battle/unk_824B8A8.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Water[] = INCBIN_U32("graphics/battle/unk_824BBE0.bin.lz");
-static const u32 sBattleTerrainPalette_Pond[] = INCBIN_U32("graphics/battle/unk_824BCE0.gbapal.lz");
-static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle/unk_824BD38.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle/unk_824C07C.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Pond[] = INCBIN_U32("graphics/battle/unk_824C314.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Pond[] = INCBIN_U32("graphics/battle/unk_824C520.bin.lz");
-static const u32 sBattleTerrainPalette_Mountain[] = INCBIN_U32("graphics/battle/unk_824C5D8.gbapal.lz");
-static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle/unk_824C624.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle/unk_824C958.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Mountain[] = INCBIN_U32("graphics/battle/unk_824CBF8.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Mountain[] = INCBIN_U32("graphics/battle/unk_824CEC8.bin.lz");
-static const u32 sBattleTerrainPalette_Cave[] = INCBIN_U32("graphics/battle/unk_824CF98.gbapal.lz");
-static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle/unk_824CFEC.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle/unk_824D418.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Cave[] = INCBIN_U32("graphics/battle/unk_824D6B8.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Cave[] = INCBIN_U32("graphics/battle/unk_824DC98.bin.lz");
-static const u32 sBattleTerrainPalette_Building[] = INCBIN_U32("graphics/battle/unk_824DDF0.gbapal.lz");
-static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle/unk_824DE34.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle/unk_824E16C.bin.lz");
-static const u32 sBattleTerrainAnimTiles_Building[] = INCBIN_U32("graphics/battle/unk_824E410.4bpp.lz");
-static const u32 sBattleTerrainAnimTilemap_Building[] = INCBIN_U32("graphics/battle/unk_824E490.bin.lz");
-static const u32 sBattleTerrainPalette_Link[] = INCBIN_U32("graphics/battle/unk_824E528.gbapal.lz");
-static const u32 sBattleTerrainPalette_Gym[] = INCBIN_U32("graphics/battle/unk_824E56C.gbapal.lz");
-static const u32 sBattleTerrainPalette_Leader[] = INCBIN_U32("graphics/battle/unk_824E5B8.gbapal.lz");
-static const u32 sBattleTerrainPalette_Indoor2[] = INCBIN_U32("graphics/battle/unk_824E604.gbapal.lz");
-static const u32 sBattleTerrainPalette_Indoor1[] = INCBIN_U32("graphics/battle/unk_824E650.gbapal.lz");
-static const u32 sBattleTerrainPalette_Lorelei[] = INCBIN_U32("graphics/battle/unk_824E6A4.gbapal.lz");
-static const u32 sBattleTerrainPalette_Bruno[] = INCBIN_U32("graphics/battle/unk_824E6F0.gbapal.lz");
-static const u32 sBattleTerrainPalette_Agatha[] = INCBIN_U32("graphics/battle/unk_824E740.gbapal.lz");
-static const u32 sBattleTerrainPalette_Lance[] = INCBIN_U32("graphics/battle/unk_824E78C.gbapal.lz");
-static const u32 sBattleTerrainPalette_Champion[] = INCBIN_U32("graphics/battle/unk_824E7DC.gbapal.lz");
-static const u32 sBattleTerrainPalette_Plain[] = INCBIN_U32("graphics/battle/unk_824E81C.gbapal.lz");
-static const u32 sBattleTerrainTiles_Indoor2[] = INCBIN_U32("graphics/battle/unk_824E858.4bpp.lz");
-static const u32 sBattleTerrainTilemap_Indoor2[] = INCBIN_U32("graphics/battle/unk_824EB90.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/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/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/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/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/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/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/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/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/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] =
@@ -509,56 +518,56 @@ static const struct BattleBackground sBattleTerrainTable[] = {
     },
     [BATTLE_TERRAIN_INDOOR_2] =
     {
-        .tileset = sBattleTerrainTiles_Indoor2,
-        .tilemap = sBattleTerrainTilemap_Indoor2,
+        .tileset = sBattleTerrainTiles_Indoor,
+        .tilemap = sBattleTerrainTilemap_Indoor,
         .entryTileset = sBattleTerrainAnimTiles_Building,
         .entryTilemap = sBattleTerrainAnimTilemap_Building,
         .palette = sBattleTerrainPalette_Indoor2
     },
     [BATTLE_TERRAIN_INDOOR_1] =
     {
-        .tileset = sBattleTerrainTiles_Indoor2,
-        .tilemap = sBattleTerrainTilemap_Indoor2,
+        .tileset = sBattleTerrainTiles_Indoor,
+        .tilemap = sBattleTerrainTilemap_Indoor,
         .entryTileset = sBattleTerrainAnimTiles_Building,
         .entryTilemap = sBattleTerrainAnimTilemap_Building,
         .palette = sBattleTerrainPalette_Indoor1
     },
     [BATTLE_TERRAIN_LORELEI] =
     {
-        .tileset = sBattleTerrainTiles_Indoor2,
-        .tilemap = sBattleTerrainTilemap_Indoor2,
+        .tileset = sBattleTerrainTiles_Indoor,
+        .tilemap = sBattleTerrainTilemap_Indoor,
         .entryTileset = sBattleTerrainAnimTiles_Building,
         .entryTilemap = sBattleTerrainAnimTilemap_Building,
         .palette = sBattleTerrainPalette_Lorelei
     },
     [BATTLE_TERRAIN_BRUNO] =
     {
-        .tileset = sBattleTerrainTiles_Indoor2,
-        .tilemap = sBattleTerrainTilemap_Indoor2,
+        .tileset = sBattleTerrainTiles_Indoor,
+        .tilemap = sBattleTerrainTilemap_Indoor,
         .entryTileset = sBattleTerrainAnimTiles_Building,
         .entryTilemap = sBattleTerrainAnimTilemap_Building,
         .palette = sBattleTerrainPalette_Bruno
     },
     [BATTLE_TERRAIN_AGATHA] =
     {
-        .tileset = sBattleTerrainTiles_Indoor2,
-        .tilemap = sBattleTerrainTilemap_Indoor2,
+        .tileset = sBattleTerrainTiles_Indoor,
+        .tilemap = sBattleTerrainTilemap_Indoor,
         .entryTileset = sBattleTerrainAnimTiles_Building,
         .entryTilemap = sBattleTerrainAnimTilemap_Building,
         .palette = sBattleTerrainPalette_Agatha
     },
     [BATTLE_TERRAIN_LANCE] =
     {
-        .tileset = sBattleTerrainTiles_Indoor2,
-        .tilemap = sBattleTerrainTilemap_Indoor2,
+        .tileset = sBattleTerrainTiles_Indoor,
+        .tilemap = sBattleTerrainTilemap_Indoor,
         .entryTileset = sBattleTerrainAnimTiles_Building,
         .entryTilemap = sBattleTerrainAnimTilemap_Building,
         .palette = sBattleTerrainPalette_Lance
     },
     [BATTLE_TERRAIN_CHAMPION] =
     {
-        .tileset = sBattleTerrainTiles_Indoor2,
-        .tilemap = sBattleTerrainTilemap_Indoor2,
+        .tileset = sBattleTerrainTiles_Indoor,
+        .tilemap = sBattleTerrainTilemap_Indoor,
         .entryTileset = sBattleTerrainAnimTiles_Building,
         .entryTilemap = sBattleTerrainAnimTilemap_Building,
         .palette = sBattleTerrainPalette_Champion
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 3744c34eb..4cc39e8aa 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -342,7 +342,7 @@ static const struct SubspriteTable gUnknown_8260404[] = {
     {NELEMS(gUnknown_82603E4), gUnknown_82603E4}
 };
 
-static const u16 gUnknown_26040C[] = INCBIN_U16("graphics/battle_interface/unk_826404C.4bpp");
+static const u16 sBattleInterface_Unused[] = INCBIN_U16("graphics/battle_interface/unused.4bpp");
 
 static const struct CompressedSpriteSheet sStatusSummaryBarSpriteSheets[] = {
     {gFile_graphics_battle_interface_ball_status_bar_sheet, 0x0200, 55052},
@@ -360,8 +360,8 @@ static const struct SpritePalette sStatusSummaryBallsSpritePals[] = {
 };
 
 static const struct SpriteSheet sStatusSummaryBallsSpriteSheets[] = {
-    {gUnknown_8D12404, 0x0080, 55060},
-    {gUnknown_8D12404, 0x0080, 55061}
+    {gBattleInterface_SummaryBallDisplayGfx, 0x0080, 55060},
+    {gBattleInterface_SummaryBallDisplayGfx, 0x0080, 55061}
 };
 
 static const struct OamData gUnknown_82604AC = {
diff --git a/src/battle_records.c b/src/battle_records.c
index a32276199..017c1078c 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -25,7 +25,7 @@ static void Task_WaitFadeIn(u8 taskId);
 static void Task_WaitButton(u8 taskId);
 static void Task_FadeOut(u8 taskId);
 static void Task_DestroyAndReturnToField(u8 taskId);
-static void ClearWindowCommitAndRemove(u8 winddowId);
+static void ClearWindowCommitAndRemove(u8 windowId);
 static void ResetGpu(void);
 static void StopAllRunningTasks(void);
 static void EnableDisplay(void);
@@ -35,8 +35,8 @@ static void CommitWindow(u8 windowId);
 static void LoadFrameGfxOnBg(u8 bgId);
 
 static const u16 sTiles[] = INCBIN_U16("graphics/battle_records/bg_tiles.4bpp");
-static const u16 sPalette[] = INCBIN_U16("graphics/battle_records/palette.gbapal");
-static const u16 sTilemap[] = INCBIN_U16("graphics/battle_records/tilemap.bin");
+static const u16 sPalette[] = INCBIN_U16("graphics/battle_records/bg_tiles.gbapal");
+static const u16 sTilemap[] = INCBIN_U16("graphics/battle_records/bg_tiles.bin");
 
 static const struct WindowTemplate sWindowTemplates[] = {
     {
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index f040d9419..ee9251017 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -703,8 +703,9 @@ static const struct WindowTemplate sUnusedWinTemplate =
     .baseBlock = 0x3F,
 };
 
-static const u16 gUnknown_82506D0[] = INCBIN_U16("graphics/battle_interface/unk_battlebox.gbapal");
-static const u32 gUnknown_82506F0[] = INCBIN_U32("graphics/battle_interface/unk_battlebox.4bpp.lz");
+// not used
+static const u16 sUnknownBattleboxPal[] = INCBIN_U16("graphics/battle_interface/unk_battlebox.gbapal");
+static const u32 sUnknownBattleboxGfx[] = INCBIN_U32("graphics/battle_interface/unk_battlebox.4bpp.lz");
 
 // not used
 static const u8 sRubyLevelUpStatBoxStats[] =
@@ -5593,8 +5594,8 @@ static void sub_8026480(void)
 {
     gBattle_BG2_Y = 0;
     gBattle_BG2_X = 0x1A0;
-    LoadPalette(gUnknown_82506D0, 0x60, 0x20);
-    CopyToWindowPixelBuffer(13, gUnknown_82506F0, 0, 0);
+    LoadPalette(sUnknownBattleboxPal, 0x60, 0x20);
+    CopyToWindowPixelBuffer(13, sUnknownBattleboxGfx, 0, 0);
     PutWindowTilemap(13);
     CopyWindowToVram(13, COPYWIN_BOTH);
     PutMonIconOnLvlUpBox();
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/diploma.c b/src/diploma.c
index 50c3adf41..38df40663 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -29,9 +29,9 @@ static void Task_WaitForExit(u8);
 static void Task_DiplomaInit(u8);
 static void Task_DiplomaReturnToOverworld(u8);
 
-static const u32 gUnknown_84147C0[] = INCBIN_U32("graphics/diploma/unk_84147C0.4bpp.lz");
-static const u32 gUnknown_84154E8[] = INCBIN_U32("graphics/diploma/unk_84154E8.bin.lz");
-static const u16 gUnknown_8415954[] = INCBIN_U16("graphics/diploma/unk_8415954.gbapal");
+static const u32 sDiplomaGfx[] = INCBIN_U32("graphics/diploma/diploma.4bpp.lz");
+static const u32 sDiplomaTilemap[] = INCBIN_U32("graphics/diploma/diploma.bin.lz");
+static const u16 sDiplomaPal[] = INCBIN_U16("graphics/diploma/diploma.gbapal");
 
 static const u8 gUnknown_8415994[] = _("{HIGHLIGHT TRANSPARENT}プレイヤー");
 static const u8 gUnknown_841599D[] = _("{HIGHLIGHT TRANSPARENT}さま");
@@ -118,7 +118,7 @@ static void Task_DiplomaInit(u8 taskId)
         }
         break;
     case 3:
-        CopyToBgTilemapBuffer(1, gUnknown_84154E8, 0, 0);
+        CopyToBgTilemapBuffer(1, sDiplomaTilemap, 0, 0);
         break;
     case 4:
         if (HasAllMons())
@@ -231,7 +231,7 @@ static u8 DiplomaLoadGfx(void)
         ResetTempTileDataBuffers();
         break;
     case 1:
-        DecompressAndCopyTileDataToVram(1, gUnknown_84147C0, 0, 0, 0);
+        DecompressAndCopyTileDataToVram(1, sDiplomaGfx, 0, 0, 0);
         break;
     case 2:
         if (!(FreeTempTileDataBuffersIfPossible() == 1))
@@ -240,7 +240,7 @@ static u8 DiplomaLoadGfx(void)
         }
         return 0;
     case 3:
-        LoadPalette(gUnknown_8415954, 0, 0x40);
+        LoadPalette(sDiplomaPal, 0, 0x40);
     default:
         return 1;
     }
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 1f8fd1cda..0eb36b523 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -59,12 +59,12 @@ static void Task_MovingBackgroundPos(u8 taskId);
 static void ResetBgRegsAfterMovingBackgroundCancel(void);
 
 // const data
-static const u16 sUnrefPal_83F6C90[] = INCBIN_U16("graphics/evolution_scene/unknown_5B4114.gbapal");
+static const u16 sUnusedPal[] = INCBIN_U16("graphics/evolution_scene/unused.gbapal");
 static const u32 sMovingBackgroundTiles[] = INCBIN_U32("graphics/evolution_scene/bg.4bpp.lz");
 static const u32 sMovingBackgroundMap1[] = INCBIN_U32("graphics/evolution_scene/bg.bin.lz");
 static const u32 sMovingBackgroundMap2[] = INCBIN_U32("graphics/evolution_scene/bg2.bin.lz");
 static const u16 sBlackPalette[] = INCBIN_U16("graphics/evolution_scene/gray_transition_intro.gbapal");
-static const u16 unref_83F7D80[] = INCBIN_U16("graphics/evolution_scene/unref_83F7D80.bin");
+static const u16 sUnusedTilemap[] = INCBIN_U16("graphics/evolution_scene/unused_tilemap.bin");
 static const u16 sMovingBgPals[] = INCBIN_U16("graphics/evolution_scene/transition.gbapal");
 
 static const u8 sText_ShedinjaJapaneseName[] = _("ヌケニン");
diff --git a/src/field_effect.c b/src/field_effect.c
index 5942e68fd..c2b507882 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -59,10 +59,10 @@ static void SpriteCB_PokeballGlow(struct Sprite * sprite);
 static void SpriteCB_PokecenterMonitor(struct Sprite * sprite);
 static void SpriteCB_HallOfFameMonitor(struct Sprite * sprite);
 
-static const u16 sNewGameOakObjectSpriteTiles[] = INCBIN_U16("graphics/field_effects/unk_83CA770.4bpp");
-static const u16 sNewGameOakObjectPals[] = INCBIN_U16("graphics/field_effects/unk_83CAF70.gbapal");
-static const u16 sUnknown_83CAF90[] = INCBIN_U16("graphics/field_effects/unk_83CAF90.4bpp");
-static const u16 sUnknown_83CAFB0[] = INCBIN_U16("graphics/field_effects/unk_83CAFB0.gbapal");
+static const u16 sNewGameOakObjectSpriteTiles[] = INCBIN_U16("graphics/field_effects/new_game_oak.4bpp");
+static const u16 sNewGameOakObjectPals[] = INCBIN_U16("graphics/field_effects/new_game_oak.gbapal");
+static const u16 sPokeballGfx[] = INCBIN_U16("graphics/field_effects/pokeball.4bpp");
+static const u16 sPokeballPal[] = INCBIN_U16("graphics/field_effects/pokeball.gbapal");
 static const u16 sUnknown_83CAFD0[] = INCBIN_U16("graphics/field_effects/unk_83CAFD0.4bpp");
 static const u16 sUnknown_83CB3D0[] = INCBIN_U16("graphics/field_effects/unk_83CB3D0.gbapal");
 static const u16 sUnknown_83CB3F0[] = INCBIN_U16("graphics/field_effects/unk_83CB3F0.4bpp");
@@ -161,7 +161,7 @@ static const struct SpriteTemplate sNewGameOakObjectTemplate = {
 };
 
 const struct SpritePalette gUnknown_83CBE9C = {
-    sUnknown_83CAFB0, 4103
+    sPokeballPal, 4103
 };
 
 const struct SpritePalette gUnknown_83CBEA4 = {
@@ -185,7 +185,7 @@ static const struct OamData sOamData_83CBEAC = {
 };
 
 static const struct SpriteFrameImage sUnknown_83CBEB4[] = {
-    {sUnknown_83CAF90, 0x20}
+    {sPokeballGfx, 0x20}
 };
 
 static const struct SpriteFrameImage sUnknown_83CBEBC[] = {
diff --git a/src/graphics.c b/src/graphics.c
index c14251d17..04a6f6206 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -366,10 +366,10 @@ const u8 gHealthboxElementsGfxTable_Misc[] = INCBIN_U8("graphics/battle_interfac
 const u8 gHealthboxElementsGfxTable_HpBarAnim[] = INCBIN_U8("graphics/battle_interface/hp_bar_anim.4bpp");
 const u8 gHealthboxElementsGfxTable_MiscFrameEnd[] = INCBIN_U8("graphics/battle_interface/misc_frame_end.4bpp");
 
-const u8 gUnknown_8D12404[] = INCBIN_U8("graphics/battle_interface/ball_display.4bpp");
+const u8 gBattleInterface_SummaryBallDisplayGfx[] = INCBIN_U8("graphics/battle_interface/ball_display.4bpp");
 
 //Originally an array?
-const u8 gUnknown_08C1249C[] = INCBIN_U8("graphics/battle_interface/ball_display_unused_extra.4bpp");
+const u8 gBattleInterface_UnusedSummaryBallDisplayGfx[] = INCBIN_U8("graphics/battle_interface/ball_display_unused_extra.4bpp");
 const u8 gBattleInterfaceGfx_Status2[] = INCBIN_U8("graphics/battle_interface/status2.4bpp"); // these three duplicate sets of graphics are for the opponent pokemon
 const u8 gBattleInterfaceGfx_Status3[] = INCBIN_U8("graphics/battle_interface/status3.4bpp"); // and are also for use in double battles. they use dynamic palettes so
 const u8 gBattleInterfaceGfx_Status4[] = INCBIN_U8("graphics/battle_interface/status4.4bpp"); // coloring them is an extreme headache and wont be done for now
@@ -461,25 +461,25 @@ const u32 gFile_graphics_unknown_unknown_D17AB8_tilemap[] = INCBIN_U32("graphics
 
 const u32 gContestMiscGfx[] = INCBIN_U32("graphics/contest/misc.4bpp.lz");
 
-const u32 gFile_graphics_contest_audience_sheet[] = INCBIN_U32("graphics/contest/audience.4bpp.lz");
+const u32 gContestAudienceGfx[] = INCBIN_U32("graphics/contest/audience.4bpp.lz");
 
-const u32 gFile_graphics_contest_faces_sheet[] = INCBIN_U32("graphics/contest/faces.4bpp.lz");
+const u32 gContestFacesSheetGfx[] = INCBIN_U32("graphics/contest/faces.4bpp.lz");
 
-const u32 gFile_graphics_contest_judge_symbols_sheet[] = INCBIN_U32("graphics/contest/judge_symbols.4bpp.lz");
-const u32 gFile_graphics_contest_judge_symbols_palette[] = INCBIN_U32("graphics/contest/judge_symbols.gbapal.lz");
+const u32 gContestJudgeSymbolsGfx[] = INCBIN_U32("graphics/contest/judge_symbols.4bpp.lz");
+const u32 gContestJudgeSymbolsPal[] = INCBIN_U32("graphics/contest/judge_symbols.gbapal.lz");
 
-const u8 gFile_graphics_contest_heart[] = INCBIN_U8("graphics/contest/heart.4bpp");
+const u8 gContestHeartGfx[] = INCBIN_U8("graphics/contest/heart.4bpp");
 
 const u32 gFile_graphics_unknown_unknown_D196E4_sheet[] = INCBIN_U32("graphics/unknown/unknown_D196E4.4bpp.lz");
 const u32 gFile_graphics_unknown_unknown_D196E4_palette[] = INCBIN_U32("graphics/unknown/unknown_D196E4.gbapal.lz");
 
-const u32 gUnknown_8D197FC[] = INCBIN_U32("graphics/contest/misc_2.4bpp.lz");
+const u32 gContestMisc2Gfx[] = INCBIN_U32("graphics/contest/misc_2.4bpp.lz");
 
-const u32 gFile_graphics_contest_misc_2_tilemap_1_tilemap[] = INCBIN_U32("graphics/contest/misc_2_tilemap_1.bin.lz");
-const u32 gFile_graphics_contest_misc_2_tilemap_2_tilemap[] = INCBIN_U32("graphics/contest/misc_2_tilemap_2.bin.lz");
-const u32 gFile_graphics_contest_misc_2_tilemap_3_tilemap[] = INCBIN_U32("graphics/contest/misc_2_tilemap_3.bin.lz");
+const u32 gContestMiscTilemap1[] = INCBIN_U32("graphics/contest/misc_2_tilemap_1.bin.lz");
+const u32 gContestMiscTilemap2[] = INCBIN_U32("graphics/contest/misc_2_tilemap_2.bin.lz");
+const u32 gContestMiscTilemap3[] = INCBIN_U32("graphics/contest/misc_2_tilemap_3.bin.lz");
 
-const u32 gFile_graphics_contest_misc_2_palette[] = INCBIN_U32("graphics/contest/misc_2.gbapal.lz");
+const u32 gContestMiscPal[] = INCBIN_U32("graphics/contest/misc.gbapal.lz");
 
 const u32 gBattleAnimSpriteGfx_Impact[] = INCBIN_U32("graphics/battle_anims/sprites/impact.4bpp.lz");
 const u32 gBattleAnimSpritePal_Impact[] = INCBIN_U32("graphics/battle_anims/sprites/impact.gbapal.lz");
@@ -582,8 +582,8 @@ const u32 gBattleAnimSpritePal_BlackBall2[] = INCBIN_U32("graphics/battle_anims/
 
 const u32 gBattleAnimSpritePal_PurpleGasCloud[] = INCBIN_U32("graphics/battle_anims/sprites/purple_gas_cloud.gbapal.lz");
 
-const u32 gFile_graphics_contest_judge_sheet[] = INCBIN_U32("graphics/contest/judge.4bpp.lz");
-const u32 gFile_graphics_contest_judge_palette[] = INCBIN_U32("graphics/contest/judge.gbapal.lz");
+const u32 gContestJudgeGfx[] = INCBIN_U32("graphics/contest/judge.4bpp.lz");
+const u32 gContestJudgePal[] = INCBIN_U32("graphics/contest/judge.gbapal.lz");
 
 const u32 gBattleAnimSpriteGfx_Spark[] = INCBIN_U32("graphics/battle_anims/sprites/spark.4bpp.lz");
 const u32 gBattleAnimSpritePal_Spark[] = INCBIN_U32("graphics/battle_anims/sprites/spark.gbapal.lz");
@@ -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");
 
@@ -984,8 +984,8 @@ const u32 gBattleAnimSpriteGfx_IcicleSpear[] = INCBIN_U32("graphics/battle_anims
 const u32 gBattleAnimSpritePal_IcicleSpear[] = INCBIN_U32("graphics/battle_anims/sprites/icicle_spear.gbapal.lz");
 
 const u32 gContestNextTurnGfx[] = INCBIN_U32("graphics/contest/next_turn.4bpp.lz");
-const u8 gFile_graphics_contest_nextturn_numbers[] = INCBIN_U8("graphics/contest/next_turn_numbers.4bpp");
-const u8 gFile_graphics_contest_nextturn_random[] = INCBIN_U8("graphics/contest/next_turn_random.4bpp");
+const u8 gContestNextTurnNumbersGfx[] = INCBIN_U8("graphics/contest/next_turn_numbers.4bpp");
+const u8 gContestNextTurnRandomGfx[] = INCBIN_U8("graphics/contest/next_turn_random.4bpp");
 
 const u32 gBattleAnimSpriteGfx_GlowyRedOrb[] = INCBIN_U32("graphics/battle_anims/sprites/glowy_red_orb.4bpp.lz");
 const u32 gBattleAnimSpritePal_GlowyRedOrb[] = INCBIN_U32("graphics/battle_anims/sprites/glowy_red_orb.gbapal.lz");
@@ -994,9 +994,9 @@ const u32 gBattleAnimSpritePal_SleepPowder[] = INCBIN_U32("graphics/battle_anims
 const u32 gBattleAnimSpritePal_StunSpore[] = INCBIN_U32("graphics/battle_anims/sprites/stun_spore.gbapal.lz");
 
 const u32 gContestApplauseGfx[] = INCBIN_U32("graphics/contest/applause.4bpp.lz");
-const u8 gFile_graphics_contest_applause_meter[] = INCBIN_U8("graphics/contest/applause_meter.4bpp");
+const u8 gContestApplauseMeterGfx[] = INCBIN_U8("graphics/contest/applause_meter.4bpp");
 
-const u16 gFile_graphics_contest_nextturn[] = INCBIN_U16("graphics/contest/next_turn.gbapal");
+const u16 gContestNextTurnPal[] = INCBIN_U16("graphics/contest/next_turn.gbapal");
 
 const u32 gBattleAnimSpriteGfx_Splash[] = INCBIN_U32("graphics/battle_anims/sprites/splash.4bpp.lz");
 const u32 gBattleAnimSpritePal_Splash[] = INCBIN_U32("graphics/battle_anims/sprites/splash.gbapal.lz");
@@ -1136,12 +1136,12 @@ const u8 gItemPcTiles[] = INCBIN_U8("graphics/item_pc/unk_8E85090.4bpp.lz");
 const u32 gItemPcBgPals[] = INCBIN_U32("graphics/item_pc/unk_8E85408.gbapal.lz");
 const u8 gItemPcTilemap[] = INCBIN_U8("graphics/item_pc/unk_8E85458.bin.lz");
 
-const u32 gBerryPouchSpriteTiles[] = INCBIN_U32("graphics/berry_pouch/unk_8E8560C.4bpp.lz");
-const u8 gBerryPouchBgGfx[] = INCBIN_U8("graphics/berry_pouch/unk_8E859D0.4bpp.lz");
-const u32 gBerryPouchBgPals[] = INCBIN_U32("graphics/berry_pouch/unk_8E85BA4.gbapal.lz");
-const u32 gBerryPouchBgPal0FemaleOverride[] = INCBIN_U32("graphics/berry_pouch/unk_8E85BF4.gbapal.lz");
-const u32 gBerryPouchSpritePalette[] = INCBIN_U32("graphics/berry_pouch/unk_8E85C1C.gbapal.lz");
-const u8 gBerryPouchBg1Tilemap[] = INCBIN_U8("graphics/berry_pouch/unk_8E85C44.bin.lz");
+const u32 gBerryPouchSpriteTiles[] = INCBIN_U32("graphics/berry_pouch/berry_pouch.4bpp.lz");
+const u8 gBerryPouchBgGfx[] = INCBIN_U8("graphics/berry_pouch/background.4bpp.lz");
+const u32 gBerryPouchBgPals[] = INCBIN_U32("graphics/berry_pouch/background.gbapal.lz");
+const u32 gBerryPouchBgPal0FemaleOverride[] = INCBIN_U32("graphics/berry_pouch/background_female.gbapal.lz");
+const u32 gBerryPouchSpritePalette[] = INCBIN_U32("graphics/berry_pouch/berry_pouch.gbapal.lz");
+const u8 gBerryPouchBg1Tilemap[] = INCBIN_U8("graphics/berry_pouch/background.bin.lz");
 
 const u32 gBuyMenuFrame_Gfx[] = INCBIN_U32("graphics/shop_menu/shop_menu.4bpp.lz");
 const u32 gBuyMenuFrame_Tilemap[] = INCBIN_U32("graphics/shop_menu/shop_tilemap.bin");
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 8480edfaf..e6f8b72ec 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -283,8 +283,8 @@ static const struct SpriteTemplate sSpriteTemplate_Confetti = {
     .callback = SpriteCB_Confetti
 };
 
-static const u16 sHallOfFame_Pal[] = INCBIN_U16("graphics/hall_of_fame/unk_840C3BC.gbapal");
-static const u32 sHallOfFame_Gfx[] = INCBIN_U32("graphics/hall_of_fame/unk_840C3BC.4bpp.lz");
+static const u16 sHallOfFame_Pal[] = INCBIN_U16("graphics/hall_of_fame/hall_of_fame.gbapal");
+static const u32 sHallOfFame_Gfx[] = INCBIN_U32("graphics/hall_of_fame/hall_of_fame.4bpp.lz");
 
 static const struct HallofFameMon sDummyHofMon = {
     .tid = 0x03EA03EA, // (u16[]){1002, 1002} corrupted sprite template?
diff --git a/src/help_system.c b/src/help_system.c
index 27ec64baa..f29359354 100644
--- a/src/help_system.c
+++ b/src/help_system.c
@@ -1646,7 +1646,7 @@ static const u8 *const sHelpSystemSubmenuItemLists[HELPCONTEXT_COUNT * (TOPIC_CO
     NULL,                          NULL,                       NULL,                       NULL,                    NULL  // HELPCONTEXT_UNUSED
 };
 
-static const u16 unref_845BCB0[] = INCBIN_U16("graphics/help_system/unk_845BCB0.bin");
+static const u16 unref_845BCB0[] = INCBIN_U16("graphics/help_system/unused.bin");
 
 static const u8 sHelpSystemContextTopicOrder[TOPIC_COUNT] = {
     TOPIC_ABOUT_GAME, 
diff --git a/src/water.c b/src/water.c
index 5f7fa4dc6..eb7c13c8f 100644
--- a/src/water.c
+++ b/src/water.c
@@ -56,7 +56,7 @@ static void CreateWaterSportDroplet(struct Task*);
 static void CreateWaterPulseRingBubbles(struct Sprite*, s32, s32);
 
 // Both unused? Comment copied from pokeemerald
-static const u8 gUnknown_83E44F4[] = INCBIN_U8("graphics/battle_anims/unk_83E4874.4bpp");
+static const u8 gUnknown_83E44F4[] = INCBIN_U8("graphics/battle_anims/unk_83E44F4.4bpp");
 static const u8 gUnknown_83E4874[] = INCBIN_U8("graphics/battle_anims/unk_83E4874.bin");
 
 static const union AnimCmd sAnim_RainDrop[] =