you actually found most of them, there's also a room filled with bombs and swords, and an ultra rare room filled with giant dew drops
