Merge pull request #664 from hiddenruby/master

gUnknown_08E96EC8 and gSpriteImage_83C172C named, moved into interface

5 files changed, 10 insertions, 10 deletions

diff --git a/data/graphics.s b/data/graphics.s
index f48723501..587be6df0 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -4039,8 +4039,8 @@ gUnknown_08E96D2C:: @ 8E96D2C
 	.incbin "graphics/unknown/unknown_E96D2C.bin.lz"
 
 	.align 2
-gUnknown_08E96EC8:: @ 8E96EC8
-	.incbin "graphics/unknown/unknown_E96EC8.bin"
+gBagScreenLabels_Tilemap:: @ 8E96EC8
+	.incbin "graphics/interface/bag_screen_labels.bin"
 
 	.align 2
 gSlotMachineSpritePalette0:: @ 8E976C8
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
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
diff --git a/include/graphics.h b/include/graphics.h
index d9390e1b6..f242e3752 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2615,7 +2615,7 @@ extern const u8 gMailTilemap_Dream[];
 extern const u8 gMailTilemap_Fab[];
 extern const u8 gMailTilemap_Retro[];
 
-extern const u8 gUnknown_08E96EC8[];
+extern const u8 gBagScreenLabels_Tilemap[];
 
 extern const u8 gMenuTrainerCard_Gfx[];
 extern const u16 gMenuTrainerCard0Star_Pal[];
diff --git a/src/item_menu.c b/src/item_menu.c
index 915aa5183..12d02ebd8 100644
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -762,7 +762,7 @@ static void sub_80A39B8(u16 *a, u8 b)
 {
     u8 var = b * 2;
 
-    sub_809D104(a, 4, 10, gUnknown_08E96EC8, 0, var, 8, 2);
+    sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, 0, var, 8, 2);
 }
 
 static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d)
@@ -776,8 +776,8 @@ static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d)
         if (b == 5)
             r7 = 2;
 
-        sub_809D104(a, 4, 10, gUnknown_08E96EC8, 8 - c, r2, c, 2);
-        sub_809D104(a, c + 4, 10, gUnknown_08E96EC8, 0, r7, 8 - c, 2);
+        sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, 8 - c, r2, c, 2);
+        sub_809D104(a, c + 4, 10, gBagScreenLabels_Tilemap, 0, r7, 8 - c, 2);
     }
     else if (d == 1)
     {
@@ -785,8 +785,8 @@ static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d)
         if (b == 1)
             r7 = 10;
 
-        sub_809D104(a, 4, 10, gUnknown_08E96EC8, c, r7, 8 - c, 2);
-        sub_809D104(a, 12 - c, 10, gUnknown_08E96EC8, 0, r2, c, 2);
+        sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, c, r7, 8 - c, 2);
+        sub_809D104(a, 12 - c, 10, gBagScreenLabels_Tilemap, 0, r2, c, 2);
     }
 }
 
@@ -4024,7 +4024,7 @@ static int sub_80A7988(void)
 }
 
 static const u16 gPalette_83C170C[] = INCBIN_U16("graphics/unknown/83C170C.gbapal");
-static const u8 gSpriteImage_83C172C[] = INCBIN_U8("graphics/unknown_sprites/83C172C.4bpp");
+static const u8 gSpriteImage_BagSpinner[] = INCBIN_U8("graphics/interface/bag_spinner.4bpp");
 
 const u8 gSpriteImage_UnusedCherry[] = INCBIN_U8("graphics/unused/cherry.4bpp");
 const u16 gSpritePalette_UnusedCherry[] = INCBIN_U16("graphics/unused/cherry.gbapal");
@@ -4258,7 +4258,7 @@ static const union AffineAnimCmd *const gSpriteAffineAnimTable_83C1D20[] =
 
 static const struct SpriteFrameImage gSpriteImageTable_83C1D28[] =
 {
-    {gSpriteImage_83C172C, sizeof(gSpriteImage_83C172C)},
+    {gSpriteImage_BagSpinner, sizeof(gSpriteImage_BagSpinner)},
 };
 
 static const struct SpritePalette sPokeballSpritePalette = {gPalette_83C170C, 8};