diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-25 21:55:01 -0400 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-10-31 03:25:56 -0400 |
| commit | e01ec84837c018bd3bfde58d7987d32733cc8bd6 (patch) | |
| tree | d77ea1ff907db132b393b02e089a365d00907ebe /src/pokemon.c | |
| parent | 6db014cc32d28a64499af7d605be3a062560d5e0 (diff) | |
Document party_menu second pass
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 18d4fdb12..ea8dcf0cc 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4861,7 +4861,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov if (battlerId != 4) { gAbsentBattlerFlags &= ~gBitTable[battlerId]; - CopyPlayerPartyMonToBattleData(battlerId, GetBattlerPartyId(gBattlerPartyIndexes[battlerId])); + CopyPlayerPartyMonToBattleData(battlerId, GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[battlerId])); if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleResults.numRevivesUsed < 255) gBattleResults.numRevivesUsed++; } @@ -6440,11 +6440,11 @@ void SetMonPreventsSwitchingString(void) gBattleTextBuff1[4] = B_BUFF_EOS; if (GetBattlerSide(gBattleStruct->battlerPreventingSwitchout) == B_SIDE_PLAYER) - gBattleTextBuff1[3] = GetBattlerPartyId(gBattlerPartyIndexes[gBattleStruct->battlerPreventingSwitchout]); + gBattleTextBuff1[3] = GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[gBattleStruct->battlerPreventingSwitchout]); else gBattleTextBuff1[3] = gBattlerPartyIndexes[gBattleStruct->battlerPreventingSwitchout]; - PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff2, gBattlerInMenuId, GetBattlerPartyId(gBattlerPartyIndexes[gBattlerInMenuId])) + PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff2, gBattlerInMenuId, GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[gBattlerInMenuId])) BattleStringExpandPlaceholders(gText_PkmnsXPreventsSwitching, gStringVar4); } |