Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renamed SendMonToPC to CopyMonToPC instead #1940

Merged
merged 1 commit into from
Nov 7, 2023
+3 −3
Merged

Renamed SendMonToPC to CopyMonToPC instead #1940

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/pokemon.c
View file
Open in desktop
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