ported battle_gfx_sfx_util from pokeem

3 files changed, 24 insertions, 46 deletions

diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 3d1de8ac5..4b45f3669 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -10,8 +10,8 @@ gUnknown_81C68F4:: @ 81C68F4
 gUnknown_81C6E84:: @ 81C6E84
 	.incbin "baserom.gba", 0x1C6E84, 0x24
 
-gUnknown_81C6EA8:: @ 81C6EA8
+gBattleAnims_General:: @ 81C6EA8
 	.incbin "baserom.gba", 0x1C6EA8, 0x70
 
-gUnknown_81C6F18:: @ 81C6F18
+gBattleAnims_Special:: @ 81C6F18
 	.incbin "baserom.gba", 0x1C6F18, 0xF690
diff --git a/data/data.s b/data/data.s
index 0322670c0..943c71678 100644
--- a/data/data.s
+++ b/data/data.s
@@ -166,7 +166,7 @@ gTrainerBackPicTable:: @ 8239FA4
 gUnknown_8239FD4:: @ 8239FD4
 	.incbin "baserom.gba", 0x239FD4, 0x30
 
-gUnknown_823A004:: @ 823A004
+gEnemyMonElevation:: @ 823A004
 	.incbin "baserom.gba", 0x23A004, 0x4554
 
 gTrainerClassNames:: @ 823E558
@@ -344,10 +344,10 @@ gUnknown_8250994:: @ 8250994
 gUnknown_82509F4:: @ 82509F4
 	.incbin "baserom.gba", 0x2509F4, 0x18
 
-gUnknown_8250A0C:: @ 8250A0C
+gSpriteSheet_EnemyShadow:: @ 8250A0C
 	.incbin "baserom.gba", 0x250A0C, 0x10
 
-gUnknown_8250A1C:: @ 8250A1C
+gSpriteTemplate_EnemyShadow:: @ 8250A1C
 	.incbin "baserom.gba", 0x250A1C, 0x18
 
 gUnknown_8250A34:: @ 8250A34
@@ -356,35 +356,10 @@ gUnknown_8250A34:: @ 8250A34
 gUnknown_8250B20:: @ 8250B20
 	.incbin "baserom.gba", 0x250B20, 0xE4
 
-	.section .rodata.825EF0C
+	.section .rodata.8260270
 
-	.align 2
-gUnknown_8260208:: @ 8260208
-	.incbin "baserom.gba", 0x260208, 0x8
-
-gUnknown_8260210:: @ 8260210
-	.incbin "baserom.gba", 0x260210, 0x8
-
-gUnknown_8260218:: @ 8260218
-	.incbin "baserom.gba", 0x260218, 0x8
-
-gUnknown_8260220:: @ 8260220
-	.incbin "baserom.gba", 0x260220, 0x8
-
-gUnknown_8260228:: @ 8260228
-	.incbin "baserom.gba", 0x260228, 0x8
-
-gUnknown_8260230:: @ 8260230
-	.incbin "baserom.gba", 0x260230, 0x8
-
-gUnknown_8260238:: @ 8260238
-	.incbin "baserom.gba", 0x260238, 0x8
-
-gUnknown_8260240:: @ 8260240
-	.incbin "baserom.gba", 0x260240, 0x20
-
-gUnknown_8260260:: @ 8260260
-	.incbin "baserom.gba", 0x260260, 0x18
+gUnknown_8260270:: @ 8260270
+	.incbin "baserom.gba", 0x260270, 0x8
 
 gUnknown_8260278:: @ 8260278
 	.incbin "baserom.gba", 0x260278, 0x30
diff --git a/data/graphics.s b/data/graphics.s
index 83d14001d..034db89da 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -146,7 +146,7 @@ gFile_graphics_interface_ball_Open_sheet:: @ 8D022E8
 	.incbin "graphics/interface/ball_open.4bpp.lz"
 
 	.align 2
