summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-08-19 13:26:22 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-08-19 13:26:22 -0500
commitbbe876153c2a0903a30b37734874bf63ca6d8a10 (patch)
tree7efa03650e784e7ff6ac7d479b5315194a4081fb /graphics
parent300f2274f381b5a700b6a67847c3b9f97c67a541 (diff)
parentc2218920d57c883dc83078c2d1d7cf3af82babbb (diff)
Merge remote-tracking branch 'upstream/master' into ice
Diffstat (limited to 'graphics')
-rw-r--r--graphics/interface/bag_screen.bin (renamed from graphics/unknown/unknown_E77004.bin)bin2048 -> 2048 bytes
-rw-r--r--graphics/interface/bag_screen_labels.bin (renamed from graphics/unknown/unknown_E96EC8.bin)bin2048 -> 2048 bytes
-rw-r--r--graphics/interface/bag_spinner.png (renamed from graphics/unknown_sprites/83C172C.png)bin108 -> 108 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/graphics/unknown/unknown_E77004.bin b/graphics/interface/bag_screen.bin
index 0342aac39..0342aac39 100644
--- a/graphics/unknown/unknown_E77004.bin
+++ b/graphics/interface/bag_screen.bin
Binary files differ
diff --git a/graphics/unknown/unknown_E96EC8.bin b/graphics/interface/bag_screen_labels.bin
index eaaed586e..eaaed586e 100644
--- a/graphics/unknown/unknown_E96EC8.bin
+++ b/graphics/interface/bag_screen_labels.bin
Binary files differ
diff --git a/graphics/unknown_sprites/83C172C.png b/graphics/interface/bag_spinner.png
index a05d86c79..a05d86c79 100644
--- a/graphics/unknown_sprites/83C172C.png
+++ b/graphics/interface/bag_spinner.png
Binary files differ