diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2019-02-05 14:35:42 -0600 | 
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2019-02-05 14:35:42 -0600 | 
| commit | bc4cc9f78a705636228c39311bb6e3c393f090d3 (patch) | |
| tree | d2b59408df53676ffb65e217cc1a62cbcba05f97 /src/secret_base.c | |
| parent | 37e86d75788f4ed364db19aabce11e6e054a1084 (diff) | |
| parent | b0ee1009759ed1c46da81b1fb8410e2b75e42bb2 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'src/secret_base.c')
| -rw-r--r-- | src/secret_base.c | 10 | 
1 files changed, 5 insertions, 5 deletions
| diff --git a/src/secret_base.c b/src/secret_base.c index de5fae077..adcab9cbc 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -953,13 +953,13 @@ void sub_80E9E90(u8 taskId)      s32 input;      data = gTasks[taskId].data; -    input = ListMenuHandleInputGetItemId(data[5]); +    input = ListMenu_ProcessInput(data[5]);      ListMenuGetScrollAndRow(data[5], &data[2], &data[1]);      switch (input)      { -        case -1: +        case LIST_NOTHING_CHOSEN:              break; -        case -2: +        case LIST_B_PRESSED:              PlaySE(SE_SELECT);              DestroyListMenuTask(data[5], NULL, NULL);              RemoveScrollIndicatorArrowPair(data[8]); @@ -1002,11 +1002,11 @@ void sub_80E9FB0(u8 taskId)      input = Menu_ProcessInputNoWrap();      switch (input)      { -        case -1: +        case MENU_B_PRESSED:              PlaySE(SE_SELECT);              sub_80EA18C(taskId);              break; -        case -2: +        case MENU_NOTHING_CHOSEN:              break;          default:              PlaySE(SE_SELECT); | 
