From 946de7529d7496fa5c7a0d35caca425eb834386a Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Wed, 5 Aug 2020 17:47:03 -0500
Subject: [PATCH] Dump Nintendo + Capcom intro screen graphics

---
 data/data_08121C58.s               |  19 +++++++++++++++++--
 graphics/intro/capcom.pal          |  19 +++++++++++++++++++
 graphics/intro/nintendo.pal        |  19 +++++++++++++++++++
 graphics/intro/nintendo_capcom.png | Bin 0 -> 1613 bytes
 graphics_file_rules.mk             |   4 ++++
 5 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 graphics/intro/capcom.pal
 create mode 100644 graphics/intro/nintendo.pal
 create mode 100644 graphics/intro/nintendo_capcom.png

diff --git a/data/data_08121C58.s b/data/data_08121C58.s
index 9c5f3788..a691f57a 100755
--- a/data/data_08121C58.s
+++ b/data/data_08121C58.s
@@ -19322,7 +19322,16 @@ gUnk_085BD440:: @ 085BD440
 	.incbin "baserom.gba", 0x5BD440, 0x00000E0
 
 gUnk_085BD520:: @ 085BD520
-	.incbin "baserom.gba", 0x5BD520, 0x00029D8
+	.incbin "baserom.gba", 0x5BD520, 0x0000100
+
+gUnk_085BD620:: @ 085BD620
+	.incbin "graphics/intro/capcom.gbapal"
+
+gUnk_085BD640:: @ 085BD640
+	.incbin "graphics/intro/nintendo.gbapal"
+
+gUnk_085BD660:: @ 085BD660
+	.incbin "baserom.gba", 0x5BD660, 0x0002898
 
 gUnk_085BFEF8:: @ 085BFEF8
 	.incbin "baserom.gba", 0x5BFEF8, 0x000002E
@@ -22535,7 +22544,13 @@ gUnk_088C065C:: @ 088C065C
 	.incbin "baserom.gba", 0x8C065C, 0x00002A4
 
 gUnk_088C0900:: @ 088C0900
-	.incbin "baserom.gba", 0x8C0900, 0x000598C
+	.incbin "baserom.gba", 0x8C0900, 0x0001980
+
+gUnk_088C2280:: @ 088C2280
+	.incbin "graphics/intro/nintendo_capcom.4bpp"
+
+gUnk_088C31E0:: @ 088C31E0
+	.incbin "baserom.gba", 0x8C31E0, 0x00030AC
 
 gUnk_088C628C:: @ 088C628C
 	.incbin "baserom.gba", 0x8C628C, 0x00003FC
diff --git a/graphics/intro/capcom.pal b/graphics/intro/capcom.pal
new file mode 100644
index 00000000..97dc7b18
--- /dev/null
+++ b/graphics/intro/capcom.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+41 0 238
+74 115 180
+98 131 123
+139 156 106
+205 164 24
+238 197 49
+255 230 0
+106 139 189
+164 172 197
+213 213 222
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/nintendo.pal b/graphics/intro/nintendo.pal
new file mode 100644
index 00000000..32b3f094
--- /dev/null
+++ b/graphics/intro/nintendo.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 57 0
+255 98 8
+255 131 41
+255 156 74
+255 180 115
+255 205 156
+255 238 213
+255 255 255
+255 156 74
+255 180 115
+255 205 156
+255 238 213
+0 0 0
+0 0 0
+255 222 0
diff --git a/graphics/intro/nintendo_capcom.png b/graphics/intro/nintendo_capcom.png
new file mode 100644
index 0000000000000000000000000000000000000000..15439c4c4a12da78cff2fb83baf656b083d205d2
GIT binary patch
literal 1613
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
LNkvXXu0mjf6lmZW

literal 0
HcmV?d00001

diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index e69de29b..6f83b00b 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -0,0 +1,4 @@
+GFXDIR := graphics
+
+$(GFXDIR)/intro/nintendo_capcom.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 123