Merge pull request #2423 from LOuroboros/debugPCFlag

Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config
rh-hideout · Oct 31, 2022 · dc4c575 · dc4c575
2 parents 93dd878 + 5ebc996
commit dc4c575
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 23 deletions.
diff --git a/include/constants/overworld_config.h b/include/constants/overworld_config.h
@@ -16,6 +16,5 @@
 
 // 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_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
diff --git a/src/debug.c b/src/debug.c
@@ -2792,16 +2792,6 @@ static void DebugAction_Give_CHEAT(u8 taskId)
     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)
 {
     Debug_DestroyMenu_Full(taskId);

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