diff options
| author | hondew <pokehondew@gmail.com> | 2020-08-30 14:14:38 -0400 |
|---|---|---|
| committer | hondew <pokehondew@gmail.com> | 2020-08-30 14:14:38 -0400 |
| commit | e46b35455d1e2af8c8c2d291ce1cc28e682d9095 (patch) | |
| tree | 76855f3dedad94ba34a8f8b40811a1005107b5ae /graphics/field_effects/palettes | |
| parent | 328aecc96e690c437e52663a1445417e8aa78df6 (diff) | |
| parent | a9719c92bfa4c6b6dcf57e9516f184721152ad80 (diff) | |
Merge branch 'master' into pokeball-doc
Diffstat (limited to 'graphics/field_effects/palettes')
| -rw-r--r-- | graphics/field_effects/palettes/ash.pal (renamed from graphics/field_effects/palettes/02.pal) | 0 | ||||
| -rw-r--r-- | graphics/field_effects/palettes/cut_grass.pal (renamed from graphics/field_effects/palettes/06.pal) | 0 | ||||
| -rw-r--r-- | graphics/field_effects/palettes/general_0.pal (renamed from graphics/field_effects/palettes/00.pal) | 0 | ||||
| -rw-r--r-- | graphics/field_effects/palettes/general_1.pal (renamed from graphics/field_effects/palettes/01.pal) | 0 | ||||
| -rw-r--r-- | graphics/field_effects/palettes/hof_monitor.pal (renamed from graphics/field_effects/palettes/05.pal) | 0 | ||||
| -rw-r--r-- | graphics/field_effects/palettes/pokeball.pal (renamed from graphics/field_effects/palettes/10.pal) | 0 | ||||
| -rw-r--r-- | graphics/field_effects/palettes/pokeball_glow.pal (renamed from graphics/field_effects/palettes/04.pal) | 0 | ||||
| -rw-r--r-- | graphics/field_effects/palettes/record_mix_lights.pal | 19 | ||||
| -rw-r--r-- | graphics/field_effects/palettes/secret_power_cave.pal (renamed from graphics/field_effects/palettes/07.pal) | 0 | ||||
| -rw-r--r-- | graphics/field_effects/palettes/secret_power_plant.pal (renamed from graphics/field_effects/palettes/08.pal) | 0 | ||||
| -rw-r--r-- | graphics/field_effects/palettes/small_sparkle.pal (renamed from graphics/field_effects/palettes/03.pal) | 0 |
11 files changed, 19 insertions, 0 deletions
diff --git a/graphics/field_effects/palettes/02.pal b/graphics/field_effects/palettes/ash.pal index e3a76c035..e3a76c035 100644 --- a/graphics/field_effects/palettes/02.pal +++ b/graphics/field_effects/palettes/ash.pal diff --git a/graphics/field_effects/palettes/06.pal b/graphics/field_effects/palettes/cut_grass.pal index e4a49a4b9..e4a49a4b9 100644 --- a/graphics/field_effects/palettes/06.pal +++ b/graphics/field_effects/palettes/cut_grass.pal diff --git a/graphics/field_effects/palettes/00.pal b/graphics/field_effects/palettes/general_0.pal index bbc9c778b..bbc9c778b 100644 --- a/graphics/field_effects/palettes/00.pal +++ b/graphics/field_effects/palettes/general_0.pal diff --git a/graphics/field_effects/palettes/01.pal b/graphics/field_effects/palettes/general_1.pal index 044e1c987..044e1c987 100644 --- a/graphics/field_effects/palettes/01.pal +++ b/graphics/field_effects/palettes/general_1.pal diff --git a/graphics/field_effects/palettes/05.pal b/graphics/field_effects/palettes/hof_monitor.pal index 468d7212c..468d7212c 100644 --- a/graphics/field_effects/palettes/05.pal +++ b/graphics/field_effects/palettes/hof_monitor.pal diff --git a/graphics/field_effects/palettes/10.pal b/graphics/field_effects/palettes/pokeball.pal index 6190709ed..6190709ed 100644 --- a/graphics/field_effects/palettes/10.pal +++ b/graphics/field_effects/palettes/pokeball.pal diff --git a/graphics/field_effects/palettes/04.pal b/graphics/field_effects/palettes/pokeball_glow.pal index 2dddefa5f..2dddefa5f 100644 --- a/graphics/field_effects/palettes/04.pal +++ b/graphics/field_effects/palettes/pokeball_glow.pal diff --git a/graphics/field_effects/palettes/record_mix_lights.pal b/graphics/field_effects/palettes/record_mix_lights.pal new file mode 100644 index 000000000..292acfd35 --- /dev/null +++ b/graphics/field_effects/palettes/record_mix_lights.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 0 0 +0 255 0 +0 0 255 +255 255 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/palettes/07.pal b/graphics/field_effects/palettes/secret_power_cave.pal index 6d9e03c67..6d9e03c67 100644 --- a/graphics/field_effects/palettes/07.pal +++ b/graphics/field_effects/palettes/secret_power_cave.pal diff --git a/graphics/field_effects/palettes/08.pal b/graphics/field_effects/palettes/secret_power_plant.pal index 4c41030f6..4c41030f6 100644 --- a/graphics/field_effects/palettes/08.pal +++ b/graphics/field_effects/palettes/secret_power_plant.pal diff --git a/graphics/field_effects/palettes/03.pal b/graphics/field_effects/palettes/small_sparkle.pal index b170eb1f5..b170eb1f5 100644 --- a/graphics/field_effects/palettes/03.pal +++ b/graphics/field_effects/palettes/small_sparkle.pal |