Extract intro gfx from graphics.s

15 files changed, 155 insertions, 40 deletions

diff --git a/data/graphics.s b/data/graphics.s
index 4bff14d97..79ef25aeb 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -356,26 +356,36 @@ gUnknown_08D85E72:: @ 8D85E72
 gUnknown_08D85E7C:: @ 8D85E7C
 	.incbin "baserom.gba", 0xd85e7c, 0x54
 
-gUnknown_08D85ED0:: @ 8D85ED0
-	.incbin "baserom.gba", 0xd85ed0, 0x20
+	.align 2
+gIntroVolbeatPal:: @ 8D85ED0
+	.incbin "graphics/intro/volbeat.gbapal"
 
-gUnknown_08D85EF0:: @ 8D85EF0
-	.incbin "baserom.gba", 0xd85ef0, 0x20
+	.align 2
+gIntroTorchicPal:: @ 8D85EF0
+	.incbin "graphics/intro/torchic.gbapal"
 
-gUnknown_08D85F10:: @ 8D85ED0
-	.incbin "baserom.gba", 0xd85f10, 0x20
+	.align 2
+gIntroManectricPal:: @ 8D85ED0
+	.incbin "graphics/intro/manectric.gbapal"
 
+	.align 2
 gUnknown_08D85F30:: @ 8D85ED0
 	.incbin "baserom.gba", 0xd85f30, 0x20
 
-gUnknown_08D85F50:: @ 8D85F50
-	.incbin "baserom.gba", 0xd85f50, 0x1e0
+	.align 2
+gIntroVolbeatGfx:: @ 8D85F50
+	.incbin "graphics/intro/volbeat.4bpp.lz"
 
-gUnknown_08D86130:: @ 8D86130
-	.incbin "baserom.gba", 0xd86130, 0x420
+	.align 2
+gIntroTorchicGfx:: @ 8D86130
+	.incbin "graphics/intro/torchic.4bpp.lz"
+
+	.align 2
+gIntroManectricGfx:: @ 8D86550
+	.incbin "graphics/intro/manectric.4bpp.lz"
 
-gUnknown_08D86550:: @ 8D86550
-	.incbin "baserom.gba", 0xd86550, 0x1f44
+	.align 2
+	.incbin "baserom.gba", 0xd8702c, 0x1468
 
 gUnknown_08D88494:: @ 8D88494
 	.incbin "baserom.gba", 0xd88494, 0x8ac
@@ -410,12 +420,15 @@ gUnknown_08D8B440:: @ 8D8B440
 gUnknown_08D8B6E8:: @ 8D8B6E8
 	.incbin "baserom.gba", 0xd8b6e8, 0x124
 
-gUnknown_08D8B80C:: @ 8D8B80C
-	.incbin "baserom.gba", 0xd8b80c, 0x248
+	.align 2
+gIntroRayquazaLightningGfx:: @ 8D8B80C
+	.incbin "graphics/intro/rayquaza_lightning.4bpp.lz"
 
-gUnknown_08D8BA54:: @ 8D8BA54
-	.incbin "baserom.gba", 0xd8ba54, 0x20
+	.align 2
+gIntroRayquazaLightningPal:: @ 8D8BA54
+	.incbin "graphics/intro/rayquaza_lightning.gbapal"
 
+	.align 2
 gUnknown_08D8BA74:: @ 8D8BA74
 	.incbin "baserom.gba", 0xd8ba74, 0x6f8
 
@@ -428,17 +441,24 @@ gUnknown_08D8C838:: @ 8D8C838
 gUnknown_08D8CCC8:: @ 8D8CCC8
 	.incbin "baserom.gba", 0xd8ccc8, 0x27c
 
-gUnknown_08D8CF44:: @ 8D8CF44
-	.incbin "baserom.gba", 0xd8cf44, 0x1cc
+	.align 2
+gIntroKyogreBubblesGfx:: @ 8D8CF44
+	.incbin "graphics/intro/kyogre_bubbles.4bpp.lz"
 
-gUnknown_08D8D110:: @ 8D8D110
-	.incbin "baserom.gba", 0xd8d110, 0x20
+	.align 2
+gIntroKyogreBubblesPal:: @ 8D8D110
+	.incbin "graphics/intro/kyogre_bubbles.gbapal"
 
-gUnknown_08D8D130:: @ 8D8D130
-	.incbin "baserom.gba", 0xd8d130, 0xd8
+	.align 2
+gIntroFlygonSilhouette:: @ 8D8D130
+	.incbin "graphics/intro/flygon_silhouette.4bpp.lz"
+
+	.align 2
+gIntroLeavesDropletSparkleGfx:: @ 8D8D208
+	.incbin "graphics/intro/droplet_sparkle.4bpp.lz"
 
