mirror of https://github.com/pret/pokeemerald.git
Updated to use constants
parent
0e2d898bb7
commit
3a7b49e843
|
@ -105,7 +105,7 @@ You may also want to use this for Rare Candies, so all you have to do is find `P
|
||||||
static void PartyMenuTryEvolution(u8 taskId)
|
static void PartyMenuTryEvolution(u8 taskId)
|
||||||
{
|
{
|
||||||
struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
|
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)
|
if (targetSpecies != SPECIES_NONE)
|
||||||
{
|
{
|
||||||
|
@ -114,7 +114,7 @@ static void PartyMenuTryEvolution(u8 taskId)
|
||||||
gCB2_AfterEvolution = CB2_ReturnToPartyMenuUsingRareCandy;
|
gCB2_AfterEvolution = CB2_ReturnToPartyMenuUsingRareCandy;
|
||||||
else
|
else
|
||||||
gCB2_AfterEvolution = gPartyMenu.exitCallback;
|
gCB2_AfterEvolution = gPartyMenu.exitCallback;
|
||||||
BeginEvolutionScene(mon, targetSpecies, 1, gPartyMenu.slotId);
|
BeginEvolutionScene(mon, targetSpecies, TRUE, gPartyMenu.slotId);
|
||||||
DestroyTask(taskId);
|
DestroyTask(taskId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue