atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debug menu tweaks (#4025)

Browse source 
* Moved Access PC to the first option of the PC/Bag debug submenu

* Prevent item give music from cutting off by having a shorter jingle

* Removed redundant "Give all TMs" option

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
This commit is contained in:
Eduardo Quezada D'Ottone 2024-01-19 17:06:21 -03:00 committed by GitHub
parent 89a632cfa4
commit 6857497f60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/debug.c
View file

@ -103,8 +103,8 @@ enum UtilDebugMenu
enum GivePCBagDebugMenu
{
DEBUG_PCBAG_MENU_ITEM_FILL,
DEBUG_PCBAG_MENU_ITEM_ACCESS_PC,
DEBUG_PCBAG_MENU_ITEM_FILL,
DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG,
DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES,
};
@ -211,7 +211,6 @@ enum BattleTerrain
enum GiveDebugMenu
{
DEBUG_GIVE_MENU_ITEM_ITEM_X,
DEBUG_GIVE_MENU_ITEM_ALLTMS,
DEBUG_GIVE_MENU_ITEM_POKEMON_SIMPLE,
DEBUG_GIVE_MENU_ITEM_POKEMON_COMPLEX,
DEBUG_GIVE_MENU_ITEM_MAX_MONEY,
@ -417,7 +416,6 @@ static void Debug_InitializeBattle(u8 taskId);
static void DebugAction_Give_Item(u8 taskId);
static void DebugAction_Give_Item_SelectId(u8 taskId);
static void DebugAction_Give_Item_SelectQuantity(u8 taskId);
static void DebugAction_Give_AllTMs(u8 taskId);
static void DebugAction_Give_PokemonSimple(u8 taskId);
static void DebugAction_Give_PokemonComplex(u8 taskId);
static void DebugAction_Give_Pokemon_SelectId(u8 taskId);
@ -604,7 +602,6 @@ static const u8 sDebugText_Battle_2_Terrain_9[] = _("Plain…{CLEAR_TO 110}{RI
static const u8 sDebugText_Give_GiveItem[] = _("Give item XYZ…{CLEAR_TO 110}{RIGHT_ARROW}");
static const u8 sDebugText_ItemQuantity[] = _("Quantity:{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n\n{STR_VAR_2}");
static const u8 sDebugText_ItemID[] = _("Item ID: {STR_VAR_3}\n{STR_VAR_1}{CLEAR_TO 90}\n\n{STR_VAR_2}");
static const u8 sDebugText_Give_AllTMs[] = _("Give all TMs");
static const u8 sDebugText_Give_GivePokemonSimple[] = _("Pokémon (Basic){CLEAR_TO 110}{RIGHT_ARROW}");
static const u8 sDebugText_Give_GivePokemonComplex[] = _("Pokémon (Complex){CLEAR_TO 110}{RIGHT_ARROW}");
static const u8 sDebugText_PokemonID[] = _("Species: {STR_VAR_3}\n{STR_VAR_1}{CLEAR_TO 90}\n\n{STR_VAR_2}{CLEAR_TO 90}");
@ -715,8 +712,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_ACCESS_PC] = {sDebugText_PCBag_AccessPC, DEBUG_PCBAG_MENU_ITEM_ACCESS_PC},
[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_CLEAR_BOXES] = {sDebugText_PCBag_ClearBoxes, DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES},
};
@ -823,7 +820,6 @@ static const struct ListMenuItem sDebugMenu_Items_Battle_2[] =
static const struct ListMenuItem sDebugMenu_Items_Give[] =
{
[DEBUG_GIVE_MENU_ITEM_ITEM_X] = {sDebugText_Give_GiveItem, DEBUG_GIVE_MENU_ITEM_ITEM_X},
[DEBUG_GIVE_MENU_ITEM_ALLTMS] = {sDebugText_Give_AllTMs, DEBUG_GIVE_MENU_ITEM_ALLTMS},
[DEBUG_GIVE_MENU_ITEM_POKEMON_SIMPLE] = {sDebugText_Give_GivePokemonSimple, DEBUG_GIVE_MENU_ITEM_POKEMON_SIMPLE},
[DEBUG_GIVE_MENU_ITEM_POKEMON_COMPLEX] = {sDebugText_Give_GivePokemonComplex, DEBUG_GIVE_MENU_ITEM_POKEMON_COMPLEX},
[DEBUG_GIVE_MENU_ITEM_MAX_MONEY] = {sDebugText_Give_MaxMoney, DEBUG_GIVE_MENU_ITEM_MAX_MONEY},
@ -882,8 +878,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_ACCESS_PC] = DebugAction_PCBag_AccessPC,
[DEBUG_PCBAG_MENU_ITEM_FILL] = DebugAction_OpenPCBagFillMenu,
[DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = DebugAction_PCBag_ClearBag,
[DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES] = DebugAction_PCBag_ClearBoxes,
};
@ -943,7 +939,6 @@ static void (*const sDebugMenu_Actions_Flags[])(u8) =
static void (*const sDebugMenu_Actions_Give[])(u8) =
{
[DEBUG_GIVE_MENU_ITEM_ITEM_X] = DebugAction_Give_Item,
[DEBUG_GIVE_MENU_ITEM_ALLTMS] = DebugAction_Give_AllTMs,
[DEBUG_GIVE_MENU_ITEM_POKEMON_SIMPLE] = DebugAction_Give_PokemonSimple,
[DEBUG_GIVE_MENU_ITEM_POKEMON_COMPLEX] = DebugAction_Give_PokemonComplex,
[DEBUG_GIVE_MENU_ITEM_MAX_MONEY] = DebugAction_Give_MaxMoney,
@ -3047,7 +3042,7 @@ static void DebugAction_Give_Item_SelectQuantity(u8 taskId)
FreeSpriteOamMatrix(&gSprites[gTasks[taskId].tSpriteId]); //Destroy item icon
DestroySprite(&gSprites[gTasks[taskId].tSpriteId]); //Destroy item icon
PlaySE(MUS_OBTAIN_ITEM);
PlaySE(MUS_LEVEL_UP);
AddBagItem(itemId, gTasks[taskId].tInput);
DebugAction_DestroyExtraWindow(taskId);
}
@ -3066,21 +3061,6 @@ static void DebugAction_Give_Item_SelectQuantity(u8 taskId)
#undef tItemId
#undef tSpriteId
//TMs
static void DebugAction_Give_AllTMs(u8 taskId)
{
u16 i;
PlayFanfare(MUS_OBTAIN_TMHM);
for (i = ITEM_TM01; i <= ITEM_HM08; i++)
{
if (ItemIdToBattleMoveId(i) != MOVE_NONE && !CheckBagHasItem(i, 1))
AddBagItem(i, 1);
}
Debug_DestroyMenu_Full(taskId);
ScriptContext_Enable();
}
//Pokemon
static void ResetMonDataStruct(struct DebugMonData *sDebugMonData)
{