diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-03 15:40:14 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-03 15:40:14 -0400 |
| commit | f6c10b27e4a605ba6ab4a18d49a628daa43e7963 (patch) | |
| tree | 44400108becac5811454198d4f39c7791c098beb /src/trade.c | |
| parent | 14954c546383611dde2a944b2dfc49ad4e5c9b50 (diff) | |
| parent | 83cdfb52f7c9695d2d14084ae00b0daa1b23da41 (diff) | |
Merge remote-tracking branch 'origin/master' into doc_tileset_anims
Diffstat (limited to 'src/trade.c')
| -rw-r--r-- | src/trade.c | 6 |
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; } |