Merge pull request #252 from marijnvdwerf/include/data-2

Include various data

8 files changed, 101 insertions, 13 deletions

diff --git a/data/fldeff_80C5CD4.s b/data/fldeff_80C5CD4.s
index b0c3a15ea..f4de75f7d 100644
--- a/data/fldeff_80C5CD4.s
+++ b/data/fldeff_80C5CD4.s
@@ -36,11 +36,11 @@ gSpriteAnimTable_83D18E8:: @ 83D18E8
 
 	.align 2
 gUnknownPal_083D18EC::
-	.incbin "baserom.gba", 0x003d18ec, 0x20
+	.incbin "graphics/unknown/unknown_3D18EC.gbapal"
 
 	.align 2
 gUnknownPal_083D190C::
-	.incbin "baserom.gba", 0x003d190c, 0x20
+	.incbin "graphics/unknown/unknown_3D190C.gbapal"
 
 	.incbin "baserom.gba", 0x003d192c, 0x60
 
@@ -112,7 +112,7 @@ gSpriteImage_83D20CC:: @ 83D20CC
 	.incbin "graphics/unknown_sprites/83D25C4/4.4bpp"
 
 	.align 2
-	.incbin "baserom.gba", 0x003d214c, 0x80
+	.incbin "graphics/unknown_sprites/83D25C4/5.4bpp"
 
 	.align 2
 gFieldEffectObjectPalette8: @ 83D21CC
@@ -295,7 +295,7 @@ gSpriteImage_83D27C0:: @ 83D27C0
 
 	.align 2
 Palette_3D2840:: @ 83D2840
-	.incbin "baserom.gba", 0x3d2840, 0x20
+	.incbin "graphics/unknown/unknown_3D2840.gbapal"
 
 	.align 2
 gSpriteImageTable_83D2860:: @ 83D2860
diff --git a/data/learn_move.s b/data/learn_move.s
index adb8dc1c2..29c44521f 100644
--- a/data/learn_move.s
+++ b/data/learn_move.s
@@ -11,10 +11,11 @@ gDexArrows_Pal::
 gDexArrows_Gfx::
 	.incbin "graphics/pokedex/arrows.4bpp"
 
-	.incbin "baserom.gba", 0x00402c78, 0x80
-
 gUnknown_08402CF8:: @ 8402CF8
-	.incbin "baserom.gba", 0x00402cf8, 0x10
+	.byte 0,  0,  9,  13
+	.byte 10, 0,  29, 7
+	.byte 2,  14, 27, 19
+	.byte 10, 8,  29, 13
 
 gUnknown_08402D08:: @ 8402D08
 	.4byte OtherText_Battle
@@ -132,10 +133,16 @@ gSpriteTemplate_8402E08:: @ 8402E08
 	spr_template 5525, 5526, gOamData_8402D50, gSpriteAnimTable_8402DF8, NULL, gDummySpriteAffineAnimTable, sub_8133300
 
 	.align 2
-	.incbin "baserom.gba", 0x00402e20, 0x4
+	.incbin "baserom.gba", 0x00402e20, 0x4 @ あきと ?
 
 gUnknown_08402E24:: @ 8402E24
-	.incbin "baserom.gba", 0x00402e24, 0x15
+	.byte 11,  1,  1
+	.byte  3,  6,  2
+	.byte 24,  1,  3
+	.byte  3, 11,  4
+	.byte  5,  4,  5
+	.byte  3,  6,  6
+	.byte  3, 11,  7
 
 gUnknown_08402E39:: @ 8402E39
 	.byte 0, 1, 2, 3
diff --git a/data/pokedex.s b/data/pokedex.s
index 5411f82a2..984adfe9c 100644
--- a/data/pokedex.s
+++ b/data/pokedex.s
@@ -396,16 +396,40 @@ gUnknown_083B57FC:: @ 83B57FC
 	.byte 0, 12, 5, 0, 0, 0, 0, 0
 
 gUnknown_083B5850:: @ 83B5850
