battle terrain graphics

50 files changed, 794 insertions, 116 deletions

diff --git a/asm/rom3.s b/asm/rom3.s
index 095eb41e8..f21b943b2 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -8424,9 +8424,9 @@ sub_800D7B8: @ 800D7B8
 	.align 2, 0
 _0800D7DC: .4byte 0x020239f8
 _0800D7E0: .4byte 0x00000902
-_0800D7E4: .4byte gUnknown_08E62514
+_0800D7E4: .4byte gBattleTerrainTiles_Building
 _0800D7E8: .4byte 0x06008000
-_0800D7EC: .4byte gUnknown_08E62AFC
+_0800D7EC: .4byte gBattleTerrainTilemap_Building
 _0800D7F0: .4byte 0x0600d000
 _0800D7F4: .4byte gUnknown_08E62AC0
 _0800D7F8:
@@ -8449,9 +8449,9 @@ _0800D7F8:
 	b _0800DA66
 	.align 2, 0
 _0800D820: .4byte gGameVersion
-_0800D824: .4byte gUnknown_08E61BE8
+_0800D824: .4byte gBattleTerrainTiles_Cave
 _0800D828: .4byte 0x06008000
-_0800D82C: .4byte gUnknown_08E62228
+_0800D82C: .4byte gBattleTerrainTilemap_Cave
 _0800D830: .4byte 0x0600d000
 _0800D834: .4byte gUnknown_08E636E0
 _0800D838:
@@ -8464,9 +8464,9 @@ _0800D838:
 	ldr r0, _0800D85C
 	b _0800DA66
 	.align 2, 0
-_0800D84C: .4byte gUnknown_08E601DC
+_0800D84C: .4byte gBattleTerrainTiles_Water
 _0800D850: .4byte 0x06008000
-_0800D854: .4byte gUnknown_08E607F4
+_0800D854: .4byte gBattleTerrainTilemap_Water
 _0800D858: .4byte 0x0600d000
 _0800D85C: .4byte gUnknown_08E636A4
 _0800D860:
@@ -8495,9 +8495,9 @@ _0800D860:
 	.align 2, 0
 _0800D890: .4byte gTrainers
 _0800D894: .4byte 0x0202ff5e
-_0800D898: .4byte gUnknown_08E62514
+_0800D898: .4byte gBattleTerrainTiles_Building
 _0800D89C: .4byte 0x06008000
-_0800D8A0: .4byte gUnknown_08E62AFC
+_0800D8A0: .4byte gBattleTerrainTilemap_Building
 _0800D8A4: .4byte 0x0600d000
 _0800D8A8: .4byte gUnknown_08E63774
 _0800D8AC:
@@ -8572,7 +8572,7 @@ _0800D918:
 	ldr r0, [r0]
 	b _0800DA66
 	.align 2, 0
-_0800D954: .4byte gUnknown_081F95AC
+_0800D954: .4byte gBattleTerrainTable
 _0800D958: .4byte 0x0300428c
 _0800D95C: .4byte 0x06008000
 _0800D960: .4byte 0x0600d000
@@ -8586,9 +8586,9 @@ _0800D964:
 	ldr r0, _0800D988
 	b _0800DA66
 	.align 2, 0
-_0800D978: .4byte gUnknown_08E62514
+_0800D978: .4byte gBattleTerrainTiles_Building
 _0800D97C: .4byte 0x06008000
-_0800D980: .4byte gUnknown_08E62AFC
+_0800D980: .4byte gBattleTerrainTilemap_Building
 _0800D984: .4byte 0x0600d000
 _0800D988: .4byte gUnknown_08E63738
 _0800D98C:
@@ -8701,9 +8701,9 @@ _0800DA9E:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0800DAA4: .4byte gUnknown_08E62514
+_0800DAA4: .4byte gBattleTerrainTiles_Building
 _0800DAA8: .4byte 0x06008000
-_0800DAAC: .4byte gUnknown_08E62AFC
+_0800DAAC: .4byte gBattleTerrainTilemap_Building
 _0800DAB0: .4byte 0x0600d000
 _0800DAB4: .4byte gUnknown_08E62AC0
 	thumb_func_end sub_800D7B8
@@ -9698,9 +9698,9 @@ _0800E2DC:
 	b _0800E3D2
 	.align 2, 0
 _0800E2F0: .4byte 0x00000902
-_0800E2F4: .4byte gUnknown_08E67838
+_0800E2F4: .4byte gBattleTerrainAnimTiles_Building
 _0800E2F8: .4byte 0x06004000
-_0800E2FC: .4byte gUnknown_08E67C48
+_0800E2FC: .4byte gBattleTerrainAnimTilemap_Building
 _0800E300:
 	movs r0, 0x80
 	lsls r0, 5
@@ -9718,9 +9718,9 @@ _0800E300:
 	b _0800E3D2
 	.align 2, 0
 _0800E320: .4byte gGameVersion
-_0800E324: .4byte gUnknown_08E66D74
+_0800E324: .4byte gBattleTerrainAnimTiles_Cave
 _0800E328: .4byte 0x06004000
-_0800E32C: .4byte gUnknown_08E67590
+_0800E32C: .4byte gBattleTerrainAnimTilemap_Cave
 _0800E330:
 	ldr r0, _0800E33C
 	ldr r1, _0800E340
@@ -9728,9 +9728,9 @@ _0800E330:
 	ldr r0, _0800E344
 	b _0800E3D2
 	.align 2, 0
-_0800E33C: .4byte gUnknown_08E6515C
+_0800E33C: .4byte gBattleTerrainAnimTiles_Underwater
 _0800E340: .4byte 0x06004000
