1 files changed, 16 insertions, 16 deletions

diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c
index c68e1d29e..669195b33 100644
--- a/src/item_menu_icons.c
+++ b/src/item_menu_icons.c
@@ -1,14 +1,14 @@
 #include "global.h"
-#include "sprite.h"
+#include "berry.h"
 #include "decompress.h"
+#include "graphics.h"
+#include "item.h"
 #include "item_menu.h"
 #include "item_icon.h"
 #include "item_menu_icons.h"
-#include "window.h"
 #include "menu_helpers.h"
-#include "berry.h"
-#include "graphics.h"
-#include "item.h"
+#include "sprite.h"
+#include "window.h"
 #include "constants/items.h"
 
 struct CompressedTilesPal
@@ -199,7 +199,7 @@ static const struct SpritePalette gUnknown_0857FBA8 =
     gUnknown_0857F564, 101
 };
 
-static const struct SpriteTemplate gUnknown_0857FBB0 =
+static const struct SpriteTemplate gSpriteTemplate_RotatingBall =
 {
     .tileTag = 101,
     .paletteTag = 101,
@@ -409,7 +409,7 @@ static const struct SpriteTemplate gUnknown_0857FE10 =
 // code
 void RemoveBagSprite(u8 id)
 {
-    u8 *spriteId = &gUnknown_0203CE54->unk804[id];
+    u8 *spriteId = &gUnknown_0203CE54->spriteId[id];
     if (*spriteId != 0xFF)
     {
         FreeSpriteTilesByTag(id + 100);
@@ -422,14 +422,14 @@ void RemoveBagSprite(u8 id)
 
 void AddBagVisualSprite(u8 bagPocketId)
 {
-    u8 *spriteId = &gUnknown_0203CE54->unk804[0];
+    u8 *spriteId = &gUnknown_0203CE54->spriteId[0];
     *spriteId = CreateSprite(&gUnknown_0857FB4C, 68, 66, 0);
     SetBagVisualPocketId(bagPocketId, FALSE);
 }
 
 void SetBagVisualPocketId(u8 bagPocketId, bool8 isSwitchingPockets)
 {
-    struct Sprite *sprite = &gSprites[gUnknown_0203CE54->unk804[0]];
+    struct Sprite *sprite = &gSprites[gUnknown_0203CE54->spriteId[0]];
     if (isSwitchingPockets)
     {
         sprite->pos2.y = -5;
@@ -458,7 +458,7 @@ static void SpriteCB_BagVisualSwitchingPockets(struct Sprite *sprite)
 
 void ShakeBagVisual(void)
 {
-    struct Sprite *sprite = &gSprites[gUnknown_0203CE54->unk804[0]];
+    struct Sprite *sprite = &gSprites[gUnknown_0203CE54->spriteId[0]];
     if (sprite->affineAnimEnded)
     {
         StartSpriteAffineAnim(sprite, 1);
@@ -477,10 +477,10 @@ static void SpriteCB_ShakeBagVisual(struct Sprite *sprite)
 
 void AddSwitchPocketRotatingBallSprite(s16 rotationDirection)
 {
-    u8 *spriteId = &gUnknown_0203CE54->unk804[1];
+    u8 *spriteId = &gUnknown_0203CE54->spriteId[1];
     LoadSpriteSheet(&gUnknown_0857FBA0);
     LoadSpritePalette(&gUnknown_0857FBA8);
-    *spriteId = CreateSprite(&gUnknown_0857FBB0, 16, 16, 0);
+    *spriteId = CreateSprite(&gSpriteTemplate_RotatingBall, 16, 16, 0);
     gSprites[*spriteId].data[0] = rotationDirection;
 }
 
@@ -515,7 +515,7 @@ static void SpriteCB_SwitchPocketRotatingBallContinue(struct Sprite *sprite)
 
 void AddBagItemIconSprite(u16 itemId, u8 id)
 {
-    u8 *spriteId = &gUnknown_0203CE54->unk804[id + 2];
+    u8 *spriteId = &gUnknown_0203CE54->spriteId[id + 2];
     if (*spriteId == 0xFF)
     {
         u8 iconSpriteId;
@@ -539,17 +539,17 @@ void RemoveBagItemIconSprite(u8 id)
 
 void sub_80D4FAC(void)
 {
-    sub_8122344(&gUnknown_0203CE54->unk804[4], 8);
+    sub_8122344(&gUnknown_0203CE54->spriteId[4], 8);
 }
 
 void sub_80D4FC8(u8 arg0)
 {
-    sub_81223FC(&gUnknown_0203CE54->unk804[4], 8, arg0);
+    sub_81223FC(&gUnknown_0203CE54->spriteId[4], 8, arg0);
 }
 
 void sub_80D4FEC(u8 arg0)
 {
-    sub_8122448(&gUnknown_0203CE54->unk804[4], 136, 120, (arg0 + 1) * 16);
+    sub_8122448(&gUnknown_0203CE54->spriteId[4], 136, 120, (arg0 + 1) * 16);
 }
 
 static void sub_80D5018(void *mem0, void *mem1)