5 files changed, 58 insertions, 60 deletions
diff --git a/data/battle_interface.s b/data/battle_interface.s
deleted file mode 100644
index 3a021fc71..000000000
--- a/data/battle_interface.s
+++ /dev/null
@@ -1,44 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_0820A47C:: @ 820A47C
-	obj_tiles gBattleWindowLargeGfx, 4096, 0xd6ff
-
-	.align 2
-gUnknown_0820A484:: @ 820A484
-	obj_tiles gBattleWindowSmallGfx, 4096, 0xd701
-
-	.align 2
-gUnknown_0820A48C:: @ 820A48C
-	obj_tiles gBattleWindowSmall2Gfx, 2048, 0xd6ff
-
-	.align 2
-gUnknown_0820A494:: @ 820A494
-	obj_tiles gBattleWindowSmall2Gfx, 2048, 0xd700
-
-	.align 2
-gUnknown_0820A49C:: @ 820A49C
-	obj_tiles gBattleWindowSmall3Gfx, 2048, 0xd701
-
-	.align 2
-gUnknown_0820A4A4:: @ 820A4A4
-	obj_tiles gBattleWindowSmall3Gfx, 2048, 0xd702
-
-	.align 2
-gUnknown_0820A4AC:: @ 820A4AC
-	obj_tiles gBattleWindowLarge2Gfx, 4096, 0xd70b
-
-	.align 2
-gUnknown_0820A4B4:: @ 820A4B4
-	obj_tiles gBlankGfxCompressed, 256, 0xd704
-	obj_tiles gBlankGfxCompressed, 288, 0xd705
-	obj_tiles gBlankGfxCompressed, 256, 0xd706
-	obj_tiles gBlankGfxCompressed, 288, 0xd707
-
-	.align 2
-gUnknown_0820A4D4:: @ 820A4D4
-	obj_pal gUnknown_08D1212C, 0xD6FF
-	obj_pal gUnknown_08D1214C, 0xD704
diff --git a/include/graphics.h b/include/graphics.h
index 01a193ab3..f99da32e5 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3337,9 +3337,16 @@ extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17;
 extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20;
 extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21;
 
+// data/graphics.s
+extern const u8 gBattleWindowLargeGfx[];
+extern const u8 gBattleWindowSmallGfx[];
+extern const u8 gBattleWindowSmall2Gfx[];
+extern const u8 gBattleWindowSmall3Gfx[];
+extern const u8 gBattleWindowLarge2Gfx[];
+extern const u8 gBlankGfxCompressed[];
 extern const u8 gBattleGfx_BallStatusBar[];
-extern const u8 gUnknown_08D1212C[];
-extern const u8 gUnknown_08D1214C[];
+extern const u16 gUnknown_08D1212C[];
+extern const u16 gUnknown_08D1214C[];
 extern const u8 Tiles_D129AC[];
 
 #endif  // GUARD_GRAPHICS_H
