diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
| commit | 7bb0fcf182e5a760ab9e08878a381566819dc8f2 (patch) | |
| tree | bbb0603d41fa6d0d71a838c7e2fde85fe346fbe1 /graphics | |
| parent | 601fc9e85b383792819768c31728e4855e854f32 (diff) | |
| parent | a57915fa5bd8c2e68bc291a371e66e3cafd7e195 (diff) | |
merge with master and fix conflicts
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/battle_interface/unk_battlebox.pal | 19 | ||||
| -rw-r--r-- | graphics/battle_interface/unk_battlebox.png | bin | 0 -> 174 bytes | |||
| -rw-r--r-- | graphics/misc/egg_hatch.png | bin | 0 -> 469 bytes | |||
| -rw-r--r-- | graphics/misc/egg_shard.png | bin | 0 -> 189 bytes |
4 files changed, 19 insertions, 0 deletions
diff --git a/graphics/battle_interface/unk_battlebox.pal b/graphics/battle_interface/unk_battlebox.pal new file mode 100644 index 000000000..862165f3f --- /dev/null +++ b/graphics/battle_interface/unk_battlebox.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +106 90 115 +0 0 0 +213 230 255 +189 205 238 +238 238 255 +106 172 197 +90 139 180 +123 197 205 +0 0 0 +0 0 0 +123 197 255 +0 0 139 +255 131 131 +164 0 0 diff --git a/graphics/battle_interface/unk_battlebox.png b/graphics/battle_interface/unk_battlebox.png Binary files differnew file mode 100644 index 000000000..24700ef4d --- /dev/null +++ b/graphics/battle_interface/unk_battlebox.png diff --git a/graphics/misc/egg_hatch.png b/graphics/misc/egg_hatch.png Binary files differnew file mode 100644 index 000000000..abea3122f --- /dev/null +++ b/graphics/misc/egg_hatch.png diff --git a/graphics/misc/egg_shard.png b/graphics/misc/egg_shard.png Binary files differnew file mode 100644 index 000000000..d404445b8 --- /dev/null +++ b/graphics/misc/egg_shard.png |
