summaryrefslogtreecommitdiff
path: root/src/item_menu.c
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 /src/item_menu.c
parent6a7b3033eadef95b9fb8788b3bf7251bc4ee27ae (diff)
parent3f1288e3e055013e0ab847ba5fea4b566bc31996 (diff)
Merge branch 'master' of github.com:pret/pokeruby into flying
Diffstat (limited to 'src/item_menu.c')
-rw-r--r--src/item_menu.c14
1 files changed, 7 insertions, 7 deletions
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};