Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add new actions to Debug Menu (#7837)

Browse Source
This commit is contained in:
FosterProgramming 2025-10-03 20:26:49 +02:00 committed by GitHub
parent 232503de4c
commit 730352683c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 138 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
data/scripts/debug.inc
View File

@ -396,7 +396,29 @@ Debug_EventScript_SetHiddenNature::
dynmultistack 0, 0, TRUE, 7, FALSE, 0, NULL
switch VAR_RESULT
case MULTI_B_PRESSED, Debug_EventScript_InflictStatus1_Close
special SetHiddenNature
special SetHiddenNature
releaseall
end
Debug_EventScript_SetAbility::
special ChoosePartyMon
waitstate
callnative DebugNative_GetAbilityNames
dynmultipush gStringVar1, 0
dynmultipush gStringVar2, 1
dynmultipush gStringVar3, 2
dynmultistack 0, 0, FALSE, 3 FALSE, 0, NULL
switch VAR_RESULT
case MULTI_B_PRESSED, Debug_EventScript_SetAbilityClose
special SetAbility
Debug_EventScript_SetAbilityClose:
releaseall
end
Debug_EventScript_SetFriendship::
special ChoosePartyMon
waitstate
callnative DebugNative_Party_SetFriendship
releaseall
end

1
data/specials.inc
View File

@ -564,3 +564,4 @@ gSpecials::
def_special EnterCode
def_special GetCodeFeedback
def_special SetHiddenNature
def_special SetAbility

3
include/debug.h
View File

@ -6,6 +6,9 @@ extern const u8 Debug_FlagsAndVarNotSetBattleConfigMessage[];
const u8 *GetWeatherName(u32 weatherId);
const struct Trainer* GetDebugAiTrainer(void);
void DebugNative_GetAbilityNames(void);
void DebugNative_Party_SetFriendship(void);
extern EWRAM_DATA bool8 gIsDebugBattle;
extern EWRAM_DATA u64 gDebugAIFlags;

110
src/debug.c
View File

@ -236,6 +236,8 @@ static void Debug_DestroyMenu(u8 taskId);
static void DebugAction_Cancel(u8 taskId);
static void DebugAction_DestroyExtraWindow(u8 taskId);
static void Debug_RefreshListMenu(u8 taskId);
static u8 DebugNativeStep_CreateDebugWindow(void);
static void DebugNativeStep_CloseDebugWindow(u8 taskId);
static void DebugAction_OpenSubMenu(u8 taskId, const struct DebugMenuOption *items);
static void DebugAction_OpenSubMenuFlagsVars(u8 taskId, const struct DebugMenuOption *items);
@ -348,6 +350,8 @@ extern const u8 Debug_EventScript_CheckEVs[];
extern const u8 Debug_EventScript_CheckIVs[];
extern const u8 Debug_EventScript_InflictStatus1[];
extern const u8 Debug_EventScript_SetHiddenNature[];
extern const u8 Debug_EventScript_SetAbility[];
extern const u8 Debug_EventScript_SetFriendship[];
extern const u8 Debug_EventScript_Script_1[];
extern const u8 Debug_EventScript_Script_2[];
extern const u8 Debug_EventScript_Script_3[];
@ -576,6 +580,8 @@ static const struct DebugMenuOption sDebugMenu_Actions_Party[] =
{ COMPOUND_STRING("Heal party"), DebugAction_Party_HealParty },
{ COMPOUND_STRING("Inflict Status1"), DebugAction_ExecuteScript, Debug_EventScript_InflictStatus1 },
{ COMPOUND_STRING("Set Hidden Nature"), DebugAction_ExecuteScript, Debug_EventScript_SetHiddenNature },
{ COMPOUND_STRING("Set Friendship"), DebugAction_ExecuteScript, Debug_EventScript_SetFriendship },
{ COMPOUND_STRING("Set Ability"), DebugAction_ExecuteScript, Debug_EventScript_SetAbility },
{ COMPOUND_STRING("Check EVs"), DebugAction_ExecuteScript, Debug_EventScript_CheckEVs },
{ COMPOUND_STRING("Check IVs"), DebugAction_ExecuteScript, Debug_EventScript_CheckIVs },
{ COMPOUND_STRING("Clear Party"), DebugAction_Party_ClearParty },
@ -939,6 +945,30 @@ static void DebugAction_DestroyExtraWindow(u8 taskId)
UnfreezeObjectEvents();
}
static u8 DebugNativeStep_CreateDebugWindow(void)
{
u8 windowId;
LockPlayerFieldControls();
FreezeObjectEvents();
HideMapNamePopUpWindow();
LoadMessageBoxAndBorderGfx();
windowId = AddWindow(&sDebugMenuWindowTemplateExtra);
DrawStdWindowFrame(windowId, FALSE);
CopyWindowToVram(windowId, COPYWIN_FULL);
return windowId;
}
static void DebugNativeStep_CloseDebugWindow(u8 taskId)
{
ClearStdWindowAndFrame(gTasks[taskId].tSubWindowId, TRUE);
RemoveWindow(gTasks[taskId].tSubWindowId);
DestroyTask(taskId);
UnfreezeObjectEvents();
UnlockPlayerFieldControls();
}
static const u16 sLocationFlags[] =
{
FLAG_VISITED_LITTLEROOT_TOWN,
@ -3390,11 +3420,6 @@ static void DebugAction_DestroyFollowerNPC(u8 taskId)
#undef tCurrentSong
#undef tMenuTaskId
#undef tWindowId
#undef tSubWindowId
#undef tInput
#undef tDigit
#define SOUND_LIST_BGM \
X(MUS_LITTLEROOT_TEST) \
@ -4018,6 +4043,81 @@ static void DebugAction_Party_HealParty(u8 taskId)
Debug_DestroyMenu_Full(taskId);
}
void DebugNative_GetAbilityNames(void)
{
u32 species = GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_SPECIES);
StringCopy(gStringVar1, gAbilitiesInfo[GetAbilityBySpecies(species, 0)].name);
StringCopy(gStringVar2, gAbilitiesInfo[GetAbilityBySpecies(species, 1)].name);
StringCopy(gStringVar3, gAbilitiesInfo[GetAbilityBySpecies(species, 2)].name);
}
#define tPartyId data[5]
#define tFriendship data[6]
static void Debug_Display_FriendshipInfo(s32 oldFriendship, s32 newFriendship, u32 digit, u8 windowId)
{
ConvertIntToDecimalStringN(gStringVar1, oldFriendship, STR_CONV_MODE_LEADING_ZEROS, 3);
ConvertIntToDecimalStringN(gStringVar2, newFriendship, STR_CONV_MODE_LEADING_ZEROS, 3);
StringCopy(gStringVar3, gText_DigitIndicator[digit]);
StringExpandPlaceholders(gStringVar4, COMPOUND_STRING("Friendship:\n{STR_VAR_1} {RIGHT_ARROW} {STR_VAR_2}\n\n{STR_VAR_3}"));
AddTextPrinterParameterized(windowId, DEBUG_MENU_FONT, gStringVar4, 0, 0, 0, NULL);
}
static void DebugNativeStep_Party_SetFriendshipSelect(u8 taskId)
{
if (JOY_NEW(A_BUTTON))
{
PlaySE(SE_SELECT);
gTasks[taskId].tFriendship = gTasks[taskId].tInput;
SetMonData(&gPlayerParty[gTasks[taskId].tPartyId], MON_DATA_FRIENDSHIP, &gTasks[taskId].tInput);
}
else if (JOY_NEW(B_BUTTON))
{
PlaySE(SE_SELECT);
DebugNativeStep_CloseDebugWindow(taskId);
return;
}
Debug_HandleInput_Numeric(taskId, 0, 255, 3);
if (JOY_NEW(DPAD_ANY) || JOY_NEW(A_BUTTON))
Debug_Display_FriendshipInfo(gTasks[taskId].tFriendship, gTasks[taskId].tInput, gTasks[taskId].tDigit, gTasks[taskId].tSubWindowId);
}
static void DebugNativeStep_Party_SetFriendshipMain(u8 taskId)
{
u8 windowId = DebugNativeStep_CreateDebugWindow();
u32 friendship = GetMonData(&gPlayerParty[gTasks[taskId].tPartyId], MON_DATA_FRIENDSHIP);
// Display initial flag
Debug_Display_FriendshipInfo(friendship, friendship, 0, windowId);
gTasks[taskId].func = DebugNativeStep_Party_SetFriendshipSelect;
gTasks[taskId].tSubWindowId = windowId;
gTasks[taskId].tFriendship = friendship;
gTasks[taskId].tInput = friendship;
gTasks[taskId].tDigit = 0;
gTasks[taskId].tPartyId = 0;
}
void DebugNative_Party_SetFriendship(void)
{
if (gSpecialVar_0x8004 < PARTY_SIZE)
{
u32 taskId = CreateTask(DebugNativeStep_Party_SetFriendshipMain, 1);
gTasks[taskId].tPartyId = gSpecialVar_0x8004;
}
}
#undef tPartyId
#undef tFriendship
#undef tMenuTaskId
#undef tWindowId
#undef tSubWindowId
#undef tInput
#undef tDigit
static void DebugAction_Party_ClearParty(u8 taskId)
{
ZeroPlayerPartyMons();

6
src/field_specials.c
View File

@ -4368,3 +4368,9 @@ void SetHiddenNature(void)
SetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_HIDDEN_NATURE, &hiddenNature);
CalculateMonStats(&gPlayerParty[gSpecialVar_0x8004]);
}
void SetAbility(void)
{
u32 ability = gSpecialVar_Result;
SetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_ABILITY_NUM, &ability);
}