ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 23:23:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2423 from LOuroboros/debugPCFlag

Browse Source 
Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config
This commit is contained in:
Eduardo Quezada D'Ottone 2022-10-31 07:14:48 -03:00 committed by GitHub
commit dc4c5757f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/constants/overworld_config.h
View File

@ -16,6 +16,5 @@
// Replace the used flags with others or disable with a 0 // Replace the used flags with others or disable with a 0
#define DEBUG_FLAG_NO_COLLISION 0 // If this flag is set, the debug function in the Utility submenu to disable player collision can be used. #define DEBUG_FLAG_NO_COLLISION 0 // If this flag is set, the debug function in the Utility submenu to disable player collision can be used.
#define DEBUG_FLAG_PC_FROM_DEBUG_MENU 0 // If this flag is set, the debug function in debug menu to access the player PC works.
#endif // GUARD_CONSTANTS_OVERWORLD_CONFIG_H #endif // GUARD_CONSTANTS_OVERWORLD_CONFIG_H

10
src/debug.c
View File

@ -2792,16 +2792,6 @@ static void DebugAction_Give_CHEAT(u8 taskId)
ScriptContext_SetupScript(Debug_CheatStart); ScriptContext_SetupScript(Debug_CheatStart);
} }
static void Task_WaitFadeAccessPC(u8 taskId)
{
if (!gPaletteFade.active)
{
DestroyTask(taskId);
FlagSet(DEBUG_FLAG_PC_FROM_DEBUG_MENU);
EnterPokeStorage(2);
}
}
static void DebugAction_AccessPC(u8 taskId) static void DebugAction_AccessPC(u8 taskId)
{ {
Debug_DestroyMenu_Full(taskId); Debug_DestroyMenu_Full(taskId);

16
src/pokemon_storage_system.c
View File

@ -1669,18 +1669,10 @@ static void FieldTask_ReturnToPcMenu(void)
MainCallback vblankCb = gMain.vblankCallback; MainCallback vblankCb = gMain.vblankCallback;
SetVBlankCallback(NULL); SetVBlankCallback(NULL);
if (!FlagGet(DEBUG_FLAG_PC_FROM_DEBUG_MENU)) taskId = CreateTask(Task_PCMainMenu, 80);
{ gTasks[taskId].tState = 0;
taskId = CreateTask(Task_PCMainMenu, 80); gTasks[taskId].tSelectedOption = sPreviousBoxOption;
gTasks[taskId].tState = 0; Task_PCMainMenu(taskId);
gTasks[taskId].tSelectedOption = sPreviousBoxOption;
Task_PCMainMenu(taskId);
}
else
{
FlagClear(DEBUG_FLAG_PC_FROM_DEBUG_MENU);
ScriptContext_Enable();
}
SetVBlankCallback(vblankCb); SetVBlankCallback(vblankCb);
FadeInFromBlack(); FadeInFromBlack();
} }