ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-30 22:30:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed a bug not showing hidden abilities (POKEMON_EXPANSION) if the second ability was ABILITY_NONE, thanks to Syreldar

Browse Source
This commit is contained in:
TheXaman 2021-06-30 10:44:09 +02:00
parent 45012a66d7
commit a663742eba
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/debug.c
View File

@ -2185,13 +2185,12 @@ static void DebugAction_Give_Pokemon_SelectNature(u8 taskId)
static void DebugAction_Give_Pokemon_SelectAbility(u8 taskId) static void DebugAction_Give_Pokemon_SelectAbility(u8 taskId)
{ {
u8 abilityId; u8 abilityId;
u8 abilityCount = 0; u8 abilityCount = 2 - 1; //-1 for proper iteration
if (gBaseStats[sDebugMonData->mon_speciesId].abilities[1] != ABILITY_NONE) u8 i = 0;
abilityCount++;
#ifdef POKEMON_EXPANSION #ifdef POKEMON_EXPANSION
if (gBaseStats[sDebugMonData->mon_speciesId].abilities[2] != ABILITY_NONE) abilityCount = NUM_ABILITY_SLOTS - 1;
abilityCount++;
#endif #endif
if (gMain.newKeys & DPAD_ANY) if (gMain.newKeys & DPAD_ANY)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
@ -2209,7 +2208,11 @@ static void DebugAction_Give_Pokemon_SelectAbility(u8 taskId)
gTasks[taskId].data[3] = 0; gTasks[taskId].data[3] = 0;
} }
abilityId = GetAbilityBySpecies(sDebugMonData->mon_speciesId, gTasks[taskId].data[3]); while (GetAbilityBySpecies(sDebugMonData->mon_speciesId, gTasks[taskId].data[3] - i) == ABILITY_NONE)
{
i++;
}
abilityId = GetAbilityBySpecies(sDebugMonData->mon_speciesId, gTasks[taskId].data[3] - i);
StringCopy(gStringVar2, gText_DigitIndicator[gTasks[taskId].data[4]]); StringCopy(gStringVar2, gText_DigitIndicator[gTasks[taskId].data[4]]);
ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].data[3], STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].data[3], STR_CONV_MODE_LEADING_ZEROS, 2);
StringCopyPadded(gStringVar3, gStringVar3, CHAR_SPACE, 15); StringCopyPadded(gStringVar3, gStringVar3, CHAR_SPACE, 15);
@ -2220,7 +2223,7 @@ static void DebugAction_Give_Pokemon_SelectAbility(u8 taskId)
if (gMain.newKeys & A_BUTTON) if (gMain.newKeys & A_BUTTON)
{ {
sDebugMonData->mon_abilityNum = gTasks[taskId].data[3]; //AbilityNum sDebugMonData->mon_abilityNum = gTasks[taskId].data[3] - i; //AbilityNum
gTasks[taskId].data[3] = 0; gTasks[taskId].data[3] = 0;
gTasks[taskId].data[4] = 0; gTasks[taskId].data[4] = 0;