diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-11-08 17:25:26 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-11-08 17:25:26 -0600 |
| commit | fc11078cef11edc9deedd08c6175fb5e6628504c (patch) | |
| tree | 62823b5dc1335a4d8659104dc4156713674ce757 /graphics/trade | |
| parent | ba06c424c974f18f9c4af85eb0ffe8adc6056941 (diff) | |
| parent | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff) | |
fix merge conflicts
Diffstat (limited to 'graphics/trade')
| -rw-r--r-- | graphics/trade/ball.pal | 19 | ||||
| -rw-r--r-- | graphics/trade/cable_end.pal | 19 | ||||
| -rw-r--r-- | graphics/trade/gba.pal | 19 | ||||
| -rw-r--r-- | graphics/trade/selected_mon.pal | 19 | ||||
| -rw-r--r-- | graphics/trade/shadow.pal | 19 |
5 files changed, 0 insertions, 95 deletions
diff --git a/graphics/trade/ball.pal b/graphics/trade/ball.pal deleted file mode 100644 index 0e6b2fb5c..000000000 --- a/graphics/trade/ball.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -131 0 0 -172 0 0 -213 41 41 -255 156 123 -255 255 255 -148 148 148 -65 65 65 -24 24 24 -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/trade/cable_end.pal b/graphics/trade/cable_end.pal deleted file mode 100644 index 64a442293..000000000 --- a/graphics/trade/cable_end.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -230 230 230 -205 205 205 -180 180 180 -156 156 156 -213 180 106 -205 156 82 -49 255 106 diff --git a/graphics/trade/gba.pal b/graphics/trade/gba.pal deleted file mode 100644 index 64a442293..000000000 --- a/graphics/trade/gba.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -230 230 230 -205 205 205 -180 180 180 -156 156 156 -213 180 106 -205 156 82 -49 255 106 diff --git a/graphics/trade/selected_mon.pal b/graphics/trade/selected_mon.pal deleted file mode 100644 index bb74b34a2..000000000 --- a/graphics/trade/selected_mon.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -123 131 222 -98 98 180 -123 106 222 -106 172 238 -82 148 205 -180 189 230 -148 156 189 -205 106 0 -255 189 49 -246 148 0 -255 213 115 -205 74 90 -255 98 32 -205 205 222 -255 98 32 diff --git a/graphics/trade/shadow.pal b/graphics/trade/shadow.pal deleted file mode 100644 index a4bec6478..000000000 --- a/graphics/trade/shadow.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -0 16 172 -32 32 106 -16 16 90 -0 0 74 -255 255 189 -230 230 164 -205 205 148 -189 180 115 -139 139 90 -74 74 57 -32 32 32 |