Skip to content

Commit

Permalink
Renamed SendMonToPC to CopyMonToPC instead
Browse files Browse the repository at this point in the history
"SendMonToPC" implies that the Pokémon affected is actually sent over to the PC, but in reality the function simply copies the data of the Pokémon and then pastes it in the first available slot of the Pokémon Storage System.
  • Loading branch information
LOuroboros committed Oct 31, 2023
1 parent 2304283 commit d44b2a9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/pokemon.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static void Task_PlayMapChosenOrBattleBGM(u8 taskId);
static bool8 ShouldGetStatBadgeBoost(u16 flagId, u8 battlerId);
static u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move);
static bool8 ShouldSkipFriendshipChange(void);
static u8 SendMonToPC(struct Pokemon *mon);
static u8 CopyMonToPC(struct Pokemon *mon);

EWRAM_DATA static u8 sLearningMoveTableID = 0;
EWRAM_DATA u8 gPlayerPartyCount = 0;
Expand Down Expand Up @@ -4405,14 +4405,14 @@ u8 GiveMonToPlayer(struct Pokemon *mon)
}

if (i >= PARTY_SIZE)
return SendMonToPC(mon);
return CopyMonToPC(mon);

CopyMon(&gPlayerParty[i], mon, sizeof(*mon));
gPlayerPartyCount = i + 1;
return MON_GIVEN_TO_PARTY;
}

static u8 SendMonToPC(struct Pokemon *mon)
static u8 CopyMonToPC(struct Pokemon *mon)
{
s32 boxNo, boxPos;

Expand Down

0 comments on commit d44b2a9

Please sign in to comment.