Yes, but at Uwajimaya I can never find Lemon Squash. Most of the other cold drinks there are based on tea and I can't have that.
Unfortunately the hotel is a long walk away from any convenience stores. I might be able to get through the contest ofn a Super Big Gulp of Diet Dr.pepper, but somehow I doubt such a thing would be available. And hotel prices for soda are usually somewhat above the astronimical range, especially from the vending machines.