Extract baseroms from battle_interface

7 files changed, 203 insertions, 28 deletions

diff --git a/data/battle_7.s b/data/battle_7.s
index 4b0eea65a..ffd2e8daa 100644
--- a/data/battle_7.s
+++ b/data/battle_7.s
@@ -40,7 +40,5 @@ gUnknown_0832C108:: @ 832C108
 
     .align 2
 gUnknown_0832C128:: @ 832C128
-	obj_pal gUnknown_08C11B9C, 0xd6ff
-	obj_pal gUnknown_08C11BBC, 0xd704
-
-	.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
+	obj_pal gBattleInterface_BallStatusBarPal, 0xd6ff
+	obj_pal gBattleInterface_BallDisplayPal, 0xd704
diff --git a/data/battle_interface.s b/data/battle_interface.s
index 3fd9060fd..766f34752 100644
--- a/data/battle_interface.s
+++ b/data/battle_interface.s
@@ -4,53 +4,177 @@
 	.section .rodata
 	.align 2, 0
 
+gUnknown_0832C138:: @ 832C138
+	.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
+
+	.align 2
 gUnknown_0832C140:: @ 832C140
-	.incbin "baserom.gba", 0x32c140, 0x30
+	spr_template 0xd6ff, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+	.align 2
+gUnknown_0832C158:: @ 832C158
+	spr_template 0xd700, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
 gUnknown_0832C170:: @ 832C170
-	.incbin "baserom.gba", 0x32c170, 0x30
+	spr_template 0xd701, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
+gUnknown_0832C188:: @ 832C188
+	spr_template 0xd702, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+	.align 2
 gUnknown_0832C1A0:: @ 832C1A0
-	.incbin "baserom.gba", 0x32c1a0, 0x20
+	spr_template 0xd70b, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
-gUnknown_0832C1C0:: @ 832C1C0
-	.incbin "baserom.gba", 0x32c1c0, 0xcc
+	.align 2
+gUnknown_0832C1B8:: @ 832C1B8
+	.byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00
 
+	.align 2
+gUnknown_0832C1C0:: @ 832C1C0
+	spr_template 0xd704, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
+
+	.align 2
+gUnknown_0832C1D8:: @ 832C1D8
+	spr_template 0xd705, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
+
+	.align 2
+gUnknown_0832C1F0:: @ 832C1F0
+	spr_template 0xd706, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
+
+	.align 2
+gUnknown_0832C208:: @ 832C208
+	spr_template 0xd707, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
+
+	.align 2
+gUnknown_0832C220:: @ 832C220
+	.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
+	.byte 0xf0, 0x20, 0x05, 0x43, 0x10, 0x20, 0x45, 0x43
+	.byte 0x30, 0x20, 0x85, 0x43
+
+	.align 2
+gUnknown_0832C234:: @ 832C234
+	.byte 0xf0, 0x00, 0x0d, 0x44, 0x30, 0x00, 0x08, 0x46
+	.byte 0xf0, 0x20, 0x05, 0x47, 0x10, 0x20, 0x45, 0x47
+	.byte 0x30, 0x20, 0x85, 0x47
+
+	.align 2
+gUnknown_0832C248:: @ 832C248
+	.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
+
+	.align 2
+gUnknown_0832C250:: @ 832C250
+	.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
+
+	.align 2
+gUnknown_0832C258:: @ 832C258
+	.byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
+
+	.align 2
+gUnknown_0832C260:: @ 832C260
+	.byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
+	.byte 0xe0, 0x00, 0x80, 0x40
+
+	.align 2
+gUnknown_0832C26C:: @ 832C26C
+	.4byte 0x00000005, gUnknown_0832C220
+	.4byte 0x00000002, gUnknown_0832C248
+	.4byte 0x00000005, gUnknown_0832C234
+	.4byte 0x00000002, gUnknown_0832C250
+
+	.align 2
 gUnknown_0832C28C:: @ 832C28C
-	.incbin "baserom.gba", 0x32c28c, 0x38
+	.4byte 0x00000002, gUnknown_0832C258
+	.4byte 0x00000003, gUnknown_0832C260
+
+	.align 2
+gUnknown_0832C29C:: @ 832C29C
+	.byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
+	.byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0xc5, 0x40
+
+	.align 2
+gUnknown_0832C2AC:: @ 832C2AC
+	.byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
+	.byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0x85, 0x40
+	.byte 0x20, 0x00, 0x85, 0x40, 0x40, 0x00, 0xc5, 0x40
 
+	.align 2
 gUnknown_0832C2C4:: @ 832C2C4
-	.incbin "baserom.gba", 0x32c2c4, 0x8
+	.4byte 0x00000004, gUnknown_0832C29C
 
+	.align 2
 gUnknown_0832C2CC:: @ 832C2CC
-	.incbin "baserom.gba", 0x32c2cc, 0x68
+	.4byte 0x00000006, gUnknown_0832C2AC
 
+	.align 2
+gUnknown_0832C2D4:: @ 832C2D4
+	.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
+	.2byte 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777
+
+	.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
+	.2byte 0x7777, 0x7777, 0x7777, 0x7717, 0x1777, 0x7177, 0x7777, 0x7771
+
+	.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
+	.2byte 0x7777, 0x7777, 0x7777, 0x7111, 0x7777, 0x7171, 0x7777, 0x7111
+
+	.align 2
 gUnknown_0832C334:: @ 832C334
-	.incbin "baserom.gba", 0x32c334, 0x8
+	obj_tiles gBattleInterface_BallStatusBarGfx, 0x0200, 0xd70c
 
+	.align 2
 gUnknown_0832C33C:: @ 832C33C
-	.incbin "baserom.gba", 0x32c33c, 0x8
+	obj_pal gBattleInterface_BallStatusBarPal, 0xd710
 
