atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1940 from LOuroboros/copyMonToPC

Browse source 
Renamed SendMonToPC to CopyMonToPC instead
This commit is contained in:
GriffinR 2023-11-07 12:22:31 -05:00 committed by GitHub
commit 2e1fe4c82b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/pokemon.c
View file

@ -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;
@ -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;