The E3 2015 hype train is a-rolling, and the extra coal for the engine today is provided by Nintendo, who has released a short and silly video laying out exactly what its plans are for the big show, including a return 25 years in the making.

After Tweeting this tease yesterday, The Big N has finally dished: the annual Digital Event will once again take place on Tuesday before the show floor opens. Players will be able to try Mario Maker at Best Buy stores across the country, and an expanded Treehouse Live event will show off Nintendo's entire upcoming library.

The biggest announcement, however, is the return of the Nintendo World Championships after 25 years. Qualifying events will be held in select Best Buy stores on May 30, with the finals taking place in the Nokia Theatre Sunday, June 14.

Nintendo no doubt has some big plans in store for E3, and the return of the Nintendo World Championships is a great idea, but we're worried about one thing: the Nintendo Digital Event is still slated for 9AM Pacific Tuesday morning as usual, but this year Square Enix has planned its own E3 event for the same time, and these two shows are now going head to head. That's a lot of news to focus on in a few short hours before the show floor opens. Let's hope the two don't make the same announcement at the same time... that would be strange.

E3 2015 kicks off Sunday, June 14 with the Bethesda E3 showcase, and ArcadeSushi will be in the trenches bringing you every piece of news from the show.