You’ve sparked an idea in me… What if there were multiple draw decks: Pokemon, Trainer Cards, Energies, etc and you rolled the D6 to determine which deck to draw from? Maybe do what you suggested and draw an energy with every pokemon/trainer card and assign tarot-like meanings to the energies…?
