diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2019-12-04 01:57:27 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2019-12-04 01:57:27 -0500 |
| commit | cb5fe2f84f6f79748f8b67c236956371784619db (patch) | |
| tree | 24df75a4c8b2051aa2fb6c51fcd1c79bf1d3cbb0 /graphics/interface | |
| parent | 1b7dc422d96ef13888139f190a5f7c2d591fb0ca (diff) | |
| parent | bc0fe11d163da1131daf63bdeb2abcba788f6036 (diff) | |
resolve conflict
Diffstat (limited to 'graphics/interface')
| -rw-r--r-- | graphics/interface/shop.pal | 35 | ||||
| -rw-r--r-- | graphics/interface/shop.png | bin | 324 -> 0 bytes | |||
| -rw-r--r-- | graphics/interface/shop1.bin | bin | 2048 -> 0 bytes | |||
| -rw-r--r-- | graphics/interface/shop2.bin | bin | 2048 -> 0 bytes |
4 files changed, 0 insertions, 35 deletions
diff --git a/graphics/interface/shop.pal b/graphics/interface/shop.pal deleted file mode 100644 index b0fec0a30..000000000 --- a/graphics/interface/shop.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -238 230 172 -222 156 106 -255 189 131 -255 222 164 -255 255 213 -238 230 172 -106 106 106 -189 213 213 -238 255 255 -222 246 255 -255 255 255 -164 222 255 -16 172 222 -0 82 115 -0 115 139 -0 123 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -189 213 213 -238 255 255 -222 246 255 -255 255 255 -164 222 255 -24 82 180 -0 90 131 -24 82 180 -24 82 180 diff --git a/graphics/interface/shop.png b/graphics/interface/shop.png Binary files differdeleted file mode 100644 index 892e728fe..000000000 --- a/graphics/interface/shop.png +++ /dev/null diff --git a/graphics/interface/shop1.bin b/graphics/interface/shop1.bin Binary files differdeleted file mode 100644 index 801a5c6ff..000000000 --- a/graphics/interface/shop1.bin +++ /dev/null diff --git a/graphics/interface/shop2.bin b/graphics/interface/shop2.bin Binary files differdeleted file mode 100644 index 4d0a67f05..000000000 --- a/graphics/interface/shop2.bin +++ /dev/null |
