4 files changed, 27 insertions, 88 deletions
diff --git a/data/battle_anim.s b/data/battle_anim.s
index 3fae69431..c166708a2 100644
--- a/data/battle_anim.s
+++ b/data/battle_anim.s
@@ -242,21 +242,3 @@ gUnknown_83ADE18:: @ 83ADE18
 
 gUnknown_83ADF5C:: @ 83ADF5C
 	.incbin "baserom.gba", 0x3ADF5C, 0xC0
-
-gUnknown_83AE01C:: @ 83AE01C
-	.incbin "baserom.gba", 0x3AE01C, 0x20
-
-gUnknown_83AE03C:: @ 83AE03C
-	.incbin "baserom.gba", 0x3AE03C, 0x10
-
-gUnknown_83AE04C:: @ 83AE04C
-	.incbin "baserom.gba", 0x3AE04C, 0x4
-
-gUnknown_83AE050:: @ 83AE050
-	.incbin "baserom.gba", 0x3AE050, 0x4
-
-gUnknown_83AE054:: @ 83AE054
-	.incbin "baserom.gba", 0x3AE054, 0x30
-
-gUnknown_83AE084:: @ 0x83AE084
-	.incbin "baserom.gba", 0x3AE084, 0x10
diff --git a/data/data.s b/data/data.s
index 0883c65d7..fd4b9d274 100644
--- a/data/data.s
+++ b/data/data.s
@@ -55,7 +55,7 @@ gUnknown_823499C:: @ 823499C
 gUnknown_82349BC:: @ 82349BC
 	.incbin "baserom.gba", 0x2349BC, 0x10
 
-gUnknown_82349CC:: @ 82349CC
+gMonFrontPicCoords:: @ 82349CC
 	.incbin "baserom.gba", 0x2349CC, 0x6E0
 
 gMonFrontPicTable:: @ 82350AC
@@ -64,7 +64,7 @@ gMonFrontPicTable:: @ 82350AC
 gUnknown_8235194:: @ 8235194
 	.incbin "baserom.gba", 0x235194, 0xCD8
 
-gUnknown_8235E6C:: @ 8235E6C
+gMonBackPicCoords:: @ 8235E6C
 	.incbin "baserom.gba", 0x235E6C, 0x6E0
 
 gMonBackPicTable:: @ 823654C
diff --git a/data/data_835B488.s b/data/data_835B488.s
index 742224d2b..2766f0eeb 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -843,13 +843,19 @@ gUnknown_83E4410:: @ 83E4410
 	.incbin "baserom.gba", 0x3E4410, 0x1488
 
 gUnknown_83E5898:: @ 83E5898
-	.incbin "baserom.gba", 0x3E5898, 0x248
+	.incbin "baserom.gba", 0x3E5898, 0xC0
+
+gUnknown_83E5958:: @ 83E5958
+	.incbin "baserom.gba", 0x3E5958, 0x188
 
 gUnknown_83E5AE0:: @ 83E5AE0
 	.incbin "baserom.gba", 0x3E5AE0, 0xA8
 
 gUnknown_83E5B88:: @ 83E5B88
-	.incbin "baserom.gba", 0x3E5B88, 0x2A4
+	.incbin "baserom.gba", 0x3E5B88, 0x1C0
+
+gUnknown_83E5D48:: @ 83E5D48
+	.incbin "baserom.gba", 0x3E5D48, 0xE4
 
 gUnknown_83E5E2C:: @ 83E5E2C
 	.incbin "baserom.gba", 0x3E5E2C, 0x18
@@ -900,58 +906,9 @@ gUnknown_83E652C:: @ 83E652C
 	.incbin "baserom.gba", 0x3E652C, 0x78
 
 gUnknown_83E65A4:: @ 83E65A4
-	.incbin "baserom.gba", 0x3E65A4, 0xA4C
-
-gUnknown_83E6FF0:: @ 83E6FF0
-	.incbin "baserom.gba", 0x3E6FF0, 0x1C
-
-gUnknown_83E700C:: @ 83E700C
-	.incbin "baserom.gba", 0x3E700C, 0x20
-
-gUnknown_83E702C:: @ 83E702C
-	.incbin "baserom.gba", 0x3E702C, 0x18
-
-gUnknown_83E7044:: @ 83E7044
-	.incbin "baserom.gba", 0x3E7044, 0xD0
-
-gUnknown_83E7114:: @ 83E7114
-	.incbin "baserom.gba", 0x3E7114, 0x35C
-
-gUnknown_83E7470:: @ 83E7470
-	.incbin "baserom.gba", 0x3E7470, 0x68
-
-gUnknown_83E74D8:: @ 83E74D8
-	.incbin "baserom.gba", 0x3E74D8, 0x18
-
-gUnknown_83E74F0:: @ 83E74F0
-	.incbin "baserom.gba", 0x3E74F0, 0x178
-
-gUnknown_83E7668:: @ 83E7668
-	.incbin "baserom.gba", 0x3E7668, 0x78
-
-gUnknown_83E76E0:: @ 83E76E0
-	.incbin "baserom.gba", 0x3E76E0, 0x528
-
-gUnknown_83E7C08:: @ 83E7C08
-	.incbin "baserom.gba", 0x3E7C08, 0x30
-
-gUnknown_83E7C38:: @ 83E7C38
-	.incbin "baserom.gba", 0x3E7C38, 0x60
-
-gUnknown_83E7C98:: @ 83E7C98
-	.incbin "baserom.gba", 0x3E7C98, 0x30
-
-gUnknown_83E7CC8:: @ 83E7CC8
-	.incbin "baserom.gba", 0x3E7CC8, 0x2
-
-gUnknown_83E7CCA:: @ 83E7CCA
-	.incbin "baserom.gba", 0x3E7CCA, 0x4
-
-gUnknown_83E7CCE:: @ 83E7CCE
-	.incbin "baserom.gba", 0x3E7CCE, 0x6
+	.incbin "baserom.gba", 0x3E65A4, 0x544
 
