Document and index graphics/battle

79 files changed, 124 insertions, 72 deletions

diff --git a/graphics/battle/unk_824E16C.bin b/graphics/battle/terrain_building.bin
index 0710427da..0710427da 100644
--- a/graphics/battle/unk_824E16C.bin
+++ b/graphics/battle/terrain_building.bin
diff --git a/graphics/battle/unk_824DDF0.pal b/graphics/battle/terrain_building.pal
index 16421567f..16421567f 100644
--- a/graphics/battle/unk_824DDF0.pal
+++ b/graphics/battle/terrain_building.pal
diff --git a/graphics/battle/terrain_building.png b/graphics/battle/terrain_building.png
new file mode 100644
index 000000000..3b060be4e
--- /dev/null
+++ b/graphics/battle/terrain_building.png
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_824D418.bin b/graphics/battle/terrain_cave.bin
index 255f2953d..255f2953d 100644
--- a/graphics/battle/unk_824D418.bin
+++ b/graphics/battle/terrain_cave.bin
diff --git a/graphics/battle/unk_824CF98.pal b/graphics/battle/terrain_cave.pal
index f17a7bf9d..f17a7bf9d 100644
--- a/graphics/battle/unk_824CF98.pal
+++ b/graphics/battle/terrain_cave.pal
diff --git a/graphics/battle/terrain_cave.png b/graphics/battle/terrain_cave.png
new file mode 100644
index 000000000..e2a18ae57
--- /dev/null
+++ b/graphics/battle/terrain_cave.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/unk_82489A8.bin b/graphics/battle/terrain_grass.bin
index e0da76dc2..e0da76dc2 100644
--- a/graphics/battle/unk_82489A8.bin
+++ b/graphics/battle/terrain_grass.bin
diff --git a/graphics/battle/unk_8248400.pal b/graphics/battle/terrain_grass.pal
index cc00b3dc2..cc00b3dc2 100644
--- a/graphics/battle/unk_8248400.pal
+++ b/graphics/battle/terrain_grass.pal
diff --git a/graphics/battle/terrain_grass.png b/graphics/battle/terrain_grass.png
new file mode 100644
index 000000000..645796cb1
--- /dev/null
+++ b/graphics/battle/terrain_grass.png
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_824EB90.bin b/graphics/battle/terrain_indoor.bin
index 0710427da..0710427da 100644
--- a/graphics/battle/unk_824EB90.bin
+++ b/graphics/battle/terrain_indoor.bin
diff --git a/graphics/battle/terrain_indoor.png b/graphics/battle/terrain_indoor.png
new file mode 100644
index 000000000..1cbb7c63b
--- /dev/null
+++ b/graphics/battle/terrain_indoor.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_8249620.bin b/graphics/battle/terrain_longgrass.bin
index 2b2634a14..2b2634a14 100644
--- a/graphics/battle/unk_8249620.bin
+++ b/graphics/battle/terrain_longgrass.bin
diff --git a/graphics/battle/unk_8249074.pal b/graphics/battle/terrain_longgrass.pal
index c390b8c44..c390b8c44 100644
--- a/graphics/battle/unk_8249074.pal
+++ b/graphics/battle/terrain_longgrass.pal
diff --git a/graphics/battle/terrain_longgrass.png b/graphics/battle/terrain_longgrass.png
new file mode 100644
index 000000000..0d09d739c
--- /dev/null
+++ b/graphics/battle/terrain_longgrass.png
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_824C958.bin b/graphics/battle/terrain_mountain.bin
index 16600f5f8..16600f5f8 100644
--- a/graphics/battle/unk_824C958.bin
+++ b/graphics/battle/terrain_mountain.bin
diff --git a/graphics/battle/unk_824C5D8.pal b/graphics/battle/terrain_mountain.pal
index bfe75be65..bfe75be65 100644
--- a/graphics/battle/unk_824C5D8.pal
+++ b/graphics/battle/terrain_mountain.pal
diff --git a/graphics/battle/terrain_mountain.png b/graphics/battle/terrain_mountain.png
new file mode 100644
index 000000000..9889a6b62
--- /dev/null
+++ b/graphics/battle/terrain_mountain.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_824C07C.bin b/graphics/battle/terrain_pond.bin
index d4c3dedcb..d4c3dedcb 100644
--- a/graphics/battle/unk_824C07C.bin
+++ b/graphics/battle/terrain_pond.bin
diff --git a/graphics/battle/unk_824BCE0.pal b/graphics/battle/terrain_pond.pal
index 041560cf4..041560cf4 100644
--- a/graphics/battle/unk_824BCE0.pal
+++ b/graphics/battle/terrain_pond.pal
diff --git a/graphics/battle/terrain_pond.png b/graphics/battle/terrain_pond.png
new file mode 100644
index 000000000..161498b2a
--- /dev/null
+++ b/graphics/battle/terrain_pond.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_824A37C.bin b/graphics/battle/terrain_sand.bin
index 365e1474f..365e1474f 100644
--- a/graphics/battle/unk_824A37C.bin
+++ b/graphics/battle/terrain_sand.bin
diff --git a/graphics/battle/unk_8249F98.pal b/graphics/battle/terrain_sand.pal
index dafc3eb7f..dafc3eb7f 100644
--- a/graphics/battle/unk_8249F98.pal
+++ b/graphics/battle/terrain_sand.pal
diff --git a/graphics/battle/terrain_sand.png b/graphics/battle/terrain_sand.png
new file mode 100644
index 000000000..e802b34f2
--- /dev/null
+++ b/graphics/battle/terrain_sand.png
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/unk_824ACD0.bin b/graphics/battle/terrain_underwater.bin
index 29843f17d..29843f17d 100644
--- a/graphics/battle/unk_824ACD0.bin
+++ b/graphics/battle/terrain_underwater.bin
diff --git a/graphics/battle/unk_824A940.pal b/graphics/battle/terrain_underwater.pal
index 5fa95cf21..5fa95cf21 100644
--- a/graphics/battle/unk_824A940.pal
+++ b/graphics/battle/terrain_underwater.pal
diff --git a/graphics/battle/terrain_underwater.png b/graphics/battle/terrain_underwater.png
new file mode 100644
index 000000000..19e115348
--- /dev/null
+++ b/graphics/battle/terrain_underwater.png
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/unk_824B608.bin b/graphics/battle/terrain_water.bin
index 0ee05129a..0ee05129a 100644
--- a/graphics/battle/unk_824B608.bin
+++ b/graphics/battle/terrain_water.bin
diff --git a/graphics/battle/unk_824B19C.pal b/graphics/battle/terrain_water.pal
index d31dce658..d31dce658 100644
--- a/graphics/battle/unk_824B19C.pal
+++ b/graphics/battle/terrain_water.pal
diff --git a/graphics/battle/terrain_water.png b/graphics/battle/terrain_water.png
new file mode 100644
index 000000000..8953e7940
--- /dev/null
+++ b/graphics/battle/terrain_water.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/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_file_rules.mk b/graphics_file_rules.mk
index 64e173aa4..0b3fda217 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -24,6 +24,7 @@ TITLESCREENGFXDIR := graphics/title_screen
 CREDITSGFXDIR := graphics/credits
 ITEMMENUGFXDIR := graphics/item_menu
 INTROGFXDIR := graphics/intro