-	.incbin "baserom.gba", 0x003b5850, 0x1c
+	.byte 0xFF, 0xFF, 0xFF,    1
+	.byte 0xFF, 0xFF,    0,    2
+	.byte 0xFF,    3,    1,    4
+	.byte    2, 0xFF,    1,    4
+	.byte 0xFF, 0xFF,    2,    5
+	.byte 0xFF, 0xFF,    4,    6
+	.byte 0xFF, 0xFF,    5, 0xFF
 
 gUnknown_083B586C:: @ 83B586C
-	.incbin "baserom.gba", 0x003b586c, 0x1c
+	.byte 0xFF, 0xFF, 0xFF, 0xFF
+	.byte 0xFF, 0xFF, 0xFF, 0xFF
+	.byte 0xFF, 0xFF, 0xFF, 0xFF
+	.byte 0xFF, 0xFF, 0xFF, 0xFF
+	.byte 0xFF, 0xFF, 0xFF,    5
+	.byte 0xFF, 0xFF,    4,    6
+	.byte 0xFF, 0xFF,    5, 0xFF
 
 gUnknown_083B5888:: @ 83B5888
-	.incbin "baserom.gba", 0x003b5888, 0x1c
+	.byte 0xFF, 0xFF, 0xFF,    1
+	.byte 0xFF, 0xFF,    0,    2
+	.byte 0xFF,    3,    1,    4
+	.byte    2, 0xFF,    1,    4
+	.byte 0xFF, 0xFF,    2,    6
+	.byte 0xFF, 0xFF, 0xFF, 0xFF
+	.byte 0xFF, 0xFF,    4, 0xFF
 
 gUnknown_083B58A4:: @ 83B58A4
-	.incbin "baserom.gba", 0x003b58a4, 0x1c
+	.byte 0xFF, 0xFF, 0xFF, 0xFF
+	.byte 0xFF, 0xFF, 0xFF, 0xFF
+	.byte 0xFF, 0xFF, 0xFF, 0xFF
+	.byte 0xFF, 0xFF, 0xFF, 0xFF
+	.byte 0xFF, 0xFF, 0xFF,    6
+	.byte 0xFF, 0xFF, 0xFF, 0xFF
+	.byte 0xFF, 0xFF,    4, 0xFF
 
 	.align 2
 gUnknown_083B58C0:: @ 83B58C0
diff --git a/graphics/pokedex/arrows.png b/graphics/pokedex/arrows.png
index fe992db2f..2abf39366 100755
--- a/graphics/pokedex/arrows.png
+++ b/graphics/pokedex/arrows.png
diff --git a/graphics/unknown/unknown_3D18EC.pal b/graphics/unknown/unknown_3D18EC.pal
new file mode 100644
index 000000000..3841584c8
--- /dev/null
+++ b/graphics/unknown/unknown_3D18EC.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+189 197 222
+0 0 0
+82 82 90
+148 148 172
+164 164 180
+222 222 246
+255 255 255
+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
diff --git a/graphics/unknown/unknown_3D190C.pal b/graphics/unknown/unknown_3D190C.pal
new file mode 100644
index 000000000..088afec9e
--- /dev/null
+++ b/graphics/unknown/unknown_3D190C.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+139 65 32
+139 65 32
+139 65 32
+139 65 32
+139 65 32
+139 65 32
+139 65 32
+139 65 32
+139 65 32
+139 65 32
+139 65 32
+139 65 32
+139 65 32
+139 65 32
+139 65 32
+139 65 32
diff --git a/graphics/unknown/unknown_3D2840.pal b/graphics/unknown/unknown_3D2840.pal
new file mode 100644
index 000000000..292acfd35
--- /dev/null
+++ b/graphics/unknown/unknown_3D2840.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 0 0
+0 255 0
+0 0 255
+255 255 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
diff --git a/graphics/unknown_sprites/83D25C4/5.png b/graphics/unknown_sprites/83D25C4/5.png
new file mode 100644
index 000000000..7006e9cc9
--- /dev/null
+++ b/graphics/unknown_sprites/83D25C4/5.png