Skip to content

Commit be2c56c

Browse files
Shortened GetEvolutionTargetSpecies calls.
1 parent 86334ca commit be2c56c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/trade.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3735,7 +3735,7 @@ static bool8 AnimateTradeSequenceCable(void)
37353735
case 72: // Only if in-game trade
37363736
TradeMons(gSpecialVar_0x8005, 0);
37373737
gCB2_AfterEvolution = CB2_UpdateInGameTrade;
3738-
evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PLAYER]], TRUE, ITEM_NONE, GetMonData(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PARTNER]], MON_DATA_SPECIES, SPECIES_NONE));
3738+
evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PLAYER]], TRUE, ITEM_NONE, GetMonData(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PARTNER]], MON_DATA_SPECIES));
37393739
if (evoTarget != SPECIES_NONE)
37403740
{
37413741
TradeEvolutionScene(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PLAYER]], evoTarget, sTradeData->pokePicSpriteIdxs[TRADE_PARTNER], gSelectedTradeMonPositions[TRADE_PLAYER]);
@@ -4250,7 +4250,7 @@ static bool8 AnimateTradeSequenceWireless(void)
42504250
case 72: // Only if in-game trade
42514251
TradeMons(gSpecialVar_0x8005, 0);
42524252
gCB2_AfterEvolution = CB2_UpdateInGameTrade;
4253-
evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PLAYER]], TRUE, ITEM_NONE, GetMonData(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PARTNER]], MON_DATA_SPECIES, SPECIES_NONE));
4253+
evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PLAYER]], TRUE, ITEM_NONE, GetMonData(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PARTNER]], MON_DATA_SPECIES));
42544254
if (evoTarget != SPECIES_NONE)
42554255
{
42564256
TradeEvolutionScene(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PLAYER]], evoTarget, sTradeData->pokePicSpriteIdxs[TRADE_PARTNER], gSelectedTradeMonPositions[TRADE_PLAYER]);
@@ -4293,7 +4293,7 @@ static void CB2_TryTradeEvolution(void)
42934293
break;
42944294
case 4:
42954295
gCB2_AfterEvolution = CB2_SaveAndEndTrade;
4296-
evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PLAYER]], TRUE, ITEM_NONE, GetMonData(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PARTNER]], MON_DATA_SPECIES, SPECIES_NONE));
4296+
evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PLAYER]], TRUE, ITEM_NONE, GetMonData(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PARTNER]], MON_DATA_SPECIES));
42974297
if (evoTarget != SPECIES_NONE)
42984298
TradeEvolutionScene(&gPlayerParty[gSelectedTradeMonPositions[TRADE_PLAYER]], evoTarget, sTradeData->pokePicSpriteIdxs[TRADE_PARTNER], gSelectedTradeMonPositions[TRADE_PLAYER]);
42994299
else if (IsWirelessTrade())

0 commit comments

Comments
 (0)