Dump and split battle_interface data

6 files changed, 171 insertions, 65 deletions

diff --git a/baserom.ips b/baserom.ips
index b177f77e2..e7a5c21cf 100644
--- a/baserom.ips
+++ b/baserom.ips
diff --git a/data/battle_interface.s b/data/battle_interface.s
new file mode 100644
index 000000000..f7072c3e7
--- /dev/null
+++ b/data/battle_interface.s
@@ -0,0 +1,164 @@
+#include "constants/region_map.h"
+#include "constants/trainer_classes.h"
+#include "constants/songs.h"
+#include "constants/flags.h"
+#include "constants/region_map.h"
+#include "constants/maps.h"
+#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+	.align 2, 0
+
+gUnknown_8260270:: @ 8260270
+	.4byte 0xc0004000, 0x00000400
+
+gUnknown_8260278:: @ 8260278
+	spr_template 55039, 55039, gUnknown_8260270, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 55040, 55039, gUnknown_8260270, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+gUnknown_82602A8:: @ 82602A8
+	spr_template 55041, 55039, gUnknown_8260270, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 55042, 55039, gUnknown_8260270, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+gUnknown_82602D8:: @ 82602D8
+	spr_template 55051, 55039, gUnknown_8260270, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+gUnknown_82602F0::
+	.4byte 0x40004000, 0x00000400
+
+gUnknown_82602F8:: @ 82602F8
+	spr_template 55044, 55044, gUnknown_82602F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80480B8
+	spr_template 55045, 55044, gUnknown_82602F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80480B8
+	spr_template 55046, 55044, gUnknown_82602F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80480B8
+	spr_template 55047, 55044, gUnknown_82602F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80480B8
+
+gUnknown_8260358::
+	subsprite 240, 0, 1, 0x0000, 64x32
+	subsprite 48, 0, 1, 0x0020, 32x32
+	subsprite 240, 32, 1, 0x0030, 32x8
+	subsprite 16, 32, 1, 0x0034, 32x8
+	subsprite 48, 32, 1, 0x0038, 32x8
+
+gUnknown_826036C::
+	subsprite 240, 0, 1, 0x0040, 64x32
+	subsprite 48, 0, 1, 0x0060, 32x32
+	subsprite 240, 32, 1, 0x0070, 32x8
+	subsprite 16, 32, 1, 0x0074, 32x8
+	subsprite 48, 32, 1, 0x0078, 32x8
+
+gUnknown_8260380::
+	subsprite 240, 0, 1, 0x0000, 64x32
+	subsprite 48, 0, 1, 0x0020, 32x32
+
+gUnknown_8260388::
+	subsprite 240, 0, 1, 0x0000, 64x32
+	subsprite 48, 0, 1, 0x0020, 32x32
+
+gUnknown_8260390::
+	subsprite 240, 0, 1, 0x0000, 32x8
+	subsprite 16, 0, 1, 0x0004, 32x8
+
+gUnknown_8260398::
+	subsprite 240, 0, 1, 0x0000, 32x8
+	subsprite 16, 0, 1, 0x0004, 32x8
+	subsprite 224, 0, 1, 0x0008, 8x8
+
+gUnknown_82603A4::
+	.4byte 5, gUnknown_8260358
+	.4byte 2, gUnknown_8260380
+	.4byte 5, gUnknown_826036C
+	.4byte 2, gUnknown_8260388
+
+gUnknown_82603C4:: @ 82603C4
+	.4byte 2, gUnknown_8260390
+	.4byte 3, gUnknown_8260398
+
+gUnknown_82603D4::
+	subsprite 160, 0, 1, 0x0000, 32x8
+	subsprite 192, 0, 1, 0x0004, 32x8
+	subsprite 224, 0, 1, 0x0008, 32x8
+	subsprite 0, 0, 1, 0x000c, 32x8
+
+gUnknown_82603E4::
+	subsprite 160, 0, 1, 0x0000, 32x8
+	subsprite 192, 0, 1, 0x0004, 32x8
+	subsprite 224, 0, 1, 0x0008, 32x8
+	subsprite 0, 0, 1, 0x0008, 32x8
+	subsprite 32, 0, 1, 0x0008, 32x8
+	subsprite 64, 0, 1, 0x000c, 32x8
+
+gUnknown_82603FC:: @ 82603FC
+	.4byte 4, gUnknown_82603D4
+
+gUnknown_8260404:: @ 8260404
+	.4byte 6, gUnknown_82603E4
+
+gUnknown_26040C::
+	.incbin "graphics/battle_interface/unk_826404C.4bpp"
+
+gUnknown_826046C:: @ 826046C
+	obj_tiles gFile_graphics_battle_interface_ball_status_bar_sheet, 0x0200, 55052
+	obj_tiles gFile_graphics_battle_interface_ball_status_bar_sheet, 0x0200, 55053
+
+gUnknown_826047C:: @ 826047C
+	obj_pal gBattleInterface_BallStatusBarPal, 55056
+	obj_pal gBattleInterface_BallStatusBarPal, 55057
+
+gUnknown_826048C:: @ 826048C
+	obj_pal gBattleInterface_BallDisplayPal, 55058
+	obj_pal gBattleInterface_BallDisplayPal, 55059
+
+gUnknown_826049C:: @ 826049C
+	obj_tiles gUnknown_8D12404, 0x0080, 55060
+	obj_tiles gUnknown_8D12404, 0x0080, 55061
+
+gUnknown_82604AC::
+	.4byte 0xc0004000, 0x00000400
+
+gUnknown_82604B4::
+	.4byte 0x00000000, 0x00000400
+
+gUnknown_82604BC:: @ 82604BC
+	spr_template 55052, 55056, gUnknown_8260270, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_StatusSummaryBar
+	spr_template 55053, 55057, gUnknown_8260270, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_StatusSummaryBar
+
+gUnknown_82604EC:: @ 82604EC
+	spr_template 55060, 55058, gUnknown_82604B4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_StatusSummaryBallsOnBattleStart
+	spr_template 55061, 55059, gUnknown_82604B4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_StatusSummaryBallsOnBattleStart
+
+gUnknown_826051C:: @ 826051C
+	.string "{EXTRA_LV}$", 16
+
+gUnknown_826052C:: @ 826052C
+	.string "{COLOR 01}{HIGHLIGHT 02}", 20
+
+gUnknown_8260540:: @ 8260540
+	.string "/$"
+
+gUnknown_8260542:: @ 8260542
+	.string "{COLOR 01}{HIGHLIGHT 00}", 20
+
+gUnknown_8260556:: @ 8260556
+	.string "{HIGHLIGHT 02}$"
+
+gUnknown_826055A:: @ 826055A
+	.2byte RGB(24, 12, 24)
+	.2byte RGB(23, 23, 3)
+	.2byte RGB(20, 20, 17)
+	.2byte RGB(17, 22, 28)
+	.2byte RGB(28, 14, 10)
+
+gUnknown_8260564:: @ 8260564
+	.byte 0, 0, 0, 8, 2, 0
+	.2byte 0x0000
+	@ {
+	@   .bg = 0,
+	@   .tilemapLeft = 0,
+	@   .tilemapTop = 0,
+	@   .width = 8,
+	@   .height = 2,
+	@   .paletteNum = 0,
+	@   .baseBlock = 0x0000
+	@ }
diff --git a/data/data.s b/data/data.s
index 209cfcb4a..b19173bc6 100644
--- a/data/data.s
+++ b/data/data.s
@@ -4,75 +4,13 @@
 #include "constants/flags.h"
 #include "constants/region_map.h"
 #include "constants/maps.h"
