Allow Charizard Y and Mewtwonite Y in randoms

For Pokemon with multiple mega evolutions (Charizard and Mewtwo) it should randomly select either.
Merge pull request #830 from Relados/patch-58

Allow Charizardite Y and Mewtwonite Y in randoms