sorta

OTL, the treaty of Tordesillas, and all that was to prevent war between those two kingdoms. But in the event that a Portuguese Castilian union forms while leaving Aragon out via a marriage of Isabella and John II of Portugal (hell maybe Afonso V's first son named john lives) then, well... war is...