-gUnknown_08D8D208:: @ 8D8D208
-	.incbin "baserom.gba", 0xd8d208, 0x208
+	.align 2
+	.incbin "baserom.gba", 0xd8d2a4, 0x16c
 
 gUnknown_08D8D410:: @ 8D8D410
 	.incbin "baserom.gba", 0xd8d410, 0x17c
diff --git a/data/intro.s b/data/intro.s
index acd1164b6..ea6223c7e 100644
--- a/data/intro.s
+++ b/data/intro.s
@@ -72,8 +72,8 @@ gIntroBattleCircleGfx:: @ 85E45B0
 	.incbin "graphics/intro/battle_circle.4bpp.lz"
 
 	.align 2
-gIntroFlyingPkmnShadowPal:: @ 85E492C
-	.incbin "graphics/intro/flying_shadow.gbapal"
+gIntroFlyingPkmnSilhouettePal:: @ 85E492C
+	.incbin "graphics/intro/flying_silhouette.gbapal"
 
 	.align 2
 	.incbin "graphics/intro/latis.4bpp.lz"
@@ -90,12 +90,12 @@ gIntroFlyingPkmnShadowPal:: @ 85E492C
 
 	.align 2
 gUnknown_085E4A74:: @ 85E4A74
-	obj_tiles gUnknown_08D8D208, 0x0400, 0x05e1
+	obj_tiles gIntroLeavesDropletSparkleGfx, 0x0400, 0x05e1
 	null_obj_tiles
 
 	.align 2
 gUnknown_085E4A84:: @ 85E4A84
-	obj_pal gUnknown_08D8BA54, 0x05e1
+	obj_pal gIntroRayquazaLightningPal, 0x05e1
 	null_obj_pal
 
 	.align 2
@@ -122,16 +122,16 @@ gUnknown_085E4AD0:: @ 85E4AD0
 
 	.align 2
 gUnknown_085E4AE8:: @ 85E4AE8
-	obj_tiles gUnknown_08D85F50, 0x0400, 0x05dc
-	obj_tiles gUnknown_08D86130, 0x0c00, 0x05dd
-	obj_tiles gUnknown_08D86550, 0x2000, 0x05de
+	obj_tiles gIntroVolbeatGfx, 0x0400, 0x05dc
+	obj_tiles gIntroTorchicGfx, 0x0c00, 0x05dd
+	obj_tiles gIntroManectricGfx, 0x2000, 0x05de
 	null_obj_tiles
 
 	.align 2
 gUnknown_085E4B08:: @ 85E4B08
-	obj_pal gUnknown_08D85ED0, 0x05dc
-	obj_pal gUnknown_08D85EF0, 0x05dd
-	obj_pal gUnknown_08D85F10, 0x05de
+	obj_pal gIntroVolbeatPal, 0x05dc
+	obj_pal gIntroTorchicPal, 0x05dd
+	obj_pal gIntroManectricPal, 0x05de
 	null_obj_pal
 
 	.align 2
@@ -194,12 +194,12 @@ gUnknown_085E4BDC:: @ 85E4BDC
 
 	.align 2
 gUnknown_085E4BF4:: @ 85E4BF4
-	obj_tiles gUnknown_08D8B80C, 0x0c00, 0x05df
+	obj_tiles gIntroRayquazaLightningGfx, 0x0c00, 0x05df
 	null_obj_tiles
 
 	.align 2
 gUnknown_085E4C04:: @ 85E4C04
-	obj_pal gUnknown_08D8BA54, 0x05df
+	obj_pal gIntroRayquazaLightningPal, 0x05df
 	null_obj_pal
 
 	.align 2
@@ -236,12 +236,12 @@ gUnknown_085E4C64:: @ 85E4C64
 
 	.align 2
 gUnknown_085E4C88:: @ 85E4C88
-	obj_tiles gUnknown_08D8CF44, 0x0600, 0x05e0
+	obj_tiles gIntroKyogreBubblesGfx, 0x0600, 0x05e0
 	null_obj_tiles
 
 	.align 2
 gUnknown_085E4C98:: @ 85E4C98
-	obj_pal gUnknown_08D8D110, 0x05e0
+	obj_pal gIntroKyogreBubblesPal, 0x05e0
 	null_obj_pal
 
 	.align 2
@@ -492,14 +492,14 @@ gUnknown_085E4FDC:: @ 85E4FDC
 	null_obj_tiles
 
 gUnknown_085E4FEC:: @ 85E4FEC
