summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-10-26 15:38:10 -0400
committerGitHub <noreply@github.com>2019-10-26 15:38:10 -0400
commitb1d7bd24aa9e89bd9340146bea8d4c6da7b14c97 (patch)
tree29ac6c00128212854f8d96ac732885af97875305 /data
parenta64503e744cc12b78969631974c9fde50f3e2027 (diff)
parent743c01fd7e016e02fc544e1da801af8d20f4ac8d (diff)
Merge pull request #135 from PikalaxALT/more_data_dump
More data dump
Diffstat (limited to 'data')
-rw-r--r--data/battle_bg.s583
-rw-r--r--data/battle_interface.s164
-rw-r--r--data/data.s90
-rw-r--r--data/graphics.s12
4 files changed, 756 insertions, 93 deletions
diff --git a/data/battle_bg.s b/data/battle_bg.s
new file mode 100644
index 000000000..a6c67612e
--- /dev/null
+++ b/data/battle_bg.s
@@ -0,0 +1,583 @@
+ .include "asm/macros.inc"
+ .include "constants/constants.inc"
+
+ .section .rodata
+ .align 2, 0
+
+gUnknown_824829C:: @ 824829C
+ .byte 1, 2, 0
+
+ .align 2
+gOamData_82482A0::
+ .4byte 0xc0000300, 0x00000000
+
+gOamData_82482A8::
+ .4byte 0xc0000300, 0x00000040
+
+gUnknown_82482B0::
+ obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
+ obj_rot_scal_anim_end
+
+gUnknown_82482C0::
+ obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
+ obj_rot_scal_anim_frame 0x18, 0x18, 0, 0x80
+ obj_rot_scal_anim_frame 0x18, 0x18, 0, 0x80
+ obj_rot_scal_anim_end
+
+gAffineAnimTable_82482E0::
+ .4byte gUnknown_82482B0
+ .4byte gUnknown_82482C0
+
+gUnknown_82482E8:: @ 82482E8
+ spr_template 10000, 10000, gOamData_82482A0, gDummySpriteAnimTable, NULL, gAffineAnimTable_82482E0, nullsub_9
+
+gUnknown_8248300:: @ 8248300
+ spr_template 10000, 10000, gOamData_82482A8, gDummySpriteAnimTable, NULL, gAffineAnimTable_82482E0, nullsub_9
+
+gUnknown_8248318:: @ 8248318
+ obj_tiles gFile_graphics_battle_transitions_vs_sheet, 0x1000, 10000
+
+gBattleBgTemplates:: @ 8248320
+ .4byte 0x00000580
+ @ {
+ @ .bg = 0,
+ @ .charBaseIndex = 0,
+ @ .mapBaseIndex = 24,
+ @ .screenSize = 2,
+ @ .paletteMode = 0,
+ @ .priority = 0,
+ @ .baseTile = 0x0000
+ @ }
+ .4byte 0x000005c5
+ @ {
+ @ .bg = 1,
+ @ .charBaseIndex = 1,
+ @ .mapBaseIndex = 28,
+ @ .screenSize = 2,
+ @ .paletteMode = 0,
+ @ .priority = 0,
+ @ .baseTile = 0x0000
+ @ }
+ .4byte 0x000013e6
+ @ {
+ @ .bg = 2,
+ @ .charBaseIndex = 1,
+ @ .mapBaseIndex = 30,
+ @ .screenSize = 1,
+ @ .paletteMode = 0,
+ @ .priority = 1,
+ @ .baseTile = 0x0000
+ @ }
+ .4byte 0x000033ab
+ @ {
+ @ .bg = 3,
+ @ .charBaseIndex = 2,
+ @ .mapBaseIndex = 26,
+ @ .screenSize = 1,
+ @ .paletteMode = 0,
+ @ .priority = 3,
+ @ .baseTile = 0x0000
+ @ }
+
+gUnknown_8248330:: @ 8248330
+ .byte 0, 1, 15, 28, 4, 0
+ .2byte 0x0090
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 1,
+ @ .tilemapTop = 15,
+ @ .width = 28,
+ @ .height = 4,
+ @ .paletteNum = 0,
+ @ .baseBlock = 0x0090
+ @ }
+ .byte 0, 1, 35, 14, 4, 0
+ .2byte 0x01c0
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 1,
+ @ .tilemapTop = 35,
+ @ .width = 14,
+ @ .height = 4,
+ @ .paletteNum = 0,
+ @ .baseBlock = 0x01c0
+ @ }
+ .byte 0, 17, 35, 12, 4, 5
+ .2byte 0x0190
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 17,
+ @ .tilemapTop = 35,
+ @ .width = 12,
+ @ .height = 4,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0190
+ @ }
+ .byte 0, 2, 55, 8, 2, 5
+ .2byte 0x0300
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 2,
+ @ .tilemapTop = 55,
+ @ .width = 8,
+ @ .height = 2,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0300
+ @ }
+ .byte 0, 11, 55, 8, 2, 5
+ .2byte 0x0310
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 11,
+ @ .tilemapTop = 55,
+ @ .width = 8,
+ @ .height = 2,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0310
+ @ }
+ .byte 0, 2, 57, 8, 2, 5
+ .2byte 0x0320
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 2,
+ @ .tilemapTop = 57,
+ @ .width = 8,
+ @ .height = 2,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0320
+ @ }
+ .byte 0, 11, 57, 8, 2, 5
+ .2byte 0x0330
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 11,
+ @ .tilemapTop = 57,
+ @ .width = 8,
+ @ .height = 2,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0330
+ @ }
+ .byte 0, 21, 55, 3, 2, 5
+ .2byte 0x0290
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 21,
+ @ .tilemapTop = 55,
+ @ .width = 3,
+ @ .height = 2,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0290
+ @ }
+ .byte 0, 21, 57, 8, 2, 5
+ .2byte 0x0296
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 21,
+ @ .tilemapTop = 57,
+ @ .width = 8,
+ @ .height = 2,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0296
+ @ }
+ .byte 0, 24, 55, 5, 2, 5
+ .2byte 0x02a6
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 24,
+ @ .tilemapTop = 55,
+ @ .width = 5,
+ @ .height = 2,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x02a6
+ @ }
+ .byte 0, 25, 57, 0, 0, 5
+ .2byte 0x02b0
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 25,
+ @ .tilemapTop = 57,
+ @ .width = 0,
+ @ .height = 0,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x02b0
+ @ }
+ .byte 0, 21, 55, 8, 4, 5
+ .2byte 0x02b0
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 21,
+ @ .tilemapTop = 55,
+ @ .width = 8,
+ @ .height = 4,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x02b0
+ @ }
+ .byte 1, 19, 8, 10, 11, 5
+ .2byte 0x0100
+ @ {
+ @ .bg = 1,
+ @ .tilemapLeft = 19,
+ @ .tilemapTop = 8,
+ @ .width = 10,
+ @ .height = 11,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0100
+ @ }
+ .byte 2, 18, 0, 12, 3, 6
+ .2byte 0x016e
+ @ {
+ @ .bg = 2,
+ @ .tilemapLeft = 18,
+ @ .tilemapTop = 0,
+ @ .width = 12,
+ @ .height = 3,
+ @ .paletteNum = 6,
+ @ .baseBlock = 0x016e
+ @ }
+ .byte 0, 25, 9, 4, 4, 5
+ .2byte 0x0100
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 25,
+ @ .tilemapTop = 9,
+ @ .width = 4,
+ @ .height = 4,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0100
+ @ }
+ .byte 1, 2, 3, 7, 2, 5
+ .2byte 0x0020
+ @ {
+ @ .bg = 1,
+ @ .tilemapLeft = 2,
+ @ .tilemapTop = 3,
+ @ .width = 7,
+ @ .height = 2,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0020
+ @ }
+ .byte 2, 2, 3, 7, 2, 5
+ .2byte 0x0040
+ @ {
+ @ .bg = 2,
+ @ .tilemapLeft = 2,
+ @ .tilemapTop = 3,
+ @ .width = 7,
+ @ .height = 2,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0040
+ @ }
+ .byte 1, 2, 2, 7, 2, 5
+ .2byte 0x0020
+ @ {
+ @ .bg = 1,
+ @ .tilemapLeft = 2,
+ @ .tilemapTop = 2,
+ @ .width = 7,
+ @ .height = 2,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0020
+ @ }
+ .byte 2, 2, 2, 7, 2, 5
+ .2byte 0x0040
+ @ {
+ @ .bg = 2,
+ @ .tilemapLeft = 2,
+ @ .tilemapTop = 2,
+ @ .width = 7,
+ @ .height = 2,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0040
+ @ }
+ .byte 1, 2, 6, 7, 2, 5
+ .2byte 0x0060
+ @ {
+ @ .bg = 1,
+ @ .tilemapLeft = 2,
+ @ .tilemapTop = 6,
+ @ .width = 7,
+ @ .height = 2,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0060
+ @ }
+ .byte 2, 2, 6, 7, 2, 5
+ .2byte 0x0080
+ @ {
+ @ .bg = 2,
+ @ .tilemapLeft = 2,
+ @ .tilemapTop = 6,
+ @ .width = 7,
+ @ .height = 2,
+ @ .paletteNum = 5,
+ @ .baseBlock = 0x0080
+ @ }
+ .byte 0, 11, 2, 8, 2, 0
+ .2byte 0x00a0
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 11,
+ @ .tilemapTop = 2,
+ @ .width = 8,
+ @ .height = 2,
+ @ .paletteNum = 0,
+ @ .baseBlock = 0x00a0
+ @ }
+ .byte 0, 4, 2, 8, 2, 0
+ .2byte 0x00a0
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 4,
+ @ .tilemapTop = 2,
+ @ .width = 8,
+ @ .height = 2,
+ @ .paletteNum = 0,
+ @ .baseBlock = 0x00a0
+ @ }
+ .byte 0, 19, 2, 8, 2, 0
+ .2byte 0x00b0
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 19,
+ @ .tilemapTop = 2,
+ @ .width = 8,
+ @ .height = 2,
+ @ .paletteNum = 0,
+ @ .baseBlock = 0x00b0
+ @ }
+ .byte 0, 2, 15, 26, 4, 7
+ .2byte 0x0090
+ @ {
+ @ .bg = 0,
+ @ .tilemapLeft = 2,
+ @ .tilemapTop = 15,
+ @ .width = 26,
+ @ .height = 4,
+ @ .paletteNum = 7,
+ @ .baseBlock = 0x0090
+ @ }
+ .byte 255, 0, 0, 0, 0, 0
+ .2byte 0x0000
+ @ {
+ @ .bg = 255,
+ @ .tilemapLeft = 0,
+ @ .tilemapTop = 0,
+ @ .width = 0,
+ @ .height = 0,
+ @ .paletteNum = 0,
+ @ .baseBlock = 0x0000
+ @ }
+
+gUnknown_8248400:: @ 8248400
+ .incbin "graphics/battle/unk_8248400.gbapal.lz"
+
+gUnknown_824844C:: @ 824844C
+ .incbin "graphics/battle/unk_824844C.4bpp.lz"
+
+gUnknown_82489A8:: @ 82489A8
+ .incbin "graphics/battle/unk_82489A8.bin.lz"
+
+gUnknown_8248C68:: @ 8248C68
+ .incbin "graphics/battle/unk_8248C68.4bpp.lz"
+
+gUnknown_8248F58:: @ 8248F58
+ .incbin "graphics/battle/unk_8248F58.bin.lz"
+
+gUnknown_8249074:: @ 8249074
+ .incbin "graphics/battle/unk_8249074.gbapal.lz"
+
+gUnknown_82490C4:: @ 82490C4
+ .incbin "graphics/battle/unk_82490C4.4bpp.lz"
+
+gUnknown_8249620:: @ 8249620
+ .incbin "graphics/battle/unk_8249620.bin.lz"
+
+gUnknown_82498DC:: @ 82498DC
+ .incbin "graphics/battle/unk_82498DC.4bpp.lz"
+
+gUnknown_8249E10:: @ 8249E10
+ .incbin "graphics/battle/unk_8249E10.bin.lz"
+
+gUnknown_8249F98:: @ 8249F98
+ .incbin "graphics/battle/unk_8249F98.gbapal.lz"
+
+gUnknown_8249FE4:: @ 8249FE4
+ .incbin "graphics/battle/unk_8249FE4.4bpp.lz"
+
+gUnknown_824A37C:: @ 824A37C
+ .incbin "graphics/battle/unk_824A37C.bin.lz"
+
+gUnknown_824A618:: @ 824A618
+ .incbin "graphics/battle/unk_824A618.4bpp.lz"
+
+gUnknown_824A844:: @ 824A844
+ .incbin "graphics/battle/unk_824A844.bin.lz"
+
+gUnknown_824A940:: @ 824A940
+ .incbin "graphics/battle/unk_824A940.gbapal.lz"
+
+gUnknown_824A990:: @ 824A990
+ .incbin "graphics/battle/unk_824A990.4bpp.lz"
+
+gUnknown_824ACD0:: @ 824ACD0
+ .incbin "graphics/battle/unk_824ACD0.bin.lz"
+
+gUnknown_824AF70:: @ 824AF70
+ .incbin "graphics/battle/unk_824AF70.4bpp.lz"
+
+gUnknown_824B0DC:: @ 824B0DC
+ .incbin "graphics/battle/unk_824B0DC.bin.lz"
+
+gUnknown_824B19C:: @ 824B19C
+ .incbin "graphics/battle/unk_824B19C.gbapal.lz"
+
+gUnknown_824B1EC:: @ 824B1EC
+ .incbin "graphics/battle/unk_824B1EC.4bpp.lz"
+
+gUnknown_824B608:: @ 824B608
+ .incbin "graphics/battle/unk_824B608.bin.lz"
+
+gUnknown_824B8A8:: @ 824B8A8
+ .incbin "graphics/battle/unk_824B8A8.4bpp.lz"
+
+gUnknown_824BBE0:: @ 824BBE0
+ .incbin "graphics/battle/unk_824BBE0.bin.lz"
+
+gUnknown_824BCE0:: @ 824BCE0
+ .incbin "graphics/battle/unk_824BCE0.gbapal.lz"
+
+gUnknown_824BD38:: @ 824BD38
+ .incbin "graphics/battle/unk_824BD38.4bpp.lz"
+
+gUnknown_824C07C:: @ 824C07C
+ .incbin "graphics/battle/unk_824C07C.bin.lz"
+
+gUnknown_824C314:: @ 824C314
+ .incbin "graphics/battle/unk_824C314.4bpp.lz"
+
+gUnknown_824C520:: @ 824C520
+ .incbin "graphics/battle/unk_824C520.bin.lz"
+
+gUnknown_824C5D8:: @ 824C5D8
+ .incbin "graphics/battle/unk_824C5D8.gbapal.lz"
+
+gUnknown_824C624:: @ 824C624
+ .incbin "graphics/battle/unk_824C624.4bpp.lz"
+
+gUnknown_824C958:: @ 824C958
+ .incbin "graphics/battle/unk_824C958.bin.lz"
+
+gUnknown_824CBF8:: @ 824CBF8
+ .incbin "graphics/battle/unk_824CBF8.4bpp.lz"
+
+gUnknown_824CEC8:: @ 824CEC8
+ .incbin "graphics/battle/unk_824CEC8.bin.lz"
+
+gUnknown_824CF98:: @ 824CF98
+ .incbin "graphics/battle/unk_824CF98.gbapal.lz"
+
+gUnknown_824CFEC:: @ 824CFEC
+ .incbin "graphics/battle/unk_824CFEC.4bpp.lz"
+
+gUnknown_824D418:: @ 824D418
+ .incbin "graphics/battle/unk_824D418.bin.lz"
+
+gUnknown_824D6B8:: @ 824D6B8
+ .incbin "graphics/battle/unk_824D6B8.4bpp.lz"
+
+gUnknown_824DC98:: @ 824DC98
+ .incbin "graphics/battle/unk_824DC98.bin.lz"
+
+gUnknown_824DDF0:: @ 824DDF0
+ .incbin "graphics/battle/unk_824DDF0.gbapal.lz"
+
+gUnknown_824DE34:: @ 824DE34
+ .incbin "graphics/battle/unk_824DE34.4bpp.lz"
+
+gUnknown_824E16C:: @ 824E16C
+ .incbin "graphics/battle/unk_824E16C.bin.lz"
+
+gUnknown_824E410:: @ 824E410
+ .incbin "graphics/battle/unk_824E410.4bpp.lz"
+
+gUnknown_824E490:: @ 824E490
+ .incbin "graphics/battle/unk_824E490.bin.lz"
+
+gUnknown_824E528:: @ 824E528
+ .incbin "graphics/battle/unk_824E528.gbapal.lz"
+
+gUnknown_824E56C:: @ 824E56C
+ .incbin "graphics/battle/unk_824E56C.gbapal.lz"
+
+gUnknown_824E5B8:: @ 824E5B8
+ .incbin "graphics/battle/unk_824E5B8.gbapal.lz"
+
+gUnknown_824E604:: @ 824E604
+ .incbin "graphics/battle/unk_824E604.gbapal.lz"
+
+gUnknown_824E650:: @ 824E650
+ .incbin "graphics/battle/unk_824E650.gbapal.lz"
+
+gUnknown_824E6A4:: @ 824E6A4
+ .incbin "graphics/battle/unk_824E6A4.gbapal.lz"
+
+gUnknown_824E6F0:: @ 824E6F0
+ .incbin "graphics/battle/unk_824E6F0.gbapal.lz"
+
+gUnknown_824E740:: @ 824E740
+ .incbin "graphics/battle/unk_824E740.gbapal.lz"
+
+gUnknown_824E78C:: @ 824E78C
+ .incbin "graphics/battle/unk_824E78C.gbapal.lz"
+
+gUnknown_824E7DC:: @ 824E7DC
+ .incbin "graphics/battle/unk_824E7DC.gbapal.lz"
+
+gUnknown_824E81C:: @ 824E81C
+ .incbin "graphics/battle/unk_824E81C.gbapal.lz"
+
+gUnknown_824E858:: @ 824E858
+ .incbin "graphics/battle/unk_824E858.4bpp.lz"
+
+gUnknown_824EB90:: @ 824EB90
+ .incbin "graphics/battle/unk_824EB90.bin.lz"
+
+gUnknown_824EE34:: @ 824EE34
+ .4byte gUnknown_824844C, gUnknown_82489A8, gUnknown_8248C68, gUnknown_8248F58, gUnknown_8248400
+ .4byte gUnknown_82490C4, gUnknown_8249620, gUnknown_82498DC, gUnknown_8249E10, gUnknown_8249074
+ .4byte gUnknown_8249FE4, gUnknown_824A37C, gUnknown_824A618, gUnknown_824A844, gUnknown_8249F98
+ .4byte gUnknown_824A990, gUnknown_824ACD0, gUnknown_824AF70, gUnknown_824B0DC, gUnknown_824A940
+ .4byte gUnknown_824B1EC, gUnknown_824B608, gUnknown_824B8A8, gUnknown_824BBE0, gUnknown_824B19C
+ .4byte gUnknown_824BD38, gUnknown_824C07C, gUnknown_824C314, gUnknown_824C520, gUnknown_824BCE0
+ .4byte gUnknown_824C624, gUnknown_824C958, gUnknown_824CBF8, gUnknown_824CEC8, gUnknown_824C5D8
+ .4byte gUnknown_824CFEC, gUnknown_824D418, gUnknown_824D6B8, gUnknown_824DC98, gUnknown_824CF98
+ .4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824DDF0
+ .4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824E81C
+ .4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824E528
+ .4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824E56C
+ .4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824E5B8
+ .4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E604
+ .4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E650
+ .4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E6A4
+ .4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E6F0
+ .4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E740
+ .4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E78C
+ .4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E7DC
+
+@ struct {u8; u8;}
+gUnknown_824EFC4:: @ 824EFC4
+ .byte 0x01, 0x0b
+ .align 2
+ .byte 0x02, 0x0e
+ .align 2
+ .byte 0x03, 0x0d
+ .align 2
+ .byte 0x04, 0x0f
+ .align 2
+ .byte 0x05, 0x10
+ .align 2
+ .byte 0x06, 0x11
+ .align 2
+ .byte 0x07, 0x12
+ .align 2
+ .byte 0x08, 0x0a
+ .align 2
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 72c9374b9..b19173bc6 100644
--- a/data/data.s
+++ b/data/data.s
@@ -4,101 +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_824829C:: @ 824829C
- .incbin "baserom.gba", 0x24829C, 0x4c
-
-gUnknown_82482E8:: @ 82482E8
- .incbin "baserom.gba", 0x2482E8, 0x18
-
-gUnknown_8248300:: @ 8248300
- .incbin "baserom.gba", 0x248300, 0x18
-
-gUnknown_8248318:: @ 8248318
- .incbin "baserom.gba", 0x248318, 0x8
-
-gBattleBgTemplates:: @ 8248320
- .incbin "baserom.gba", 0x248320, 0x10
-
-gUnknown_8248330:: @ 8248330
- .incbin "baserom.gba", 0x248330, 0x6B04
-
-gUnknown_824EE34:: @ 824EE34
- .incbin "baserom.gba", 0x24EE34, 0x190
-
-gUnknown_824EFC4:: @ 824EFC4
- .incbin "baserom.gba", 0x24EFC4, 0x20
-
- .section .rodata.8260270
-
-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..2adc0f0b3 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -1063,14 +1063,18 @@ gFile_graphics_unused_basic_frame_tilemap:: @ 8D11A78
.align 2
gBattleInterface_BallStatusBarPal:: @ 8D11B84
- .incbin "baserom.gba", 0xD11B84, 0x20
+ .incbin "graphics/battle_interface/ball_status_bar.gbapal"
gBattleInterface_BallDisplayPal:: @ 8D11BA4
- .incbin "baserom.gba", 0xD11BA4, 0x20
+ .incbin "graphics/battle_interface/ball_display.gbapal"
gUnknown_8D11BC4:: @ 8D11BC4
- .incbin "baserom.gba", 0xD11BC4, 0xF00
-
+ .incbin "baserom.gba", 0xD11BC4, 0x840
+
+gUnknown_8D12404::
+ .incbin "graphics/battle_interface/ball_display.4bpp"
+ .incbin "baserom.gba", 0xD12484, 0x640
+
.align 2
gFile_graphics_battle_interface_unused_window3_sheet:: @ 8D12AC4
.incbin "graphics/battle_interface/unused_window3.4bpp.lz"