-gFile_graphics_interface_blank_sheet:: @ 8D02364
+gBlankGfxCompressed:: @ 8D02364
 	.incbin "graphics/interface/blank.4bpp.lz"
 
 	.align 2
@@ -1062,8 +1062,11 @@ gFile_graphics_unused_basic_frame_tilemap:: @ 8D11A78
 	.incbin "graphics/unused/basic_frame.bin.lz"
 
 	.align 2
-gUnknown_8D11B84:: @ 8D11B84
-	.incbin "baserom.gba", 0xD11B84, 0x40
+gBattleInterface_BallStatusBarPal:: @ 8D11B84
+	.incbin "baserom.gba", 0xD11B84, 0x20
+
+gBattleInterface_BallDisplayPal:: @ 8D11BA4
+	.incbin "baserom.gba", 0xD11BA4, 0x20
 
 gUnknown_8D11BC4:: @ 8D11BC4
 	.incbin "baserom.gba", 0xD11BC4, 0xF00
@@ -1761,23 +1764,23 @@ gFile_graphics_battle_anims_sprites_186_palette:: @ 8D1F31C
 	.incbin "graphics/battle_anims/sprites/186.gbapal.lz"
 	
 	.align 2
-gUnknown_8D1F340:: @ 8D1F340
+gHealthboxSinglesPlayerGfx:: @ 8D1F340
 	.incbin "baserom.gba", 0xD1F340, 0x2C4
 	
 	.align 2
-gUnknown_8D1F604:: @ 8D1F604
+gHealthboxSinglesOpponentGfx:: @ 8D1F604
 	.incbin "baserom.gba", 0xD1F604, 0x190
 	
 	.align 2
-gUnknown_8D1F794:: @ 8D1F794
+gHealthboxDoublesPlayerGfx:: @ 8D1F794
 	.incbin "baserom.gba", 0xD1F794, 0x194
 	
 	.align 2
-gUnknown_8D1F928:: @ 8D1F928
+gHealthboxDoublesOpponentGfx:: @ 8D1F928
 	.incbin "baserom.gba", 0xD1F928, 0x194
 	
 	.align 2
-gFile_graphics_battle_interface_healthbox_safari_sheet:: @ 8D1FABC
+gHealthboxSafariGfx:: @ 8D1FABC
 	.incbin "graphics/battle_interface/healthbox_safari.4bpp.lz"
 
 	.align 2
@@ -2365,15 +2368,15 @@ gFile_graphics_battle_anims_sprites_240_palette:: @ 8D2D068
 	.incbin "graphics/battle_anims/sprites/240.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_sprites_substitute_palette:: @ 8D2D090
+gSubstituteDollPal:: @ 8D2D090
 	.incbin "graphics/battle_anims/sprites/substitute.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_sprites_substitute_sheet:: @ 8D2D0B4
+gSubstituteDollGfx:: @ 8D2D0B4
 	.incbin "graphics/battle_anims/sprites/substitute.4bpp.lz"
 
 	.align 2
-gFile_graphics_battle_anims_sprites_substitute_tilemap:: @ 8D2D2F4
+gSubstituteDollTilemap:: @ 8D2D2F4
 	.incbin "graphics/battle_anims/sprites/substitute.bin.lz"
 
 	.align 2
@@ -15923,10 +15926,10 @@ gFile_graphics_battle_anims_sprites_271_sheet:: @ 8E93AB4
 	.incbin "graphics/battle_anims/sprites/271.4bpp.lz"
 
 	.align 2
-gUnknown_8E93B14:: @ 8E93B14
+gGhostPalette:: @ 8E93B14
 	.incbin "baserom.gba", 0xE93B14, 0x24
 
-gUnknown_8E93B38:: @ 8E93B38
+gGhostFrontPic:: @ 8E93B38
 	.incbin "baserom.gba", 0xE93B38, 0x368
 
 gUnknown_8E93EA0:: @ 8E93EA0