It was a bit annoying with the iron boots obviously, and with having to play zelda's lullaby every time you want to change the water level. Couldn't there just be a switch? Other than that, no it was not annoying. I think they'll fix up the annoyance level of the water temple in the remake.