diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-09 13:32:57 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-09 13:32:57 -0400 |
| commit | f438734192e272af065820ad718ceb76ee59927a (patch) | |
| tree | 9230432a4a80c4fb6d1ae106f872c0990d6f1cb5 /graphics | |
| parent | d361f7030abb3441bfe61e95c3803297454acbb8 (diff) | |
| parent | 96c5966ff3676eb1b3463808b83b42e13e1591fd (diff) | |
fixing merge conflicts
Diffstat (limited to 'graphics')
| -rwxr-xr-x | graphics/misc/clock_small.pal | 19 | ||||
| -rwxr-xr-x | graphics/misc/clock_small.png | bin | 0 -> 221 bytes | |||
| -rwxr-xr-x | graphics/misc/diploma.png | bin | 0 -> 2064 bytes | |||
| -rwxr-xr-x | graphics/misc/diploma_hoenn.pal | 19 | ||||
| -rwxr-xr-x | graphics/misc/diploma_map.bin | bin | 0 -> 4096 bytes | |||
| -rwxr-xr-x | graphics/misc/diploma_national.pal | 19 |
6 files changed, 57 insertions, 0 deletions
diff --git a/graphics/misc/clock_small.pal b/graphics/misc/clock_small.pal new file mode 100755 index 000000000..3398fcbe3 --- /dev/null +++ b/graphics/misc/clock_small.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 139 90 +0 0 0 +57 57 57 +123 123 123 +189 189 189 +255 255 255 +255 65 41 +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/clock_small.png b/graphics/misc/clock_small.png Binary files differnew file mode 100755 index 000000000..6b9f6c1f7 --- /dev/null +++ b/graphics/misc/clock_small.png diff --git a/graphics/misc/diploma.png b/graphics/misc/diploma.png Binary files differnew file mode 100755 index 000000000..d9607dce6 --- /dev/null +++ b/graphics/misc/diploma.png diff --git a/graphics/misc/diploma_hoenn.pal b/graphics/misc/diploma_hoenn.pal new file mode 100755 index 000000000..2890eb24a --- /dev/null +++ b/graphics/misc/diploma_hoenn.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 222 +246 238 230 +205 230 139 +172 222 49 +238 238 222 +222 230 230 +255 222 197 +222 222 189 +246 246 180 +238 230 180 +213 213 156 +230 230 139 +255 255 123 +238 238 106 +255 205 172 diff --git a/graphics/misc/diploma_map.bin b/graphics/misc/diploma_map.bin Binary files differnew file mode 100755 index 000000000..e9a47fa44 --- /dev/null +++ b/graphics/misc/diploma_map.bin diff --git a/graphics/misc/diploma_national.pal b/graphics/misc/diploma_national.pal new file mode 100755 index 000000000..03c37bf22 --- /dev/null +++ b/graphics/misc/diploma_national.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 222 +255 255 189 +230 238 90 +213 222 0 +238 238 222 +222 230 230 +255 222 197 +222 222 189 +246 246 180 +238 230 180 +213 213 156 +230 230 139 +255 255 123 +238 238 106 +255 205 172 |
