Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-03-21 17:54:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace incorrect instances of Mystery Gift with Mystery Event

Browse Source
This commit is contained in:
SatoMew 2021-09-12 23:08:09 +01:00
parent d0f6de3d9d
commit f931f40b1b
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/event_data.h
View File

@ -10,9 +10,9 @@ void ClearDailyFlags(void);
void DisableNationalPokedex(void);
void EnableNationalPokedex(void);
bool32 IsNationalPokedexEnabled(void);
void DisableMysteryGift(void);
void EnableMysteryGift(void);
bool32 IsMysteryGiftEnabled(void);
void DisableMysteryEvent(void);
void EnableMysteryEvent(void);
bool32 IsMysteryEventEnabled(void);
void DisableResetRTC(void);
void EnableResetRTC(void);
bool32 CanResetRTC(void);

8
src/debug/start_menu_debug.c
View File

@ -1932,13 +1932,13 @@ u8 DebugMenu_OpenWeatherEvents(void)
bool8 DebugMenu_80784E8(void)
{
switch (DebugMenu_8077E40(IsMysteryGiftEnabled()))
switch (DebugMenu_8077E40(IsMysteryEventEnabled()))
{
case 0:
DisableMysteryGift();
DisableMysteryEvent();
return FALSE;
case 1:
EnableMysteryGift();
EnableMysteryEvent();
return FALSE;
case -1:
return TRUE;
@ -1949,7 +1949,7 @@ bool8 DebugMenu_80784E8(void)
u8 DebugMenu_OpenMysteryEvent(void)
{
Menu_EraseScreen();
DebugMenu_807786C(IsMysteryGiftEnabled() ? FALSE : TRUE);
DebugMenu_807786C(IsMysteryEventEnabled() ? FALSE : TRUE);
gMenuCallback = DebugMenu_80784E8;
return FALSE;
}

6
src/event_data.c
View File

@ -75,17 +75,17 @@ bool32 IsNationalPokedexEnabled(void)
return FALSE;
}
void DisableMysteryGift(void)
void DisableMysteryEvent(void)
{
FlagClear(FLAG_SYS_EXDATA_ENABLE);
}
void EnableMysteryGift(void)
void EnableMysteryEvent(void)
{
FlagSet(FLAG_SYS_EXDATA_ENABLE);
}
bool32 IsMysteryGiftEnabled(void)
bool32 IsMysteryEventEnabled(void)
{
return FlagGet(FLAG_SYS_EXDATA_ENABLE);
}

18
src/main_menu.c
View File

@ -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: