summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-01-30 15:26:46 -0500
committergolem galvanize <golemgalvanize@github.com>2018-01-30 15:26:46 -0500
commitf220ac971c72aeeef1b2affaf149f4c5aa7d0058 (patch)
tree074d1b463352bebaf6a995d4d83c4557ab0ac4e1 /src
parent59b0e698204e7c772325afb9bb996202c2bd5c3e (diff)
got Task_BagMenu closer
Diffstat (limited to 'src')
-rwxr-xr-xsrc/item_menu.c32
1 files changed, 19 insertions, 13 deletions
diff --git a/src/item_menu.c b/src/item_menu.c
index 9d7afbb24..f623753dc 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -790,7 +790,7 @@ void sub_81ABCC0(int a, int b, int c)
}
if ((select = (gMain.newKeys & SELECT_BUTTON)))
{
- if (sub_81AC2C0())
+ if (sub_81AC2C0() == 1)
{
sub_81AE860(data[0], ScrollPos, CursorPos);
if ((*ScrollPos + *CursorPos) != gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - 1)
@@ -805,10 +805,19 @@ void sub_81ABCC0(int a, int b, int c)
{
int r4 = ListMenuHandleInputGetItemId(data[0]);
sub_81AE860(data[0], ScrollPos, CursorPos);
- if (r4 != -2)
+ switch (r4)
{
- if (r4 != -1)
- {
+ default:
+ if (gUnknown_0203CE58.unk4 == 5)
+ {
+ PlaySE(SE_HAZURE);
+ return;
+ }
+ PlaySE(SE_SELECT);
+ gSpecialVar_ItemId = select;
+ gTasks[taskId].func = unknown_ItemMenu_Confirm;
+ return;
+ case -2:
PlaySE(SE_SELECT);
sub_81AB824();
bag_menu_print_cursor_(data[0], 2);
@@ -816,16 +825,13 @@ void sub_81ABCC0(int a, int b, int c)
data[2] = BagGetQuantityByPocketPosition(gUnknown_0203CE58.pocket + 1, r4);
gSpecialVar_ItemId = BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, r4);
gUnknown_08614054[gUnknown_0203CE58.unk4](taskId);
- }
- }
- else if (gUnknown_0203CE58.unk4 == 5)
- PlaySE(SE_HAZURE);
- else
- {
- PlaySE(SE_SELECT);
- gSpecialVar_ItemId = select;
- gTasks[taskId].func = unknown_ItemMenu_Confirm;
+ case -1:
+ break;
+
+
+
}
+
}
}
} */