Pokémon isn't as cut and dry, as it's not 100% Nintendo owned. I think it'll get worked out, but I'd say Mario is the only definite.
As for rides, Mario definitely gets the E-ticket (or one of the E-ticket, who knows what the final plans will be). Maybe another ride? But I think we get 3-4 rides of varying sizes overall.
That's an educated guess, BTW.