Skip to content

Commit

Permalink
Merge pull request #1940 from LOuroboros/copyMonToPC
Browse files Browse the repository at this point in the history
Renamed SendMonToPC to CopyMonToPC instead
  • Loading branch information
GriffinRichards authored Nov 7, 2023
2 parents 92e7963 + d44b2a9 commit 2e1fe4c
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 2e1fe4c

Please sign in to comment.