diff --git a/ld_script.txt b/ld_script.txt
index 54dfe644d..9a5cf1bd6 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -499,7 +499,7 @@ SECTIONS {
         src/engine/util.o(.rodata);
         src/field/daycare.o(.rodata);
         src/scene/egg_hatch.o(.rodata);
-        data/battle_interface.o(.rodata);
+        src/battle/battle_7.o(.rodata);
         src/battle/battle_interface.o(.rodata);
         src/battle/pokeball.o(.rodata);
         src/engine/trade.o(.rodata);
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index 1c79d7ebf..195e47a6b 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -20,6 +20,7 @@
 #include "text.h"
 #include "gba/m4a_internal.h"
 #include "ewram.h"
+#include "graphics.h"
 
 extern u8 gBattleBufferA[][0x200];
 extern u8 gActiveBank;
@@ -49,19 +50,53 @@ extern const u8 *const gBattleAnims_Special[];
 extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
 extern const struct MonCoords gTrainerFrontPicCoords[];
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-extern const u8 gSubstituteDollTilemap[];
-extern const u8 gSubstituteDollGfx[];
-extern const u8 gSubstituteDollPal[];
 extern const struct CompressedSpriteSheet gUnknown_081FAF24;
 extern const struct SpriteTemplate gSpriteTemplate_81FAF34;
-extern const struct CompressedSpriteSheet gUnknown_0820A47C;
-extern const struct CompressedSpriteSheet gUnknown_0820A484;
-extern const struct CompressedSpriteSheet gUnknown_0820A48C[];
-extern const struct CompressedSpriteSheet gUnknown_0820A49C[];
-extern const struct CompressedSpriteSheet gUnknown_0820A4AC;
-extern const struct CompressedSpriteSheet gUnknown_0820A4B4[];
-extern const struct SpritePalette gUnknown_0820A4D4[];
-extern const u8 gUnknown_08D09C48[];
+extern const u8 gSubstituteDollTilemap[]; // graphics.s
+extern const u8 gSubstituteDollGfx[]; // graphics.s
+extern const u8 gSubstituteDollPal[]; // graphics.s
+extern const u8 gUnknown_08D09C48[]; // graphics.s
+
+const struct CompressedSpriteSheet gUnknown_0820A47C =
+{ gBattleWindowLargeGfx, 4096, 0xd6ff };
+
+const struct CompressedSpriteSheet gUnknown_0820A484 =
+{ gBattleWindowSmallGfx, 4096, 0xd701 };
+
+const struct CompressedSpriteSheet gUnknown_0820A48C[] =
+{
+    { gBattleWindowSmall2Gfx, 2048, 0xd6ff },
+    { gBattleWindowSmall2Gfx, 2048, 0xd700 },
+};
+
+const struct CompressedSpriteSheet gUnknown_0820A49C[] =
+{
+    { gBattleWindowSmall3Gfx, 2048, 0xd701 },
+    { gBattleWindowSmall3Gfx, 2048, 0xd702 },
+};
+
+const struct CompressedSpriteSheet gUnknown_0820A4AC =
+{ gBattleWindowLarge2Gfx, 4096, 0xd70b };
+
+const struct CompressedSpriteSheet gUnknown_0820A4B4[] =
+{
+    { gBlankGfxCompressed, 256, 0xd704 },
+    { gBlankGfxCompressed, 288, 0xd705 },
+    { gBlankGfxCompressed, 256, 0xd706 },
+    { gBlankGfxCompressed, 288, 0xd707 },
+};
+
+const struct SpritePalette gUnknown_0820A4D4[] =
+{
+    { gUnknown_08D1212C, 0xD6FF },
+    { gUnknown_08D1214C, 0xD704 },
+};
+
+// const struct CompressedSpriteSheet gUnknown_0820A784[] =
+// {
+//     { Tiles_D129AC, 0x80, 0xd714 },
+//     { Tiles_D129AC, 0x80, 0xd715 },
+// };
 
 extern void c3_0802FDF4(u8);
 extern void sub_80440EC();
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c
index 0fca01c00..a24c0427c 100644
--- a/src/battle/battle_interface.c
+++ b/src/battle/battle_interface.c
@@ -237,13 +237,13 @@ const struct CompressedSpriteSheet gUnknown_0820A754[] =
     { gBattleGfx_BallStatusBar, 512, 0xd70d },
 };
 
-const struct CompressedSpritePalette gUnknown_0820A764[] =
+const struct SpritePalette gUnknown_0820A764[] =
 {
     { gUnknown_08D1212C, 0xd710 },
     { gUnknown_08D1212C, 0xd711 },
 };
 
-const struct CompressedSpritePalette gUnknown_0820A774[] =
+const struct SpritePalette gUnknown_0820A774[] =
 {
     { gUnknown_08D1214C, 0xd712 },
     { gUnknown_08D1214C, 0xd713 },