diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
| commit | b18ec47b1393d562655e50d30acb3de191423581 (patch) | |
| tree | 7959a1477120baf656599794b423aa8cc11ea0c0 /graphics/field_effects | |
| parent | 359d345913d7f5ed36c34ede5476fff946318ffd (diff) | |
| parent | 2d284654440cb77365639bf107c31b44326362e3 (diff) | |
fix conflicts
Diffstat (limited to 'graphics/field_effects')
| -rw-r--r-- | graphics/field_effects/flash_black.pal | 19 | ||||
| -rw-r--r-- | graphics/field_effects/flash_effect_map.bin | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | graphics/field_effects/flash_effect_tiles.png | bin | 0 -> 199 bytes | |||
| -rw-r--r-- | graphics/field_effects/flash_gradient.pal | 19 | ||||
| -rw-r--r-- | graphics/field_effects/flash_white.pal | 19 |
5 files changed, 57 insertions, 0 deletions
diff --git a/graphics/field_effects/flash_black.pal b/graphics/field_effects/flash_black.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/field_effects/flash_black.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/field_effects/flash_effect_map.bin b/graphics/field_effects/flash_effect_map.bin Binary files differnew file mode 100644 index 000000000..4293bfd1c --- /dev/null +++ b/graphics/field_effects/flash_effect_map.bin diff --git a/graphics/field_effects/flash_effect_tiles.png b/graphics/field_effects/flash_effect_tiles.png Binary files differnew file mode 100644 index 000000000..4079a5a84 --- /dev/null +++ b/graphics/field_effects/flash_effect_tiles.png diff --git a/graphics/field_effects/flash_gradient.pal b/graphics/field_effects/flash_gradient.pal new file mode 100644 index 000000000..ec7a2b50e --- /dev/null +++ b/graphics/field_effects/flash_gradient.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 172 +16 16 16 +32 32 32 +49 49 49 +65 65 65 +82 82 82 +98 98 98 +115 115 115 +131 131 131 +148 148 148 +164 164 164 +180 180 180 +197 197 197 +213 213 213 +230 230 230 +255 255 255 diff --git a/graphics/field_effects/flash_white.pal b/graphics/field_effects/flash_white.pal new file mode 100644 index 000000000..98a1fb3c8 --- /dev/null +++ b/graphics/field_effects/flash_white.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 |