-_0800E344: .4byte gUnknown_08E65628
+_0800E344: .4byte gBattleTerrainAnimTilemap_Underwater
 _0800E348:
 	movs r0, 0x8
 	ands r0, r1
@@ -9754,9 +9754,9 @@ _0800E348:
 	.align 2, 0
 _0800E370: .4byte gTrainers
 _0800E374: .4byte 0x0202ff5e
-_0800E378: .4byte gUnknown_08E67838
+_0800E378: .4byte gBattleTerrainAnimTiles_Building
 _0800E37C: .4byte 0x06004000
-_0800E380: .4byte gUnknown_08E67C48
+_0800E380: .4byte gBattleTerrainAnimTilemap_Building
 _0800E384:
 	cmp r0, 0x20
 	bne _0800E3A0
@@ -9766,9 +9766,9 @@ _0800E384:
 	ldr r0, _0800E39C
 	b _0800E3D2
 	.align 2, 0
-_0800E394: .4byte gUnknown_08E67838
+_0800E394: .4byte gBattleTerrainAnimTiles_Building
 _0800E398: .4byte 0x06004000
-_0800E39C: .4byte gUnknown_08E67C48
+_0800E39C: .4byte gBattleTerrainAnimTilemap_Building
 _0800E3A0:
 	bl sav1_map_get_battletype
 	lsls r0, 24
@@ -9798,7 +9798,7 @@ _0800E3D2:
 	bl LZDecompressVram
 	b _0800E3FC
 	.align 2, 0
-_0800E3DC: .4byte gUnknown_081F95AC
+_0800E3DC: .4byte gBattleTerrainTable
 _0800E3E0: .4byte 0x0300428c
 _0800E3E4: .4byte 0x06004000
 _0800E3E8: .4byte 0x0600e000
@@ -9814,9 +9814,9 @@ _0800E3FC:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0800E404: .4byte gUnknown_08E67838
+_0800E404: .4byte gBattleTerrainAnimTiles_Building
 _0800E408: .4byte 0x06004000
-_0800E40C: .4byte gUnknown_08E67C48
+_0800E40C: .4byte gBattleTerrainAnimTilemap_Building
 _0800E410: .4byte 0x0600e000
 	thumb_func_end sub_800E23C
 
@@ -9896,12 +9896,12 @@ _0800E492:
 _0800E4A8: .4byte 0x020239f8
 _0800E4AC: .4byte 0x00000902
 _0800E4B0: .4byte gGameVersion
-_0800E4B4: .4byte gUnknown_08E61BE8
+_0800E4B4: .4byte gBattleTerrainTiles_Cave
 _0800E4B8:
 	ldr r0, _0800E4BC
 	b _0800E57E
 	.align 2, 0
-_0800E4BC: .4byte gUnknown_08E601DC
+_0800E4BC: .4byte gBattleTerrainTiles_Water
 _0800E4C0:
 	movs r0, 0x8
 	ands r0, r1
@@ -9962,7 +9962,7 @@ _0800E530:
 	ldr r0, [r0]
 	b _0800E57E
 	.align 2, 0
-_0800E544: .4byte gUnknown_081F95AC
+_0800E544: .4byte gBattleTerrainTable
 _0800E548: .4byte 0x0300428c
 _0800E54C:
 	ldr r0, _0800E550
@@ -10001,7 +10001,7 @@ _0800E57E:
 	bl LZDecompressVram
 	b _0800E7BC
 	.align 2, 0
-_0800E588: .4byte gUnknown_08E62514
+_0800E588: .4byte gBattleTerrainTiles_Building
 _0800E58C: .4byte 0x06008000
 _0800E590:
 	ldr r0, _0800E5B4
@@ -10027,12 +10027,12 @@ _0800E59E:
 _0800E5B4: .4byte 0x020239f8
 _0800E5B8: .4byte 0x00000902
 _0800E5BC: .4byte gGameVersion
-_0800E5C0: .4byte gUnknown_08E62228
+_0800E5C0: .4byte gBattleTerrainTilemap_Cave
 _0800E5C4:
 	ldr r0, _0800E5C8
 	b _0800E68A
 	.align 2, 0
-_0800E5C8: .4byte gUnknown_08E607F4
+_0800E5C8: .4byte gBattleTerrainTilemap_Water
 _0800E5CC:
 	movs r0, 0x8
 	ands r0, r1
@@ -10094,7 +10094,7 @@ _0800E63C:
 	ldr r0, [r0]
 	b _0800E68A
 	.align 2, 0
-_0800E650: .4byte gUnknown_081F95AC
+_0800E650: .4byte gBattleTerrainTable
 _0800E654: .4byte 0x0300428c
 _0800E658:
 	ldr r0, _0800E65C
@@ -10133,7 +10133,7 @@ _0800E68A:
 	bl LZDecompressVram
 	b _0800E7BC
 	.align 2, 0
-_0800E694: .4byte gUnknown_08E62AFC
+_0800E694: .4byte gBattleTerrainTilemap_Building
 _0800E698: .4byte 0x0600d000
 _0800E69C:
 	ldr r0, _0800E6C0
@@ -10229,7 +10229,7 @@ _0800E750:
 	ldr r0, [r0]
 	b _0800E7A6
 	.align 2, 0
-_0800E764: .4byte gUnknown_081F95AC
+_0800E764: .4byte gBattleTerrainTable
 _0800E768: .4byte 0x0300428c
 _0800E76C:
 	ldr r0, _0800E770
@@ -67963,9 +67963,9 @@ _0802BB7C: .4byte 0x0202f388
 _0802BB80: .4byte 0x03001770
 _0802BB84: .4byte sub_800F808
 _0802BB88: .4byte 0x03004b20
