diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-11 12:06:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-11 12:06:00 -0400 |
| commit | b1603bba92dac95fd1621978f21ee9bf107f7b6a (patch) | |
| tree | 9d86f2a2aed82e2dcbefebe7c5dbdecf3aed607e /graphics/field_effects | |
| parent | 44dc1a473c8a4ff1c73b776889f2002136c7787d (diff) | |
| parent | 4767019e4f541a19577a9bfd09851a94b2e3c745 (diff) | |
Merge remote-tracking branch 'origin/master' into modern_ld
Diffstat (limited to 'graphics/field_effects')
| -rw-r--r-- | graphics/field_effects/flash_effect_tiles.png | bin | 199 -> 258 bytes | |||
| -rw-r--r-- | graphics/field_effects/new_game_oak.png (renamed from graphics/field_effects/unk_83CA770.png) | bin | 789 -> 789 bytes | |||
| -rw-r--r-- | graphics/field_effects/pokeball.png | bin | 0 -> 155 bytes | |||
| -rw-r--r-- | graphics/field_effects/unk_83CAF90.png | bin | 168 -> 0 bytes | |||
| -rw-r--r-- | graphics/field_effects/unk_83CAFB0.pal | 19 |
5 files changed, 0 insertions, 19 deletions
diff --git a/graphics/field_effects/flash_effect_tiles.png b/graphics/field_effects/flash_effect_tiles.png Binary files differindex 4079a5a84..05d4d3b2e 100644 --- a/graphics/field_effects/flash_effect_tiles.png +++ b/graphics/field_effects/flash_effect_tiles.png diff --git a/graphics/field_effects/unk_83CA770.png b/graphics/field_effects/new_game_oak.png Binary files differindex d3ca87183..d3ca87183 100644 --- a/graphics/field_effects/unk_83CA770.png +++ b/graphics/field_effects/new_game_oak.png diff --git a/graphics/field_effects/pokeball.png b/graphics/field_effects/pokeball.png Binary files differnew file mode 100644 index 000000000..eb2e56faf --- /dev/null +++ b/graphics/field_effects/pokeball.png diff --git a/graphics/field_effects/unk_83CAF90.png b/graphics/field_effects/unk_83CAF90.png Binary files differdeleted file mode 100644 index c6c456817..000000000 --- a/graphics/field_effects/unk_83CAF90.png +++ /dev/null diff --git a/graphics/field_effects/unk_83CAFB0.pal b/graphics/field_effects/unk_83CAFB0.pal deleted file mode 100644 index 5e2face1d..000000000 --- a/graphics/field_effects/unk_83CAFB0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -156 180 172 -106 115 115 -57 57 57 -156 24 24 -255 0 0 -255 123 123 -255 255 255 -82 82 106 -123 123 123 -255 255 255 -189 230 255 -164 197 230 -156 189 213 -90 131 180 |
