diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
| commit | 1b895ff52c011d51a9516791148cd5088ba411b5 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /src/mauville_old_man.c | |
| parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'src/mauville_old_man.c')
| -rw-r--r-- | src/mauville_old_man.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 3d3408bbb..110ec068e 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -430,7 +430,7 @@ static void sub_81206F0(void) gUnknown_03002F84 = FALSE; } -static void BardSong_TextSubPrinter(struct TextSubPrinter * printer, u16 a1) +static void BardSong_TextSubPrinter(struct TextPrinterTemplate * printer, u16 a1) { gUnknown_03002F84 = TRUE; } @@ -1179,7 +1179,7 @@ static void Task_StoryListMenu(u8 taskId) // Task_StoryListMenu task->data[0]++; break; case 1: - selection = ProcessMenuInput(); + selection = Menu_ProcessInput(); if (selection == -2) break; if (selection == -1 || selection == GetFreeStorySlot()) |