+#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
 	.section .rodata
 	.align 2, 0
 
-gUnknown_8260270:: @ 8260270
-	.incbin "baserom.gba", 0x260270, 0x8
-
-gUnknown_8260278:: @ 8260278
-	.incbin "baserom.gba", 0x260278, 0x30
-
-gUnknown_82602A8:: @ 82602A8
-	.incbin "baserom.gba", 0x2602A8, 0x30
-
-gUnknown_82602D8:: @ 82602D8
-	.incbin "baserom.gba", 0x2602D8, 0x20
-
-gUnknown_82602F8:: @ 82602F8
-	.incbin "baserom.gba", 0x2602F8, 0xCC
-
-gUnknown_82603C4:: @ 82603C4
-	.incbin "baserom.gba", 0x2603C4, 0x38
-
-gUnknown_82603FC:: @ 82603FC
-	.incbin "baserom.gba", 0x2603FC, 0x8
-
-gUnknown_8260404:: @ 8260404
-	.incbin "baserom.gba", 0x260404, 0x68
-
-gUnknown_826046C:: @ 826046C
-	.incbin "baserom.gba", 0x26046C, 0x10
-
-gUnknown_826047C:: @ 826047C
-	.incbin "baserom.gba", 0x26047C, 0x10
-
-gUnknown_826048C:: @ 826048C
-	.incbin "baserom.gba", 0x26048C, 0x10
-
-gUnknown_826049C:: @ 826049C
-	.incbin "baserom.gba", 0x26049C, 0x20
-
-gUnknown_82604BC:: @ 82604BC
-	.incbin "baserom.gba", 0x2604BC, 0x30
-
-gUnknown_82604EC:: @ 82604EC
-	.incbin "baserom.gba", 0x2604EC, 0x30
-
-gUnknown_826051C:: @ 826051C
-	.incbin "baserom.gba", 0x26051C, 0x10
-
-gUnknown_826052C:: @ 826052C
-	.incbin "baserom.gba", 0x26052C, 0x14
-
-gUnknown_8260540:: @ 8260540
-	.incbin "baserom.gba", 0x260540, 0x2
-
-gUnknown_8260542:: @ 8260542
-	.incbin "baserom.gba", 0x260542, 0x14
-
-gUnknown_8260556:: @ 8260556
-	.incbin "baserom.gba", 0x260556, 0x4
-
-gUnknown_826055A:: @ 826055A
-	.incbin "baserom.gba", 0x26055A, 0xA
-
-gUnknown_8260564:: @ 8260564
-	.incbin "baserom.gba", 0x260564, 0x8
-
 gUnknown_826056C:: @ 826056C
 	.incbin "baserom.gba", 0x26056C, 0x60
 
