diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
| commit | b24559d69b6fa0abf042a1b7cdbcab3d1ec91fd6 (patch) | |
| tree | 7b51d7b9cb9a370fe1dd9db8eeadc23089ba1328 /graphics/event_objects/pics/misc | |
| parent | fa9d1759bd7fa17ced37225bd31d46466da857c6 (diff) | |
| parent | a2a6700966cc802185577e44ba88a9154429c93b (diff) | |
Merge remote-tracking branch 'upstream/master' into shop
# Conflicts:
# asm/shop.s
Diffstat (limited to 'graphics/event_objects/pics/misc')
25 files changed, 0 insertions, 0 deletions
diff --git a/graphics/event_objects/pics/misc/birchs_bag.png b/graphics/event_objects/pics/misc/birchs_bag.png Binary files differindex 045e5546c..21f463b71 100644 --- a/graphics/event_objects/pics/misc/birchs_bag.png +++ b/graphics/event_objects/pics/misc/birchs_bag.png diff --git a/graphics/event_objects/pics/misc/birth_island_stone.png b/graphics/event_objects/pics/misc/birth_island_stone.png Binary files differindex 2ec134c22..3c5d82c11 100644 --- a/graphics/event_objects/pics/misc/birth_island_stone.png +++ b/graphics/event_objects/pics/misc/birth_island_stone.png diff --git a/graphics/event_objects/pics/misc/breakable_rock.png b/graphics/event_objects/pics/misc/breakable_rock.png Binary files differnew file mode 100644 index 000000000..c5054da41 --- /dev/null +++ b/graphics/event_objects/pics/misc/breakable_rock.png diff --git a/graphics/event_objects/pics/misc/breakable_rock/0.png b/graphics/event_objects/pics/misc/breakable_rock/0.png Binary files differdeleted file mode 100644 index 058324c86..000000000 --- a/graphics/event_objects/pics/misc/breakable_rock/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/breakable_rock/1.png b/graphics/event_objects/pics/misc/breakable_rock/1.png Binary files differdeleted file mode 100644 index 6c8b3133a..000000000 --- a/graphics/event_objects/pics/misc/breakable_rock/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/breakable_rock/2.png b/graphics/event_objects/pics/misc/breakable_rock/2.png Binary files differdeleted file mode 100644 index 737148d66..000000000 --- a/graphics/event_objects/pics/misc/breakable_rock/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/breakable_rock/3.png b/graphics/event_objects/pics/misc/breakable_rock/3.png Binary files differdeleted file mode 100644 index 89eedd1aa..000000000 --- a/graphics/event_objects/pics/misc/breakable_rock/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/cable_car.png b/graphics/event_objects/pics/misc/cable_car.png Binary files differindex e0bd21ddf..67f581fb9 100644 --- a/graphics/event_objects/pics/misc/cable_car.png +++ b/graphics/event_objects/pics/misc/cable_car.png diff --git a/graphics/event_objects/pics/misc/cuttable_tree.png b/graphics/event_objects/pics/misc/cuttable_tree.png Binary files differnew file mode 100644 index 000000000..fba4ced1a --- /dev/null +++ b/graphics/event_objects/pics/misc/cuttable_tree.png diff --git a/graphics/event_objects/pics/misc/cuttable_tree/0.png b/graphics/event_objects/pics/misc/cuttable_tree/0.png Binary files differdeleted file mode 100644 index 509d8b03c..000000000 --- a/graphics/event_objects/pics/misc/cuttable_tree/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/cuttable_tree/1.png b/graphics/event_objects/pics/misc/cuttable_tree/1.png Binary files differdeleted file mode 100644 index afa42cf16..000000000 --- a/graphics/event_objects/pics/misc/cuttable_tree/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/cuttable_tree/2.png b/graphics/event_objects/pics/misc/cuttable_tree/2.png Binary files differdeleted file mode 100644 index f222ece43..000000000 --- a/graphics/event_objects/pics/misc/cuttable_tree/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/cuttable_tree/3.png b/graphics/event_objects/pics/misc/cuttable_tree/3.png Binary files differdeleted file mode 100644 index 09ffefd29..000000000 --- a/graphics/event_objects/pics/misc/cuttable_tree/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/fossil.png b/graphics/event_objects/pics/misc/fossil.png Binary files differindex a8da0e8ff..3e070a6c9 100644 --- a/graphics/event_objects/pics/misc/fossil.png +++ b/graphics/event_objects/pics/misc/fossil.png diff --git a/graphics/event_objects/pics/misc/item_ball.png b/graphics/event_objects/pics/misc/item_ball.png Binary files differindex a30e02fb1..ef02e158c 100644 --- a/graphics/event_objects/pics/misc/item_ball.png +++ b/graphics/event_objects/pics/misc/item_ball.png diff --git a/graphics/event_objects/pics/misc/moving_box.png b/graphics/event_objects/pics/misc/moving_box.png Binary files differindex 3cbc41900..43b65c2c1 100644 --- a/graphics/event_objects/pics/misc/moving_box.png +++ b/graphics/event_objects/pics/misc/moving_box.png diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat.png b/graphics/event_objects/pics/misc/mr_brineys_boat.png Binary files differnew file mode 100644 index 000000000..249f25b51 --- /dev/null +++ b/graphics/event_objects/pics/misc/mr_brineys_boat.png diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/0.png b/graphics/event_objects/pics/misc/mr_brineys_boat/0.png Binary files differdeleted file mode 100644 index 593ed07c8..000000000 --- a/graphics/event_objects/pics/misc/mr_brineys_boat/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/1.png b/graphics/event_objects/pics/misc/mr_brineys_boat/1.png Binary files differdeleted file mode 100644 index 39b75fd73..000000000 --- a/graphics/event_objects/pics/misc/mr_brineys_boat/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/2.png b/graphics/event_objects/pics/misc/mr_brineys_boat/2.png Binary files differdeleted file mode 100644 index 9db6b11fe..000000000 --- a/graphics/event_objects/pics/misc/mr_brineys_boat/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/pushable_boulder.png b/graphics/event_objects/pics/misc/pushable_boulder.png Binary files differindex a6962123c..eba6a116f 100644 --- a/graphics/event_objects/pics/misc/pushable_boulder.png +++ b/graphics/event_objects/pics/misc/pushable_boulder.png diff --git a/graphics/event_objects/pics/misc/ss_tidal.png b/graphics/event_objects/pics/misc/ss_tidal.png Binary files differindex 40ca9a3f3..44510d25a 100644 --- a/graphics/event_objects/pics/misc/ss_tidal.png +++ b/graphics/event_objects/pics/misc/ss_tidal.png diff --git a/graphics/event_objects/pics/misc/statue.png b/graphics/event_objects/pics/misc/statue.png Binary files differindex 725aa8a7b..7b4b13cd7 100644 --- a/graphics/event_objects/pics/misc/statue.png +++ b/graphics/event_objects/pics/misc/statue.png diff --git a/graphics/event_objects/pics/misc/submarine_shadow.png b/graphics/event_objects/pics/misc/submarine_shadow.png Binary files differindex b9dfc4c55..d43bc98dc 100644 --- a/graphics/event_objects/pics/misc/submarine_shadow.png +++ b/graphics/event_objects/pics/misc/submarine_shadow.png diff --git a/graphics/event_objects/pics/misc/truck.png b/graphics/event_objects/pics/misc/truck.png Binary files differindex 0d31ffbc2..46940a9a3 100644 --- a/graphics/event_objects/pics/misc/truck.png +++ b/graphics/event_objects/pics/misc/truck.png |
