summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-07-11 17:58:09 -0700
committerYamaArashi <shadow962@live.com>2016-07-11 17:58:09 -0700
commitc48cd82c0dc64bd251bb16eff5d9f8ee47a10704 (patch)
tree5fa36c36e42ad95b34d49e8880ada0f11f505fa3
parent0fb0e614918f2280e6de07f033049f53b4e9c46c (diff)
pokemon marking graphics
-rw-r--r--data/data2.s6
-rw-r--r--graphics/misc/mon_markings.pal19
-rw-r--r--graphics/misc/mon_markings.pngbin0 -> 489 bytes
3 files changed, 23 insertions, 2 deletions
diff --git a/data/data2.s b/data/data2.s
index 150d7d377..931f8c092 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -18753,11 +18753,13 @@ gUnknown_083E499C:: @ 83E499C
gUnknown_083E49C0:: @ 83E49C0
.incbin "baserom.gba", 0x003e49c0, 0x34
+ .align 2
gUnknown_083E49F4:: @ 83E49F4
- .incbin "baserom.gba", 0x003e49f4, 0x20
+ .incbin "graphics/misc/mon_markings.gbapal"
+ .align 2
gUnknown_083E4A14:: @ 83E4A14
- .incbin "baserom.gba", 0x003e4a14, 0x800
+ .incbin "graphics/misc/mon_markings.4bpp"
gUnknown_083E5214:: @ 83E5214
.incbin "baserom.gba", 0x003e5214, 0x8
diff --git a/graphics/misc/mon_markings.pal b/graphics/misc/mon_markings.pal
new file mode 100644
index 000000000..8f31611f7
--- /dev/null
+++ b/graphics/misc/mon_markings.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 172 172
+131 131 131
+156 156 156
+255 255 255
+205 205 205
+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/misc/mon_markings.png b/graphics/misc/mon_markings.png
new file mode 100644
index 000000000..66fcbcb0f
--- /dev/null
+++ b/graphics/misc/mon_markings.png
Binary files differ