diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-22 12:15:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 12:15:19 -0500 |
| commit | fc3d6eb178be7efcf0f09644c9567f3b4fd83efd (patch) | |
| tree | 9e9e27350001aa1ce211ccb87c6888a1400d14ec /src/party_menu.c | |
| parent | 65433c790ebe11da158453a794c649034ad9640a (diff) | |
| parent | 8634710996fc440105d8be6dc354b1e9fef303b1 (diff) | |
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem
Document PokemonUseItemEffects
Diffstat (limited to 'src/party_menu.c')
| -rwxr-xr-x | src/party_menu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/party_menu.c b/src/party_menu.c index b2fd358ca..95c41ac05 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -915,7 +915,7 @@ static bool8 DisplayPartyPokemonDataForMoveTutorOrEvolutionItem(u8 slot) DisplayPartyPokemonDataToTeachMove(slot, item, 0); break; case 2: // Evolution stone - if (!GetMonData(currentPokemon, MON_DATA_IS_EGG) && GetEvolutionTargetSpecies(currentPokemon, 3, item) != SPECIES_NONE) + if (!GetMonData(currentPokemon, MON_DATA_IS_EGG) && GetEvolutionTargetSpecies(currentPokemon, EVO_MODE_ITEM_CHECK, item) != SPECIES_NONE) return FALSE; DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_NO_USE); break; @@ -5018,13 +5018,13 @@ static void Task_TryLearningNextMove(u8 taskId) static void PartyMenuTryEvolution(u8 taskId) { struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId]; - u16 targetSpecies = GetEvolutionTargetSpecies(mon, 0, 0); + u16 targetSpecies = GetEvolutionTargetSpecies(mon, EVO_MODE_NORMAL, ITEM_NONE); if (targetSpecies != SPECIES_NONE) { FreePartyPointers(); gCB2_AfterEvolution = gPartyMenu.exitCallback; - BeginEvolutionScene(mon, targetSpecies, 1, gPartyMenu.slotId); + BeginEvolutionScene(mon, targetSpecies, TRUE, gPartyMenu.slotId); DestroyTask(taskId); } else @@ -5232,7 +5232,7 @@ u8 GetItemEffectType(u16 item) return ITEM_EFFECT_PP_UP; else if (itemEffect[5] & ITEM5_PP_MAX) return ITEM_EFFECT_PP_MAX; - else if (itemEffect[4] & (ITEM4_HEAL_PP_ALL | ITEM4_HEAL_PP_ONE)) + else if (itemEffect[4] & (ITEM4_HEAL_PP | ITEM4_HEAL_PP_ONE)) return ITEM_EFFECT_HEAL_PP; else return ITEM_EFFECT_NONE; |