-_0802BB8C: .4byte gUnknown_08E62514
+_0802BB8C: .4byte gBattleTerrainTiles_Building
 _0802BB90: .4byte 0x06008000
-_0802BB94: .4byte gUnknown_08E62AFC
+_0802BB94: .4byte gBattleTerrainTilemap_Building
 _0802BB98: .4byte 0x0600d000
 _0802BB9C: .4byte gUnknown_08E62AC0
 _0802BBA0: .4byte 0x0400000e
diff --git a/asm/rom5.s b/asm/rom5.s
index 85a46ee52..d619accc5 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -420307,7 +420307,7 @@ _08147C2C:
 	lsls r1, 19
 	b _08147C3C
 	.align 2, 0
-_08147C34: .4byte gUnknown_08E62514
+_08147C34: .4byte gBattleTerrainTiles_Building
 _08147C38:
 	ldr r0, _08147C50
 	ldr r1, _08147C54
diff --git a/data/data2.s b/data/data2.s
index f3dc9f509..bfb931e24 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -481,57 +481,76 @@ gUnknown_081F95A4:: @ 81F95A4
 	obj_tiles 0x08e5dc2c, 4096, 0x2710
 
 	.align 2
-gUnknown_081F95AC:: @ 81F95AC
-	.4byte 0x08e5de3c
-	.4byte 0x08e5e424
-	.4byte 0x08e639e4
-	.4byte 0x08e63f6c
-	.4byte 0x08e5e3ec
-	.4byte 0x08e5e6d4
-	.4byte 0x08e5ed8c
-	.4byte 0x08e64128
-	.4byte 0x08e64838
-	.4byte 0x08e5ed4c
-	.4byte 0x08e5f03c
-	.4byte 0x08e5f67c
-	.4byte 0x08e64a70
-	.4byte 0x08e64fb4
-	.4byte 0x08e5f634
-	.4byte 0x08e5f92c
-	.4byte 0x08e5ff2c
-	.4byte 0x08e6515c
-	.4byte 0x08e65628
-	.4byte 0x08e5fee4
-	.4byte 0x08e601dc
-	.4byte 0x08e607f4
-	.4byte 0x08e657b8
-	.4byte 0x08e65dc4
-	.4byte 0x08e607b0
-	.4byte 0x08e60aa4
-	.4byte 0x08e6108c
-	.4byte 0x08e65f68
-	.4byte 0x08e664b4
-	.4byte 0x08e6104c
-	.4byte 0x08e6133c
-	.4byte 0x08e61938
-	.4byte 0x08e66600
-	.4byte 0x08e66be0
-	.4byte 0x08e618fc
-	.4byte 0x08e61be8
-	.4byte 0x08e62228
-	.4byte 0x08e66d74
-	.4byte 0x08e67590
-	.4byte 0x08e621e0
-	.4byte 0x08e62514
-	.4byte 0x08e62afc
-	.4byte 0x08e67838
-	.4byte 0x08e67c48
-	.4byte 0x08e63664
-	.4byte 0x08e62514
-	.4byte 0x08e62afc
-	.4byte 0x08e67838
-	.4byte 0x08e67c48
-	.4byte 0x08e624d8
+gBattleTerrainTable:: @ 81F95AC
+	@ tall_grass
+	.4byte gBattleTerrainTiles_TallGrass
+	.4byte gBattleTerrainTilemap_TallGrass
+	.4byte gBattleTerrainAnimTiles_TallGrass
+	.4byte gBattleTerrainAnimTilemap_TallGrass
+	.4byte gBattleTerrainPalette_TallGrass
+
+	@ long_grass
+	.4byte gBattleTerrainTiles_LongGrass
+	.4byte gBattleTerrainTilemap_LongGrass
+	.4byte gBattleTerrainAnimTiles_LongGrass
+	.4byte gBattleTerrainAnimTilemap_LongGrass
+	.4byte gBattleTerrainPalette_LongGrass
+
+	@ sand
+	.4byte gBattleTerrainTiles_Sand
+	.4byte gBattleTerrainTilemap_Sand
+	.4byte gBattleTerrainAnimTiles_Sand
+	.4byte gBattleTerrainAnimTilemap_Sand
+	.4byte gBattleTerrainPalette_Sand
+
+	@ underwater
+	.4byte gBattleTerrainTiles_Underwater
+	.4byte gBattleTerrainTilemap_Underwater
+	.4byte gBattleTerrainAnimTiles_Underwater
+	.4byte gBattleTerrainAnimTilemap_Underwater
+	.4byte gBattleTerrainPalette_Underwater
+
+	@ water
+	.4byte gBattleTerrainTiles_Water
+	.4byte gBattleTerrainTilemap_Water
+	.4byte gBattleTerrainAnimTiles_Water
+	.4byte gBattleTerrainAnimTilemap_Water
+	.4byte gBattleTerrainPalette_Water
+
+	@ pond_water
+	.4byte gBattleTerrainTiles_PondWater
+	.4byte gBattleTerrainTilemap_PondWater
+	.4byte gBattleTerrainAnimTiles_PondWater
+	.4byte gBattleTerrainAnimTilemap_PondWater
+	.4byte gBattleTerrainPalette_PondWater
+
+	@ rock
+	.4byte gBattleTerrainTiles_Rock
+	.4byte gBattleTerrainTilemap_Rock
+	.4byte gBattleTerrainAnimTiles_Rock
+	.4byte gBattleTerrainAnimTilemap_Rock
+	.4byte gBattleTerrainPalette_Rock
+
+	@ cave
+	.4byte gBattleTerrainTiles_Cave
+	.4byte gBattleTerrainTilemap_Cave
+	.4byte gBattleTerrainAnimTiles_Cave
+	.4byte gBattleTerrainAnimTilemap_Cave
+	.4byte gBattleTerrainPalette_Cave
+
+	@ building
+	.4byte gBattleTerrainTiles_Building
+	.4byte gBattleTerrainTilemap_Building
+	.4byte gBattleTerrainAnimTiles_Building
+	.4byte gBattleTerrainAnimTilemap_Building
+	.4byte gBattleTerrainPalette_Building
+
+	@ plain
+	.4byte gBattleTerrainTiles_Building
+	.4byte gBattleTerrainTilemap_Building
+	.4byte gBattleTerrainAnimTiles_Building
+	.4byte gBattleTerrainAnimTilemap_Building
+	.4byte gBattleTerrainPalette_Plain
 
 gUnknown_081F9674:: @ 81F9674
 	.incbin "baserom.gba", 0x001f9674, 0xc
