Just want to point out, there's 2/3 Odds that the T-Shirt tease has absolutely nothing to do with abilities.

Dark Knight has nothing to do with Batman.
Red Mage has nothing to do with Scarlet Witch.
Both were merely used for their name. Dark Knight is nothing close to an animal-themed ninja, nor does Red Mage have anything to do with perception-alteration.
Machinist was teased with 007, a marksman, with Yoshi-P specifically pointing to "Gadgets". This foreshadowed Machinists abilities.