dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

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
parent 92e7963eff d44b2a972d
commit 2e1fe4c82b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon.c
+3 -3
View File
@@ -70,7 +70,7 @@ static void Task_PlayMapChosenOrBattleBGM(u8 taskId);
static bool8 ShouldGetStatBadgeBoost(u16 flagId, u8 battlerId); static bool8 ShouldGetStatBadgeBoost(u16 flagId, u8 battlerId);
static u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move); static u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move);
static bool8 ShouldSkipFriendshipChange(void); static bool8 ShouldSkipFriendshipChange(void);
static u8 SendMonToPC(struct Pokemon *mon); static u8 CopyMonToPC(struct Pokemon *mon);
EWRAM_DATA static u8 sLearningMoveTableID = 0; EWRAM_DATA static u8 sLearningMoveTableID = 0;
EWRAM_DATA u8 gPlayerPartyCount = 0; EWRAM_DATA u8 gPlayerPartyCount = 0;
@@ -4405,14 +4405,14 @@ u8 GiveMonToPlayer(struct Pokemon *mon)
} }
if (i >= PARTY_SIZE) if (i >= PARTY_SIZE)
return SendMonToPC(mon); return CopyMonToPC(mon);
CopyMon(&gPlayerParty[i], mon, sizeof(*mon)); CopyMon(&gPlayerParty[i], mon, sizeof(*mon));
gPlayerPartyCount = i + 1; gPlayerPartyCount = i + 1;
return MON_GIVEN_TO_PARTY; return MON_GIVEN_TO_PARTY;
} }
static u8 SendMonToPC(struct Pokemon *mon) static u8 CopyMonToPC(struct Pokemon *mon)
{ {
s32 boxNo, boxPos; s32 boxNo, boxPos;