Merge branch 'master' into slot_machine

6 files changed, 38 insertions, 0 deletions

diff --git a/graphics/pokemon/blastoise/back.png b/graphics/pokemon/blastoise/back.png
new file mode 100644
index 000000000..f380e1515
--- /dev/null
+++ b/graphics/pokemon/blastoise/back.png
diff --git a/graphics/pokemon/blastoise/footprint.png b/graphics/pokemon/blastoise/footprint.png
new file mode 100644
index 000000000..b881f9270
--- /dev/null
+++ b/graphics/pokemon/blastoise/footprint.png
diff --git a/graphics/pokemon/blastoise/front.png b/graphics/pokemon/blastoise/front.png
new file mode 100644
index 000000000..1166b98ea
--- /dev/null
+++ b/graphics/pokemon/blastoise/front.png
diff --git a/graphics/pokemon/blastoise/icon.png b/graphics/pokemon/blastoise/icon.png
new file mode 100644
index 000000000..253d4f8da
--- /dev/null
+++ b/graphics/pokemon/blastoise/icon.png
diff --git a/graphics/pokemon/blastoise/normal.pal b/graphics/pokemon/blastoise/normal.pal
new file mode 100644
index 000000000..694eb3675
--- /dev/null
+++ b/graphics/pokemon/blastoise/normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+139 205 164
+255 255 255
+222 213 213
+148 164 164
+106 74 49
+172 49 57
+222 164 115
+255 213 106
+238 172 65
+189 139 57
+156 115 65
+156 197 238
+115 148 230
+74 131 148
+74 74 115
+16 16 16
diff --git a/graphics/pokemon/blastoise/shiny.pal b/graphics/pokemon/blastoise/shiny.pal
new file mode 100644
index 000000000..d96b5ffee
--- /dev/null
+++ b/graphics/pokemon/blastoise/shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 205 172
+255 255 255
+213 205 205
+148 164 164
+32 65 32
+172 49 57
+180 172 65
+213 189 57
+238 205 74
+115 139 8
+65 90 8
+222 205 246
+213 180 255
+156 148 197
+57 57 106
+16 16 16