diff --git a/data/graphics.s b/data/graphics.s
index 3ee99d8b1..482cfc253 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -2248,35 +2248,130 @@ gUnknown_08E5DC04:: @ 8E5DC04
 	.incbin "baserom.gba", 0x00e5dc04, 0x28
 
 gUnknown_08E5DC2C:: @ 8E5DC2C
-	.incbin "baserom.gba", 0x00e5dc2c, 0x25b0
+	.incbin "baserom.gba", 0x00e5dc2c, 0x210
 
-gUnknown_08E601DC:: @ 8E601DC
-	.incbin "baserom.gba", 0x00e601dc, 0x618
+	.align 2
+gBattleTerrainTiles_TallGrass:: @ 8E5DE3C
+	.incbin "graphics/battle_terrain/tall_grass/tiles.4bpp.lz"
+
+	.align 2
+gBattleTerrainPalette_TallGrass:: @ 8E5E3EC
+	.incbin "graphics/battle_terrain/tall_grass/palette.gbapal.lz"
 
-gUnknown_08E607F4:: @ 8E607F4
-	.incbin "baserom.gba", 0x00e607f4, 0x13f4
+	.align 2
+gBattleTerrainTilemap_TallGrass:: @ 8E5E424
+	.incbin "graphics/battle_terrain/tall_grass/map.bin.lz"
 
-gUnknown_08E61BE8:: @ 8E61BE8
-	.incbin "baserom.gba", 0x00e61be8, 0x640
+	.align 2
+gBattleTerrainTiles_LongGrass:: @ 8E5E6D4
+	.incbin "graphics/battle_terrain/long_grass/tiles.4bpp.lz"
 
-gUnknown_08E62228:: @ 8E62228
-	.incbin "baserom.gba", 0x00e62228, 0x2ec
+	.align 2
+gBattleTerrainPalette_LongGrass:: @ 8E5ED4C
+	.incbin "graphics/battle_terrain/long_grass/palette.gbapal.lz"
 
-gUnknown_08E62514:: @ 8E62514
-	.incbin "baserom.gba", 0x00e62514, 0x5ac
+	.align 2
+gBattleTerrainTilemap_LongGrass:: @ 8E5ED8C
+	.incbin "graphics/battle_terrain/long_grass/map.bin.lz"
+
+	.align 2
+gBattleTerrainTiles_Sand:: @ 8E5F03C
+	.incbin "graphics/battle_terrain/sand/tiles.4bpp.lz"
+
+	.align 2
+gBattleTerrainPalette_Sand:: @ 8E5F634
+	.incbin "graphics/battle_terrain/sand/palette.gbapal.lz"
+
+	.align 2
+gBattleTerrainTilemap_Sand:: @ 8E5F67C
+	.incbin "graphics/battle_terrain/sand/map.bin.lz"
+
+	.align 2
+gBattleTerrainTiles_Underwater:: @ 8E5F92C
+	.incbin "graphics/battle_terrain/underwater/tiles.4bpp.lz"
+
+	.align 2
+gBattleTerrainPalette_Underwater:: @ 8E5FEE4
+	.incbin "graphics/battle_terrain/underwater/palette.gbapal.lz"
+
+	.align 2
+gBattleTerrainTilemap_Underwater:: @ 8E5FF2C
+	.incbin "graphics/battle_terrain/underwater/map.bin.lz"
+
+	.align 2
+gBattleTerrainTiles_Water:: @ 8E601DC
+	.incbin "graphics/battle_terrain/water/tiles.4bpp.lz"
+
+	.align 2
+gBattleTerrainPalette_Water:: @ 8E607B0
+	.incbin "graphics/battle_terrain/water/palette.gbapal.lz"
+
+	.align 2
+gBattleTerrainTilemap_Water:: @ 8E607F4
+	.incbin "graphics/battle_terrain/water/map.bin.lz"
+
+	.align 2
+gBattleTerrainTiles_PondWater:: @ 8E60AA4
+	.incbin "graphics/battle_terrain/pond_water/tiles.4bpp.lz"
+
+	.align 2
+gBattleTerrainPalette_PondWater:: @ 8E6104C
+	.incbin "graphics/battle_terrain/pond_water/palette.gbapal.lz"
+
+	.align 2
+gBattleTerrainTilemap_PondWater:: @ 8E6108C
+	.incbin "graphics/battle_terrain/pond_water/map.bin.lz"
+
+	.align 2
+gBattleTerrainTiles_Rock:: @ 8E6133C
+	.incbin "graphics/battle_terrain/rock/tiles.4bpp.lz"
+
+	.align 2
+gBattleTerrainPalette_Rock:: @ 8E618FC
+	.incbin "graphics/battle_terrain/rock/palette.gbapal.lz"
+
+	.align 2
+gBattleTerrainTilemap_Rock:: @ 8E61938
+	.incbin "graphics/battle_terrain/rock/map.bin.lz"
+
+	.align 2
+gBattleTerrainTiles_Cave:: @ 8E61BE8
+	.incbin "graphics/battle_terrain/cave/tiles.4bpp.lz"
+
+	.align 2
+gBattleTerrainPalette_Cave:: @ 8E621E0
+	.incbin "graphics/battle_terrain/cave/palette.gbapal.lz"
+
+	.align 2
+gBattleTerrainTilemap_Cave:: @ 8E62228
+	.incbin "graphics/battle_terrain/cave/map.bin.lz"
+
+	.align 2
+gBattleTerrainPalette_Plain:: @ 8E624D8
+	.incbin "graphics/battle_terrain/plain/palette.gbapal.lz"
+
+	.align 2
+gBattleTerrainTiles_Building:: @ 8E62514
+	.incbin "graphics/battle_terrain/building/tiles.4bpp.lz"
 
 gUnknown_08E62AC0:: @ 8E62AC0
 	.incbin "baserom.gba", 0x00e62ac0, 0x3c
 
