From ee8a7eb88da5860638165a29277ae3bc2c91296e Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 4 Jan 2024 20:35:50 -0300 Subject: [PATCH 01/11] Renamed the Party/Boxes section of the debug menu to just Party Misc: -Relabeled the enums containing the constants for the different features in each main section of the menu. -The reason why is that "enum PartyMenu" was throwing a compiler error for whatever reason, so I renamed the other labels to keep them consistent with it. --- src/debug.c | 116 ++++++++++++++++++++++++++-------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/src/debug.c b/src/debug.c index ad6c0e81378f..b2ca55bc8c93 100644 --- a/src/debug.c +++ b/src/debug.c @@ -71,7 +71,7 @@ enum DebugMenu { DEBUG_MENU_ITEM_UTILITIES, - DEBUG_MENU_ITEM_PARTY_BOXES, + DEBUG_MENU_ITEM_PARTY, DEBUG_MENU_ITEM_GIVE, DEBUG_MENU_ITEM_SCRIPTS, DEBUG_MENU_ITEM_FLAGVAR, @@ -81,7 +81,7 @@ enum DebugMenu DEBUG_MENU_ITEM_CANCEL, }; -enum UtilMenu +enum UtilDebugMenu { DEBUG_UTIL_MENU_ITEM_FLY, DEBUG_UTIL_MENU_ITEM_WARP, @@ -98,17 +98,17 @@ enum UtilMenu DEBUG_UTIL_MENU_ITEM_EXPANSION_VER, }; -enum PartyBoxesMenu +enum PartyDebugMenu { - DEBUG_PARTY_BOXES_MENU_ITEM_ACCESS_PC, - DEBUG_PARTY_BOXES_MENU_ITEM_MOVE_REMINDER, - DEBUG_PARTY_BOXES_MENU_ITEM_HATCH_AN_EGG, - DEBUG_PARTY_BOXES_MENU_ITEM_HEAL_PARTY, - DEBUG_PARTY_BOXES_MENU_ITEM_POISON_MONS, - DEBUG_PARTY_BOXES_MENU_ITEM_CLEAR_BOXES, + DEBUG_PARTY_MENU_ITEM_ACCESS_PC, + DEBUG_PARTY_MENU_ITEM_MOVE_REMINDER, + DEBUG_PARTY_MENU_ITEM_HATCH_AN_EGG, + DEBUG_PARTY_MENU_ITEM_HEAL_PARTY, + DEBUG_PARTY_MENU_ITEM_POISON_MONS, + DEBUG_PARTY_MENU_ITEM_CLEAR_BOXES, }; -enum ScriptMenu +enum ScriptDebugMenu { DEBUG_UTIL_MENU_ITEM_SCRIPT_1, DEBUG_UTIL_MENU_ITEM_SCRIPT_2, @@ -120,7 +120,7 @@ enum ScriptMenu DEBUG_UTIL_MENU_ITEM_SCRIPT_8, }; -enum FlagsVarsMenu +enum FlagsVarsDebugMenu { DEBUG_FLAGVAR_MENU_ITEM_FLAGS, DEBUG_FLAGVAR_MENU_ITEM_VARS, @@ -187,7 +187,7 @@ enum BattleTerrain DEBUG_BATTLE_2_MENU_ITEM_TERRAIN_9, }; -enum GiveMenu +enum GiveDebugMenu { DEBUG_GIVE_MENU_ITEM_ITEM_X, DEBUG_GIVE_MENU_ITEM_ALLTMS, @@ -199,7 +199,7 @@ enum GiveMenu DEBUG_GIVE_MENU_ITEM_DAYCARE_EGG, }; -enum GiveFillMenu +enum GiveFillDebugMenu { DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST, DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW, @@ -211,7 +211,7 @@ enum GiveFillMenu DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS, }; -enum SoundMenu +enum SoundDebugMenu { DEBUG_SOUND_MENU_ITEM_SE, DEBUG_SOUND_MENU_ITEM_MUS, @@ -317,7 +317,7 @@ static void DebugAction_Util_Script_7(u8 taskId); static void DebugAction_Util_Script_8(u8 taskId); static void DebugAction_OpenUtilitiesMenu(u8 taskId); -static void DebugAction_OpenPartyBoxesMenu(u8 taskId); +static void DebugAction_OpenPartyMenu(u8 taskId); static void DebugAction_OpenScriptsMenu(u8 taskId); static void DebugAction_OpenFlagsVarsMenu(u8 taskId); static void DebugAction_OpenGiveMenu(u8 taskId); @@ -326,7 +326,7 @@ static void DebugAction_OpenSoundMenu(u8 taskId); static void DebugTask_HandleMenuInput_Main(u8 taskId); static void DebugTask_HandleMenuInput_Utilities(u8 taskId); -static void DebugTask_HandleMenuInput_PartyBoxes(u8 taskId); +static void DebugTask_HandleMenuInput_Party(u8 taskId); static void DebugTask_HandleMenuInput_Scripts(u8 taskId); static void DebugTask_HandleMenuInput_FlagsVars(u8 taskId); static void DebugTask_HandleMenuInput_Battle(u8 taskId); @@ -352,12 +352,12 @@ static void DebugAction_Util_Player_Id(u8 taskId); static void DebugAction_Util_CheatStart(u8 taskId); static void DebugAction_Util_ExpansionVersion(u8 taskId); -static void DebugAction_PartyBoxes_AccessPC(u8 taskId); -static void DebugAction_PartyBoxes_MoveReminder(u8 taskId); -static void DebugAction_PartyBoxes_HatchAnEgg(u8 taskId); -static void DebugAction_PartyBoxes_HealParty(u8 taskId); -static void DebugAction_PartyBoxes_PoisonMons(u8 taskId); -static void DebugAction_PartyBoxes_ClearBoxes(u8 taskId); +static void DebugAction_Party_AccessPC(u8 taskId); +static void DebugAction_Party_MoveReminder(u8 taskId); +static void DebugAction_Party_HatchAnEgg(u8 taskId); +static void DebugAction_Party_HealParty(u8 taskId); +static void DebugAction_Party_PoisonMons(u8 taskId); +static void DebugAction_Party_ClearBoxes(u8 taskId); static void DebugAction_FlagsVars_Flags(u8 taskId); static void DebugAction_FlagsVars_FlagsSelect(u8 taskId); @@ -457,7 +457,7 @@ static const u8 sDebugText_Empty[] = _(""); static const u8 sDebugText_Continue[] = _("Continue…{CLEAR_TO 110}{RIGHT_ARROW}"); // Main Menu static const u8 sDebugText_Utilities[] = _("Utilities…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_PartyBoxes[] = _("Party/Boxes…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Party[] = _("Party…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Scripts[] = _("Scripts…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_FlagsVars[] = _("Flags & Vars…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Battle[] = _("Battle Test{CLEAR_TO 110}{RIGHT_ARROW}"); @@ -494,12 +494,12 @@ static const u8 sDebugText_Util_Player_Id[] = _("New Trainer ID") static const u8 sDebugText_Util_CheatStart[] = _("Cheat start"); static const u8 sDebugText_Util_ExpansionVersion[] = _("Expansion Version"); // Party/Boxes Menu -static const u8 sDebugText_PartyBoxes_AccessPC[] = _("Access PC"); -static const u8 sDebugText_PartyBoxes_MoveReminder[] = _("Move Reminder"); -static const u8 sDebugText_PartyBoxes_HatchAnEgg[] = _("Hatch an Egg"); -static const u8 sDebugText_PartyBoxes_HealParty[] = _("Heal party"); -static const u8 sDebugText_PartyBoxes_PoisonParty[] = _("Poison party"); -static const u8 sDebugText_PartyBoxes_ClearBoxes[] = _("Clear Storage Boxes"); +static const u8 sDebugText_Party_AccessPC[] = _("Access PC"); +static const u8 sDebugText_Party_MoveReminder[] = _("Move Reminder"); +static const u8 sDebugText_Party_HatchAnEgg[] = _("Hatch an Egg"); +static const u8 sDebugText_Party_HealParty[] = _("Heal party"); +static const u8 sDebugText_Party_PoisonParty[] = _("Poison party"); +static const u8 sDebugText_Party_ClearBoxes[] = _("Clear Storage Boxes"); // Flags/Vars Menu static const u8 sDebugText_FlagsVars_Flags[] = _("Set Flag XYZ…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_FlagsVars_Flag[] = _("Flag: {STR_VAR_1}{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}\n{STR_VAR_3}"); @@ -645,7 +645,7 @@ static const s32 sPowersOfTen[] = static const struct ListMenuItem sDebugMenu_Items_Main[] = { [DEBUG_MENU_ITEM_UTILITIES] = {sDebugText_Utilities, DEBUG_MENU_ITEM_UTILITIES}, - [DEBUG_MENU_ITEM_PARTY_BOXES] = {sDebugText_PartyBoxes, DEBUG_MENU_ITEM_PARTY_BOXES}, + [DEBUG_MENU_ITEM_PARTY] = {sDebugText_Party, DEBUG_MENU_ITEM_PARTY}, [DEBUG_MENU_ITEM_GIVE] = {sDebugText_Give, DEBUG_MENU_ITEM_GIVE}, [DEBUG_MENU_ITEM_SCRIPTS] = {sDebugText_Scripts, DEBUG_MENU_ITEM_SCRIPTS}, [DEBUG_MENU_ITEM_FLAGVAR] = {sDebugText_FlagsVars, DEBUG_MENU_ITEM_FLAGVAR}, @@ -672,14 +672,14 @@ static const struct ListMenuItem sDebugMenu_Items_Utilities[] = [DEBUG_UTIL_MENU_ITEM_EXPANSION_VER] = {sDebugText_Util_ExpansionVersion,DEBUG_UTIL_MENU_ITEM_EXPANSION_VER}, }; -static const struct ListMenuItem sDebugMenu_Items_PartyBoxes[] = +static const struct ListMenuItem sDebugMenu_Items_Party[] = { - [DEBUG_PARTY_BOXES_MENU_ITEM_ACCESS_PC] = {sDebugText_PartyBoxes_AccessPC, DEBUG_PARTY_BOXES_MENU_ITEM_ACCESS_PC}, - [DEBUG_PARTY_BOXES_MENU_ITEM_MOVE_REMINDER] = {sDebugText_PartyBoxes_MoveReminder, DEBUG_PARTY_BOXES_MENU_ITEM_MOVE_REMINDER}, - [DEBUG_PARTY_BOXES_MENU_ITEM_HATCH_AN_EGG] = {sDebugText_PartyBoxes_HatchAnEgg, DEBUG_PARTY_BOXES_MENU_ITEM_HATCH_AN_EGG}, - [DEBUG_PARTY_BOXES_MENU_ITEM_HEAL_PARTY] = {sDebugText_PartyBoxes_HealParty, DEBUG_PARTY_BOXES_MENU_ITEM_HEAL_PARTY}, - [DEBUG_PARTY_BOXES_MENU_ITEM_POISON_MONS] = {sDebugText_PartyBoxes_PoisonParty, DEBUG_PARTY_BOXES_MENU_ITEM_POISON_MONS}, - [DEBUG_PARTY_BOXES_MENU_ITEM_CLEAR_BOXES] = {sDebugText_PartyBoxes_ClearBoxes, DEBUG_PARTY_BOXES_MENU_ITEM_CLEAR_BOXES}, + [DEBUG_PARTY_MENU_ITEM_ACCESS_PC] = {sDebugText_Party_AccessPC, DEBUG_PARTY_MENU_ITEM_ACCESS_PC}, + [DEBUG_PARTY_MENU_ITEM_MOVE_REMINDER] = {sDebugText_Party_MoveReminder, DEBUG_PARTY_MENU_ITEM_MOVE_REMINDER}, + [DEBUG_PARTY_MENU_ITEM_HATCH_AN_EGG] = {sDebugText_Party_HatchAnEgg, DEBUG_PARTY_MENU_ITEM_HATCH_AN_EGG}, + [DEBUG_PARTY_MENU_ITEM_HEAL_PARTY] = {sDebugText_Party_HealParty, DEBUG_PARTY_MENU_ITEM_HEAL_PARTY}, + [DEBUG_PARTY_MENU_ITEM_POISON_MONS] = {sDebugText_Party_PoisonParty, DEBUG_PARTY_MENU_ITEM_POISON_MONS}, + [DEBUG_PARTY_MENU_ITEM_CLEAR_BOXES] = {sDebugText_Party_ClearBoxes, DEBUG_PARTY_MENU_ITEM_CLEAR_BOXES}, }; static const struct ListMenuItem sDebugMenu_Items_Scripts[] = @@ -796,7 +796,7 @@ static const struct ListMenuItem sDebugMenu_Items_Sound[] = static void (*const sDebugMenu_Actions_Main[])(u8) = { [DEBUG_MENU_ITEM_UTILITIES] = DebugAction_OpenUtilitiesMenu, - [DEBUG_MENU_ITEM_PARTY_BOXES] = DebugAction_OpenPartyBoxesMenu, + [DEBUG_MENU_ITEM_PARTY] = DebugAction_OpenPartyMenu, [DEBUG_MENU_ITEM_GIVE] = DebugAction_OpenGiveMenu, [DEBUG_MENU_ITEM_SCRIPTS] = DebugAction_OpenScriptsMenu, [DEBUG_MENU_ITEM_FLAGVAR] = DebugAction_OpenFlagsVarsMenu, @@ -823,14 +823,14 @@ static void (*const sDebugMenu_Actions_Utilities[])(u8) = [DEBUG_UTIL_MENU_ITEM_EXPANSION_VER] = DebugAction_Util_ExpansionVersion, }; -static void (*const sDebugMenu_Actions_PartyBoxes[])(u8) = +static void (*const sDebugMenu_Actions_Party[])(u8) = { - [DEBUG_PARTY_BOXES_MENU_ITEM_ACCESS_PC] = DebugAction_PartyBoxes_AccessPC, - [DEBUG_PARTY_BOXES_MENU_ITEM_MOVE_REMINDER] = DebugAction_PartyBoxes_MoveReminder, - [DEBUG_PARTY_BOXES_MENU_ITEM_HATCH_AN_EGG] = DebugAction_PartyBoxes_HatchAnEgg, - [DEBUG_PARTY_BOXES_MENU_ITEM_HEAL_PARTY] = DebugAction_PartyBoxes_HealParty, - [DEBUG_PARTY_BOXES_MENU_ITEM_POISON_MONS] = DebugAction_PartyBoxes_PoisonMons, - [DEBUG_PARTY_BOXES_MENU_ITEM_CLEAR_BOXES] = DebugAction_PartyBoxes_ClearBoxes, + [DEBUG_PARTY_MENU_ITEM_ACCESS_PC] = DebugAction_Party_AccessPC, + [DEBUG_PARTY_MENU_ITEM_MOVE_REMINDER] = DebugAction_Party_MoveReminder, + [DEBUG_PARTY_MENU_ITEM_HATCH_AN_EGG] = DebugAction_Party_HatchAnEgg, + [DEBUG_PARTY_MENU_ITEM_HEAL_PARTY] = DebugAction_Party_HealParty, + [DEBUG_PARTY_MENU_ITEM_POISON_MONS] = DebugAction_Party_PoisonMons, + [DEBUG_PARTY_MENU_ITEM_CLEAR_BOXES] = DebugAction_Party_ClearBoxes, }; static void (*const sDebugMenu_Actions_Scripts[])(u8) = @@ -968,11 +968,11 @@ static const struct ListMenuTemplate sDebugMenu_ListTemplate_Utilities = .totalItems = ARRAY_COUNT(sDebugMenu_Items_Utilities), }; -static const struct ListMenuTemplate sDebugMenu_ListTemplate_PartyBoxes = +static const struct ListMenuTemplate sDebugMenu_ListTemplate_Party = { - .items = sDebugMenu_Items_PartyBoxes, + .items = sDebugMenu_Items_Party, .moveCursorFunc = ListMenuDefaultCursorMoveFunc, - .totalItems = ARRAY_COUNT(sDebugMenu_Items_PartyBoxes), + .totalItems = ARRAY_COUNT(sDebugMenu_Items_Party), }; static const struct ListMenuTemplate sDebugMenu_ListTemplate_Scripts = @@ -1403,7 +1403,7 @@ static void DebugTask_HandleMenuInput_Utilities(u8 taskId) } } -static void DebugTask_HandleMenuInput_PartyBoxes(u8 taskId) +static void DebugTask_HandleMenuInput_Party(u8 taskId) { void (*func)(u8); u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuTaskId); @@ -1411,7 +1411,7 @@ static void DebugTask_HandleMenuInput_PartyBoxes(u8 taskId) if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); - if ((func = sDebugMenu_Actions_PartyBoxes[input]) != NULL) + if ((func = sDebugMenu_Actions_Party[input]) != NULL) func(taskId); } else if (JOY_NEW(B_BUTTON)) @@ -1689,10 +1689,10 @@ static void DebugAction_OpenUtilitiesMenu(u8 taskId) Debug_ShowMenu(DebugTask_HandleMenuInput_Utilities, sDebugMenu_ListTemplate_Utilities); } -static void DebugAction_OpenPartyBoxesMenu(u8 taskId) +static void DebugAction_OpenPartyMenu(u8 taskId) { Debug_DestroyMenu(taskId); - Debug_ShowMenu(DebugTask_HandleMenuInput_PartyBoxes, sDebugMenu_ListTemplate_PartyBoxes); + Debug_ShowMenu(DebugTask_HandleMenuInput_Party, sDebugMenu_ListTemplate_Party); } static void DebugAction_OpenScriptsMenu(u8 taskId) @@ -4794,22 +4794,22 @@ SOUND_LIST_SE // ******************************* // Actions Party/Boxes -static void DebugAction_PartyBoxes_AccessPC(u8 taskId) +static void DebugAction_Party_AccessPC(u8 taskId) { Debug_DestroyMenu_Full_Script(taskId, EventScript_PC); } -static void DebugAction_PartyBoxes_MoveReminder(u8 taskId) +static void DebugAction_Party_MoveReminder(u8 taskId) { Debug_DestroyMenu_Full_Script(taskId, FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon); } -static void DebugAction_PartyBoxes_HatchAnEgg(u8 taskId) +static void DebugAction_Party_HatchAnEgg(u8 taskId) { Debug_DestroyMenu_Full_Script(taskId, Debug_HatchAnEgg); } -static void DebugAction_PartyBoxes_HealParty(u8 taskId) +static void DebugAction_Party_HealParty(u8 taskId) { PlaySE(SE_USE_ITEM); HealPlayerParty(); @@ -4817,7 +4817,7 @@ static void DebugAction_PartyBoxes_HealParty(u8 taskId) Debug_DestroyMenu_Full(taskId); } -static void DebugAction_PartyBoxes_PoisonMons(u8 taskId) +static void DebugAction_Party_PoisonMons(u8 taskId) { int i; for (i = 0; i < PARTY_SIZE; i++) @@ -4835,7 +4835,7 @@ static void DebugAction_PartyBoxes_PoisonMons(u8 taskId) Debug_DestroyMenu_Full(taskId); } -static void DebugAction_PartyBoxes_ClearBoxes(u8 taskId) +static void DebugAction_Party_ClearBoxes(u8 taskId) { ResetPokemonStorageSystem(); Debug_DestroyMenu_Full(taskId); From a4d8babf33f6ff34fc721e2c3dd34ded6c9a84a8 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 4 Jan 2024 20:44:57 -0300 Subject: [PATCH 02/11] Renamed the debug menu's 'Fill PC/Pockets' to 'PC/Bag' --- src/debug.c | 114 ++++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/src/debug.c b/src/debug.c index b2ca55bc8c93..bf25f8942548 100644 --- a/src/debug.c +++ b/src/debug.c @@ -199,7 +199,7 @@ enum GiveDebugMenu DEBUG_GIVE_MENU_ITEM_DAYCARE_EGG, }; -enum GiveFillDebugMenu +enum GivePCBagDebugMenu { DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST, DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW, @@ -321,7 +321,7 @@ static void DebugAction_OpenPartyMenu(u8 taskId); static void DebugAction_OpenScriptsMenu(u8 taskId); static void DebugAction_OpenFlagsVarsMenu(u8 taskId); static void DebugAction_OpenGiveMenu(u8 taskId); -static void DebugAction_OpenFillMenu(u8 taskId); +static void DebugAction_OpenPCBagMenu(u8 taskId); static void DebugAction_OpenSoundMenu(u8 taskId); static void DebugTask_HandleMenuInput_Main(u8 taskId); @@ -331,7 +331,7 @@ static void DebugTask_HandleMenuInput_Scripts(u8 taskId); static void DebugTask_HandleMenuInput_FlagsVars(u8 taskId); static void DebugTask_HandleMenuInput_Battle(u8 taskId); static void DebugTask_HandleMenuInput_Give(u8 taskId); -static void DebugTask_HandleMenuInput_Fill(u8 taskId); +static void DebugTask_HandleMenuInput_PCBag(u8 taskId); static void DebugTask_HandleMenuInput_Sound(u8 taskId); static void DebugAction_Util_Fly(u8 taskId); @@ -402,14 +402,14 @@ static void DebugAction_Give_MaxCoins(u8 taskId); static void DebugAction_Give_MaxBattlePoints(u8 taskId); static void DebugAction_Give_DayCareEgg(u8 taskId); -static void DebugAction_Fill_PCBoxes_Fast(u8 taskId); -static void DebugAction_Fill_PCBoxes_Slow(u8 taskId); -static void DebugAction_Fill_PCItemStorage(u8 taskId); -static void DebugAction_Fill_PocketItems(u8 taskId); -static void DebugAction_Fill_PocketPokeBalls(u8 taskId); -static void DebugAction_Fill_PocketTMHM(u8 taskId); -static void DebugAction_Fill_PocketBerries(u8 taskId); -static void DebugAction_Fill_PocketKeyItems(u8 taskId); +static void DebugAction_PCBag_PCBoxes_Fast(u8 taskId); +static void DebugAction_PCBag_PCBoxes_Slow(u8 taskId); +static void DebugAction_PCBag_PCItemStorage(u8 taskId); +static void DebugAction_PCBag_PocketItems(u8 taskId); +static void DebugAction_PCBag_PocketPokeBalls(u8 taskId); +static void DebugAction_PCBag_PocketTMHM(u8 taskId); +static void DebugAction_PCBag_PocketBerries(u8 taskId); +static void DebugAction_PCBag_PocketKeyItems(u8 taskId); static void DebugAction_Sound_SE(u8 taskId); static void DebugAction_Sound_SE_SelectId(u8 taskId); @@ -462,7 +462,7 @@ static const u8 sDebugText_Scripts[] = _("Scripts…{CLEAR_TO 110}{RIGHT_A static const u8 sDebugText_FlagsVars[] = _("Flags & Vars…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Battle[] = _("Battle Test{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Give[] = _("Give X…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Fill[] = _("Fill PC/Pockets…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_PCBag[] = _("PC/Bag…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Sound[] = _("Sound…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Cancel[] = _("Cancel"); // Script menu @@ -591,15 +591,15 @@ static const u8 sDebugText_Give_MaxMoney[] = _("Max Money"); static const u8 sDebugText_Give_MaxCoins[] = _("Max Coins"); static const u8 sDebugText_Give_BattlePoints[] = _("Max Battle Points"); static const u8 sDebugText_Give_DaycareEgg[] = _("Daycare Egg"); -// Fill Menu -static const u8 sDebugText_Fill_Pc_Fast[] = _("Fill PC Boxes Fast"); -static const u8 sDebugText_Fill_Pc_Slow[] = _("Fill PC Boxes Slow (LAG!)"); -static const u8 sDebugText_Fill_Pc_Items[] = _("Fill PC Items"); -static const u8 sDebugText_Fill_PocketItems[] = _("Fill Pocket Items"); -static const u8 sDebugText_Fill_PocketPokeBalls[] = _("Fill Pocket Poké Balls"); -static const u8 sDebugText_Fill_PocketTMHM[] = _("Fill Pocket TMHM"); -static const u8 sDebugText_Fill_PocketBerries[] = _("Fill Pocket Berries"); -static const u8 sDebugText_Fill_PocketKeyItems[] = _("Fill Pocket Key Items"); +// PC/Bag Menu +static const u8 sDebugText_PCBag_Pc_Fast[] = _("Fill PC Boxes Fast"); +static const u8 sDebugText_PCBag_Pc_Slow[] = _("Fill PC Boxes Slow (LAG!)"); +static const u8 sDebugText_PCBag_Pc_Items[] = _("Fill PC Items"); +static const u8 sDebugText_PCBag_PocketItems[] = _("Fill Pocket Items"); +static const u8 sDebugText_PCBag_PocketPokeBalls[] = _("Fill Pocket Poké Balls"); +static const u8 sDebugText_PCBag_PocketTMHM[] = _("Fill Pocket TMHM"); +static const u8 sDebugText_PCBag_PocketBerries[] = _("Fill Pocket Berries"); +static const u8 sDebugText_PCBag_PocketKeyItems[] = _("Fill Pocket Key Items"); // Sound Menu static const u8 sDebugText_Sound_SFX[] = _("SFX…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Sound_SFX_ID[] = _("SFX ID: {STR_VAR_3} {START_BUTTON} Stop\n{STR_VAR_1} \n{STR_VAR_2}"); @@ -649,7 +649,7 @@ static const struct ListMenuItem sDebugMenu_Items_Main[] = [DEBUG_MENU_ITEM_GIVE] = {sDebugText_Give, DEBUG_MENU_ITEM_GIVE}, [DEBUG_MENU_ITEM_SCRIPTS] = {sDebugText_Scripts, DEBUG_MENU_ITEM_SCRIPTS}, [DEBUG_MENU_ITEM_FLAGVAR] = {sDebugText_FlagsVars, DEBUG_MENU_ITEM_FLAGVAR}, - [DEBUG_MENU_ITEM_FILL] = {sDebugText_Fill, DEBUG_MENU_ITEM_FILL}, + [DEBUG_MENU_ITEM_FILL] = {sDebugText_PCBag, DEBUG_MENU_ITEM_FILL}, //[DEBUG_MENU_ITEM_BATTLE] = {sDebugText_Battle, DEBUG_MENU_ITEM_BATTLE}, [DEBUG_MENU_ITEM_SOUND] = {sDebugText_Sound, DEBUG_MENU_ITEM_SOUND}, [DEBUG_MENU_ITEM_CANCEL] = {sDebugText_Cancel, DEBUG_MENU_ITEM_CANCEL}, @@ -773,16 +773,16 @@ static const struct ListMenuItem sDebugMenu_Items_Give[] = [DEBUG_GIVE_MENU_ITEM_DAYCARE_EGG] = {sDebugText_Give_DaycareEgg, DEBUG_GIVE_MENU_ITEM_DAYCARE_EGG}, }; -static const struct ListMenuItem sDebugMenu_Items_Fill[] = +static const struct ListMenuItem sDebugMenu_Items_PCBag[] = { - [DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST] = {sDebugText_Fill_Pc_Fast, DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST}, - [DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW] = {sDebugText_Fill_Pc_Slow, DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW}, - [DEBUG_FILL_MENU_ITEM_PC_ITEMS] = {sDebugText_Fill_Pc_Items , DEBUG_FILL_MENU_ITEM_PC_ITEMS}, - [DEBUG_FILL_MENU_ITEM_POCKET_ITEMS] = {sDebugText_Fill_PocketItems, DEBUG_FILL_MENU_ITEM_POCKET_ITEMS}, - [DEBUG_FILL_MENU_ITEM_POCKET_BALLS] = {sDebugText_Fill_PocketPokeBalls, DEBUG_FILL_MENU_ITEM_POCKET_BALLS}, - [DEBUG_FILL_MENU_ITEM_POCKET_TMHM] = {sDebugText_Fill_PocketTMHM, DEBUG_FILL_MENU_ITEM_POCKET_TMHM}, - [DEBUG_FILL_MENU_ITEM_POCKET_BERRIES] = {sDebugText_Fill_PocketBerries, DEBUG_FILL_MENU_ITEM_POCKET_BERRIES}, - [DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS] = {sDebugText_Fill_PocketKeyItems, DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS}, + [DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST] = {sDebugText_PCBag_Pc_Fast, DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST}, + [DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW] = {sDebugText_PCBag_Pc_Slow, DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW}, + [DEBUG_FILL_MENU_ITEM_PC_ITEMS] = {sDebugText_PCBag_Pc_Items , DEBUG_FILL_MENU_ITEM_PC_ITEMS}, + [DEBUG_FILL_MENU_ITEM_POCKET_ITEMS] = {sDebugText_PCBag_PocketItems, DEBUG_FILL_MENU_ITEM_POCKET_ITEMS}, + [DEBUG_FILL_MENU_ITEM_POCKET_BALLS] = {sDebugText_PCBag_PocketPokeBalls, DEBUG_FILL_MENU_ITEM_POCKET_BALLS}, + [DEBUG_FILL_MENU_ITEM_POCKET_TMHM] = {sDebugText_PCBag_PocketTMHM, DEBUG_FILL_MENU_ITEM_POCKET_TMHM}, + [DEBUG_FILL_MENU_ITEM_POCKET_BERRIES] = {sDebugText_PCBag_PocketBerries, DEBUG_FILL_MENU_ITEM_POCKET_BERRIES}, + [DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS] = {sDebugText_PCBag_PocketKeyItems, DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS}, }; static const struct ListMenuItem sDebugMenu_Items_Sound[] = @@ -800,7 +800,7 @@ static void (*const sDebugMenu_Actions_Main[])(u8) = [DEBUG_MENU_ITEM_GIVE] = DebugAction_OpenGiveMenu, [DEBUG_MENU_ITEM_SCRIPTS] = DebugAction_OpenScriptsMenu, [DEBUG_MENU_ITEM_FLAGVAR] = DebugAction_OpenFlagsVarsMenu, - [DEBUG_MENU_ITEM_FILL] = DebugAction_OpenFillMenu, + [DEBUG_MENU_ITEM_FILL] = DebugAction_OpenPCBagMenu, //[DEBUG_MENU_ITEM_BATTLE] = DebugAction_OpenBattleMenu, [DEBUG_MENU_ITEM_SOUND] = DebugAction_OpenSoundMenu, [DEBUG_MENU_ITEM_CANCEL] = DebugAction_Cancel @@ -877,16 +877,16 @@ static void (*const sDebugMenu_Actions_Give[])(u8) = [DEBUG_GIVE_MENU_ITEM_DAYCARE_EGG] = DebugAction_Give_DayCareEgg, }; -static void (*const sDebugMenu_Actions_Fill[])(u8) = +static void (*const sDebugMenu_Actions_PCBag[])(u8) = { - [DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST] = DebugAction_Fill_PCBoxes_Fast, - [DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW] = DebugAction_Fill_PCBoxes_Slow, - [DEBUG_FILL_MENU_ITEM_PC_ITEMS] = DebugAction_Fill_PCItemStorage, - [DEBUG_FILL_MENU_ITEM_POCKET_ITEMS] = DebugAction_Fill_PocketItems, - [DEBUG_FILL_MENU_ITEM_POCKET_BALLS] = DebugAction_Fill_PocketPokeBalls, - [DEBUG_FILL_MENU_ITEM_POCKET_TMHM] = DebugAction_Fill_PocketTMHM, - [DEBUG_FILL_MENU_ITEM_POCKET_BERRIES] = DebugAction_Fill_PocketBerries, - [DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS] = DebugAction_Fill_PocketKeyItems, + [DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST] = DebugAction_PCBag_PCBoxes_Fast, + [DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW] = DebugAction_PCBag_PCBoxes_Slow, + [DEBUG_FILL_MENU_ITEM_PC_ITEMS] = DebugAction_PCBag_PCItemStorage, + [DEBUG_FILL_MENU_ITEM_POCKET_ITEMS] = DebugAction_PCBag_PocketItems, + [DEBUG_FILL_MENU_ITEM_POCKET_BALLS] = DebugAction_PCBag_PocketPokeBalls, + [DEBUG_FILL_MENU_ITEM_POCKET_TMHM] = DebugAction_PCBag_PocketTMHM, + [DEBUG_FILL_MENU_ITEM_POCKET_BERRIES] = DebugAction_PCBag_PocketBerries, + [DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS] = DebugAction_PCBag_PocketKeyItems, }; static void (*const sDebugMenu_Actions_Sound[])(u8) = @@ -1017,11 +1017,11 @@ static const struct ListMenuTemplate sDebugMenu_ListTemplate_Give = .totalItems = ARRAY_COUNT(sDebugMenu_Items_Give), }; -static const struct ListMenuTemplate sDebugMenu_ListTemplate_Fill = +static const struct ListMenuTemplate sDebugMenu_ListTemplate_PCBag = { - .items = sDebugMenu_Items_Fill, + .items = sDebugMenu_Items_PCBag, .moveCursorFunc = ListMenuDefaultCursorMoveFunc, - .totalItems = ARRAY_COUNT(sDebugMenu_Items_Fill), + .totalItems = ARRAY_COUNT(sDebugMenu_Items_PCBag), }; static const struct ListMenuTemplate sDebugMenu_ListTemplate_Sound = @@ -1643,7 +1643,7 @@ static void DebugTask_HandleMenuInput_Give(u8 taskId) } } -static void DebugTask_HandleMenuInput_Fill(u8 taskId) +static void DebugTask_HandleMenuInput_PCBag(u8 taskId) { void (*func)(u8); u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuTaskId); @@ -1651,7 +1651,7 @@ static void DebugTask_HandleMenuInput_Fill(u8 taskId) if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); - if ((func = sDebugMenu_Actions_Fill[input]) != NULL) + if ((func = sDebugMenu_Actions_PCBag[input]) != NULL) func(taskId); } else if (JOY_NEW(B_BUTTON)) @@ -1715,10 +1715,10 @@ static void DebugAction_OpenGiveMenu(u8 taskId) Debug_ShowMenu(DebugTask_HandleMenuInput_Give, sDebugMenu_ListTemplate_Give); } -static void DebugAction_OpenFillMenu(u8 taskId) +static void DebugAction_OpenPCBagMenu(u8 taskId) { Debug_DestroyMenu(taskId); - Debug_ShowMenu(DebugTask_HandleMenuInput_Fill, sDebugMenu_ListTemplate_Fill); + Debug_ShowMenu(DebugTask_HandleMenuInput_PCBag, sDebugMenu_ListTemplate_PCBag); } static void DebugAction_OpenSoundMenu(u8 taskId) @@ -3924,8 +3924,8 @@ static void DebugAction_Give_DayCareEgg(u8 taskId) } // ******************************* -// Actions Fill -static void DebugAction_Fill_PCBoxes_Fast(u8 taskId) //Credit: Sierraffinity +// Actions PCBag +static void DebugAction_PCBag_PCBoxes_Fast(u8 taskId) //Credit: Sierraffinity { int boxId, boxPosition; u32 personality; @@ -3958,7 +3958,7 @@ static void DebugAction_Fill_PCBoxes_Fast(u8 taskId) //Credit: Sierraffinity ScriptContext_Enable(); } -static void DebugAction_Fill_PCBoxes_Slow(u8 taskId) +static void DebugAction_PCBag_PCBoxes_Slow(u8 taskId) { int boxId, boxPosition; struct BoxPokemon boxMon; @@ -3989,7 +3989,7 @@ static void DebugAction_Fill_PCBoxes_Slow(u8 taskId) Debug_DestroyMenu_Full_Script(taskId, Debug_BoxFilledMessage); } -static void DebugAction_Fill_PCItemStorage(u8 taskId) +static void DebugAction_PCBag_PCItemStorage(u8 taskId) { u16 itemId; @@ -4000,7 +4000,7 @@ static void DebugAction_Fill_PCItemStorage(u8 taskId) } } -static void DebugAction_Fill_PocketItems(u8 taskId) +static void DebugAction_PCBag_PocketItems(u8 taskId) { u16 itemId; @@ -4011,7 +4011,7 @@ static void DebugAction_Fill_PocketItems(u8 taskId) } } -static void DebugAction_Fill_PocketPokeBalls(u8 taskId) +static void DebugAction_PCBag_PocketPokeBalls(u8 taskId) { u16 itemId; @@ -4022,7 +4022,7 @@ static void DebugAction_Fill_PocketPokeBalls(u8 taskId) } } -static void DebugAction_Fill_PocketTMHM(u8 taskId) +static void DebugAction_PCBag_PocketTMHM(u8 taskId) { u16 itemId; @@ -4033,7 +4033,7 @@ static void DebugAction_Fill_PocketTMHM(u8 taskId) } } -static void DebugAction_Fill_PocketBerries(u8 taskId) +static void DebugAction_PCBag_PocketBerries(u8 taskId) { u16 itemId; @@ -4044,7 +4044,7 @@ static void DebugAction_Fill_PocketBerries(u8 taskId) } } -static void DebugAction_Fill_PocketKeyItems(u8 taskId) +static void DebugAction_PCBag_PocketKeyItems(u8 taskId) { u16 itemId; From 7ea0ac9410de2a03395b2674ee515ac824c57356 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 4 Jan 2024 20:51:54 -0300 Subject: [PATCH 03/11] Moved PC/Bar higher in the debug menu's list --- src/debug.c | 176 ++++++++++++++++++++++++++-------------------------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/src/debug.c b/src/debug.c index bf25f8942548..909a65b5910b 100644 --- a/src/debug.c +++ b/src/debug.c @@ -71,11 +71,11 @@ enum DebugMenu { DEBUG_MENU_ITEM_UTILITIES, + DEBUG_MENU_ITEM_PCBAG, DEBUG_MENU_ITEM_PARTY, DEBUG_MENU_ITEM_GIVE, DEBUG_MENU_ITEM_SCRIPTS, DEBUG_MENU_ITEM_FLAGVAR, - DEBUG_MENU_ITEM_FILL, //DEBUG_MENU_ITEM_BATTLE, DEBUG_MENU_ITEM_SOUND, DEBUG_MENU_ITEM_CANCEL, @@ -201,14 +201,14 @@ enum GiveDebugMenu enum GivePCBagDebugMenu { - DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST, - DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW, - DEBUG_FILL_MENU_ITEM_PC_ITEMS, - DEBUG_FILL_MENU_ITEM_POCKET_ITEMS, - DEBUG_FILL_MENU_ITEM_POCKET_BALLS, - DEBUG_FILL_MENU_ITEM_POCKET_TMHM, - DEBUG_FILL_MENU_ITEM_POCKET_BERRIES, - DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS, + DEBUG_PCBAG_MENU_ITEM_PC_BOXES_FAST, + DEBUG_PCBAG_MENU_ITEM_PC_BOXES_SLOW, + DEBUG_PCBAG_MENU_ITEM_PC_ITEMS, + DEBUG_PCBAG_MENU_ITEM_POCKET_ITEMS, + DEBUG_PCBAG_MENU_ITEM_POCKET_BALLS, + DEBUG_PCBAG_MENU_ITEM_POCKET_TMHM, + DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES, + DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS, }; enum SoundDebugMenu @@ -317,21 +317,21 @@ static void DebugAction_Util_Script_7(u8 taskId); static void DebugAction_Util_Script_8(u8 taskId); static void DebugAction_OpenUtilitiesMenu(u8 taskId); +static void DebugAction_OpenPCBagMenu(u8 taskId); static void DebugAction_OpenPartyMenu(u8 taskId); static void DebugAction_OpenScriptsMenu(u8 taskId); static void DebugAction_OpenFlagsVarsMenu(u8 taskId); static void DebugAction_OpenGiveMenu(u8 taskId); -static void DebugAction_OpenPCBagMenu(u8 taskId); static void DebugAction_OpenSoundMenu(u8 taskId); static void DebugTask_HandleMenuInput_Main(u8 taskId); static void DebugTask_HandleMenuInput_Utilities(u8 taskId); +static void DebugTask_HandleMenuInput_PCBag(u8 taskId); static void DebugTask_HandleMenuInput_Party(u8 taskId); static void DebugTask_HandleMenuInput_Scripts(u8 taskId); static void DebugTask_HandleMenuInput_FlagsVars(u8 taskId); static void DebugTask_HandleMenuInput_Battle(u8 taskId); static void DebugTask_HandleMenuInput_Give(u8 taskId); -static void DebugTask_HandleMenuInput_PCBag(u8 taskId); static void DebugTask_HandleMenuInput_Sound(u8 taskId); static void DebugAction_Util_Fly(u8 taskId); @@ -352,6 +352,15 @@ static void DebugAction_Util_Player_Id(u8 taskId); static void DebugAction_Util_CheatStart(u8 taskId); static void DebugAction_Util_ExpansionVersion(u8 taskId); +static void DebugAction_PCBag_PCBoxes_Fast(u8 taskId); +static void DebugAction_PCBag_PCBoxes_Slow(u8 taskId); +static void DebugAction_PCBag_PCItemStorage(u8 taskId); +static void DebugAction_PCBag_PocketItems(u8 taskId); +static void DebugAction_PCBag_PocketPokeBalls(u8 taskId); +static void DebugAction_PCBag_PocketTMHM(u8 taskId); +static void DebugAction_PCBag_PocketBerries(u8 taskId); +static void DebugAction_PCBag_PocketKeyItems(u8 taskId); + static void DebugAction_Party_AccessPC(u8 taskId); static void DebugAction_Party_MoveReminder(u8 taskId); static void DebugAction_Party_HatchAnEgg(u8 taskId); @@ -402,15 +411,6 @@ static void DebugAction_Give_MaxCoins(u8 taskId); static void DebugAction_Give_MaxBattlePoints(u8 taskId); static void DebugAction_Give_DayCareEgg(u8 taskId); -static void DebugAction_PCBag_PCBoxes_Fast(u8 taskId); -static void DebugAction_PCBag_PCBoxes_Slow(u8 taskId); -static void DebugAction_PCBag_PCItemStorage(u8 taskId); -static void DebugAction_PCBag_PocketItems(u8 taskId); -static void DebugAction_PCBag_PocketPokeBalls(u8 taskId); -static void DebugAction_PCBag_PocketTMHM(u8 taskId); -static void DebugAction_PCBag_PocketBerries(u8 taskId); -static void DebugAction_PCBag_PocketKeyItems(u8 taskId); - static void DebugAction_Sound_SE(u8 taskId); static void DebugAction_Sound_SE_SelectId(u8 taskId); static void DebugAction_Sound_MUS(u8 taskId); @@ -457,12 +457,12 @@ static const u8 sDebugText_Empty[] = _(""); static const u8 sDebugText_Continue[] = _("Continue…{CLEAR_TO 110}{RIGHT_ARROW}"); // Main Menu static const u8 sDebugText_Utilities[] = _("Utilities…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_PCBag[] = _("PC/Bag…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Party[] = _("Party…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Scripts[] = _("Scripts…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_FlagsVars[] = _("Flags & Vars…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Battle[] = _("Battle Test{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Give[] = _("Give X…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_PCBag[] = _("PC/Bag…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Sound[] = _("Sound…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Cancel[] = _("Cancel"); // Script menu @@ -493,6 +493,15 @@ static const u8 sDebugText_Util_Player_Gender[] = _("Toggle gender"); static const u8 sDebugText_Util_Player_Id[] = _("New Trainer ID"); static const u8 sDebugText_Util_CheatStart[] = _("Cheat start"); static const u8 sDebugText_Util_ExpansionVersion[] = _("Expansion Version"); +// PC/Bag Menu +static const u8 sDebugText_PCBag_Pc_Fast[] = _("Fill PC Boxes Fast"); +static const u8 sDebugText_PCBag_Pc_Slow[] = _("Fill PC Boxes Slow (LAG!)"); +static const u8 sDebugText_PCBag_Pc_Items[] = _("Fill PC Items"); +static const u8 sDebugText_PCBag_PocketItems[] = _("Fill Pocket Items"); +static const u8 sDebugText_PCBag_PocketPokeBalls[] = _("Fill Pocket Poké Balls"); +static const u8 sDebugText_PCBag_PocketTMHM[] = _("Fill Pocket TMHM"); +static const u8 sDebugText_PCBag_PocketBerries[] = _("Fill Pocket Berries"); +static const u8 sDebugText_PCBag_PocketKeyItems[] = _("Fill Pocket Key Items"); // Party/Boxes Menu static const u8 sDebugText_Party_AccessPC[] = _("Access PC"); static const u8 sDebugText_Party_MoveReminder[] = _("Move Reminder"); @@ -591,15 +600,6 @@ static const u8 sDebugText_Give_MaxMoney[] = _("Max Money"); static const u8 sDebugText_Give_MaxCoins[] = _("Max Coins"); static const u8 sDebugText_Give_BattlePoints[] = _("Max Battle Points"); static const u8 sDebugText_Give_DaycareEgg[] = _("Daycare Egg"); -// PC/Bag Menu -static const u8 sDebugText_PCBag_Pc_Fast[] = _("Fill PC Boxes Fast"); -static const u8 sDebugText_PCBag_Pc_Slow[] = _("Fill PC Boxes Slow (LAG!)"); -static const u8 sDebugText_PCBag_Pc_Items[] = _("Fill PC Items"); -static const u8 sDebugText_PCBag_PocketItems[] = _("Fill Pocket Items"); -static const u8 sDebugText_PCBag_PocketPokeBalls[] = _("Fill Pocket Poké Balls"); -static const u8 sDebugText_PCBag_PocketTMHM[] = _("Fill Pocket TMHM"); -static const u8 sDebugText_PCBag_PocketBerries[] = _("Fill Pocket Berries"); -static const u8 sDebugText_PCBag_PocketKeyItems[] = _("Fill Pocket Key Items"); // Sound Menu static const u8 sDebugText_Sound_SFX[] = _("SFX…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Sound_SFX_ID[] = _("SFX ID: {STR_VAR_3} {START_BUTTON} Stop\n{STR_VAR_1} \n{STR_VAR_2}"); @@ -645,11 +645,11 @@ static const s32 sPowersOfTen[] = static const struct ListMenuItem sDebugMenu_Items_Main[] = { [DEBUG_MENU_ITEM_UTILITIES] = {sDebugText_Utilities, DEBUG_MENU_ITEM_UTILITIES}, + [DEBUG_MENU_ITEM_PCBAG] = {sDebugText_PCBag, DEBUG_MENU_ITEM_PCBAG}, [DEBUG_MENU_ITEM_PARTY] = {sDebugText_Party, DEBUG_MENU_ITEM_PARTY}, [DEBUG_MENU_ITEM_GIVE] = {sDebugText_Give, DEBUG_MENU_ITEM_GIVE}, [DEBUG_MENU_ITEM_SCRIPTS] = {sDebugText_Scripts, DEBUG_MENU_ITEM_SCRIPTS}, [DEBUG_MENU_ITEM_FLAGVAR] = {sDebugText_FlagsVars, DEBUG_MENU_ITEM_FLAGVAR}, - [DEBUG_MENU_ITEM_FILL] = {sDebugText_PCBag, DEBUG_MENU_ITEM_FILL}, //[DEBUG_MENU_ITEM_BATTLE] = {sDebugText_Battle, DEBUG_MENU_ITEM_BATTLE}, [DEBUG_MENU_ITEM_SOUND] = {sDebugText_Sound, DEBUG_MENU_ITEM_SOUND}, [DEBUG_MENU_ITEM_CANCEL] = {sDebugText_Cancel, DEBUG_MENU_ITEM_CANCEL}, @@ -672,6 +672,18 @@ static const struct ListMenuItem sDebugMenu_Items_Utilities[] = [DEBUG_UTIL_MENU_ITEM_EXPANSION_VER] = {sDebugText_Util_ExpansionVersion,DEBUG_UTIL_MENU_ITEM_EXPANSION_VER}, }; +static const struct ListMenuItem sDebugMenu_Items_PCBag[] = +{ + [DEBUG_PCBAG_MENU_ITEM_PC_BOXES_FAST] = {sDebugText_PCBag_Pc_Fast, DEBUG_PCBAG_MENU_ITEM_PC_BOXES_FAST}, + [DEBUG_PCBAG_MENU_ITEM_PC_BOXES_SLOW] = {sDebugText_PCBag_Pc_Slow, DEBUG_PCBAG_MENU_ITEM_PC_BOXES_SLOW}, + [DEBUG_PCBAG_MENU_ITEM_PC_ITEMS] = {sDebugText_PCBag_Pc_Items , DEBUG_PCBAG_MENU_ITEM_PC_ITEMS}, + [DEBUG_PCBAG_MENU_ITEM_POCKET_ITEMS] = {sDebugText_PCBag_PocketItems, DEBUG_PCBAG_MENU_ITEM_POCKET_ITEMS}, + [DEBUG_PCBAG_MENU_ITEM_POCKET_BALLS] = {sDebugText_PCBag_PocketPokeBalls, DEBUG_PCBAG_MENU_ITEM_POCKET_BALLS}, + [DEBUG_PCBAG_MENU_ITEM_POCKET_TMHM] = {sDebugText_PCBag_PocketTMHM, DEBUG_PCBAG_MENU_ITEM_POCKET_TMHM}, + [DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES] = {sDebugText_PCBag_PocketBerries, DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES}, + [DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS] = {sDebugText_PCBag_PocketKeyItems, DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS}, +}; + static const struct ListMenuItem sDebugMenu_Items_Party[] = { [DEBUG_PARTY_MENU_ITEM_ACCESS_PC] = {sDebugText_Party_AccessPC, DEBUG_PARTY_MENU_ITEM_ACCESS_PC}, @@ -773,18 +785,6 @@ static const struct ListMenuItem sDebugMenu_Items_Give[] = [DEBUG_GIVE_MENU_ITEM_DAYCARE_EGG] = {sDebugText_Give_DaycareEgg, DEBUG_GIVE_MENU_ITEM_DAYCARE_EGG}, }; -static const struct ListMenuItem sDebugMenu_Items_PCBag[] = -{ - [DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST] = {sDebugText_PCBag_Pc_Fast, DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST}, - [DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW] = {sDebugText_PCBag_Pc_Slow, DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW}, - [DEBUG_FILL_MENU_ITEM_PC_ITEMS] = {sDebugText_PCBag_Pc_Items , DEBUG_FILL_MENU_ITEM_PC_ITEMS}, - [DEBUG_FILL_MENU_ITEM_POCKET_ITEMS] = {sDebugText_PCBag_PocketItems, DEBUG_FILL_MENU_ITEM_POCKET_ITEMS}, - [DEBUG_FILL_MENU_ITEM_POCKET_BALLS] = {sDebugText_PCBag_PocketPokeBalls, DEBUG_FILL_MENU_ITEM_POCKET_BALLS}, - [DEBUG_FILL_MENU_ITEM_POCKET_TMHM] = {sDebugText_PCBag_PocketTMHM, DEBUG_FILL_MENU_ITEM_POCKET_TMHM}, - [DEBUG_FILL_MENU_ITEM_POCKET_BERRIES] = {sDebugText_PCBag_PocketBerries, DEBUG_FILL_MENU_ITEM_POCKET_BERRIES}, - [DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS] = {sDebugText_PCBag_PocketKeyItems, DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS}, -}; - static const struct ListMenuItem sDebugMenu_Items_Sound[] = { [DEBUG_SOUND_MENU_ITEM_SE] = {sDebugText_Sound_SFX, DEBUG_SOUND_MENU_ITEM_SE}, @@ -796,11 +796,11 @@ static const struct ListMenuItem sDebugMenu_Items_Sound[] = static void (*const sDebugMenu_Actions_Main[])(u8) = { [DEBUG_MENU_ITEM_UTILITIES] = DebugAction_OpenUtilitiesMenu, + [DEBUG_MENU_ITEM_PCBAG] = DebugAction_OpenPCBagMenu, [DEBUG_MENU_ITEM_PARTY] = DebugAction_OpenPartyMenu, [DEBUG_MENU_ITEM_GIVE] = DebugAction_OpenGiveMenu, [DEBUG_MENU_ITEM_SCRIPTS] = DebugAction_OpenScriptsMenu, [DEBUG_MENU_ITEM_FLAGVAR] = DebugAction_OpenFlagsVarsMenu, - [DEBUG_MENU_ITEM_FILL] = DebugAction_OpenPCBagMenu, //[DEBUG_MENU_ITEM_BATTLE] = DebugAction_OpenBattleMenu, [DEBUG_MENU_ITEM_SOUND] = DebugAction_OpenSoundMenu, [DEBUG_MENU_ITEM_CANCEL] = DebugAction_Cancel @@ -823,6 +823,18 @@ static void (*const sDebugMenu_Actions_Utilities[])(u8) = [DEBUG_UTIL_MENU_ITEM_EXPANSION_VER] = DebugAction_Util_ExpansionVersion, }; +static void (*const sDebugMenu_Actions_PCBag[])(u8) = +{ + [DEBUG_PCBAG_MENU_ITEM_PC_BOXES_FAST] = DebugAction_PCBag_PCBoxes_Fast, + [DEBUG_PCBAG_MENU_ITEM_PC_BOXES_SLOW] = DebugAction_PCBag_PCBoxes_Slow, + [DEBUG_PCBAG_MENU_ITEM_PC_ITEMS] = DebugAction_PCBag_PCItemStorage, + [DEBUG_PCBAG_MENU_ITEM_POCKET_ITEMS] = DebugAction_PCBag_PocketItems, + [DEBUG_PCBAG_MENU_ITEM_POCKET_BALLS] = DebugAction_PCBag_PocketPokeBalls, + [DEBUG_PCBAG_MENU_ITEM_POCKET_TMHM] = DebugAction_PCBag_PocketTMHM, + [DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES] = DebugAction_PCBag_PocketBerries, + [DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS] = DebugAction_PCBag_PocketKeyItems, +}; + static void (*const sDebugMenu_Actions_Party[])(u8) = { [DEBUG_PARTY_MENU_ITEM_ACCESS_PC] = DebugAction_Party_AccessPC, @@ -877,18 +889,6 @@ static void (*const sDebugMenu_Actions_Give[])(u8) = [DEBUG_GIVE_MENU_ITEM_DAYCARE_EGG] = DebugAction_Give_DayCareEgg, }; -static void (*const sDebugMenu_Actions_PCBag[])(u8) = -{ - [DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST] = DebugAction_PCBag_PCBoxes_Fast, - [DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW] = DebugAction_PCBag_PCBoxes_Slow, - [DEBUG_FILL_MENU_ITEM_PC_ITEMS] = DebugAction_PCBag_PCItemStorage, - [DEBUG_FILL_MENU_ITEM_POCKET_ITEMS] = DebugAction_PCBag_PocketItems, - [DEBUG_FILL_MENU_ITEM_POCKET_BALLS] = DebugAction_PCBag_PocketPokeBalls, - [DEBUG_FILL_MENU_ITEM_POCKET_TMHM] = DebugAction_PCBag_PocketTMHM, - [DEBUG_FILL_MENU_ITEM_POCKET_BERRIES] = DebugAction_PCBag_PocketBerries, - [DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS] = DebugAction_PCBag_PocketKeyItems, -}; - static void (*const sDebugMenu_Actions_Sound[])(u8) = { [DEBUG_SOUND_MENU_ITEM_SE] = DebugAction_Sound_SE, @@ -968,6 +968,13 @@ static const struct ListMenuTemplate sDebugMenu_ListTemplate_Utilities = .totalItems = ARRAY_COUNT(sDebugMenu_Items_Utilities), }; +static const struct ListMenuTemplate sDebugMenu_ListTemplate_PCBag = +{ + .items = sDebugMenu_Items_PCBag, + .moveCursorFunc = ListMenuDefaultCursorMoveFunc, + .totalItems = ARRAY_COUNT(sDebugMenu_Items_PCBag), +}; + static const struct ListMenuTemplate sDebugMenu_ListTemplate_Party = { .items = sDebugMenu_Items_Party, @@ -1017,13 +1024,6 @@ static const struct ListMenuTemplate sDebugMenu_ListTemplate_Give = .totalItems = ARRAY_COUNT(sDebugMenu_Items_Give), }; -static const struct ListMenuTemplate sDebugMenu_ListTemplate_PCBag = -{ - .items = sDebugMenu_Items_PCBag, - .moveCursorFunc = ListMenuDefaultCursorMoveFunc, - .totalItems = ARRAY_COUNT(sDebugMenu_Items_PCBag), -}; - static const struct ListMenuTemplate sDebugMenu_ListTemplate_Sound = { .items = sDebugMenu_Items_Sound, @@ -1403,6 +1403,25 @@ static void DebugTask_HandleMenuInput_Utilities(u8 taskId) } } +static void DebugTask_HandleMenuInput_PCBag(u8 taskId) +{ + void (*func)(u8); + u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuTaskId); + + if (JOY_NEW(A_BUTTON)) + { + PlaySE(SE_SELECT); + if ((func = sDebugMenu_Actions_PCBag[input]) != NULL) + func(taskId); + } + else if (JOY_NEW(B_BUTTON)) + { + PlaySE(SE_SELECT); + Debug_DestroyMenu(taskId); + Debug_ReShowMainMenu(); + } +} + static void DebugTask_HandleMenuInput_Party(u8 taskId) { void (*func)(u8); @@ -1643,25 +1662,6 @@ static void DebugTask_HandleMenuInput_Give(u8 taskId) } } -static void DebugTask_HandleMenuInput_PCBag(u8 taskId) -{ - void (*func)(u8); - u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuTaskId); - - if (JOY_NEW(A_BUTTON)) - { - PlaySE(SE_SELECT); - if ((func = sDebugMenu_Actions_PCBag[input]) != NULL) - func(taskId); - } - else if (JOY_NEW(B_BUTTON)) - { - PlaySE(SE_SELECT); - Debug_DestroyMenu(taskId); - Debug_ReShowMainMenu(); - } -} - static void DebugTask_HandleMenuInput_Sound(u8 taskId) { void (*func)(u8); @@ -1689,6 +1689,12 @@ static void DebugAction_OpenUtilitiesMenu(u8 taskId) Debug_ShowMenu(DebugTask_HandleMenuInput_Utilities, sDebugMenu_ListTemplate_Utilities); } +static void DebugAction_OpenPCBagMenu(u8 taskId) +{ + Debug_DestroyMenu(taskId); + Debug_ShowMenu(DebugTask_HandleMenuInput_PCBag, sDebugMenu_ListTemplate_PCBag); +} + static void DebugAction_OpenPartyMenu(u8 taskId) { Debug_DestroyMenu(taskId); @@ -1715,12 +1721,6 @@ static void DebugAction_OpenGiveMenu(u8 taskId) Debug_ShowMenu(DebugTask_HandleMenuInput_Give, sDebugMenu_ListTemplate_Give); } -static void DebugAction_OpenPCBagMenu(u8 taskId) -{ - Debug_DestroyMenu(taskId); - Debug_ShowMenu(DebugTask_HandleMenuInput_PCBag, sDebugMenu_ListTemplate_PCBag); -} - static void DebugAction_OpenSoundMenu(u8 taskId) { Debug_DestroyMenu(taskId); From cbd0c3d17cb6a63f86fed0b74cddf23eaa06634c Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 4 Jan 2024 20:57:18 -0300 Subject: [PATCH 04/11] Added a debug feature to clear the bag --- src/debug.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/debug.c b/src/debug.c index 909a65b5910b..6223a81e7546 100644 --- a/src/debug.c +++ b/src/debug.c @@ -209,6 +209,7 @@ enum GivePCBagDebugMenu DEBUG_PCBAG_MENU_ITEM_POCKET_TMHM, DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES, DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS, + DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG, }; enum SoundDebugMenu @@ -360,6 +361,7 @@ static void DebugAction_PCBag_PocketPokeBalls(u8 taskId); static void DebugAction_PCBag_PocketTMHM(u8 taskId); static void DebugAction_PCBag_PocketBerries(u8 taskId); static void DebugAction_PCBag_PocketKeyItems(u8 taskId); +static void DebugAction_PCBag_ClearBag(u8 taskId); static void DebugAction_Party_AccessPC(u8 taskId); static void DebugAction_Party_MoveReminder(u8 taskId); @@ -502,6 +504,7 @@ static const u8 sDebugText_PCBag_PocketPokeBalls[] = _("Fill Pocket Pok static const u8 sDebugText_PCBag_PocketTMHM[] = _("Fill Pocket TMHM"); static const u8 sDebugText_PCBag_PocketBerries[] = _("Fill Pocket Berries"); static const u8 sDebugText_PCBag_PocketKeyItems[] = _("Fill Pocket Key Items"); +static const u8 sDebugText_PCBag_ClearBag[] = _("Clear Bag"); // Party/Boxes Menu static const u8 sDebugText_Party_AccessPC[] = _("Access PC"); static const u8 sDebugText_Party_MoveReminder[] = _("Move Reminder"); @@ -682,6 +685,7 @@ static const struct ListMenuItem sDebugMenu_Items_PCBag[] = [DEBUG_PCBAG_MENU_ITEM_POCKET_TMHM] = {sDebugText_PCBag_PocketTMHM, DEBUG_PCBAG_MENU_ITEM_POCKET_TMHM}, [DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES] = {sDebugText_PCBag_PocketBerries, DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES}, [DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS] = {sDebugText_PCBag_PocketKeyItems, DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS}, + [DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = {sDebugText_PCBag_ClearBag, DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG}, }; static const struct ListMenuItem sDebugMenu_Items_Party[] = @@ -833,6 +837,7 @@ static void (*const sDebugMenu_Actions_PCBag[])(u8) = [DEBUG_PCBAG_MENU_ITEM_POCKET_TMHM] = DebugAction_PCBag_PocketTMHM, [DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES] = DebugAction_PCBag_PocketBerries, [DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS] = DebugAction_PCBag_PocketKeyItems, + [DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = DebugAction_PCBag_ClearBag, }; static void (*const sDebugMenu_Actions_Party[])(u8) = @@ -4055,6 +4060,12 @@ static void DebugAction_PCBag_PocketKeyItems(u8 taskId) } } +static void DebugAction_PCBag_ClearBag(u8 taskId) +{ + PlaySE(MUS_LEVEL_UP); + ClearBag(); +} + // ******************************* // Actions Sound static const u8 *const sBGMNames[]; From 5eacff77708c4ee07376791cf33ba68f80f666e1 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 4 Jan 2024 21:05:43 -0300 Subject: [PATCH 05/11] Moved 'Access PC' and 'Clear Boxes' to PC/Bag --- src/debug.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/debug.c b/src/debug.c index 6223a81e7546..f8061a9b8225 100644 --- a/src/debug.c +++ b/src/debug.c @@ -100,12 +100,10 @@ enum UtilDebugMenu enum PartyDebugMenu { - DEBUG_PARTY_MENU_ITEM_ACCESS_PC, DEBUG_PARTY_MENU_ITEM_MOVE_REMINDER, DEBUG_PARTY_MENU_ITEM_HATCH_AN_EGG, DEBUG_PARTY_MENU_ITEM_HEAL_PARTY, DEBUG_PARTY_MENU_ITEM_POISON_MONS, - DEBUG_PARTY_MENU_ITEM_CLEAR_BOXES, }; enum ScriptDebugMenu @@ -210,6 +208,8 @@ enum GivePCBagDebugMenu DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES, DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS, DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG, + DEBUG_PCBAG_MENU_ITEM_ACCESS_PC, + DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES, }; enum SoundDebugMenu @@ -362,13 +362,13 @@ static void DebugAction_PCBag_PocketTMHM(u8 taskId); static void DebugAction_PCBag_PocketBerries(u8 taskId); static void DebugAction_PCBag_PocketKeyItems(u8 taskId); static void DebugAction_PCBag_ClearBag(u8 taskId); +static void DebugAction_PCBag_AccessPC(u8 taskId); +static void DebugAction_PCBag_ClearBoxes(u8 taskId); -static void DebugAction_Party_AccessPC(u8 taskId); static void DebugAction_Party_MoveReminder(u8 taskId); static void DebugAction_Party_HatchAnEgg(u8 taskId); static void DebugAction_Party_HealParty(u8 taskId); static void DebugAction_Party_PoisonMons(u8 taskId); -static void DebugAction_Party_ClearBoxes(u8 taskId); static void DebugAction_FlagsVars_Flags(u8 taskId); static void DebugAction_FlagsVars_FlagsSelect(u8 taskId); @@ -505,13 +505,13 @@ static const u8 sDebugText_PCBag_PocketTMHM[] = _("Fill Pocket TMHM static const u8 sDebugText_PCBag_PocketBerries[] = _("Fill Pocket Berries"); static const u8 sDebugText_PCBag_PocketKeyItems[] = _("Fill Pocket Key Items"); static const u8 sDebugText_PCBag_ClearBag[] = _("Clear Bag"); +static const u8 sDebugText_PCBag_AccessPC[] = _("Access PC"); +static const u8 sDebugText_PCBag_ClearBoxes[] = _("Clear Storage Boxes"); // Party/Boxes Menu -static const u8 sDebugText_Party_AccessPC[] = _("Access PC"); static const u8 sDebugText_Party_MoveReminder[] = _("Move Reminder"); static const u8 sDebugText_Party_HatchAnEgg[] = _("Hatch an Egg"); static const u8 sDebugText_Party_HealParty[] = _("Heal party"); static const u8 sDebugText_Party_PoisonParty[] = _("Poison party"); -static const u8 sDebugText_Party_ClearBoxes[] = _("Clear Storage Boxes"); // Flags/Vars Menu static const u8 sDebugText_FlagsVars_Flags[] = _("Set Flag XYZ…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_FlagsVars_Flag[] = _("Flag: {STR_VAR_1}{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}\n{STR_VAR_3}"); @@ -686,16 +686,16 @@ static const struct ListMenuItem sDebugMenu_Items_PCBag[] = [DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES] = {sDebugText_PCBag_PocketBerries, DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES}, [DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS] = {sDebugText_PCBag_PocketKeyItems, DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS}, [DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = {sDebugText_PCBag_ClearBag, DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG}, + [DEBUG_PCBAG_MENU_ITEM_ACCESS_PC] = {sDebugText_PCBag_AccessPC, DEBUG_PCBAG_MENU_ITEM_ACCESS_PC}, + [DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES] = {sDebugText_PCBag_ClearBoxes, DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES}, }; static const struct ListMenuItem sDebugMenu_Items_Party[] = { - [DEBUG_PARTY_MENU_ITEM_ACCESS_PC] = {sDebugText_Party_AccessPC, DEBUG_PARTY_MENU_ITEM_ACCESS_PC}, [DEBUG_PARTY_MENU_ITEM_MOVE_REMINDER] = {sDebugText_Party_MoveReminder, DEBUG_PARTY_MENU_ITEM_MOVE_REMINDER}, [DEBUG_PARTY_MENU_ITEM_HATCH_AN_EGG] = {sDebugText_Party_HatchAnEgg, DEBUG_PARTY_MENU_ITEM_HATCH_AN_EGG}, [DEBUG_PARTY_MENU_ITEM_HEAL_PARTY] = {sDebugText_Party_HealParty, DEBUG_PARTY_MENU_ITEM_HEAL_PARTY}, [DEBUG_PARTY_MENU_ITEM_POISON_MONS] = {sDebugText_Party_PoisonParty, DEBUG_PARTY_MENU_ITEM_POISON_MONS}, - [DEBUG_PARTY_MENU_ITEM_CLEAR_BOXES] = {sDebugText_Party_ClearBoxes, DEBUG_PARTY_MENU_ITEM_CLEAR_BOXES}, }; static const struct ListMenuItem sDebugMenu_Items_Scripts[] = @@ -838,16 +838,16 @@ static void (*const sDebugMenu_Actions_PCBag[])(u8) = [DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES] = DebugAction_PCBag_PocketBerries, [DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS] = DebugAction_PCBag_PocketKeyItems, [DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = DebugAction_PCBag_ClearBag, + [DEBUG_PCBAG_MENU_ITEM_ACCESS_PC] = DebugAction_PCBag_AccessPC, + [DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES] = DebugAction_PCBag_ClearBoxes, }; static void (*const sDebugMenu_Actions_Party[])(u8) = { - [DEBUG_PARTY_MENU_ITEM_ACCESS_PC] = DebugAction_Party_AccessPC, [DEBUG_PARTY_MENU_ITEM_MOVE_REMINDER] = DebugAction_Party_MoveReminder, [DEBUG_PARTY_MENU_ITEM_HATCH_AN_EGG] = DebugAction_Party_HatchAnEgg, [DEBUG_PARTY_MENU_ITEM_HEAL_PARTY] = DebugAction_Party_HealParty, [DEBUG_PARTY_MENU_ITEM_POISON_MONS] = DebugAction_Party_PoisonMons, - [DEBUG_PARTY_MENU_ITEM_CLEAR_BOXES] = DebugAction_Party_ClearBoxes, }; static void (*const sDebugMenu_Actions_Scripts[])(u8) = @@ -4066,6 +4066,18 @@ static void DebugAction_PCBag_ClearBag(u8 taskId) ClearBag(); } +static void DebugAction_PCBag_AccessPC(u8 taskId) +{ + Debug_DestroyMenu_Full_Script(taskId, EventScript_PC); +} + +static void DebugAction_PCBag_ClearBoxes(u8 taskId) +{ + ResetPokemonStorageSystem(); + Debug_DestroyMenu_Full(taskId); + ScriptContext_Enable(); +} + // ******************************* // Actions Sound static const u8 *const sBGMNames[]; @@ -4805,11 +4817,6 @@ SOUND_LIST_SE // ******************************* // Actions Party/Boxes -static void DebugAction_Party_AccessPC(u8 taskId) -{ - Debug_DestroyMenu_Full_Script(taskId, EventScript_PC); -} - static void DebugAction_Party_MoveReminder(u8 taskId) { Debug_DestroyMenu_Full_Script(taskId, FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon); @@ -4846,11 +4853,4 @@ static void DebugAction_Party_PoisonMons(u8 taskId) Debug_DestroyMenu_Full(taskId); } -static void DebugAction_Party_ClearBoxes(u8 taskId) -{ - ResetPokemonStorageSystem(); - Debug_DestroyMenu_Full(taskId); - ScriptContext_Enable(); -} - #endif //DEBUG_OVERWORLD_MENU == TRUE From 5c0bc2819732479a80c8eca7951465647a56ec69 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 4 Jan 2024 21:06:30 -0300 Subject: [PATCH 06/11] Relocated the GivePCBagDebugMenu enum --- src/debug.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/debug.c b/src/debug.c index f8061a9b8225..4c611dab288c 100644 --- a/src/debug.c +++ b/src/debug.c @@ -98,6 +98,21 @@ enum UtilDebugMenu DEBUG_UTIL_MENU_ITEM_EXPANSION_VER, }; +enum GivePCBagDebugMenu +{ + DEBUG_PCBAG_MENU_ITEM_PC_BOXES_FAST, + DEBUG_PCBAG_MENU_ITEM_PC_BOXES_SLOW, + DEBUG_PCBAG_MENU_ITEM_PC_ITEMS, + DEBUG_PCBAG_MENU_ITEM_POCKET_ITEMS, + DEBUG_PCBAG_MENU_ITEM_POCKET_BALLS, + DEBUG_PCBAG_MENU_ITEM_POCKET_TMHM, + DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES, + DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS, + DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG, + DEBUG_PCBAG_MENU_ITEM_ACCESS_PC, + DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES, +}; + enum PartyDebugMenu { DEBUG_PARTY_MENU_ITEM_MOVE_REMINDER, @@ -197,21 +212,6 @@ enum GiveDebugMenu DEBUG_GIVE_MENU_ITEM_DAYCARE_EGG, }; -enum GivePCBagDebugMenu -{ - DEBUG_PCBAG_MENU_ITEM_PC_BOXES_FAST, - DEBUG_PCBAG_MENU_ITEM_PC_BOXES_SLOW, - DEBUG_PCBAG_MENU_ITEM_PC_ITEMS, - DEBUG_PCBAG_MENU_ITEM_POCKET_ITEMS, - DEBUG_PCBAG_MENU_ITEM_POCKET_BALLS, - DEBUG_PCBAG_MENU_ITEM_POCKET_TMHM, - DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES, - DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS, - DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG, - DEBUG_PCBAG_MENU_ITEM_ACCESS_PC, - DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES, -}; - enum SoundDebugMenu { DEBUG_SOUND_MENU_ITEM_SE, From dda2ef681a2762540a243f614a1d8e831c076b4d Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 4 Jan 2024 21:23:09 -0300 Subject: [PATCH 07/11] Packed the debug menu's 'Fill' options into a PC/Bag category of their own And reupdated a lot of labels that I previously renamed. I shouldn't have removed the "Fill" in them when I renamed PC/Pockets to PC/Bag.. --- src/debug.c | 159 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 105 insertions(+), 54 deletions(-) diff --git a/src/debug.c b/src/debug.c index 4c611dab288c..257ca564e484 100644 --- a/src/debug.c +++ b/src/debug.c @@ -100,19 +100,24 @@ enum UtilDebugMenu enum GivePCBagDebugMenu { - DEBUG_PCBAG_MENU_ITEM_PC_BOXES_FAST, - DEBUG_PCBAG_MENU_ITEM_PC_BOXES_SLOW, - DEBUG_PCBAG_MENU_ITEM_PC_ITEMS, - DEBUG_PCBAG_MENU_ITEM_POCKET_ITEMS, - DEBUG_PCBAG_MENU_ITEM_POCKET_BALLS, - DEBUG_PCBAG_MENU_ITEM_POCKET_TMHM, - DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES, - DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS, + DEBUG_PCBAG_MENU_ITEM_FILL, DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG, DEBUG_PCBAG_MENU_ITEM_ACCESS_PC, DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES, }; +enum GivePCBagFillDebugMenu +{ + DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_FAST, + DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_SLOW, + DEBUG_PCBAG_MENU_ITEM_FILL_PC_ITEMS, + DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_ITEMS, + DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BALLS, + DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_TMHM, + DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BERRIES, + DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_KEY_ITEMS, +}; + enum PartyDebugMenu { DEBUG_PARTY_MENU_ITEM_MOVE_REMINDER, @@ -328,6 +333,7 @@ static void DebugAction_OpenSoundMenu(u8 taskId); static void DebugTask_HandleMenuInput_Main(u8 taskId); static void DebugTask_HandleMenuInput_Utilities(u8 taskId); static void DebugTask_HandleMenuInput_PCBag(u8 taskId); +static void DebugTask_HandleMenuInput_PCBag_Fill(u8 taskId); static void DebugTask_HandleMenuInput_Party(u8 taskId); static void DebugTask_HandleMenuInput_Scripts(u8 taskId); static void DebugTask_HandleMenuInput_FlagsVars(u8 taskId); @@ -353,14 +359,15 @@ static void DebugAction_Util_Player_Id(u8 taskId); static void DebugAction_Util_CheatStart(u8 taskId); static void DebugAction_Util_ExpansionVersion(u8 taskId); -static void DebugAction_PCBag_PCBoxes_Fast(u8 taskId); -static void DebugAction_PCBag_PCBoxes_Slow(u8 taskId); -static void DebugAction_PCBag_PCItemStorage(u8 taskId); -static void DebugAction_PCBag_PocketItems(u8 taskId); -static void DebugAction_PCBag_PocketPokeBalls(u8 taskId); -static void DebugAction_PCBag_PocketTMHM(u8 taskId); -static void DebugAction_PCBag_PocketBerries(u8 taskId); -static void DebugAction_PCBag_PocketKeyItems(u8 taskId); +static void DebugAction_OpenPCBagFillMenu(u8 taskId); +static void DebugAction_PCBag_Fill_PCBoxes_Fast(u8 taskId); +static void DebugAction_PCBag_Fill_PCBoxes_Slow(u8 taskId); +static void DebugAction_PCBag_Fill_PCItemStorage(u8 taskId); +static void DebugAction_PCBag_Fill_PocketItems(u8 taskId); +static void DebugAction_PCBag_Fill_PocketPokeBalls(u8 taskId); +static void DebugAction_PCBag_Fill_PocketTMHM(u8 taskId); +static void DebugAction_PCBag_Fill_PocketBerries(u8 taskId); +static void DebugAction_PCBag_Fill_PocketKeyItems(u8 taskId); static void DebugAction_PCBag_ClearBag(u8 taskId); static void DebugAction_PCBag_AccessPC(u8 taskId); static void DebugAction_PCBag_ClearBoxes(u8 taskId); @@ -496,14 +503,15 @@ static const u8 sDebugText_Util_Player_Id[] = _("New Trainer ID") static const u8 sDebugText_Util_CheatStart[] = _("Cheat start"); static const u8 sDebugText_Util_ExpansionVersion[] = _("Expansion Version"); // PC/Bag Menu -static const u8 sDebugText_PCBag_Pc_Fast[] = _("Fill PC Boxes Fast"); -static const u8 sDebugText_PCBag_Pc_Slow[] = _("Fill PC Boxes Slow (LAG!)"); -static const u8 sDebugText_PCBag_Pc_Items[] = _("Fill PC Items"); -static const u8 sDebugText_PCBag_PocketItems[] = _("Fill Pocket Items"); -static const u8 sDebugText_PCBag_PocketPokeBalls[] = _("Fill Pocket Poké Balls"); -static const u8 sDebugText_PCBag_PocketTMHM[] = _("Fill Pocket TMHM"); -static const u8 sDebugText_PCBag_PocketBerries[] = _("Fill Pocket Berries"); -static const u8 sDebugText_PCBag_PocketKeyItems[] = _("Fill Pocket Key Items"); +static const u8 sDebugText_PCBag_Fill[] = _("Fill…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_PCBag_Fill_Pc_Fast[] = _("Fill PC Boxes Fast"); +static const u8 sDebugText_PCBag_Fill_Pc_Slow[] = _("Fill PC Boxes Slow (LAG!)"); +static const u8 sDebugText_PCBag_Fill_Pc_Items[] = _("Fill PC Items"); +static const u8 sDebugText_PCBag_Fill_PocketItems[] = _("Fill Pocket Items"); +static const u8 sDebugText_PCBag_Fill_PocketPokeBalls[] = _("Fill Pocket Poké Balls"); +static const u8 sDebugText_PCBag_Fill_PocketTMHM[] = _("Fill Pocket TMHM"); +static const u8 sDebugText_PCBag_Fill_PocketBerries[] = _("Fill Pocket Berries"); +static const u8 sDebugText_PCBag_Fill_PocketKeyItems[] = _("Fill Pocket Key Items"); static const u8 sDebugText_PCBag_ClearBag[] = _("Clear Bag"); static const u8 sDebugText_PCBag_AccessPC[] = _("Access PC"); static const u8 sDebugText_PCBag_ClearBoxes[] = _("Clear Storage Boxes"); @@ -677,17 +685,22 @@ static const struct ListMenuItem sDebugMenu_Items_Utilities[] = static const struct ListMenuItem sDebugMenu_Items_PCBag[] = { - [DEBUG_PCBAG_MENU_ITEM_PC_BOXES_FAST] = {sDebugText_PCBag_Pc_Fast, DEBUG_PCBAG_MENU_ITEM_PC_BOXES_FAST}, - [DEBUG_PCBAG_MENU_ITEM_PC_BOXES_SLOW] = {sDebugText_PCBag_Pc_Slow, DEBUG_PCBAG_MENU_ITEM_PC_BOXES_SLOW}, - [DEBUG_PCBAG_MENU_ITEM_PC_ITEMS] = {sDebugText_PCBag_Pc_Items , DEBUG_PCBAG_MENU_ITEM_PC_ITEMS}, - [DEBUG_PCBAG_MENU_ITEM_POCKET_ITEMS] = {sDebugText_PCBag_PocketItems, DEBUG_PCBAG_MENU_ITEM_POCKET_ITEMS}, - [DEBUG_PCBAG_MENU_ITEM_POCKET_BALLS] = {sDebugText_PCBag_PocketPokeBalls, DEBUG_PCBAG_MENU_ITEM_POCKET_BALLS}, - [DEBUG_PCBAG_MENU_ITEM_POCKET_TMHM] = {sDebugText_PCBag_PocketTMHM, DEBUG_PCBAG_MENU_ITEM_POCKET_TMHM}, - [DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES] = {sDebugText_PCBag_PocketBerries, DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES}, - [DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS] = {sDebugText_PCBag_PocketKeyItems, DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS}, - [DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = {sDebugText_PCBag_ClearBag, DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG}, - [DEBUG_PCBAG_MENU_ITEM_ACCESS_PC] = {sDebugText_PCBag_AccessPC, DEBUG_PCBAG_MENU_ITEM_ACCESS_PC}, - [DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES] = {sDebugText_PCBag_ClearBoxes, DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES}, + [DEBUG_PCBAG_MENU_ITEM_FILL] = {sDebugText_PCBag_Fill, DEBUG_PCBAG_MENU_ITEM_FILL}, + [DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = {sDebugText_PCBag_ClearBag, DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG}, + [DEBUG_PCBAG_MENU_ITEM_ACCESS_PC] = {sDebugText_PCBag_AccessPC, DEBUG_PCBAG_MENU_ITEM_ACCESS_PC}, + [DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES] = {sDebugText_PCBag_ClearBoxes, DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES}, +}; + +static const struct ListMenuItem sDebugMenu_Items_PCBag_Fill[] = +{ + [DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_FAST] = {sDebugText_PCBag_Fill_Pc_Fast, DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_FAST}, + [DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_SLOW] = {sDebugText_PCBag_Fill_Pc_Slow, DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_SLOW}, + [DEBUG_PCBAG_MENU_ITEM_FILL_PC_ITEMS] = {sDebugText_PCBag_Fill_Pc_Items , DEBUG_PCBAG_MENU_ITEM_FILL_PC_ITEMS}, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_ITEMS] = {sDebugText_PCBag_Fill_PocketItems, DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_ITEMS}, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BALLS] = {sDebugText_PCBag_Fill_PocketPokeBalls, DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BALLS}, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_TMHM] = {sDebugText_PCBag_Fill_PocketTMHM, DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_TMHM}, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BERRIES] = {sDebugText_PCBag_Fill_PocketBerries, DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BERRIES}, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_KEY_ITEMS] = {sDebugText_PCBag_Fill_PocketKeyItems, DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_KEY_ITEMS}, }; static const struct ListMenuItem sDebugMenu_Items_Party[] = @@ -829,17 +842,22 @@ static void (*const sDebugMenu_Actions_Utilities[])(u8) = static void (*const sDebugMenu_Actions_PCBag[])(u8) = { - [DEBUG_PCBAG_MENU_ITEM_PC_BOXES_FAST] = DebugAction_PCBag_PCBoxes_Fast, - [DEBUG_PCBAG_MENU_ITEM_PC_BOXES_SLOW] = DebugAction_PCBag_PCBoxes_Slow, - [DEBUG_PCBAG_MENU_ITEM_PC_ITEMS] = DebugAction_PCBag_PCItemStorage, - [DEBUG_PCBAG_MENU_ITEM_POCKET_ITEMS] = DebugAction_PCBag_PocketItems, - [DEBUG_PCBAG_MENU_ITEM_POCKET_BALLS] = DebugAction_PCBag_PocketPokeBalls, - [DEBUG_PCBAG_MENU_ITEM_POCKET_TMHM] = DebugAction_PCBag_PocketTMHM, - [DEBUG_PCBAG_MENU_ITEM_POCKET_BERRIES] = DebugAction_PCBag_PocketBerries, - [DEBUG_PCBAG_MENU_ITEM_POCKET_KEY_ITEMS] = DebugAction_PCBag_PocketKeyItems, - [DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = DebugAction_PCBag_ClearBag, - [DEBUG_PCBAG_MENU_ITEM_ACCESS_PC] = DebugAction_PCBag_AccessPC, - [DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES] = DebugAction_PCBag_ClearBoxes, + [DEBUG_PCBAG_MENU_ITEM_FILL] = DebugAction_OpenPCBagFillMenu, + [DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = DebugAction_PCBag_ClearBag, + [DEBUG_PCBAG_MENU_ITEM_ACCESS_PC] = DebugAction_PCBag_AccessPC, + [DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES] = DebugAction_PCBag_ClearBoxes, +}; + +static void (*const sDebugMenu_Actions_PCBag_Fill[])(u8) = +{ + [DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_FAST] = DebugAction_PCBag_Fill_PCBoxes_Fast, + [DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_SLOW] = DebugAction_PCBag_Fill_PCBoxes_Slow, + [DEBUG_PCBAG_MENU_ITEM_FILL_PC_ITEMS] = DebugAction_PCBag_Fill_PCItemStorage, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_ITEMS] = DebugAction_PCBag_Fill_PocketItems, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BALLS] = DebugAction_PCBag_Fill_PocketPokeBalls, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_TMHM] = DebugAction_PCBag_Fill_PocketTMHM, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BERRIES] = DebugAction_PCBag_Fill_PocketBerries, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_KEY_ITEMS] = DebugAction_PCBag_Fill_PocketKeyItems, }; static void (*const sDebugMenu_Actions_Party[])(u8) = @@ -980,6 +998,13 @@ static const struct ListMenuTemplate sDebugMenu_ListTemplate_PCBag = .totalItems = ARRAY_COUNT(sDebugMenu_Items_PCBag), }; +static const struct ListMenuTemplate sDebugMenu_ListTemplate_PCBag_Fill = +{ + .items = sDebugMenu_Items_PCBag_Fill, + .moveCursorFunc = ListMenuDefaultCursorMoveFunc, + .totalItems = ARRAY_COUNT(sDebugMenu_Items_PCBag_Fill), +}; + static const struct ListMenuTemplate sDebugMenu_ListTemplate_Party = { .items = sDebugMenu_Items_Party, @@ -1427,6 +1452,25 @@ static void DebugTask_HandleMenuInput_PCBag(u8 taskId) } } +static void DebugTask_HandleMenuInput_PCBag_Fill(u8 taskId) +{ + void (*func)(u8); + u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuTaskId); + + if (JOY_NEW(A_BUTTON)) + { + PlaySE(SE_SELECT); + if ((func = sDebugMenu_Actions_PCBag_Fill[input]) != NULL) + func(taskId); + } + else if (JOY_NEW(B_BUTTON)) + { + PlaySE(SE_SELECT); + Debug_DestroyMenu(taskId); + Debug_ReShowMainMenu(); + } +} + static void DebugTask_HandleMenuInput_Party(u8 taskId) { void (*func)(u8); @@ -3930,7 +3974,14 @@ static void DebugAction_Give_DayCareEgg(u8 taskId) // ******************************* // Actions PCBag -static void DebugAction_PCBag_PCBoxes_Fast(u8 taskId) //Credit: Sierraffinity + +static void DebugAction_OpenPCBagFillMenu(u8 taskId) +{ + Debug_DestroyMenu(taskId); + Debug_ShowMenu(DebugTask_HandleMenuInput_PCBag_Fill, sDebugMenu_ListTemplate_PCBag_Fill); +} + +static void DebugAction_PCBag_Fill_PCBoxes_Fast(u8 taskId) //Credit: Sierraffinity { int boxId, boxPosition; u32 personality; @@ -3963,7 +4014,7 @@ static void DebugAction_PCBag_PCBoxes_Fast(u8 taskId) //Credit: Sierraffinity ScriptContext_Enable(); } -static void DebugAction_PCBag_PCBoxes_Slow(u8 taskId) +static void DebugAction_PCBag_Fill_PCBoxes_Slow(u8 taskId) { int boxId, boxPosition; struct BoxPokemon boxMon; @@ -3994,7 +4045,7 @@ static void DebugAction_PCBag_PCBoxes_Slow(u8 taskId) Debug_DestroyMenu_Full_Script(taskId, Debug_BoxFilledMessage); } -static void DebugAction_PCBag_PCItemStorage(u8 taskId) +static void DebugAction_PCBag_Fill_PCItemStorage(u8 taskId) { u16 itemId; @@ -4005,7 +4056,7 @@ static void DebugAction_PCBag_PCItemStorage(u8 taskId) } } -static void DebugAction_PCBag_PocketItems(u8 taskId) +static void DebugAction_PCBag_Fill_PocketItems(u8 taskId) { u16 itemId; @@ -4016,7 +4067,7 @@ static void DebugAction_PCBag_PocketItems(u8 taskId) } } -static void DebugAction_PCBag_PocketPokeBalls(u8 taskId) +static void DebugAction_PCBag_Fill_PocketPokeBalls(u8 taskId) { u16 itemId; @@ -4027,7 +4078,7 @@ static void DebugAction_PCBag_PocketPokeBalls(u8 taskId) } } -static void DebugAction_PCBag_PocketTMHM(u8 taskId) +static void DebugAction_PCBag_Fill_PocketTMHM(u8 taskId) { u16 itemId; @@ -4038,7 +4089,7 @@ static void DebugAction_PCBag_PocketTMHM(u8 taskId) } } -static void DebugAction_PCBag_PocketBerries(u8 taskId) +static void DebugAction_PCBag_Fill_PocketBerries(u8 taskId) { u16 itemId; @@ -4049,7 +4100,7 @@ static void DebugAction_PCBag_PocketBerries(u8 taskId) } } -static void DebugAction_PCBag_PocketKeyItems(u8 taskId) +static void DebugAction_PCBag_Fill_PocketKeyItems(u8 taskId) { u16 itemId; From 7b87e225cd7e17ce54a63d1ed05eb2dab1309880 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 4 Jan 2024 21:25:18 -0300 Subject: [PATCH 08/11] Fixed alignment in sDebugMenu_Items_Utilities --- src/debug.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/debug.c b/src/debug.c index 257ca564e484..a9940f9e745e 100644 --- a/src/debug.c +++ b/src/debug.c @@ -668,19 +668,19 @@ static const struct ListMenuItem sDebugMenu_Items_Main[] = static const struct ListMenuItem sDebugMenu_Items_Utilities[] = { - [DEBUG_UTIL_MENU_ITEM_FLY] = {sDebugText_Util_FlyToMap, DEBUG_UTIL_MENU_ITEM_FLY}, - [DEBUG_UTIL_MENU_ITEM_WARP] = {sDebugText_Util_WarpToMap, DEBUG_UTIL_MENU_ITEM_WARP}, - [DEBUG_UTIL_MENU_ITEM_SAVEBLOCK] = {sDebugText_Util_SaveBlockSpace, DEBUG_UTIL_MENU_ITEM_SAVEBLOCK}, - [DEBUG_UTIL_MENU_ITEM_ROM_SPACE] = {sDebugText_Util_ROMSpace, DEBUG_UTIL_MENU_ITEM_ROM_SPACE}, - [DEBUG_UTIL_MENU_ITEM_WEATHER] = {sDebugText_Util_Weather, DEBUG_UTIL_MENU_ITEM_WEATHER}, - [DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK] = {sDebugText_Util_CheckWallClock, DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK}, - [DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK] = {sDebugText_Util_SetWallClock, DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK}, - [DEBUG_UTIL_MENU_ITEM_WATCHCREDITS] = {sDebugText_Util_WatchCredits, DEBUG_UTIL_MENU_ITEM_WATCHCREDITS}, - [DEBUG_UTIL_MENU_ITEM_PLAYER_NAME] = {sDebugText_Util_Player_Name, DEBUG_UTIL_MENU_ITEM_PLAYER_NAME}, - [DEBUG_UTIL_MENU_ITEM_PLAYER_GENDER] = {sDebugText_Util_Player_Gender, DEBUG_UTIL_MENU_ITEM_PLAYER_GENDER}, - [DEBUG_UTIL_MENU_ITEM_PLAYER_ID] = {sDebugText_Util_Player_Id, DEBUG_UTIL_MENU_ITEM_PLAYER_ID}, - [DEBUG_UTIL_MENU_ITEM_CHEAT] = {sDebugText_Util_CheatStart, DEBUG_UTIL_MENU_ITEM_CHEAT}, - [DEBUG_UTIL_MENU_ITEM_EXPANSION_VER] = {sDebugText_Util_ExpansionVersion,DEBUG_UTIL_MENU_ITEM_EXPANSION_VER}, + [DEBUG_UTIL_MENU_ITEM_FLY] = {sDebugText_Util_FlyToMap, DEBUG_UTIL_MENU_ITEM_FLY}, + [DEBUG_UTIL_MENU_ITEM_WARP] = {sDebugText_Util_WarpToMap, DEBUG_UTIL_MENU_ITEM_WARP}, + [DEBUG_UTIL_MENU_ITEM_SAVEBLOCK] = {sDebugText_Util_SaveBlockSpace, DEBUG_UTIL_MENU_ITEM_SAVEBLOCK}, + [DEBUG_UTIL_MENU_ITEM_ROM_SPACE] = {sDebugText_Util_ROMSpace, DEBUG_UTIL_MENU_ITEM_ROM_SPACE}, + [DEBUG_UTIL_MENU_ITEM_WEATHER] = {sDebugText_Util_Weather, DEBUG_UTIL_MENU_ITEM_WEATHER}, + [DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK] = {sDebugText_Util_CheckWallClock, DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK}, + [DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK] = {sDebugText_Util_SetWallClock, DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK}, + [DEBUG_UTIL_MENU_ITEM_WATCHCREDITS] = {sDebugText_Util_WatchCredits, DEBUG_UTIL_MENU_ITEM_WATCHCREDITS}, + [DEBUG_UTIL_MENU_ITEM_PLAYER_NAME] = {sDebugText_Util_Player_Name, DEBUG_UTIL_MENU_ITEM_PLAYER_NAME}, + [DEBUG_UTIL_MENU_ITEM_PLAYER_GENDER] = {sDebugText_Util_Player_Gender, DEBUG_UTIL_MENU_ITEM_PLAYER_GENDER}, + [DEBUG_UTIL_MENU_ITEM_PLAYER_ID] = {sDebugText_Util_Player_Id, DEBUG_UTIL_MENU_ITEM_PLAYER_ID}, + [DEBUG_UTIL_MENU_ITEM_CHEAT] = {sDebugText_Util_CheatStart, DEBUG_UTIL_MENU_ITEM_CHEAT}, + [DEBUG_UTIL_MENU_ITEM_EXPANSION_VER] = {sDebugText_Util_ExpansionVersion, DEBUG_UTIL_MENU_ITEM_EXPANSION_VER}, }; static const struct ListMenuItem sDebugMenu_Items_PCBag[] = From 668e6c16db3f17bfbe0312c36a4b1cedf77f43bf Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 5 Jan 2024 06:57:50 -0300 Subject: [PATCH 09/11] Shuffled the positions of the debug menu's 'Access PC' and 'Clear Bag' --- src/debug.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/debug.c b/src/debug.c index a9940f9e745e..af41ef3ad6c3 100644 --- a/src/debug.c +++ b/src/debug.c @@ -101,8 +101,8 @@ enum UtilDebugMenu enum GivePCBagDebugMenu { DEBUG_PCBAG_MENU_ITEM_FILL, - DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG, DEBUG_PCBAG_MENU_ITEM_ACCESS_PC, + DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG, DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES, }; @@ -368,8 +368,8 @@ static void DebugAction_PCBag_Fill_PocketPokeBalls(u8 taskId); static void DebugAction_PCBag_Fill_PocketTMHM(u8 taskId); static void DebugAction_PCBag_Fill_PocketBerries(u8 taskId); static void DebugAction_PCBag_Fill_PocketKeyItems(u8 taskId); -static void DebugAction_PCBag_ClearBag(u8 taskId); static void DebugAction_PCBag_AccessPC(u8 taskId); +static void DebugAction_PCBag_ClearBag(u8 taskId); static void DebugAction_PCBag_ClearBoxes(u8 taskId); static void DebugAction_Party_MoveReminder(u8 taskId); @@ -512,8 +512,8 @@ static const u8 sDebugText_PCBag_Fill_PocketPokeBalls[] = _("Fill Pocket Pok static const u8 sDebugText_PCBag_Fill_PocketTMHM[] = _("Fill Pocket TMHM"); static const u8 sDebugText_PCBag_Fill_PocketBerries[] = _("Fill Pocket Berries"); static const u8 sDebugText_PCBag_Fill_PocketKeyItems[] = _("Fill Pocket Key Items"); -static const u8 sDebugText_PCBag_ClearBag[] = _("Clear Bag"); static const u8 sDebugText_PCBag_AccessPC[] = _("Access PC"); +static const u8 sDebugText_PCBag_ClearBag[] = _("Clear Bag"); static const u8 sDebugText_PCBag_ClearBoxes[] = _("Clear Storage Boxes"); // Party/Boxes Menu static const u8 sDebugText_Party_MoveReminder[] = _("Move Reminder"); @@ -686,8 +686,8 @@ static const struct ListMenuItem sDebugMenu_Items_Utilities[] = static const struct ListMenuItem sDebugMenu_Items_PCBag[] = { [DEBUG_PCBAG_MENU_ITEM_FILL] = {sDebugText_PCBag_Fill, DEBUG_PCBAG_MENU_ITEM_FILL}, - [DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = {sDebugText_PCBag_ClearBag, DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG}, [DEBUG_PCBAG_MENU_ITEM_ACCESS_PC] = {sDebugText_PCBag_AccessPC, DEBUG_PCBAG_MENU_ITEM_ACCESS_PC}, + [DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = {sDebugText_PCBag_ClearBag, DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG}, [DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES] = {sDebugText_PCBag_ClearBoxes, DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES}, }; @@ -843,8 +843,8 @@ static void (*const sDebugMenu_Actions_Utilities[])(u8) = static void (*const sDebugMenu_Actions_PCBag[])(u8) = { [DEBUG_PCBAG_MENU_ITEM_FILL] = DebugAction_OpenPCBagFillMenu, - [DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = DebugAction_PCBag_ClearBag, [DEBUG_PCBAG_MENU_ITEM_ACCESS_PC] = DebugAction_PCBag_AccessPC, + [DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = DebugAction_PCBag_ClearBag, [DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES] = DebugAction_PCBag_ClearBoxes, }; @@ -4111,15 +4111,15 @@ static void DebugAction_PCBag_Fill_PocketKeyItems(u8 taskId) } } -static void DebugAction_PCBag_ClearBag(u8 taskId) +static void DebugAction_PCBag_AccessPC(u8 taskId) { - PlaySE(MUS_LEVEL_UP); - ClearBag(); + Debug_DestroyMenu_Full_Script(taskId, EventScript_PC); } -static void DebugAction_PCBag_AccessPC(u8 taskId) +static void DebugAction_PCBag_ClearBag(u8 taskId) { - Debug_DestroyMenu_Full_Script(taskId, EventScript_PC); + PlaySE(MUS_LEVEL_UP); + ClearBag(); } static void DebugAction_PCBag_ClearBoxes(u8 taskId) From be8f49f1c77615c430c36027cf5d67f9a4a1cd52 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 5 Jan 2024 07:34:14 -0300 Subject: [PATCH 10/11] Made the B button take you back to PC/Bag from Fill, instead of taking you to the main debug menu --- src/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/debug.c b/src/debug.c index af41ef3ad6c3..7bee60a66e04 100644 --- a/src/debug.c +++ b/src/debug.c @@ -1467,7 +1467,7 @@ static void DebugTask_HandleMenuInput_PCBag_Fill(u8 taskId) { PlaySE(SE_SELECT); Debug_DestroyMenu(taskId); - Debug_ReShowMainMenu(); + Debug_ShowMenu(DebugTask_HandleMenuInput_PCBag, sDebugMenu_ListTemplate_PCBag); } } From 0a9eaaec35088b1b4f760aee44e393bda91be444 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 5 Jan 2024 11:36:59 -0300 Subject: [PATCH 11/11] Updated alignment in sDebugMenu_Items_Utilities again --- src/debug.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/debug.c b/src/debug.c index 9e4a70a7d1e1..023b0323847d 100644 --- a/src/debug.c +++ b/src/debug.c @@ -697,19 +697,19 @@ static const struct ListMenuItem sDebugMenu_Items_Main[] = static const struct ListMenuItem sDebugMenu_Items_Utilities[] = { - [DEBUG_UTIL_MENU_ITEM_FLY] = {sDebugText_Util_FlyToMap, DEBUG_UTIL_MENU_ITEM_FLY}, - [DEBUG_UTIL_MENU_ITEM_WARP] = {sDebugText_Util_WarpToMap, DEBUG_UTIL_MENU_ITEM_WARP}, - [DEBUG_UTIL_MENU_ITEM_SAVEBLOCK] = {sDebugText_Util_SaveBlockSpace, DEBUG_UTIL_MENU_ITEM_SAVEBLOCK}, - [DEBUG_UTIL_MENU_ITEM_ROM_SPACE] = {sDebugText_Util_ROMSpace, DEBUG_UTIL_MENU_ITEM_ROM_SPACE}, - [DEBUG_UTIL_MENU_ITEM_WEATHER] = {sDebugText_Util_Weather, DEBUG_UTIL_MENU_ITEM_WEATHER}, - [DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK] = {sDebugText_Util_CheckWallClock, DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK}, - [DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK] = {sDebugText_Util_SetWallClock, DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK}, - [DEBUG_UTIL_MENU_ITEM_WATCHCREDITS] = {sDebugText_Util_WatchCredits, DEBUG_UTIL_MENU_ITEM_WATCHCREDITS}, - [DEBUG_UTIL_MENU_ITEM_PLAYER_NAME] = {sDebugText_Util_Player_Name, DEBUG_UTIL_MENU_ITEM_PLAYER_NAME}, - [DEBUG_UTIL_MENU_ITEM_PLAYER_GENDER] = {sDebugText_Util_Player_Gender, DEBUG_UTIL_MENU_ITEM_PLAYER_GENDER}, - [DEBUG_UTIL_MENU_ITEM_PLAYER_ID] = {sDebugText_Util_Player_Id, DEBUG_UTIL_MENU_ITEM_PLAYER_ID}, - [DEBUG_UTIL_MENU_ITEM_CHEAT] = {sDebugText_Util_CheatStart, DEBUG_UTIL_MENU_ITEM_CHEAT}, - [DEBUG_UTIL_MENU_ITEM_EXPANSION_VER] = {sDebugText_Util_ExpansionVersion, DEBUG_UTIL_MENU_ITEM_EXPANSION_VER}, + [DEBUG_UTIL_MENU_ITEM_FLY] = {sDebugText_Util_FlyToMap, DEBUG_UTIL_MENU_ITEM_FLY}, + [DEBUG_UTIL_MENU_ITEM_WARP] = {sDebugText_Util_WarpToMap, DEBUG_UTIL_MENU_ITEM_WARP}, + [DEBUG_UTIL_MENU_ITEM_SAVEBLOCK] = {sDebugText_Util_SaveBlockSpace, DEBUG_UTIL_MENU_ITEM_SAVEBLOCK}, + [DEBUG_UTIL_MENU_ITEM_ROM_SPACE] = {sDebugText_Util_ROMSpace, DEBUG_UTIL_MENU_ITEM_ROM_SPACE}, + [DEBUG_UTIL_MENU_ITEM_WEATHER] = {sDebugText_Util_Weather, DEBUG_UTIL_MENU_ITEM_WEATHER}, + [DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK] = {sDebugText_Util_CheckWallClock, DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK}, + [DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK] = {sDebugText_Util_SetWallClock, DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK}, + [DEBUG_UTIL_MENU_ITEM_WATCHCREDITS] = {sDebugText_Util_WatchCredits, DEBUG_UTIL_MENU_ITEM_WATCHCREDITS}, + [DEBUG_UTIL_MENU_ITEM_PLAYER_NAME] = {sDebugText_Util_Player_Name, DEBUG_UTIL_MENU_ITEM_PLAYER_NAME}, + [DEBUG_UTIL_MENU_ITEM_PLAYER_GENDER] = {sDebugText_Util_Player_Gender, DEBUG_UTIL_MENU_ITEM_PLAYER_GENDER}, + [DEBUG_UTIL_MENU_ITEM_PLAYER_ID] = {sDebugText_Util_Player_Id, DEBUG_UTIL_MENU_ITEM_PLAYER_ID}, + [DEBUG_UTIL_MENU_ITEM_CHEAT] = {sDebugText_Util_CheatStart, DEBUG_UTIL_MENU_ITEM_CHEAT}, + [DEBUG_UTIL_MENU_ITEM_EXPANSION_VER] = {sDebugText_Util_ExpansionVersion, DEBUG_UTIL_MENU_ITEM_EXPANSION_VER}, [DEBUG_UTIL_MENU_ITEM_BERRY_FUNCTIONS] = {sDebugText_Util_BerryFunctions, DEBUG_UTIL_MENU_ITEM_BERRY_FUNCTIONS}, };