diff --git a/data/graphics.s b/data/graphics.s
index 9a7a19312..ca79cc75f 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -1069,8 +1069,11 @@ gBattleInterface_BallDisplayPal:: @ 8D11BA4
 	.incbin "baserom.gba", 0xD11BA4, 0x20
 
 gUnknown_8D11BC4:: @ 8D11BC4
-	.incbin "baserom.gba", 0xD11BC4, 0xF00
-	
+	.incbin "baserom.gba", 0xD11BC4, 0x840
+
+gUnknown_8D12404::
+	.incbin "baserom.gba", 0xD12404, 0x6C0
+
 	.align 2
 gFile_graphics_battle_interface_unused_window3_sheet:: @ 8D12AC4
 	.incbin "graphics/battle_interface/unused_window3.4bpp.lz"
diff --git a/graphics/battle_interface/unk_826404C.png b/graphics/battle_interface/unk_826404C.png
new file mode 100644
index 000000000..8672ac614
--- /dev/null
+++ b/graphics/battle_interface/unk_826404C.png
diff --git a/ld_script.txt b/ld_script.txt
index 0cf5b4c29..ab9a7c4e6 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -397,6 +397,7 @@ SECTIONS {
         src/util.o(.rodata);
         src/daycare.o(.rodata);
         src/battle_gfx_sfx_util.o(.rodata);
+        data/battle_interface.o(.rodata);
         data/data.o(.rodata);
         data/overworld.o(.rodata);
         data/tilesets.o(.rodata);