summaryrefslogtreecommitdiff
path: root/src/secret_base.c
diff options
context:
space:
mode:
authorhuderlem <huderlem@gmail.com>2019-03-17 17:32:42 -0500
committerGitHub <noreply@github.com>2019-03-17 17:32:42 -0500
commit7154d2614d21c5a5931fc944e247059d49cda782 (patch)
tree414ed687f836521c1a966531e87122951c070083 /src/secret_base.c
parent4ae8a52473a0e4842cf140bf0c59f0276125a896 (diff)
parente9a3cc6d51ce3818eed11de585f5084342450093 (diff)
Merge pull request #595 from Phlosioneer/move-tutor
Move tutor
Diffstat (limited to 'src/secret_base.c')
-rw-r--r--src/secret_base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/secret_base.c b/src/secret_base.c
index 4b270e424..e19aecba3 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -389,7 +389,7 @@ void sub_80E8FD0(u8 taskId)
}
sub_80E8F9C();
WarpIntoMap();
- gFieldCallback = sub_80AF168;
+ gFieldCallback = FieldCallback_ReturnToEventScript2;
SetMainCallback2(CB2_LoadMap);
DestroyTask(taskId);
break;
@@ -957,7 +957,7 @@ void sub_80E9E90(u8 taskId)
{
case LIST_NOTHING_CHOSEN:
break;
- case LIST_B_PRESSED:
+ case LIST_CANCEL:
PlaySE(SE_SELECT);
DestroyListMenuTask(data[5], NULL, NULL);
RemoveScrollIndicatorArrowPair(data[8]);