summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorwho-knows-who <j.williams.8@warwick.ac.uk>2018-08-28 00:26:14 +0100
committerwho-knows-who <j.williams.8@warwick.ac.uk>2018-08-28 00:26:14 +0100
commit70bb9b8f6f9a3169b83b98b266baa3e9923fba3e (patch)
tree27c6ef336e50779dd090a6468cbf73ad7f39c7a9 /graphics
parent6a7b3033eadef95b9fb8788b3bf7251bc4ee27ae (diff)
parent3f1288e3e055013e0ab847ba5fea4b566bc31996 (diff)
Merge branch 'master' of github.com:pret/pokeruby into flying
Diffstat (limited to 'graphics')
-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
2 files changed, 0 insertions, 0 deletions
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