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

More BattleEngine and PokemonExpansion compatibility

Browse Source
This commit is contained in:
TheXaman 2020-11-14 12:39:40 +01:00
parent 86412bfe91
commit 094a0b8774
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pokedex.c
View File

@ -1501,6 +1501,9 @@ static const struct SearchOptionText sDexSearchTypeOptions[] =
{gText_DexEmptyString, gTypeNames[TYPE_ICE]},
{gText_DexEmptyString, gTypeNames[TYPE_DRAGON]},
{gText_DexEmptyString, gTypeNames[TYPE_DARK]},
#ifdef BATTLE_ENGINE
{gText_DexEmptyString, gTypeNames[TYPE_FAIRY]},
#endif
{},
};
@ -1535,6 +1538,9 @@ static const u8 sDexSearchTypeIds[] =
TYPE_ICE,
TYPE_DRAGON,
TYPE_DARK,
#ifdef BATTLE_ENGINE
TYPE_FAIRY,
#endif
};
// Number pairs are the task data for tracking the cursor pos and scroll offset of each option list
@ -6810,12 +6816,16 @@ static void PrintMonStatsToggle(u8 taskId)
{
PrintInfoScreenTextSmallWhite(gAbilityNames[gBaseStats[species].abilities[1]], abilities_x, abilities_y + 30);
PrintInfoScreenTextSmall(gAbilityDescriptionPointers[gBaseStats[species].abilities[1]], abilities_x, abilities_y + 44);
}
// }else{ //For PokemonExpansion
// ability0 = gBaseStats[species].abilityHidden;
// PrintInfoScreenTextSmallWhite(gAbilityNames[ability0], abilities_x, abilities_y);
// PrintInfoScreenTextSmall(gAbilityDescriptionPointers[ability0], abilities_x, abilities_y + 14);
}
}
#if defined (BATTLE_ENGINE) && defined (POKEMON_EXPANSION)
else //Hidden abilities
{
ability0 = gBaseStats[species].abilityHidden;
PrintInfoScreenTextSmallWhite(gAbilityNames[ability0], abilities_x, abilities_y);
PrintInfoScreenTextSmall(gAbilityDescriptionPointers[ability0], abilities_x, abilities_y + 14);
}
#endif
}
static void Task_SwitchScreensFromStatsScreen(u8 taskId)