Key Takeaways:
- Nintendo has officially detailed changes to the Water Temple in the Zelda: Ocarina of Time Switch 2 remake, due November 5, 2026
- Producer Eiji Aonuma admitted he felt he had “overdue homework” on the Water Temple — which he himself designed back in 1998
- Item toggling has been made significantly easier, addressing the notorious Iron Boots problem that required endless menu pausing
- Solid walls that caused players to lose their sense of direction have been replaced with lattice-style structures, letting you see into adjacent rooms
- This marks the second time Nintendo has adjusted the Water Temple — the 3DS version in 2011 also made quality-of-life tweaks to the dungeon
- Director HokWai Ng worked alongside Aonuma to ensure the changes preserve the dungeon’s intended atmosphere while removing its worst friction
If you ever handed a controller to someone for the first time and watched them hit the Water Temple in Ocarina of Time, you know exactly what the face looks like. That slow creeping realization that nothing makes sense, water levels are doing something mysterious, and the Iron Boots need to go on and off approximately forty-seven times. It’s become almost a rite of passage for Zelda fans — and a genuine deterrent for anyone who wasn’t already committed to finishing the game.
Now, nearly thirty years after the original launched on N64, Nintendo has finally given us a proper look at what they’re doing about it. The details come straight from Eiji Aonuma and director HokWai Ng in Nintendo’s Ask the Developer interview about the Switch 2 remake, and honestly? It sounds like they actually listened.
Aonuma Calls It Overdue Homework
What makes this interview worth reading isn’t just the technical details — it’s the fact that Aonuma, who designed the original Water Temple back in 1998, is completely candid about its problems. He described fixing the dungeon as “overdue homework” he’d been carrying around for 28 years, which is a refreshingly self-aware thing to say about one of the most discussed game design decisions in Nintendo’s history.
What’s interesting is the context he gives for why the dungeon was built the way it was in the first place. At the time Ocarina of Time was being developed, almost no 3D games let players go underwater at all. Aonuma mentioned that he personally enjoys freediving, and wanted to capture that specific feeling of being submerged — how sounds change, how your sense of space and direction warps. The intention was always to create something genuinely immersive.
The problem, as he freely admits, is that the execution created a navigation nightmare. The dungeon’s complex multi-level structure, combined with the constant need to pause the game and swap the Iron Boots on and off, made it nearly impossible to keep track of where you were and which way you were facing. The feeling of being underwater got buried under the frustration of managing menus.
What’s Actually Changed in the Switch 2 Version
So what did they do about it? Two main things, according to director HokWai Ng.
First, item toggling has been made much easier. This directly targets the Iron Boots problem that’s been complained about since 1998. In the original N64 version, putting the boots on and taking them off required opening the equipment menu every single time — a flow-breaking interruption that happened constantly throughout the dungeon. The 3DS remake addressed this partially by putting items on the touchscreen, but the Switch 2 version appears to go further, streamlining the whole process so you’re spending more time actually playing and less time navigating menus.
Second — and this one is genuinely clever — some of the solid walls that were notorious for killing your sense of direction have been changed to lattice-style structures. Instead of blank walls boxing you in and making every corridor look identical, you can now see through into adjacent rooms. That single change does a huge amount of work. One of the biggest reasons the Water Temple felt so disorienting was that you could never build a mental map of the space. When you can see where you are relative to surrounding areas, the whole thing becomes far more readable.
It’s a solution that preserves the dungeon’s original layout while fixing the underlying problem. They didn’t rebuild the Water Temple from scratch — they made the existing design legible.
This Isn’t the First Time Nintendo Has Revisited the Water Temple
Long-time Zelda fans will remember that this isn’t Nintendo’s first attempt at smoothing out the Water Temple’s rough edges. When Ocarina of Time 3D launched back in 2011 for the Nintendo 3DS, the dungeon got a round of adjustments too. Aonuma had even publicly addressed the issue around that time, saying he’d been living with the shame of the Water Temple’s design for years.
The 3DS changes were meaningful but limited by the hardware — the touchscreen helped with item management, and some visual cues were added to make navigation slightly clearer. The Switch 2 version builds on that foundation and seems to take the fixes further, with the lattice walls being a more structural solution than anything that appeared in the 3D version.
For anyone who played the 3DS version and thought it felt better but still not quite right, the Switch 2 remake might finally be the version that makes the Water Temple feel like it was supposed to all along.
A Remake That Respects the Original While Fixing What Was Broken
What comes through in the interview is that neither Aonuma nor Ng approached the Water Temple with the intention of erasing what made it memorable. The dungeon has its moments — Dark Link is one of the best boss encounters in the entire series, and the water level mechanic has a satisfying logic to it when you’re not completely lost. The goal was clearly to remove the friction without gutting the experience.
That approach seems to define the broader philosophy behind this remake. The Switch 2 version was announced during the June 2026 Nintendo Direct and officially launched on November 5, 2026, giving Nintendo’s 40th anniversary of the Zelda franchise a genuinely major release to celebrate. Rather than a straight visual upgrade, this looks like a ground-up rethink of how the original game plays — respecting what worked while being honest about what didn’t.
If the Water Temple is your personal benchmark for whether Nintendo actually addressed Ocarina of Time’s problems, the Ask the Developer interview suggests they did the work. Easier item swapping and walls you can see through sound like small changes on paper, but in a dungeon that ran almost entirely on spatial awareness and inventory management, they’re not small at all.
Why This Matters for the Zelda Legacy
There’s something meaningful about the fact that Aonuma personally spearheaded these changes. He designed the original Water Temple. He’s carried the reputation of that dungeon for nearly three decades. Serving as producer on a remake that finally gets it right isn’t just good game design — it’s a full-circle moment for one of Nintendo’s most important creative voices.
For fans picking up the Switch 2 version, it means you can go into the Water Temple knowing the worst of its sins have been addressed. The bones of the dungeon are the same. The atmosphere Aonuma wanted to create — that immersive, disorienting feeling of being deep underwater — is still there. But the parts that made people put down the controller in frustration? Those have been dealt with.
If you’re catching up on everything happening in gaming right now, we’ve got full coverage of Mass Effect 3’s multiplayer finally coming to Legendary Edition on N7 Day, which is its own wild story of a beloved feature being restored years after the fact. It’s been quite a week for gaming history getting a second chance.
And if you want to keep up with everything else dropping this month alongside the Ocarina of Time remake, check out what Phantom Blade Zero pulled off with 4 million sales in 72 hours — a reminder that the gaming landscape right now is genuinely stacked.
Twenty-eight years is a long time to carry a reputation for making players miserable in a water dungeon. It sounds like Nintendo has finally done something about it.