-gUnknown_08E62AFC:: @ 8E62AFC
-	.incbin "baserom.gba", 0x00e62afc, 0x2b0
+	.align 2
+gBattleTerrainTilemap_Building:: @ 8E62AFC
+	.incbin "graphics/battle_terrain/building/map.bin.lz"
 
 gUnknown_08E62DAC:: @ 8E62DAC
 	.incbin "baserom.gba", 0x00e62dac, 0x608
 
 gUnknown_08E633B4:: @ 8E633B4
-	.incbin "baserom.gba", 0x00e633b4, 0x2f0
+	.incbin "baserom.gba", 0x00e633b4, 0x2b0
 
+	.align 2
+gBattleTerrainPalette_Building:: @ 8E63664
+	.incbin "graphics/battle_terrain/building/palette.gbapal.lz"
+
+	.align 2
 gUnknown_08E636A4:: @ 8E636A4
 	.incbin "baserom.gba", 0x00e636a4, 0x3c
 
@@ -2308,25 +2403,79 @@ gUnknown_08E63958:: @ 8E63958
 	.incbin "baserom.gba", 0x00e63958, 0x50
 
 gUnknown_08E639A8:: @ 8E639A8
-	.incbin "baserom.gba", 0x00e639a8, 0x17b4
+	.incbin "baserom.gba", 0x00e639a8, 0x3C
+
+	.align 2
+gBattleTerrainAnimTiles_TallGrass:: @ 8E639E4
+	.incbin "graphics/battle_terrain/tall_grass/anim_tiles.4bpp.lz"
+
+	.align 2
+gBattleTerrainAnimTilemap_TallGrass:: @ 8E63F6C
+	.incbin "graphics/battle_terrain/tall_grass/anim_map.bin.lz"
+
+	.align 2
+gBattleTerrainAnimTiles_LongGrass:: @ 8E64128
+	.incbin "graphics/battle_terrain/long_grass/anim_tiles.4bpp.lz"
+
+	.align 2
+gBattleTerrainAnimTilemap_LongGrass:: @ 8E64838
+	.incbin "graphics/battle_terrain/long_grass/anim_map.bin.lz"
+
+	.align 2
+gBattleTerrainAnimTiles_Sand:: @ 8E64A70
+	.incbin "graphics/battle_terrain/sand/anim_tiles.4bpp.lz"
 
-gUnknown_08E6515C:: @ 8E6515C
-	.incbin "baserom.gba", 0x00e6515c, 0x4cc
+	.align 2
+gBattleTerrainAnimTilemap_Sand:: @ 8E64FB4
+	.incbin "graphics/battle_terrain/sand/anim_map.bin.lz"
+
+	.align 2
+gBattleTerrainAnimTiles_Underwater:: @ 8E6515C
+	.incbin "graphics/battle_terrain/underwater/anim_tiles.4bpp.lz"
+
+	.align 2
+gBattleTerrainAnimTilemap_Underwater:: @ 8E65628
+	.incbin "graphics/battle_terrain/underwater/anim_map.bin.lz"
+
+	.align 2
+gBattleTerrainAnimTiles_Water:: @ 8E657B8
+	.incbin "graphics/battle_terrain/water/anim_tiles.4bpp.lz"
+
+	.align 2
+gBattleTerrainAnimTilemap_Water:: @ 8E65DC4
+	.incbin "graphics/battle_terrain/water/anim_map.bin.lz"
+
+	.align 2
+gBattleTerrainAnimTiles_PondWater:: @ 8E65F68
+	.incbin "graphics/battle_terrain/pond_water/anim_tiles.4bpp.lz"
+
+	.align 2
+gBattleTerrainAnimTilemap_PondWater:: @ 8E664B4
+	.incbin "graphics/battle_terrain/pond_water/anim_map.bin.lz"
+
+	.align 2
+gBattleTerrainAnimTiles_Rock:: @ 8E66600
+	.incbin "graphics/battle_terrain/rock/anim_tiles.4bpp.lz"
 
-gUnknown_08E65628:: @ 8E65628
-	.incbin "baserom.gba", 0x00e65628, 0x174c
+	.align 2
+gBattleTerrainAnimTilemap_Rock:: @ 8E66BE0
+	.incbin "graphics/battle_terrain/rock/anim_map.bin.lz"
 