-gUnknown_83E7CD4:: @ 83E7CD4
-	.incbin "baserom.gba", 0x3E7CD4, 0x28
+	.section .rodata.83E7CFC
 
 gUnknown_83E7CFC:: @ 83E7CFC
 	.incbin "baserom.gba", 0x3E7CFC, 0x14
diff --git a/data/graphics.s b/data/graphics.s
index 9c5d1c3f9..379411a67 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -1624,15 +1624,15 @@ gFile_graphics_battle_anims_backgrounds_00_tilemap:: @ 8D1CFD4
 	.incbin "graphics/battle_anims/backgrounds/00.bin.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_metal_shine_sheet:: @ 8D1D224
+gMetalShineGfx:: @ 8D1D224
 	.incbin "graphics/battle_anims/masks/metal_shine.4bpp.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_metal_shine_palette:: @ 8D1D360
+gMetalShinePalette:: @ 8D1D360
 	.incbin "graphics/battle_anims/masks/metal_shine.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_metal_shine_tilemap:: @ 8D1D388
+gMetalShineTilemap:: @ 8D1D388
 	.incbin "graphics/battle_anims/masks/metal_shine.bin.lz"
 
 	.align 2
@@ -2412,47 +2412,47 @@ gFile_graphics_battle_anims_sprites_243_palette:: @ 8D2D8CC
 	.incbin "graphics/battle_anims/sprites/243.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat_sheet:: @ 8D2D8F4
+gBattleStatMask_Gfx:: @ 8D2D8F4
 	.incbin "graphics/battle_anims/masks/stat.4bpp.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap:: @ 8D2DB04
+gBattleStatMask1_Tilemap:: @ 8D2DB04
 	.incbin "graphics/battle_anims/masks/stat_tilemap_1.bin.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap:: @ 8D2DC20
+gBattleStatMask2_Tilemap:: @ 8D2DC20
 	.incbin "graphics/battle_anims/masks/stat_tilemap_2.bin.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat1_palette:: @ 8D2DD3C
+gBattleStatMask1_Pal:: @ 8D2DD3C
 	.incbin "graphics/battle_anims/masks/stat1.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat2_palette:: @ 8D2DD5C
+gBattleStatMask2_Pal:: @ 8D2DD5C
 	.incbin "graphics/battle_anims/masks/stat2.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat3_palette:: @ 8D2DD7C
+gBattleStatMask3_Pal:: @ 8D2DD7C
 	.incbin "graphics/battle_anims/masks/stat3.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat4_palette:: @ 8D2DD9C
+gBattleStatMask4_Pal:: @ 8D2DD9C
 	.incbin "graphics/battle_anims/masks/stat4.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat5_palette:: @ 8D2DDBC
+gBattleStatMask5_Pal:: @ 8D2DDBC
 	.incbin "graphics/battle_anims/masks/stat5.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat6_palette:: @ 8D2DDDC
+gBattleStatMask6_Pal:: @ 8D2DDDC
 	.incbin "graphics/battle_anims/masks/stat6.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat7_palette:: @ 8D2DDFC
+gBattleStatMask7_Pal:: @ 8D2DDFC
 	.incbin "graphics/battle_anims/masks/stat7.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat8_palette:: @ 8D2DE1C
+gBattleStatMask8_Pal:: @ 8D2DE1C
 	.incbin "graphics/battle_anims/masks/stat8.gbapal.lz"
 
 	.align 2
@@ -13554,7 +13554,7 @@ gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet:: @ 8E794D0
 	.incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz"
 
 	.align 2
-gFile_graphics_battle_anims_sprites_261_palette:: @ 8E799FC
+gBattleAnimSpritePal_FlyingDirt:: @ 8E799FC
 	.incbin "graphics/battle_anims/sprites/261.gbapal.lz"
 
 	.align 2