Various includes

9 files changed, 65 insertions, 18 deletions

diff --git a/asm/region_map.s b/asm/region_map.s
index c6953705c..8113afe64 100644
--- a/asm/region_map.s
+++ b/asm/region_map.s
@@ -2623,9 +2623,9 @@ sub_80FBCF0: @ 80FBCF0
 	movs r2, 0
 	strh r3, [r0]
 	strh r1, [r0, 0x2]
-	ldr r0, _080FBDA4 @ =gUnknown_083E7708
+	ldr r0, _080FBDA4 @ =gOamData_083E7708
 	str r0, [sp, 0x4]
-	ldr r0, _080FBDA8 @ =gUnknown_083E7718
+	ldr r0, _080FBDA8 @ =gSpriteAnimTable_083E7718
 	str r0, [sp, 0x8]
 	str r2, [sp, 0xC]
 	ldr r0, _080FBDAC @ =gDummySpriteAffineAnimTable
@@ -2685,8 +2685,8 @@ _080FBD42:
 _080FBD98: .4byte gRegionMapBrendanIconTiles
 _080FBD9C: .4byte gRegionMapBrendanIconPalette
 _080FBDA0: .4byte 0xffff0000
-_080FBDA4: .4byte gUnknown_083E7708
-_080FBDA8: .4byte gUnknown_083E7718
+_080FBDA4: .4byte gOamData_083E7708
+_080FBDA8: .4byte gSpriteAnimTable_083E7718
 _080FBDAC: .4byte gDummySpriteAffineAnimTable
 _080FBDB0: .4byte SpriteCallbackDummy
 _080FBDB4: .4byte gSaveBlock2
diff --git a/data/easy_chat.s b/data/easy_chat.s
index cde3ae52b..852b1b179 100644
--- a/data/easy_chat.s
+++ b/data/easy_chat.s
@@ -341,13 +341,15 @@ gSpriteTemplate_83DBDE4:: @ 83DBDE4
 	spr_template 7, 5, gOamData_83DBD70, gSpriteAnimTable_83DBDCC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_083DBDFC:: @ 83DBDFC
-	.incbin "baserom.gba", 0x003dbdfc, 0x20
+	.incbin "graphics/unknown/unknown_3DBDFC.gbapal"
 
 gUnknown_083DBE1C:: @ 83DBE1C
 	.incbin "baserom.gba", 0x003dbe1c, 0x24
 
 gUnknown_083DBE40:: @ 83DBE40
-	.incbin "baserom.gba", 0x003dbe40, 0x68 @ LZ
+	.incbin "graphics/unknown/unknown_3DBE40.gbapal"
+
+	.incbin "baserom.gba", 0x003dbe60, 0x48
 
 gUnknown_083DBEA8:: @ 83DBEA8
 	.string "{CLEAR_TO 88}$"
diff --git a/data/pokedex.s b/data/pokedex.s
index 9e6300945..5411f82a2 100644
--- a/data/pokedex.s
+++ b/data/pokedex.s
@@ -15,11 +15,11 @@ gUnknown_0839F73C:: @ 839F73C
 
 	.align 2
 gUnknown_0839F8A0:: @ 839F8A0
-	.incbin "baserom.gba", 0x0039f8a0, 0xe8
+	.incbin "graphics/pokedex/pokedex_cry_layout.bin.lz"
 
 	.align 2
 gUnknown_0839F988:: @ 839F988
-	.incbin "baserom.gba", 0x0039f988, 0xf4
+	.incbin "graphics/pokedex/pokedex_size_layout.bin.lz"
 
 gUnknown_0839FA7C:: @ 839FA7C
 	.incbin "graphics/pokedex/noball.4bpp.lz"
@@ -262,7 +262,9 @@ gUnknown_083B4EC4:: @ 83B4EC4
 	.include "data/graphics/pokemon/footprint_table.inc"
 
 gUnknown_083B5558:: @ 83B5558