-gUnknown_08E66D74:: @ 8E66D74
-	.incbin "baserom.gba", 0x00e66d74, 0x81c
+	.align 2
+gBattleTerrainAnimTiles_Cave:: @ 8E66D74
+	.incbin "graphics/battle_terrain/cave/anim_tiles.4bpp.lz"
 
-gUnknown_08E67590:: @ 8E67590
-	.incbin "baserom.gba", 0x00e67590, 0x2a8
+	.align 2
+gBattleTerrainAnimTilemap_Cave:: @ 8E67590
+	.incbin "graphics/battle_terrain/cave/anim_map.bin.lz"
 
-gUnknown_08E67838:: @ 8E67838
-	.incbin "baserom.gba", 0x00e67838, 0x410
+	.align 2
+gBattleTerrainAnimTiles_Building:: @ 8E67838
+	.incbin "graphics/battle_terrain/building/anim_tiles.4bpp.lz"
 
-gUnknown_08E67C48:: @ 8E67C48
-	.incbin "baserom.gba", 0x00e67c48, 0x124
+	.align 2
+gBattleTerrainAnimTilemap_Building:: @ 8E67C48
+	.incbin "graphics/battle_terrain/building/anim_map.bin.lz"
 
 	.align 2
 gBattleAnimSpriteSheet_261:: @ 8E67D6C
