diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-14 11:28:21 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-14 11:28:21 -0400 |
commit | 53b950019aca8896d70c4d5e4f9e2a1d5143e489 (patch) | |
tree | 7f6edcf0d64b850f16ccba845ae275a4b763cf82 /src/menu_helpers.c | |
parent | be422beca672a776ad2b9b8025c5d828150a3314 (diff) | |
parent | c7c3d3b5eedeb9a330d1200a281ebc221f6098da (diff) |
Merge pull request #80 from jiangzhengwenjz/misc
menu
Diffstat (limited to 'src/menu_helpers.c')
-rw-r--r-- | src/menu_helpers.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 12837c099..fdcb9a56e 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -22,10 +22,10 @@ static EWRAM_DATA u8 gUnknown_20399D0 = {0}; static void Task_ContinueTaskAfterMessagePrints(u8 taskId); -void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc) +void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 tileNum, u8 paletteNum, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc) { gUnknown_20399D0 = windowId; - DrawDialogFrameWithCustomTileAndPalette(windowId, TRUE, arg2, arg3); + DrawDialogFrameWithCustomTileAndPalette(windowId, TRUE, tileNum, paletteNum); if (string != gStringVar4) StringExpandPlaceholders(gStringVar4, string); @@ -64,9 +64,9 @@ static void Task_CallYesOrNoCallback(u8 taskId) } } -void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo) +void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 fontId, u8 left, u8 top, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo) { - CreateYesNoMenu(template, arg2, arg3, arg4, tileStart, palette, 0); + CreateYesNoMenu(template, fontId, left, top, tileStart, palette, 0); gUnknown_20399C8 = yesNo; gTasks[taskId].func = Task_CallYesOrNoCallback; } |