Extract data from pokedex.s

asm/pokedex.s

@@ -8940,7 +8940,7 @@ _080C0250:
 	b _080C028E
 	.pool
 _080C028C:
-	ldr r0, =gUnknown_0856E688
+	ldr r0, =sText_TenDashes2
 _080C028E:
 	movs r1, 0x84
 	movs r2, 0x19

data/pokedex.s

@@ -23,16 +23,15 @@
 .endm
 
 gUnknown_0855D2B8:: @ 855D2B8
-	.incbin "baserom.gba", 0x55d2b8, 0x6
+	.string "{UNK_CTRL_F9 8}000$"
 
 gUnknown_0855D2BE:: @ 855D2BE
-	.incbin "baserom.gba", 0x55d2be, 0x40
+	.incbin "graphics/pokedex/caught_ball.4bpp"
 
 sText_TenDashes:: @ 855D2FE
 	.string "----------$"
 
-.align 2
+	.align 2
-
 gUnknown_0855D30C:: @ 855D30C
 	.string "$"
 
@@ -42,29 +41,41 @@ gUnknown_0855D30C:: @ 855D30C
 @ 856B5B0
 	.include "data/pokedex_entries.inc"
 
+	.align 2
 gUnknown_0856E610:: @ 856E610
-	.incbin "baserom.gba", 0x56e610, 0x20
+	.incbin "graphics/pokedex/black.gbapal"
 
+	.align 2
 gUnknown_0856E630:: @ 856E630
-	.incbin "baserom.gba", 0x56e630, 0x10
+	.4byte 0x000030c8, 0x000000d1, 0x000010ea, 0x000020f3
 
+	.align 2
 gUnknown_0856E640:: @ 856E640
-	.incbin "baserom.gba", 0x56e640, 0x28
+	window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001
+	window_template 0x02, 0x19, 0x08, 0x02, 0x02, 0x0f, 0x0281
+	window_template 0x00, 0x00, 0x0c, 0x20, 0x07, 0x08, 0x0285
+	window_template 0x02, 0x12, 0x03, 0x0a, 0x08, 0x09, 0x0365
+	window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
 
+	.align 2
 gUnknown_0856E668:: @ 856E668
-	.incbin "baserom.gba", 0x56e668, 0x8
+	.4byte 0x000020ea, 0x000030f7
 
+	.align 2
 gUnknown_0856E670:: @ 856E670
-	.incbin "baserom.gba", 0x56e670, 0x18
+	window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001
+	window_template 0x02, 0x19, 0x08, 0x02, 0x02, 0x0f, 0x0281
+	window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
 
-gUnknown_0856E688:: @ 856E688
+sText_TenDashes2:: @ 856E688
-	.incbin "baserom.gba", 0x56e688, 0xc
+	.string "----------$"
 
 @ 856E694
 	.include "data/graphics/pokemon/footprint_table.inc"
 
 gUnknown_0856ED08:: @ 856ED08
-	.incbin "baserom.gba", 0x56ed08, 0x28
+	.byte 0x00, 0x00, 0x00, 0x00, 0xbb, 0x03, 0xd5, 0x03, 0xbe, 0x03, 0xd8, 0x03, 0xc1, 0x03, 0xdb, 0x03, 0xc4, 0x03, 0xde, 0x03, 0xc7, 0x03, 0xe1, 0x03, 0xca, 0x03, 0xe4, 0x03, 0xcd, 0x03, 0xe7, 0x03
+	.byte 0xd0, 0x03, 0xea, 0x03, 0xd3, 0x02, 0xed, 0x02
 
 gUnknown_0856ED30:: @ 856ED30
 	unk_dex_struct_3 gUnknown_085E87A5, 0, 0, 5
@@ -80,18 +91,23 @@ gUnknown_0856ED48:: @ 856ED48
 	unk_dex_struct_2 gUnknown_085E8806, 0, 10, 5, 5, 10, 12
 	unk_dex_struct_2 gUnknown_085E88C8, 0, 12, 5, 0, 0, 0
 
+	.align 1
 gUnknown_0856ED9C:: @ 856ED9C
-	.incbin "baserom.gba", 0x56ed9c, 0x1c
+	.2byte 0xffff, 0x01ff, 0xffff, 0x0200, 0x03ff, 0x0401, 0xff02, 0x0401, 0xffff, 0x0502, 0xffff, 0x0604, 0xffff, 0xff05
 
+	.align 1
 gUnknown_0856EDB8:: @ 856EDB8
-	.incbin "baserom.gba", 0x56edb8, 0x1c
+	.2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x05ff, 0xffff, 0x0604, 0xffff, 0xff05
 
+	.align 1
 gUnknown_0856EDD4:: @ 856EDD4
-	.incbin "baserom.gba", 0x56edd4, 0x1c
+	.2byte 0xffff, 0x01ff, 0xffff, 0x0200, 0x03ff, 0x0401, 0xff02, 0x0401, 0xffff, 0x0602, 0xffff, 0xffff, 0xffff, 0xff04
 
+	.align 1
 gUnknown_0856EDF0:: @ 856EDF0
-	.incbin "baserom.gba", 0x56edf0, 0x1c
+	.2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x06ff, 0xffff, 0xffff, 0xffff, 0xff04
 
+	.align 2
 gUnknown_0856EE0C:: @ 856EE0C
 	.4byte gUnknown_085E89A4
 	.4byte gUnknown_085E88DF
@@ -100,6 +116,7 @@ gUnknown_0856EE0C:: @ 856EE0C
 	.4byte NULL
 	.4byte NULL
 
+	.align 2
 gUnknown_0856EE24:: @ 856EE24
 	.4byte gUnknown_085E89D4
 	.4byte gUnknown_085E88F6
@@ -208,14 +225,15 @@ gUnknown_0856EF14:: @ 856EF14
 	.4byte 0
 
 gUnknown_0856EFAC:: @ 856EFAC
-	.incbin "baserom.gba", 0x56efac, 0x2
+	.byte 0x00, 0x01
 
 gUnknown_0856EFAE:: @ 856EFAE
-	.incbin "baserom.gba", 0x56efae, 0x6
+	.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05
 
 gUnknown_0856EFB4:: @ 856EFB4
-	.incbin "baserom.gba", 0x56efb4, 0x14
+	.byte 0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x00, 0x00
 
+	.align 2
 gUnknown_0856EFC8:: @ 856EFC8
 	unk_dex_struct gUnknown_0856EE5C, 6, 7, 10
 	unk_dex_struct gUnknown_0856EEB4, 8, 9, 11
@@ -224,8 +242,12 @@ gUnknown_0856EFC8:: @ 856EFC8
 	unk_dex_struct gUnknown_0856EE24, 4, 5, 6
 	unk_dex_struct gUnknown_0856EE0C, 2, 3, 2
 
+	.align 2
 gUnknown_0856EFF8:: @ 856EFF8
-	.incbin "baserom.gba", 0x56eff8, 0x10
+	.4byte 0x000000c8, 0x000010d1, 0x000020ea, 0x000030f3
 
+	.align 2
 gUnknown_0856F008:: @ 856F008
-	.incbin "baserom.gba", 0x56f008, 0x10
+	window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001
+	null_window_template
+

graphics/pokedex/black.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0