diff options
author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-03 15:54:19 -0400 |
---|---|---|
committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-03 15:54:19 -0400 |
commit | 1ae3d9b57b0f4ad506a1bd7323e46d2fa768b6b7 (patch) | |
tree | fca8b14b2e5e3a2390c1b890db2f56f6f8cff744 /graphics/battle_interface | |
parent | 0a88d1042a80bcc703d05f1cf19527272424a03f (diff) | |
parent | d32ec8bf7246468625ab68a2d62835d70b7ac98c (diff) |
I hope this fixes merge conflicts
Diffstat (limited to 'graphics/battle_interface')
-rw-r--r-- | graphics/battle_interface/ball_display.pal | 19 | ||||
-rw-r--r-- | graphics/battle_interface/ball_display.png | bin | 0 -> 191 bytes | |||
-rw-r--r-- | graphics/battle_interface/ball_status_bar.pal | 19 | ||||
-rw-r--r-- | graphics/battle_interface/ball_status_bar.png | bin | 0 -> 174 bytes | |||
-rw-r--r-- | graphics/battle_interface/unk_battlebox.pal | 19 | ||||
-rw-r--r-- | graphics/battle_interface/unk_battlebox.png | bin | 0 -> 174 bytes |
6 files changed, 57 insertions, 0 deletions
diff --git a/graphics/battle_interface/ball_display.pal b/graphics/battle_interface/ball_display.pal new file mode 100644 index 000000000..ea646bb82 --- /dev/null +++ b/graphics/battle_interface/ball_display.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +57 57 57 +255 255 255 +213 205 189 +131 131 139 +74 65 90 +82 106 90 +255 180 123 +246 148 115 +222 106 90 +115 255 172 +90 213 131 +255 230 57 +205 172 8 +255 90 57 +172 65 74 diff --git a/graphics/battle_interface/ball_display.png b/graphics/battle_interface/ball_display.png Binary files differnew file mode 100644 index 000000000..0c49d7ac4 --- /dev/null +++ b/graphics/battle_interface/ball_display.png diff --git a/graphics/battle_interface/ball_status_bar.pal b/graphics/battle_interface/ball_status_bar.pal new file mode 100644 index 000000000..bc8e8f2bc --- /dev/null +++ b/graphics/battle_interface/ball_status_bar.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 65 65 +255 255 222 +222 213 180 +197 189 115 +123 148 131 +82 106 98 +32 57 0 +57 82 65 +255 230 0 +255 156 148 +65 205 255 +0 0 255 +0 255 0 +255 0 0 +106 148 255 diff --git a/graphics/battle_interface/ball_status_bar.png b/graphics/battle_interface/ball_status_bar.png Binary files differnew file mode 100644 index 000000000..b947a7803 --- /dev/null +++ b/graphics/battle_interface/ball_status_bar.png 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 |