Merge pull request #233 from marijnvdwerf/incbin

Dump intro palettes

12 files changed, 280 insertions, 10 deletions

diff --git a/data/intro_credits_graphics.s b/data/intro_credits_graphics.s
index 6320bc332..d7f62cc78 100644
--- a/data/intro_credits_graphics.s
+++ b/data/intro_credits_graphics.s
@@ -7,10 +7,10 @@ gUnknown_084121FC:: @ 84121FC
 	.incbin "graphics/intro/intro2_grass.gbapal"
 
 gUnknown_0841221C:: @ 841221C
-	.incbin "baserom.gba", 0x0041221c, 0x20
+	.incbin "graphics/intro/intro2_grass_afternoon.gbapal"
 
 gUnknown_0841223C:: @ 841223C
-	.incbin "baserom.gba", 0x0041223c, 0x20
+	.incbin "graphics/intro/intro2_grass_night.gbapal"
 
 	.align 2
 gUnknown_0841225C:: @ 841225C
@@ -21,10 +21,10 @@ gUnknown_084126DC:: @ 84126DC
 	.incbin "graphics/intro/intro2_grass_map.bin.lz"
 
 gUnknown_08412818:: @ 8412818
-	.incbin "baserom.gba", 0x00412818, 0x60
+	.incbin "graphics/intro/8412818.gbapal"
 
 gUnknown_08412878:: @ 8412878
-	.incbin "baserom.gba", 0x00412878, 0x60
+	.incbin "graphics/intro/8412878.gbapal"
 
 	.align 2
 gUnknown_084128D8:: @ 84128D8
@@ -38,16 +38,16 @@ gUnknown_08413184:: @ 8413184
 	.incbin "graphics/intro/intro2_bgclouds.gbapal"
 
 gUnknown_084131A4:: @ 84131A4
-	.incbin "baserom.gba", 0x004131a4, 0x20
+	.incbin "graphics/intro/intro2_bgclouds_afternoon.gbapal"
 
 gUnknown_084131C4:: @ 84131C4
 	.incbin "graphics/intro/intro2_bgclouds2.4bpp.lz"
 
 gUnknown_08413300:: @ 8413300
-	.incbin "baserom.gba", 0x00413300, 0x20
+	.incbin "graphics/intro/intro2_bgtrees2.gbapal"
 
 gUnknown_08413320:: @ 8413320
-	.incbin "baserom.gba", 0x00413320, 0x20
+	.incbin "graphics/intro/intro2_bgtrees2_afternoon.gbapal"
 
 	.align 2
 gUnknown_08413340:: @ 8413340
@@ -66,7 +66,7 @@ gIntro2TreeTiles:: @ 8413CEC
 	.incbin "graphics/intro/intro2_bgtreessmall.4bpp.lz"
 
 gUnknown_08413E38:: @ 8413E38
-	.incbin "baserom.gba", 0x00413e38, 0x40 @ two palettes?
+	.incbin "graphics/intro/8413E38.gbapal"
 
 	.align 2
 gUnknown_08413E78:: @ 8413E78
diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s
index 584b818cd..563aebf0a 100644
--- a/data/pokemon_storage_system.s
+++ b/data/pokemon_storage_system.s
@@ -82,11 +82,11 @@ WaveformTiles: @ 83B6BB4
 
 	.align 2
 gUnknown_083B6D74:: @ 83B6D74
-	.incbin "baserom.gba", 0x003b6d74, 0x20
+	.incbin "graphics/pokemon_storage/83B6D74.gbapal"
 
 	.align 2
 gUnknown_083B6D94:: @ 83B6D94
-	.incbin "baserom.gba", 0x003b6d94, 0x20
+	.incbin "graphics/pokemon_storage/83B6D94.gbapal"
 
 	.align 2
 gUnknown_083B6DB4:: @ 83B6DB4
