Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base

2019-01-05 19:54:26 +00:00
parent ee5a239534 cbf7d6cee5
commit f8c2fcb9b2
258 changed files with 17555 additions and 26977 deletions
@@ -1033,7 +1033,7 @@ void sub_80E9FFC(u8 taskId)
 void sub_80EA06C(u8 taskId)
 {
    DisplayYesNoMenu();
-    sub_8121F68(taskId, &gUnknown_0858D058);
+    DoYesNoFuncWithChoice(taskId, &gUnknown_0858D058);
 }

 void sub_80EA08C(u8 taskId)