diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-09 17:03:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 17:03:02 -0600 |
| commit | 1877ba24ca489827f1093858ed58c38ff00a4576 (patch) | |
| tree | 502c26ec51aa55df4eb1ff4324ab90c3b0a0610a /src/field/wallclock.c | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
| parent | 03b167a73e2f18fa79bbf0e6ffe11e0c35c12ad8 (diff) | |
Merge pull request #518 from camthesaxman/menu_refactor
re-label some window and text code
Diffstat (limited to 'src/field/wallclock.c')
| -rw-r--r-- | src/field/wallclock.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/field/wallclock.c b/src/field/wallclock.c index 2892d09f9..4f2a6dccd 100644 --- a/src/field/wallclock.c +++ b/src/field/wallclock.c @@ -236,8 +236,8 @@ static void LoadWallClockGraphics(void) FreeAllSpritePalettes(); LoadCompressedObjectPic(&gUnknown_083F7A90[0]); LoadSpritePalettes(gUnknown_083F7AA0); - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow(&gWindowConfig_81E6CE4); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); + InitMenuWindow(&gWindowTemplate_81E6CE4); } static void WallClockInit(void) @@ -414,10 +414,10 @@ static void Task_SetClock2(u8 taskId) //Ask player "Is this the correct time?" static void Task_SetClock3(u8 taskId) { - MenuDrawTextWindow(2, 16, 27, 19); - MenuPrint(gOtherText_CorrectTimePrompt, 3, 17); - MenuDrawTextWindow(23, 8, 29, 13); - PrintMenuItems(24, 9, 2, gMenuYesNoItems); + Menu_DrawStdWindowFrame(2, 16, 27, 19); + Menu_PrintText(gOtherText_CorrectTimePrompt, 3, 17); + Menu_DrawStdWindowFrame(23, 8, 29, 13); + Menu_PrintItems(24, 9, 2, gMenuYesNoItems); InitMenu(0, 24, 9, 2, 1, 5); gTasks[taskId].func = Task_SetClock4; } @@ -425,7 +425,7 @@ static void Task_SetClock3(u8 taskId) //Get menu selection static void Task_SetClock4(u8 taskId) { - switch (ProcessMenuInputNoWrap_()) + switch (Menu_ProcessInputNoWrap_()) { case 0: //YES PlaySE(SE_SELECT); @@ -433,10 +433,10 @@ static void Task_SetClock4(u8 taskId) return; case -1: //B button case 1: //NO - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); - MenuZeroFillWindowRect(23, 8, 29, 13); - MenuZeroFillWindowRect(2, 16, 27, 19); + Menu_EraseWindowRect(23, 8, 29, 13); + Menu_EraseWindowRect(2, 16, 27, 19); gTasks[taskId].func = Task_SetClock2; //Go back and let player adjust clock } } |