diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-12 18:28:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-12 18:28:37 -0400 |
| commit | d50b32afe77d10843554fe95480efc9e8058cbc6 (patch) | |
| tree | 2639a0d03c78a486601cbc1bb5b2b1ab60d82b83 /src/main_menu.c | |
| parent | d0f6de3d9d3392c0e530f7d86ee4e40d60f0acc6 (diff) | |
| parent | f931f40b1be6c03b1f31139fa69ca838ec2285d9 (diff) | |
Merge pull request #836 from SatoMew/master
Replace incorrect instances of Mystery Gift with Mystery Event
Diffstat (limited to 'src/main_menu.c')
| -rw-r--r-- | src/main_menu.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index 7748959ca..93eb6fbbe 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -46,7 +46,7 @@ enum { HAS_NO_SAVED_GAME, //NEW GAME, OPTION HAS_SAVED_GAME, //CONTINUE, NEW GAME, OPTION - HAS_MYSTERY_GIFT, //CONTINUE, NEW GAME, MYSTERY EVENTS, OPTION + HAS_MYSTERY_EVENT, //CONTINUE, NEW GAME, MYSTERY EVENTS, OPTION }; static void CB2_MainMenu(void); @@ -276,8 +276,8 @@ void Task_MainMenuCheckSave(u8 taskId) switch (gSaveFileStatus) { case SAVE_STATUS_OK: - if (IsMysteryGiftEnabled() == TRUE) - gTasks[taskId].tMenuLayout = HAS_MYSTERY_GIFT; + if (IsMysteryEventEnabled() == TRUE) + gTasks[taskId].tMenuLayout = HAS_MYSTERY_EVENT; else gTasks[taskId].tMenuLayout = HAS_SAVED_GAME; gTasks[taskId].func = Task_MainMenuCheckRtc; @@ -298,8 +298,8 @@ void Task_MainMenuCheckSave(u8 taskId) gTasks[taskId].tMenuLayout = HAS_SAVED_GAME; gTasks[taskId].func = Task_MainMenuWaitForSaveErrorAck; - if (IsMysteryGiftEnabled() == TRUE) - gTasks[taskId].tMenuLayout = HAS_MYSTERY_GIFT; + if (IsMysteryEventEnabled() == TRUE) + gTasks[taskId].tMenuLayout = HAS_MYSTERY_EVENT; else gTasks[taskId].tMenuLayout = HAS_SAVED_GAME; break; @@ -416,7 +416,7 @@ void Task_MainMenuDraw(u8 taskId) PrintMainMenuItem(gMainMenuString_Option, 2, 13); PrintSaveFileInfo(); break; - case HAS_MYSTERY_GIFT: + case HAS_MYSTERY_EVENT: Menu_DrawStdWindowFrame(1, 0, 28, 7); PrintMainMenuItem(gMainMenuString_Continue, 2, 1); Menu_DrawStdWindowFrame(1, 8, 28, 11); @@ -468,7 +468,7 @@ bool8 MainMenuProcessKeyInput(u8 taskId) case HAS_SAVED_GAME: menuItemCount = 3; break; - case HAS_MYSTERY_GIFT: + case HAS_MYSTERY_EVENT: menuItemCount = 4; break; } @@ -544,7 +544,7 @@ void Task_MainMenuPressedA(u8 taskId) break; } break; - case HAS_MYSTERY_GIFT: + case HAS_MYSTERY_EVENT: switch (gTasks[taskId].tMenuSelection) { case 0: @@ -636,7 +636,7 @@ void HighlightCurrentMenuItem(u8 layout, u8 menuItem) break; } break; - case HAS_MYSTERY_GIFT: + case HAS_MYSTERY_EVENT: switch (menuItem) { case 0: |