Merge branch 'master' into doc-windows

This commit is contained in:
GriffinR
2023-02-15 10:04:48 -05:00
committed by GitHub
27 changed files with 2104 additions and 2008 deletions
+1 -1
View File
@@ -1271,7 +1271,7 @@ static u32 IsTryingToTradeAcrossVersionTooSoon(struct WirelessLink_Group *data,
{
if (!(gSaveBlock2Ptr->specialSaveWarpFlags & CHAMPION_SAVEWARP))
return UR_TRADE_PLAYER_NOT_READY;
else if (partner->rfu.data.compatibility.isChampion)
else if (partner->rfu.data.compatibility.canLinkNationally)
return UR_TRADE_READY;
}
else