+BATTLEGFXDIR := graphics/battle
 
 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
@@ -523,3 +524,45 @@ $(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png
 
 $(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 17
+
+$(BATTLEGFXDIR)/terrain_building.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 77
+
+$(BATTLEGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 106
+
+$(BATTLEGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 84
+
+$(BATTLEGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 98
+
+$(BATTLEGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 77
+
+$(BATTLEGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 133
+
+$(BATTLEGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 98
+
+$(BATTLEGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 47
+
+$(BATTLEGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 36
+
+$(BATTLEGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 75
+
+$(BATTLEGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 83
+
+$(BATTLEGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 26
+
+$(BATTLEGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 85
+
+$(BATTLEGFXDIR)/terrain_water.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 81
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 32d3e017a..05a6babe2 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.gbapal.lz");
+static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle/terrain_grass.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle/terrain_grass.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Grass[] = INCBIN_U32("graphics/battle/terrain_grass_anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Grass[] = INCBIN_U32("graphics/battle/terrain_grass_anim.bin.lz");
+
+static const u32 sBattleTerrainPalette_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass.gbapal.lz");
+static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass.4bpp.lz");
+static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass.bin.lz");
+static const u32 sBattleTerrainAnimTiles_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass_anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass_anim.bin.lz");
+
+static const u32 sBattleTerrainPalette_Sand[] = INCBIN_U32("graphics/battle/terrain_sand.gbapal.lz");
+static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle/terrain_sand.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle/terrain_sand.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Sand[] = INCBIN_U32("graphics/battle/terrain_sand_anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Sand[] = INCBIN_U32("graphics/battle/terrain_sand_anim.bin.lz");
+
+static const u32 sBattleTerrainPalette_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater.gbapal.lz");
+static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater_anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater_anim.bin.lz");
+
+static const u32 sBattleTerrainPalette_Water[] = INCBIN_U32("graphics/battle/terrain_water.gbapal.lz");
+static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle/terrain_water.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle/terrain_water.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Water[] = INCBIN_U32("graphics/battle/terrain_water_anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Water[] = INCBIN_U32("graphics/battle/terrain_water_anim.bin.lz");
+
+static const u32 sBattleTerrainPalette_Pond[] = INCBIN_U32("graphics/battle/terrain_pond.gbapal.lz");
+static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle/terrain_pond.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle/terrain_pond.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Pond[] = INCBIN_U32("graphics/battle/terrain_pond_anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Pond[] = INCBIN_U32("graphics/battle/terrain_pond_anim.bin.lz");
+
+static const u32 sBattleTerrainPalette_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain.gbapal.lz");
+static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain_anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain_anim.bin.lz");
+
+static const u32 sBattleTerrainPalette_Cave[] = INCBIN_U32("graphics/battle/terrain_cave.gbapal.lz");
+static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle/terrain_cave.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle/terrain_cave.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Cave[] = INCBIN_U32("graphics/battle/terrain_cave_anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Cave[] = INCBIN_U32("graphics/battle/terrain_cave_anim.bin.lz");
+
+static const u32 sBattleTerrainPalette_Building[] = INCBIN_U32("graphics/battle/terrain_building.gbapal.lz");
+static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle/terrain_building.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle/terrain_building.bin.lz");
+static const u32 sBattleTerrainAnimTiles_Building[] = INCBIN_U32("graphics/battle/terrain_building_anim.4bpp.lz");
+static const u32 sBattleTerrainAnimTilemap_Building[] = INCBIN_U32("graphics/battle/terrain_building_anim.bin.lz");
+
+static const u32 sBattleTerrainPalette_Link[] = INCBIN_U32("graphics/battle/terrain_indoor_link.gbapal.lz");
+static const u32 sBattleTerrainPalette_Gym[] = INCBIN_U32("graphics/battle/terrain_indoor_gym.gbapal.lz");
+static const u32 sBattleTerrainPalette_Leader[] = INCBIN_U32("graphics/battle/terrain_indoor_leader.gbapal.lz");
+static const u32 sBattleTerrainPalette_Indoor2[] = INCBIN_U32("graphics/battle/terrain_indoor_2.gbapal.lz");
+static const u32 sBattleTerrainPalette_Indoor1[] = INCBIN_U32("graphics/battle/terrain_indoor_1.gbapal.lz");
+static const u32 sBattleTerrainPalette_Lorelei[] = INCBIN_U32("graphics/battle/terrain_indoor_lorelei.gbapal.lz");
+static const u32 sBattleTerrainPalette_Bruno[] = INCBIN_U32("graphics/battle/terrain_indoor_bruno.gbapal.lz");
+static const u32 sBattleTerrainPalette_Agatha[] = INCBIN_U32("graphics/battle/terrain_indoor_agatha.gbapal.lz");
+static const u32 sBattleTerrainPalette_Lance[] = INCBIN_U32("graphics/battle/terrain_indoor_lance.gbapal.lz");
+static const u32 sBattleTerrainPalette_Champion[] = INCBIN_U32("graphics/battle/terrain_indoor_champion.gbapal.lz");
+static const u32 sBattleTerrainPalette_Plain[] = INCBIN_U32("graphics/battle/terrain_indoor_plain.gbapal.lz");
+static const u32 sBattleTerrainTiles_Indoor[] = INCBIN_U32("graphics/battle/terrain_indoor.4bpp.lz");
+static const u32 sBattleTerrainTilemap_Indoor[] = INCBIN_U32("graphics/battle/terrain_indoor.bin.lz");
 
 static const 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