summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-07-02 14:57:40 -0700
committerGitHub <noreply@github.com>2016-07-02 14:57:40 -0700
commit272c48425016d21a348d66cb7141fbaf43ae99d6 (patch)
tree8e95e11b78990c2042f09a060bcc90169547c931 /graphics
parent8f08ae61851a6d21b1da046e50670b267a43b144 (diff)
parent4be92ee7bb2206f997b43e7e75b164c4911737b1 (diff)
Merge pull request #21 from yenatch/master
More sapphire diffs, and no more graphics diffs.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/slot_machine/slot_machine3_sapphire.pal19
-rw-r--r--graphics/slot_machine/slot_machine4_sapphire.pal19
-rwxr-xr-xgraphics/title_screen/pokemon_ruby.png (renamed from graphics/title_screen/pokemon.png)bin4666 -> 4666 bytes
-rwxr-xr-xgraphics/title_screen/pokemon_sapphire.pngbin0 -> 4558 bytes
4 files changed, 38 insertions, 0 deletions
diff --git a/graphics/slot_machine/slot_machine3_sapphire.pal b/graphics/slot_machine/slot_machine3_sapphire.pal
new file mode 100644
index 000000000..ec8d62a06
--- /dev/null
+++ b/graphics/slot_machine/slot_machine3_sapphire.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 213 172
+255 255 255
+255 0 255
+131 139 255
+148 156 255
+156 164 255
+172 180 255
+189 189 255
+205 205 255
+131 180 255
+0 106 255
+0 57 172
+255 0 255
+148 148 156
+90 90 106
+41 41 65
diff --git a/graphics/slot_machine/slot_machine4_sapphire.pal b/graphics/slot_machine/slot_machine4_sapphire.pal
new file mode 100644
index 000000000..f3a7dc791
--- /dev/null
+++ b/graphics/slot_machine/slot_machine4_sapphire.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 172 197
+255 255 255
+255 164 0
+246 82 0
+180 57 0
+131 41 0
+238 205 106
+189 148 65
+148 106 24
+131 180 255
+0 106 255
+0 57 172
+255 0 255
+148 148 156
+90 90 106
+41 41 65
diff --git a/graphics/title_screen/pokemon.png b/graphics/title_screen/pokemon_ruby.png
index 7d141ad67..7d141ad67 100755
--- a/graphics/title_screen/pokemon.png
+++ b/graphics/title_screen/pokemon_ruby.png
Binary files differ
diff --git a/graphics/title_screen/pokemon_sapphire.png b/graphics/title_screen/pokemon_sapphire.png
new file mode 100755
index 000000000..9363289df
--- /dev/null
+++ b/graphics/title_screen/pokemon_sapphire.png
Binary files differ