diff --git a/graphics/battle_terrain/building/anim_map.bin b/graphics/battle_terrain/building/anim_map.bin
new file mode 100644
index 000000000..432e41c2f
--- /dev/null
+++ b/graphics/battle_terrain/building/anim_map.bin
diff --git a/graphics/battle_terrain/building/anim_tiles.png b/graphics/battle_terrain/building/anim_tiles.png
new file mode 100644
index 000000000..a627523d8
--- /dev/null
+++ b/graphics/battle_terrain/building/anim_tiles.png
diff --git a/graphics/battle_terrain/building/map.bin b/graphics/battle_terrain/building/map.bin
new file mode 100644
index 000000000..d7bee6035
--- /dev/null
+++ b/graphics/battle_terrain/building/map.bin
diff --git a/graphics/battle_terrain/building/palette.pal b/graphics/battle_terrain/building/palette.pal
new file mode 100644
index 000000000..219cef565
--- /dev/null
+++ b/graphics/battle_terrain/building/palette.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+255 255 255
+222 197 164
+238 222 180
+238 230 205
+230 205 164
+246 238 230
+222 213 180
+230 213 172
+0 0 0
+0 0 0
+246 246 156
+246 246 180
+246 246 205
+246 246 230
+246 246 246
+0 0 0
+255 255 255
+222 197 164
+238 222 180
+238 230 205
+230 205 164
+246 238 230
+222 213 180
+246 246 205
+0 0 0
+0 0 0
+246 246 156
+246 246 180
+246 246 205
+246 246 230
+246 246 246
+0 0 0
+246 205 139
+255 238 164
+246 222 156
+255 238 172
+255 246 180
+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/building/tiles.png b/graphics/battle_terrain/building/tiles.png
new file mode 100644
index 000000000..9a031c297
--- /dev/null
+++ b/graphics/battle_terrain/building/tiles.png
diff --git a/graphics/battle_terrain/cave/anim_map.bin b/graphics/battle_terrain/cave/anim_map.bin
new file mode 100644
index 000000000..0ab486890
--- /dev/null
+++ b/graphics/battle_terrain/cave/anim_map.bin
diff --git a/graphics/battle_terrain/cave/anim_tiles.png b/graphics/battle_terrain/cave/anim_tiles.png
new file mode 100644
index 000000000..464a2058b
--- /dev/null
+++ b/graphics/battle_terrain/cave/anim_tiles.png
diff --git a/graphics/battle_terrain/cave/map.bin b/graphics/battle_terrain/cave/map.bin
new file mode 100644
index 000000000..61f358f53
--- /dev/null
+++ b/graphics/battle_terrain/cave/map.bin
diff --git a/graphics/battle_terrain/cave/palette.pal b/graphics/battle_terrain/cave/palette.pal
new file mode 100644
index 000000000..64894d62c
--- /dev/null
+++ b/graphics/battle_terrain/cave/palette.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+197 180 131
+205 197 90
+164 139 90
+180 156 106
+189 172 98
+189 164 115
+180 156 90
+197 164 115
+189 172 98
+222 213 106
+172 139 82
+180 148 98
+189 156 106
+197 164 106
+197 172 115
+0 0 0
+197 180 131
+205 197 90
+164 139 90
+180 156 106
+189 172 98
+189 164 115
+180 156 90
+197 164 115
+189 172 98
+222 213 106
+172 139 82
+180 148 98
+189 156 106
+197 164 106
+197 172 115
+0 0 0
+106 74 65
+148 115 82
+180 139 90
+213 180 131
+230 213 156
+0 0 0
+180 139 90
+180 139 90
+180 139 90
+213 180 131
+106 74 65
+148 115 82
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_terrain/cave/tiles.png b/graphics/battle_terrain/cave/tiles.png
new file mode 100644
index 000000000..27386731f
--- /dev/null
+++ b/graphics/battle_terrain/cave/tiles.png
diff --git a/graphics/battle_terrain/long_grass/anim_map.bin b/graphics/battle_terrain/long_grass/anim_map.bin
new file mode 100644
index 000000000..bd86cce6c
--- /dev/null
+++ b/graphics/battle_terrain/long_grass/anim_map.bin
diff --git a/graphics/battle_terrain/long_grass/anim_tiles.png b/graphics/battle_terrain/long_grass/anim_tiles.png
new file mode 100644
index 000000000..e2f1bb2c1
--- /dev/null
+++ b/graphics/battle_terrain/long_grass/anim_tiles.png
diff --git a/graphics/battle_terrain/long_grass/map.bin b/graphics/battle_terrain/long_grass/map.bin
new file mode 100644
index 000000000..61f358f53
--- /dev/null
+++ b/graphics/battle_terrain/long_grass/map.bin
diff --git a/graphics/battle_terrain/long_grass/palette.pal b/graphics/battle_terrain/long_grass/palette.pal
new file mode 100644
index 000000000..645c3d0e6
--- /dev/null
+++ b/graphics/battle_terrain/long_grass/palette.pal
@@ -0,0 +1,51 @@
+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
new file mode 100644
index 000000000..8676f2f37
--- /dev/null
+++ b/graphics/battle_terrain/long_grass/tiles.png
diff --git a/graphics/battle_terrain/plain/palette.pal b/graphics/battle_terrain/plain/palette.pal
new file mode 100644
index 000000000..2377b7729
--- /dev/null
+++ b/graphics/battle_terrain/plain/palette.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+238 255 230
+156 230 156
+230 230 148
+230 238 164
+189 230 148
+230 246 180
+205 230 172
+172 238 172
+0 0 0
+0 0 0
+164 222 246
+180 230 230
+197 238 222
+213 246 213
+230 255 205
+0 0 0
+238 255 230
+156 230 156
+230 230 148
+230 238 164
+189 230 148
+230 246 180
+205 230 172
+172 238 172
+0 0 0
+0 0 0
+164 222 246
+180 230 230
+197 238 222
+213 246 213
+230 255 205
+0 0 0
+74 189 65
+172 230 172
+106 205 90
+131 213 115
+156 213 148
+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/pond_water/anim_map.bin b/graphics/battle_terrain/pond_water/anim_map.bin
new file mode 100644
index 000000000..00aee5135
--- /dev/null
+++ b/graphics/battle_terrain/pond_water/anim_map.bin
diff --git a/graphics/battle_terrain/pond_water/anim_tiles.png b/graphics/battle_terrain/pond_water/anim_tiles.png
new file mode 100644
index 000000000..08568455f
--- /dev/null
+++ b/graphics/battle_terrain/pond_water/anim_tiles.png
diff --git a/graphics/battle_terrain/pond_water/map.bin b/graphics/battle_terrain/pond_water/map.bin
new file mode 100644
index 000000000..61f358f53
--- /dev/null
+++ b/graphics/battle_terrain/pond_water/map.bin
diff --git a/graphics/battle_terrain/pond_water/palette.pal b/graphics/battle_terrain/pond_water/palette.pal
new file mode 100644
index 000000000..b0f74a08f
--- /dev/null
+++ b/graphics/battle_terrain/pond_water/palette.pal
@@ -0,0 +1,51 @@
+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
new file mode 100644
index 000000000..81fac5393
--- /dev/null
+++ b/graphics/battle_terrain/pond_water/tiles.png
diff --git a/graphics/battle_terrain/rock/anim_map.bin b/graphics/battle_terrain/rock/anim_map.bin
new file mode 100644
index 000000000..d2a2776bd
--- /dev/null
+++ b/graphics/battle_terrain/rock/anim_map.bin
diff --git a/graphics/battle_terrain/rock/anim_tiles.png b/graphics/battle_terrain/rock/anim_tiles.png
new file mode 100644
index 000000000..41be70296
--- /dev/null
+++ b/graphics/battle_terrain/rock/anim_tiles.png
diff --git a/graphics/battle_terrain/rock/map.bin b/graphics/battle_terrain/rock/map.bin
new file mode 100644
index 000000000..61f358f53
--- /dev/null
+++ b/graphics/battle_terrain/rock/map.bin
diff --git a/graphics/battle_terrain/rock/palette.pal b/graphics/battle_terrain/rock/palette.pal
new file mode 100644
index 000000000..1702e3810
--- /dev/null
+++ b/graphics/battle_terrain/rock/palette.pal
@@ -0,0 +1,51 @@
+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
new file mode 100644
index 000000000..efb139eb6
--- /dev/null
+++ b/graphics/battle_terrain/rock/tiles.png
diff --git a/graphics/battle_terrain/sand/anim_map.bin b/graphics/battle_terrain/sand/anim_map.bin
new file mode 100644
index 000000000..83c6ba8f1
--- /dev/null
+++ b/graphics/battle_terrain/sand/anim_map.bin
diff --git a/graphics/battle_terrain/sand/anim_tiles.png b/graphics/battle_terrain/sand/anim_tiles.png
new file mode 100644
index 000000000..79c774acf
--- /dev/null
+++ b/graphics/battle_terrain/sand/anim_tiles.png
diff --git a/graphics/battle_terrain/sand/map.bin b/graphics/battle_terrain/sand/map.bin
new file mode 100644
index 000000000..d7bee6035
--- /dev/null
+++ b/graphics/battle_terrain/sand/map.bin
diff --git a/graphics/battle_terrain/sand/palette.pal b/graphics/battle_terrain/sand/palette.pal
new file mode 100644
index 000000000..20f4c3f7c
--- /dev/null
+++ b/graphics/battle_terrain/sand/palette.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+255 255 205
+213 213 90
+238 238 139
+246 246 172
+230 230 106
+255 255 189
+238 230 131
+255 255 230
+0 0 0
+0 0 0
+238 238 123
+238 238 148
+246 246 172
+246 246 180
+246 246 197
+0 0 0
+255 255 205
+222 213 82
+246 246 148
+246 246 189
+230 230 115
+255 255 197
+238 238 123
+255 255 230
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+197 197 74
+164 156 32
+222 222 131
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_terrain/sand/tiles.png b/graphics/battle_terrain/sand/tiles.png
new file mode 100644
index 000000000..a4f7342be
--- /dev/null
+++ b/graphics/battle_terrain/sand/tiles.png
diff --git a/graphics/battle_terrain/tall_grass/anim_map.bin b/graphics/battle_terrain/tall_grass/anim_map.bin
new file mode 100644
index 000000000..8e7d784f3
--- /dev/null
+++ b/graphics/battle_terrain/tall_grass/anim_map.bin
diff --git a/graphics/battle_terrain/tall_grass/anim_tiles.png b/graphics/battle_terrain/tall_grass/anim_tiles.png
new file mode 100644
index 000000000..85aed13bb
--- /dev/null
+++ b/graphics/battle_terrain/tall_grass/anim_tiles.png
diff --git a/graphics/battle_terrain/tall_grass/map.bin b/graphics/battle_terrain/tall_grass/map.bin
new file mode 100644
index 000000000..61f358f53
--- /dev/null
+++ b/graphics/battle_terrain/tall_grass/map.bin
diff --git a/graphics/battle_terrain/tall_grass/palette.pal b/graphics/battle_terrain/tall_grass/palette.pal
new file mode 100644
index 000000000..11db31cad
--- /dev/null
+++ b/graphics/battle_terrain/tall_grass/palette.pal
@@ -0,0 +1,51 @@
+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
new file mode 100644
index 000000000..2d163d7bb
--- /dev/null
+++ b/graphics/battle_terrain/tall_grass/tiles.png
diff --git a/graphics/battle_terrain/underwater/anim_map.bin b/graphics/battle_terrain/underwater/anim_map.bin
new file mode 100644
index 000000000..616c2a242
--- /dev/null
+++ b/graphics/battle_terrain/underwater/anim_map.bin
diff --git a/graphics/battle_terrain/underwater/anim_tiles.png b/graphics/battle_terrain/underwater/anim_tiles.png
new file mode 100644
index 000000000..3e75434db
--- /dev/null
+++ b/graphics/battle_terrain/underwater/anim_tiles.png
diff --git a/graphics/battle_terrain/underwater/map.bin b/graphics/battle_terrain/underwater/map.bin
new file mode 100644
index 000000000..61f358f53
--- /dev/null
+++ b/graphics/battle_terrain/underwater/map.bin
diff --git a/graphics/battle_terrain/underwater/palette.pal b/graphics/battle_terrain/underwater/palette.pal
new file mode 100644
index 000000000..b5859af6e
--- /dev/null
+++ b/graphics/battle_terrain/underwater/palette.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+197 230 255
+131 139 197
+148 197 246
+172 205 255
+131 164 213
+189 213 255
+148 180 222
+205 222 255
+197 230 255
+0 0 0
+148 164 238
+156 189 238
+172 205 238
+189 213 246
+197 222 255
+0 0 0
+197 230 255
+131 139 197
+148 197 246
+172 205 255
+131 164 213
+189 213 255
+148 180 222
+205 222 255
+197 230 255
+0 0 0
+148 164 238
+156 189 238
+172 205 238
+189 213 246
+197 222 255
+0 0 0
+98 164 230
+131 197 255
+172 238 255
+255 255 255
+205 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+98 98 172
+131 131 230
+172 172 255
+255 255 255
diff --git a/graphics/battle_terrain/underwater/tiles.png b/graphics/battle_terrain/underwater/tiles.png
new file mode 100644
index 000000000..b0d49a9cc
--- /dev/null
+++ b/graphics/battle_terrain/underwater/tiles.png
diff --git a/graphics/battle_terrain/water/anim_map.bin b/graphics/battle_terrain/water/anim_map.bin
new file mode 100644
index 000000000..2b5f7a548
--- /dev/null
+++ b/graphics/battle_terrain/water/anim_map.bin
diff --git a/graphics/battle_terrain/water/anim_tiles.png b/graphics/battle_terrain/water/anim_tiles.png
new file mode 100644
index 000000000..b50564029
--- /dev/null
+++ b/graphics/battle_terrain/water/anim_tiles.png
diff --git a/graphics/battle_terrain/water/map.bin b/graphics/battle_terrain/water/map.bin
new file mode 100644
index 000000000..61f358f53
--- /dev/null
+++ b/graphics/battle_terrain/water/map.bin
diff --git a/graphics/battle_terrain/water/palette.pal b/graphics/battle_terrain/water/palette.pal
new file mode 100644
index 000000000..cbef92774
--- /dev/null
+++ b/graphics/battle_terrain/water/palette.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+255 255 255
+90 148 222
+148 213 238
+180 230 246
+106 172 230
+197 238 255
+123 189 230
+222 246 255
+0 0 0
+0 0 0
+205 222 246
+222 230 238
+230 238 238
+238 246 246
+246 246 255
+0 0 0
+255 255 255
+90 148 222
+148 213 238
+180 230 246
+106 172 230
+197 238 255
+123 189 230
+222 246 255
+0 0 0
+0 0 0
+205 222 246
+222 230 238
+230 238 238
+238 246 246
+246 246 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+197 238 255
+148 213 238
+123 189 230
+90 148 222
+49 106 189
+16 74 156
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_terrain/water/tiles.png b/graphics/battle_terrain/water/tiles.png
new file mode 100644
index 000000000..902047875
--- /dev/null
+++ b/graphics/battle_terrain/water/tiles.png