summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-09-05 01:36:40 -0500
committerGitHub <noreply@github.com>2018-09-05 01:36:40 -0500
commit41fe72b95d29b354056d4389eebd5b4de5ddee60 (patch)
tree55ac06352ae38afa531ad6fd00bc1b9b58537c8d /src
parentc0687c7832ad1055accce617459fe313004058c0 (diff)
parent23aab35b96c53351448adab00829768a5837f7da (diff)
Merge pull request #310 from DizzyEggg/patch-1
Update item_menu.c
Diffstat (limited to 'src')
-rwxr-xr-xsrc/item_menu.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/item_menu.c b/src/item_menu.c
index 196ba9474..082fe5558 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -848,7 +848,7 @@ void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a)
}
itemId = BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, item_index_in_pocket);
itemQuantity = BagGetQuantityByPocketPosition(gUnknown_0203CE58.pocket + 1, item_index_in_pocket);
- if ((u16)(itemId - ITEM_HM01) <= 7)
+ if (itemId >= ITEM_HM01 && itemId <= ITEM_HM08)
BlitBitmapToWindow(rboxId, gBagMenuHMIcon_Gfx, 8, a - 1, 16, 16);
if (gUnknown_0203CE58.pocket == 3)
{
@@ -874,10 +874,10 @@ void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a)
void bag_menu_print_description_box_text(int a)
{
- u8* str;
+ const u8 *str;
if (a != -2)
{
- str = (u8*)ItemId_GetDescription(BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, a));
+ str = ItemId_GetDescription(BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, a));
}
else
{
@@ -2276,9 +2276,9 @@ void setup_bag_menu_textboxes(void)
InitWindows(gUnknown_08614174);
DeactivateAllTextPrinters();
- LoadUserWindowBorderGfx(0, 1, -32);
- LoadMessageBoxGfx(0, 10, -48);
- sub_819A2BC(-64, 1);
+ LoadUserWindowBorderGfx(0, 1, 0xE0);
+ LoadMessageBoxGfx(0, 10, 0xD0);
+ sub_819A2BC(0xC0, 1);
LoadPalette(&gUnknown_0860F074, 0xF0, 0x20);
for (i = 0; i < 3; i++)
{