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 | |
| parent | 1b7dc422d96ef13888139f190a5f7c2d591fb0ca (diff) | |
| parent | bc0fe11d163da1131daf63bdeb2abcba788f6036 (diff) | |
resolve conflict
Diffstat (limited to 'graphics')
| -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 | |||
| -rw-r--r-- | graphics/shop_menu/shop_menu.pal (renamed from graphics/interface/shop.pal) | 0 | ||||
| -rw-r--r-- | graphics/shop_menu/shop_menu.png | bin | 0 -> 261 bytes | |||
| -rw-r--r-- | graphics/shop_menu/shop_tilemap.bin | bin | 0 -> 316 bytes | |||
| -rw-r--r-- | graphics/shop_menu/shop_tm_hm_tilemap.bin | bin | 0 -> 312 bytes |
7 files changed, 0 insertions, 0 deletions
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 diff --git a/graphics/interface/shop.pal b/graphics/shop_menu/shop_menu.pal index b0fec0a30..b0fec0a30 100644 --- a/graphics/interface/shop.pal +++ b/graphics/shop_menu/shop_menu.pal diff --git a/graphics/shop_menu/shop_menu.png b/graphics/shop_menu/shop_menu.png Binary files differnew file mode 100644 index 000000000..23af464a2 --- /dev/null +++ b/graphics/shop_menu/shop_menu.png diff --git a/graphics/shop_menu/shop_tilemap.bin b/graphics/shop_menu/shop_tilemap.bin Binary files differnew file mode 100644 index 000000000..8d5ab35b7 --- /dev/null +++ b/graphics/shop_menu/shop_tilemap.bin diff --git a/graphics/shop_menu/shop_tm_hm_tilemap.bin b/graphics/shop_menu/shop_tm_hm_tilemap.bin Binary files differnew file mode 100644 index 000000000..92fbb7dad --- /dev/null +++ b/graphics/shop_menu/shop_tm_hm_tilemap.bin |