-	.incbin "baserom.gba", 0x3b5558, 0x24
+	.string "{CLEAR_TO 0}$"
+
+	.incbin "baserom.gba", 0x3b555c, 0x20
 
 	.align 2
 gOamData_83B557C:: @ 83B557C
@@ -497,7 +499,7 @@ gUnknown_083B5A7C:: @ 83B5A7C
 	.byte 2, 3, 2, 0
 
 gUnknown_083B5AAC:: @ 83B5AAC
-	.incbin "baserom.gba", 0x003b5aac, 0x6
+	.string "{STR_VAR_1}{CLEAR_TO 43}$"
 
 gUnknown_083B5AB2:: @ 83B5AB2
-	.incbin "baserom.gba", 0x003b5ab2, 0x6
+	.string "{STR_VAR_1}{CLEAR_TO 96}$"
diff --git a/data/region_map.s b/data/region_map.s
index 056da14da..595f2b337 100644
--- a/data/region_map.s
+++ b/data/region_map.s
@@ -97,14 +97,19 @@ gUnknown_083E76E8:: @ 83E76E8
 gSpriteTemplate_83E76F0:: @ 83E76F0
 	spr_template 0, 0, gOamData_83E76B8, gSpriteAnimTable_83E76E0, NULL, gDummySpriteAffineAnimTable, sub_80FBAF0
 
-gUnknown_083E7708:: @ 83E7708
-	.incbin "baserom.gba", 0x003e7708, 0x8
+	.align 2
+gOamData_083E7708:: @ 83E7708
+	.2byte 0x0000
+	.2byte 0x4000
+	.2byte 0x0800
 
-Unknown_83E7710:
-	.incbin "baserom.gba", 0x003e7710, 0x8
+	.align 2
+gSpriteAnim_83E7710: @ 83E7710
+	obj_image_anim_frame 0, 5
+	obj_image_anim_end
 
-gUnknown_083E7718:: @ 83E7718
-	.4byte Unknown_83E7710
+gSpriteAnimTable_083E7718:: @ 83E7718 ANIMCMD
+	.4byte gSpriteAnim_83E7710
 
 gUnknown_083E771C:: @ 83E771C
 	.incbin "graphics/pokenav/map_frame.gbapal"
@@ -113,7 +118,7 @@ gUnknown_083E773C:: @ 83E773C
 	.incbin "graphics/pokenav/map_frame.4bpp.lz"
 
 gUnknown_083E7774:: @ 83E7774
-	.incbin "baserom.gba", 0x003e7774, 0xb8
+	.incbin "graphics/pokenav/map_frame.bin.lz"
 
 	.align 2
 gPokenavMapMisc_Pal::
diff --git a/graphics/pokedex/pokedex_cry_layout.bin b/graphics/pokedex/pokedex_cry_layout.bin
new file mode 100644
index 000000000..3e32e9817
--- /dev/null
+++ b/graphics/pokedex/pokedex_cry_layout.bin
diff --git a/graphics/pokedex/pokedex_size_layout.bin b/graphics/pokedex/pokedex_size_layout.bin
new file mode 100644
index 000000000..c18fe6a5a
--- /dev/null
+++ b/graphics/pokedex/pokedex_size_layout.bin
diff --git a/graphics/pokenav/map_frame.bin b/graphics/pokenav/map_frame.bin
new file mode 100644
index 000000000..eb8e9ee62
--- /dev/null
+++ b/graphics/pokenav/map_frame.bin
diff --git a/graphics/unknown/unknown_3DBDFC.pal b/graphics/unknown/unknown_3DBDFC.pal
new file mode 100644
index 000000000..2b21dc923
--- /dev/null
+++ b/graphics/unknown/unknown_3DBDFC.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+0 197 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+131 131 131
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/unknown/unknown_3DBE40.pal b/graphics/unknown/unknown_3DBE40.pal
new file mode 100644
index 000000000..086bdf503
--- /dev/null
+++ b/graphics/unknown/unknown_3DBE40.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+98 98 98
+0 197 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+222 213 222
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255