yeah, stone mask and the giants mask messed me up too due to the placement change and I eventually just decided to just search for them later due to time running out. Luckily I found them in the more convenient locations and I still had my blue potion to give to shiro.

I do really love what they did with the twinmold battle though.