diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 09:31:40 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 09:31:40 -0700 |
| commit | 407d22af8e685076bc92f837266786dfe78e7123 (patch) | |
| tree | 11a039ad7737c105d4b81ae653ba899d342b6e57 /graphics | |
| parent | e6bc189a033bb2019233dc99f2c1114053c7650d (diff) | |
| parent | 1234d0252cbe2b0001784b10b75f0d339824632d (diff) | |
fix PR merge conflicts
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/evolution_scene/bg.bin | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | graphics/evolution_scene/bg.png | bin | 0 -> 1588 bytes | |||
| -rw-r--r-- | graphics/evolution_scene/bg2.bin | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | graphics/evolution_scene/gray_transition_intro.pal | 19 | ||||
| -rw-r--r-- | graphics/evolution_scene/transition.pal | 35 | ||||
| -rw-r--r-- | graphics/evolution_scene/unknown_5B4114.pal | 19 | ||||
| -rw-r--r-- | graphics/evolution_scene/unref_83F7D80.bin | bin | 0 -> 1664 bytes | |||
| -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 | ||||
| -rw-r--r-- | graphics/map_objects/unk_835B988.pal | 19 |
13 files changed, 149 insertions, 0 deletions
diff --git a/graphics/evolution_scene/bg.bin b/graphics/evolution_scene/bg.bin Binary files differnew file mode 100644 index 000000000..583ebac2b --- /dev/null +++ b/graphics/evolution_scene/bg.bin diff --git a/graphics/evolution_scene/bg.png b/graphics/evolution_scene/bg.png Binary files differnew file mode 100644 index 000000000..c9e84c58e --- /dev/null +++ b/graphics/evolution_scene/bg.png diff --git a/graphics/evolution_scene/bg2.bin b/graphics/evolution_scene/bg2.bin Binary files differnew file mode 100644 index 000000000..7afab112a --- /dev/null +++ b/graphics/evolution_scene/bg2.bin diff --git a/graphics/evolution_scene/gray_transition_intro.pal b/graphics/evolution_scene/gray_transition_intro.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/evolution_scene/gray_transition_intro.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/evolution_scene/transition.pal b/graphics/evolution_scene/transition.pal new file mode 100644 index 000000000..b0f4d3815 --- /dev/null +++ b/graphics/evolution_scene/transition.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +0 0 0 +16 16 16 +24 32 32 +41 49 49 +49 65 74 +65 82 90 +74 98 115 +90 115 131 +106 131 148 +115 148 172 +131 164 189 +139 180 213 +156 197 230 +172 213 255 +0 0 0 +0 0 0 +0 0 0 +65 90 106 +74 98 115 +82 106 131 +90 115 139 +98 131 156 +106 139 164 +115 148 180 +123 156 189 +131 172 205 +139 180 213 +148 189 230 +156 197 238 +172 213 255 +0 0 0 +0 0 0 diff --git a/graphics/evolution_scene/unknown_5B4114.pal b/graphics/evolution_scene/unknown_5B4114.pal new file mode 100644 index 000000000..2cd4981fd --- /dev/null +++ b/graphics/evolution_scene/unknown_5B4114.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +0 0 0 +0 0 0 diff --git a/graphics/evolution_scene/unref_83F7D80.bin b/graphics/evolution_scene/unref_83F7D80.bin Binary files differnew file mode 100644 index 000000000..b2b300184 --- /dev/null +++ b/graphics/evolution_scene/unref_83F7D80.bin 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 diff --git a/graphics/map_objects/unk_835B988.pal b/graphics/map_objects/unk_835B988.pal new file mode 100644 index 000000000..27436be92 --- /dev/null +++ b/graphics/map_objects/unk_835B988.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +172 123 65 +255 197 148 +222 148 115 +123 65 65 +65 65 213 +57 57 123 +115 164 197 +106 41 41 +238 238 255 +180 180 213 +255 106 74 +197 57 57 +255 222 90 +189 156 57 +0 0 0 |
