diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-13 20:00:20 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-13 20:00:20 +0100 |
| commit | 516a5b2219c99050153d989a65478f960b54f75a (patch) | |
| tree | 97a12007165839735210f0f777a019cf3ecc060d /graphics | |
| parent | 19d9cff2ff582d68d5aa76fd9d2068a6407e1466 (diff) | |
| parent | d1fe93bf4adfb691ba3a9220a469e0e40483d809 (diff) | |
fix merge conflicts, review changes
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/berry_blender/arrow.pal | 19 | ||||
| -rw-r--r-- | graphics/berry_blender/arrow.png | bin | 0 -> 682 bytes | |||
| -rw-r--r-- | graphics/berry_blender/center.pal | 19 | ||||
| -rw-r--r-- | graphics/berry_blender/center.png | bin | 0 -> 1374 bytes | |||
| -rw-r--r-- | graphics/berry_blender/center_map.bin | bin | 0 -> 1024 bytes | |||
| -rw-r--r-- | graphics/berry_blender/countdown_numbers.png | bin | 0 -> 457 bytes | |||
| -rw-r--r-- | graphics/berry_blender/marubatsu.png | bin | 0 -> 293 bytes | |||
| -rw-r--r-- | graphics/berry_blender/misc.pal | 19 | ||||
| -rw-r--r-- | graphics/berry_blender/outer.pal | 19 | ||||
| -rw-r--r-- | graphics/berry_blender/outer.png | bin | 0 -> 1880 bytes | |||
| -rw-r--r-- | graphics/berry_blender/outer_map.bin | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | graphics/berry_blender/particles.png | bin | 0 -> 217 bytes | |||
| -rw-r--r-- | graphics/berry_blender/start.png | bin | 0 -> 396 bytes | |||
| -rw-r--r-- | graphics/unknown/unknown_339514.pal | 19 |
14 files changed, 95 insertions, 0 deletions
diff --git a/graphics/berry_blender/arrow.pal b/graphics/berry_blender/arrow.pal new file mode 100644 index 000000000..4c975292d --- /dev/null +++ b/graphics/berry_blender/arrow.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +213 222 238 +180 197 230 +148 172 222 +115 148 205 +82 123 197 +49 98 189 +255 180 205 +255 115 98 +255 49 0 +205 65 65 +189 24 24 +148 16 16 +74 57 139 +8 0 82 diff --git a/graphics/berry_blender/arrow.png b/graphics/berry_blender/arrow.png Binary files differnew file mode 100644 index 000000000..a40948824 --- /dev/null +++ b/graphics/berry_blender/arrow.png diff --git a/graphics/berry_blender/center.pal b/graphics/berry_blender/center.pal new file mode 100644 index 000000000..606c527a3 --- /dev/null +++ b/graphics/berry_blender/center.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +205 197 255 +172 164 222 +139 139 189 +106 106 156 +74 82 123 +41 57 90 +213 222 189 +180 189 156 +148 156 123 +115 123 90 +255 172 123 +246 115 82 +238 57 41 +156 24 0 diff --git a/graphics/berry_blender/center.png b/graphics/berry_blender/center.png Binary files differnew file mode 100644 index 000000000..1da3629d4 --- /dev/null +++ b/graphics/berry_blender/center.png diff --git a/graphics/berry_blender/center_map.bin b/graphics/berry_blender/center_map.bin Binary files differnew file mode 100644 index 000000000..ef28d5093 --- /dev/null +++ b/graphics/berry_blender/center_map.bin diff --git a/graphics/berry_blender/countdown_numbers.png b/graphics/berry_blender/countdown_numbers.png Binary files differnew file mode 100644 index 000000000..7884d0c07 --- /dev/null +++ b/graphics/berry_blender/countdown_numbers.png diff --git a/graphics/berry_blender/marubatsu.png b/graphics/berry_blender/marubatsu.png Binary files differnew file mode 100644 index 000000000..f927bbce9 --- /dev/null +++ b/graphics/berry_blender/marubatsu.png diff --git a/graphics/berry_blender/misc.pal b/graphics/berry_blender/misc.pal new file mode 100644 index 000000000..9c1db8d12 --- /dev/null +++ b/graphics/berry_blender/misc.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +255 213 0 +255 82 82 +98 255 255 +0 189 255 +98 255 98 +205 0 0 +255 0 0 +255 156 156 +0 0 0 +255 255 0 +255 255 148 +189 189 189 +255 255 255 diff --git a/graphics/berry_blender/outer.pal b/graphics/berry_blender/outer.pal new file mode 100644 index 000000000..c3b83cf16 --- /dev/null +++ b/graphics/berry_blender/outer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +213 222 238 +180 197 230 +148 172 222 +115 148 205 +82 123 197 +49 98 189 +255 180 205 +255 115 98 +255 49 0 +205 65 65 +189 24 24 +148 123 197 +74 57 139 +8 0 82 diff --git a/graphics/berry_blender/outer.png b/graphics/berry_blender/outer.png Binary files differnew file mode 100644 index 000000000..d8040b022 --- /dev/null +++ b/graphics/berry_blender/outer.png diff --git a/graphics/berry_blender/outer_map.bin b/graphics/berry_blender/outer_map.bin Binary files differnew file mode 100644 index 000000000..092e3997e --- /dev/null +++ b/graphics/berry_blender/outer_map.bin diff --git a/graphics/berry_blender/particles.png b/graphics/berry_blender/particles.png Binary files differnew file mode 100644 index 000000000..d0086b029 --- /dev/null +++ b/graphics/berry_blender/particles.png diff --git a/graphics/berry_blender/start.png b/graphics/berry_blender/start.png Binary files differnew file mode 100644 index 000000000..5c8d8d5d9 --- /dev/null +++ b/graphics/berry_blender/start.png diff --git a/graphics/unknown/unknown_339514.pal b/graphics/unknown/unknown_339514.pal new file mode 100644 index 000000000..b87f25a6c --- /dev/null +++ b/graphics/unknown/unknown_339514.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +213 222 238 +180 197 230 +148 172 222 +115 148 205 +82 123 197 +49 98 189 +255 230 205 +255 164 98 +255 106 0 +222 65 8 +189 24 24 +106 106 0 +222 65 8 +189 24 24 |
