diff options
author | huderlem <huderlem@gmail.com> | 2019-03-17 17:32:42 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-17 17:32:42 -0500 |
commit | 7154d2614d21c5a5931fc944e247059d49cda782 (patch) | |
tree | 414ed687f836521c1a966531e87122951c070083 /src/player_pc.c | |
parent | 4ae8a52473a0e4842cf140bf0c59f0276125a896 (diff) | |
parent | e9a3cc6d51ce3818eed11de585f5084342450093 (diff) |
Merge pull request #595 from Phlosioneer/move-tutor
Move tutor
Diffstat (limited to 'src/player_pc.c')
-rw-r--r-- | src/player_pc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/player_pc.c b/src/player_pc.c index 6e78533e7..49b9cc5f5 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -20,7 +20,6 @@ #include "overworld.h" #include "palette.h" #include "party_menu.h" -#include "pokenav.h" #include "player_pc.h" #include "script.h" #include "sound.h" @@ -29,6 +28,7 @@ #include "strings.h" #include "task.h" #include "window.h" +#include "menu_specialized.h" // structures struct Struct203BCC4 @@ -645,7 +645,7 @@ static void Mailbox_ProcessInput(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: PlaySE(SE_SELECT); RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorId); Mailbox_ReturnToPlayerPC(taskId); @@ -1151,7 +1151,7 @@ static void ItemStorage_ProcessInput(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: PlaySE(SE_SELECT); ItemStorage_GoBackToPlayerPCMenu(taskId); break; @@ -1226,7 +1226,7 @@ static void sub_816C4FC(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: if (gMain.newKeys & A_BUTTON) { ItemStorage_DoItemSwap(taskId, FALSE); |