+	.align 2
 gUnknown_0832C344:: @ 832C344
-	.incbin "baserom.gba", 0x32c344, 0x8
+	obj_pal gBattleInterface_BallDisplayPal, 0xd712
 
+	.align 2
 gUnknown_0832C34C:: @ 832C34C
-	.incbin "baserom.gba", 0x32c34c, 0x18
+	obj_tiles gBattleInterface_BallDisplayGfx, 0x0080, 0xd714
+
+	.align 2
+gUnknown_0832C354:: @ 832C354
+	.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
 
+	.align 2
+gUnknown_0832C35C:: @ 832C35C
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00
+
+	.align 2
 gUnknown_0832C364:: @ 832C364
-	.incbin "baserom.gba", 0x32c364, 0x30
+	spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
+
+	.align 2
+gUnknown_0832C37C:: @ 832C37C
+	spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
 
+	.align 2
 gUnknown_0832C394:: @ 832C394
-	.incbin "baserom.gba", 0x32c394, 0x30
+	spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
+
+	.align 2
+gUnknown_0832C3AC:: @ 832C3AC
+	spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
 
+	.align 2
 gUnknown_0832C3C4:: @ 832C3C4
-	.incbin "baserom.gba", 0x32c3c4, 0x14
+	.byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x02, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00
 
+	.align 2
 gUnknown_0832C3D8:: @ 832C3D8
-	.incbin "baserom.gba", 0x32c3d8, 0x14
+	.byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00
 
+	.align 2
 gUnknown_0832C3EC:: @ 832C3EC
-	.incbin "baserom.gba", 0x32c3ec, 0xc
+	.byte 0x98, 0x61, 0xf7, 0x0e, 0x94, 0x46, 0xd1, 0x72
+	.byte 0xdc, 0x29, 0x00, 0x00
 
+	.align 2
 gUnknown_0832C3F8:: @ 832C3F8
-	.incbin "baserom.gba", 0x32c3f8, 0x8
+	.byte 0x00, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00
diff --git a/data/graphics.s b/data/graphics.s
index 0fa256449..e206a46f1 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -30,14 +30,25 @@ gUnknown_08C0237C:: @ 8C0237C
 gUnknown_08C093F0:: @ 8C093F0
 	.incbin "baserom.gba", 0xc093f0, 0x87ac
 
-gUnknown_08C11B9C:: @ 8C11B9C
-	.incbin "baserom.gba", 0xc11b9c, 0x20
+    .align 2
+gBattleInterface_BallStatusBarPal:: @ 8C11B9C
+	.incbin "graphics/battle_interface/ball_status_bar.gbapal"
 
-gUnknown_08C11BBC:: @ 8C11BBC
-	.incbin "baserom.gba", 0xc11bbc, 0x20
+    .align 2
+gBattleInterface_BallDisplayPal:: @ 8C11BBC
+	.incbin "graphics/battle_interface/ball_display.gbapal"
 
+    .align 2
 gUnknown_08C11BDC:: @ 8C11BDC
-	.incbin "baserom.gba", 0xc11bdc, 0x52b4
+	.incbin "baserom.gba", 0xc11bdc, 0x840
+
+    .align 2
+gBattleInterface_BallDisplayGfx:: @ 8C1241C
+	.incbin "graphics/battle_interface/ball_display.4bpp"
+
+    .align 2
+gUnknown_08C1249C:: @ 8C1249C
+	.incbin "baserom.gba", 0xc1249c, 0x49f4
 
 gUnknown_08C16E90:: @ 8C16E90
 	.incbin "baserom.gba", 0xc16e90, 0x118
@@ -506,7 +517,11 @@ gUnknown_08D8FB9C:: @ 8D8FB9C
 	.incbin "baserom.gba", 0xd8fb9c, 0x24
 
 gUnknown_08D8FBC0:: @ 8D8FBC0
-	.incbin "baserom.gba", 0xd8fbc0, 0xb4
+	.incbin "baserom.gba", 0xd8fbc0, 0x30
+
+	.align 2
+gBattleInterface_BallStatusBarGfx:: @ 8D8FBF0
+	.incbin "graphics/battle_interface/ball_status_bar.4bpp.lz"
 
 	.align 2
 gMonIcon_Egg:: @ 8D8FC74
diff --git a/graphics/battle_interface/ball_display.pal b/graphics/battle_interface/ball_display.pal
new file mode 100644
index 000000000..ea646bb82
--- /dev/null
+++ b/graphics/battle_interface/ball_display.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+57 57 57
+255 255 255
+213 205 189
+131 131 139
+74 65 90
+82 106 90
+255 180 123
+246 148 115
+222 106 90
+115 255 172
+90 213 131
+255 230 57
+205 172 8
+255 90 57
+172 65 74
diff --git a/graphics/battle_interface/ball_display.png b/graphics/battle_interface/ball_display.png
new file mode 100644
index 000000000..0c49d7ac4
--- /dev/null
+++ b/graphics/battle_interface/ball_display.png
diff --git a/graphics/battle_interface/ball_status_bar.pal b/graphics/battle_interface/ball_status_bar.pal
new file mode 100644
index 000000000..bc8e8f2bc
--- /dev/null
+++ b/graphics/battle_interface/ball_status_bar.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 65 65
+255 255 222
+222 213 180
+197 189 115
+123 148 131
+82 106 98
+32 57 0
+57 82 65
+255 230 0
+255 156 148
+65 205 255
+0 0 255
+0 255 0
+255 0 0
+106 148 255
diff --git a/graphics/battle_interface/ball_status_bar.png b/graphics/battle_interface/ball_status_bar.png
new file mode 100644
index 000000000..b947a7803
--- /dev/null
+++ b/graphics/battle_interface/ball_status_bar.png