dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #536 from DizzyEggg/menu

Browse Source 
Use Menu and List Menu input defines
This commit is contained in:
Diegoisawesome
2019-02-02 12:45:35 -06:00
committed by GitHub
parent e8952c2374 ea79f1c8f6
commit 59807c0f2c
18 changed files with 71 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rom_8011DC0.c
+3 -3
View File
@@ -1103,7 +1103,7 @@ void sub_80134E8(u8 taskId)
RedrawListMenu(data->listTaskId);
break;
case 0:
id = ListMenuHandleInputGetItemId(data->listTaskId);
id = ListMenu_ProcessInput(data->listTaskId);
if (gMain.newKeys & A_BUTTON && id != -1)
{
// this unused variable along with the assignment is needed to match
@@ -2174,7 +2174,7 @@ void sub_8014F48(u8 taskId)
RedrawListMenu(data->listTaskId);
break;
case 0:
id = ListMenuHandleInputGetItemId(data->listTaskId);
id = ListMenu_ProcessInput(data->listTaskId);
if (gMain.newKeys & A_BUTTON && id != -1)
{
// this unused variable along with the assignment is needed to match
@@ -2338,7 +2338,7 @@ void sub_80152F4(u8 taskId)
break;
case 0:
if (data->field_13 != 0)
id = ListMenuHandleInputGetItemId(data->listTaskId);
id = ListMenu_ProcessInput(data->listTaskId);
if (data->field_14 > 120)
{
if (data->field_0->arr[0].field_1A_0 == 1 && !data->field_0->arr[0].unk.field_0.unk_0a_7)