summaryrefslogtreecommitdiff
path: root/src/trade.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-06-04 09:10:09 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-06-04 09:10:09 -0400
commit75ab879fd876d35eac8498296994278e213b6e7a (patch)
treeb9763615e9771ac5dce777031a80b57b12d9cac2 /src/trade.c
parente82080d42bbb81b2add8bef5c073cc353dfea307 (diff)
parent2d3210dc1129e3d60a9d138838dc867d8b106b41 (diff)
Merge remote-tracking branch 'origin/master' into modern_ld
Diffstat (limited to 'src/trade.c')
-rw-r--r--src/trade.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/trade.c b/src/trade.c
index 656cba37b..4893f5724 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -2623,7 +2623,7 @@ static u32 TestWhetherSelectedMonCanBeTraded(struct Pokemon * party, int partyCo
if ((player->version & 0xFF) != VERSION_RUBY &&
(player->version & 0xFF) != VERSION_SAPPHIRE)
{
- if ((player->name[10] & 0xF) == 0)
+ if ((player->progressFlagsCopy & 0xF) == 0)
{
if (species2[cursorPos] == SPECIES_EGG)
{
@@ -2697,11 +2697,11 @@ s32 Trade_CalcLinkPlayerCompatibilityParam(void)
if (val > 0)
{
- if (gLinkPlayers[GetMultiplayerId()].name[10] & 0xF0)
+ if (gLinkPlayers[GetMultiplayerId()].progressFlagsCopy & 0xF0)
{
if (val == 2)
{
- if (gLinkPlayers[GetMultiplayerId() ^ 1].name[10] & 0xF0)
+ if (gLinkPlayers[GetMultiplayerId() ^ 1].progressFlagsCopy & 0xF0)
{
return 0;
}