-	obj_tiles gUnknown_08D8D130, 0x0400, 0x07d2
+	obj_tiles gIntroFlygonSilhouette, 0x0400, 0x07d2
 	null_obj_tiles
 
 	.align 2
 gUnknown_085E4FFC:: @ 85E4FFC
 	obj_pal gIntroLeavesDropsPal, 0x07d0
 	obj_pal gIntroLeavesGFLogoPal, 0x07d1
-	obj_pal gIntroFlyingPkmnShadowPal, 0x07d2
+	obj_pal gIntroFlyingPkmnSilhouettePal, 0x07d2
 	null_obj_pal
 
 	.align 2
diff --git a/graphics/intro/droplet_sparkle.png b/graphics/intro/droplet_sparkle.png
new file mode 100644
index 000000000..f8db885ec
--- /dev/null
+++ b/graphics/intro/droplet_sparkle.png
diff --git a/graphics/intro/flygon_silhouette.png b/graphics/intro/flygon_silhouette.png
new file mode 100644
index 000000000..080ab1a65
--- /dev/null
+++ b/graphics/intro/flygon_silhouette.png
diff --git a/graphics/intro/flying_shadow.pal b/graphics/intro/flying_silhouette.pal
index dcfc242a5..dcfc242a5 100644
--- a/graphics/intro/flying_shadow.pal
+++ b/graphics/intro/flying_silhouette.pal
diff --git a/graphics/intro/kyogre_bubbles.pal b/graphics/intro/kyogre_bubbles.pal
new file mode 100644
index 000000000..85c483666
--- /dev/null
+++ b/graphics/intro/kyogre_bubbles.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 148 98
+0 41 82
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+139 172 255
+106 148 222
+82 123 189
+49 98 156
+24 74 123
+0 49 98
+180 0 0
diff --git a/graphics/intro/kyogre_bubbles.png b/graphics/intro/kyogre_bubbles.png
new file mode 100644
index 000000000..d1f18701c
--- /dev/null
+++ b/graphics/intro/kyogre_bubbles.png
diff --git a/graphics/intro/manectric.pal b/graphics/intro/manectric.pal
new file mode 100644
index 000000000..c6bf97aa3
--- /dev/null
+++ b/graphics/intro/manectric.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 189 172
+82 74 74
+139 139 123
+197 189 222
+255 255 255
+230 49 0
+246 148 0
+0 0 0
+255 255 180
+246 246 90
+205 213 49
+148 123 8
+131 164 255
+106 106 255
+41 74 213
+0 0 0
diff --git a/graphics/intro/manectric.png b/graphics/intro/manectric.png
new file mode 100644
index 000000000..bcb054d7b
--- /dev/null
+++ b/graphics/intro/manectric.png
diff --git a/graphics/intro/rayquaza_lightning.pal b/graphics/intro/rayquaza_lightning.pal
new file mode 100644
index 000000000..16aae4be3
--- /dev/null
+++ b/graphics/intro/rayquaza_lightning.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 189 172
+255 255 148
+255 213 0
+205 189 49
+255 255 255
+82 74 74
+115 106 82
+148 139 98
+180 180 115
+213 213 131
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/rayquaza_lightning.png b/graphics/intro/rayquaza_lightning.png
new file mode 100644
index 000000000..e858926ec
--- /dev/null
+++ b/graphics/intro/rayquaza_lightning.png
diff --git a/graphics/intro/torchic.pal b/graphics/intro/torchic.pal
new file mode 100644
index 000000000..860b76b60
--- /dev/null
+++ b/graphics/intro/torchic.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 189 172
+82 74 74
+139 139 123
+197 189 222
+255 255 255
+131 98 41
+230 98 32
+238 148 74
+246 197 115
+255 255 148
+255 213 0
+205 189 49
+255 246 205
+255 213 148
+222 180 115
+0 0 0
diff --git a/graphics/intro/torchic.png b/graphics/intro/torchic.png
new file mode 100644
index 000000000..1bd1b1184
--- /dev/null
+++ b/graphics/intro/torchic.png
diff --git a/graphics/intro/volbeat.pal b/graphics/intro/volbeat.pal
new file mode 100644
index 000000000..8d2464800
--- /dev/null
+++ b/graphics/intro/volbeat.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 189 172
+82 74 74
+139 139 123
+197 189 222
+255 255 255
+131 98 41
+230 98 32
+238 148 74
+246 197 115
+255 255 148
+255 213 0
+205 189 49
+238 156 255
+197 115 230
+156 82 213
+0 0 0
diff --git a/graphics/intro/volbeat.png b/graphics/intro/volbeat.png
new file mode 100644
index 000000000..8b6c61eb0
--- /dev/null
+++ b/graphics/intro/volbeat.png