diff --git a/graphics/intro/8412818.pal b/graphics/intro/8412818.pal
new file mode 100644
index 000000000..09a1ee728
--- /dev/null
+++ b/graphics/intro/8412818.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+74 82 82
+90 123 123
+205 205 197
+255 255 255
+82 131 246
+115 164 246
+139 197 246
+180 222 230
+197 246 230
+164 230 246
+131 164 255
+189 197 255
+156 197 255
+180 230 255
+189 197 255
+0 0 0
+255 255 255
+230 246 255
+205 238 255
+180 230 255
+164 222 255
+139 213 255
+115 205 255
+98 197 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
+255 255 255
+230 246 255
+205 238 255
+180 230 255
+164 222 255
+139 213 255
+115 205 255
+98 197 255
+230 230 255
+246 255 255
+213 222 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/8412878.pal b/graphics/intro/8412878.pal
new file mode 100644
index 000000000..4ff388f48
--- /dev/null
+++ b/graphics/intro/8412878.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+74 82 82
+90 123 123
+205 205 197
+255 255 255
+255 98 82
+255 123 106
+255 148 139
+255 172 172
+255 197 205
+255 222 238
+156 180 172
+197 197 156
+172 189 164
+255 222 156
+222 172 106
+0 0 0
+255 255 255
+255 238 205
+255 222 156
+255 222 156
+255 213 131
+255 197 106
+255 172 98
+255 156 90
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+255 238 205
+255 222 156
+255 222 156
+255 213 131
+255 197 106
+255 172 98
+255 156 90
+255 238 205
+246 255 255
+255 222 156
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/8413E38.pal b/graphics/intro/8413E38.pal
new file mode 100644
index 000000000..82855d938
--- /dev/null
+++ b/graphics/intro/8413E38.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 0 0
+49 115 246
+57 74 123
+57 74 123
+57 74 123
+49 57 98
+49 49 82
+49 32 57
+49 24 41
+0 0 0
+0 0 0
+0 0 0
+57 74 123
+57 74 123
+246 246 123
+41 65 90
+0 0 0
+0 0 0
+0 0 0
+82 90 148
+148 131 164
+57 74 123
+131 106 156
+98 90 123
+156 164 197
+139 148 172
+90 131 139
+189 197 213
+90 115 164
+230 230 82
+131 131 164
+246 246 123
diff --git a/graphics/intro/intro2_bgclouds_afternoon.pal b/graphics/intro/intro2_bgclouds_afternoon.pal
new file mode 100644
index 000000000..6d5d9dbcd
--- /dev/null
+++ b/graphics/intro/intro2_bgclouds_afternoon.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+255 238 205
+255 222 156
+255 222 156
+255 213 131
+255 197 106
+255 172 98
+255 156 90
+255 238 205
+246 255 255
+255 222 156
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/intro2_bgtrees2.pal b/graphics/intro/intro2_bgtrees2.pal
new file mode 100644
index 000000000..5c506481a
--- /dev/null
+++ b/graphics/intro/intro2_bgtrees2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+156 189 246
+172 205 246
+197 230 255
+213 246 255
+238 255 255
+156 180 172
+197 197 156
+172 189 164
+98 139 98
+98 156 57
+123 164 131
+156 213 82
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/intro2_bgtrees2_afternoon.pal b/graphics/intro/intro2_bgtrees2_afternoon.pal
new file mode 100644
index 000000000..9736a6e95
--- /dev/null
+++ b/graphics/intro/intro2_bgtrees2_afternoon.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 106 57
+255 131 82
+255 197 106
+255 213 131
+255 222 156
+156 180 172
+197 197 156
+172 189 164
+115 139 57
+98 156 57
+131 172 57
+189 197 49
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/intro/intro2_grass_afternoon.pal b/graphics/intro/intro2_grass_afternoon.pal
new file mode 100644
index 000000000..20b1e45f5
--- /dev/null
+++ b/graphics/intro/intro2_grass_afternoon.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 82 82
+90 123 123
+205 205 197
+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
+106 164 98
+106 197 98
+164 197 131
diff --git a/graphics/intro/intro2_grass_night.pal b/graphics/intro/intro2_grass_night.pal
new file mode 100644
index 000000000..e44980f78
--- /dev/null
+++ b/graphics/intro/intro2_grass_night.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 82 82
+90 123 123
+205 205 197
+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
+106 164 98
+106 197 98
+131 197 164
diff --git a/graphics/pokemon_storage/83B6D74.pal b/graphics/pokemon_storage/83B6D74.pal
new file mode 100644
index 000000000..c3bd0a175
--- /dev/null
+++ b/graphics/pokemon_storage/83B6D74.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 205 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 139 189
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+148 148 172
diff --git a/graphics/pokemon_storage/83B6D94.pal b/graphics/pokemon_storage/83B6D94.pal
new file mode 100644
index 000000000..20982d214
--- /dev/null
+++ b/graphics/pokemon_storage/83B6D94.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 156 148
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+189 90 82
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+148 148 172