diff options
author | Tetrable <atifhuss386@gmail.com> | 2019-01-03 02:28:18 +0000 |
---|---|---|
committer | Tetrable <atifhuss386@gmail.com> | 2019-01-03 02:28:18 +0000 |
commit | 30e7ac0dcadc1ca15d56dc24e79489be63527357 (patch) | |
tree | bb804c19ca84b582f7517af645bfc8665b26a1e1 /src/menu_helpers.c | |
parent | 50aa222aff56499aeef1c64c9191f53b9b20a1de (diff) | |
parent | b471bba55e7e3743fa8cdb796cba57c41f5bfdbc (diff) |
Fix merge conflicts
Diffstat (limited to 'src/menu_helpers.c')
-rw-r--r-- | src/menu_helpers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 0adc6228e..e6547b300 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -152,7 +152,7 @@ static void Task_ContinueTaskAfterMessagePrints(u8 taskId) gUnknown_0300117C(taskId); } -void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data) +void DoYesNoFuncWithChoice(u8 taskId, const struct YesNoFuncTable *data) { gUnknown_0203A138 = *data; gTasks[taskId].func = Task_CallYesOrNoCallback; |