I was just in Figueras last week and I had the confusion as well, but didnt think of asking which was correct. We also went to Cadaques, which is wonderful, and there (actually in Port Lligat which is 2 mintues away) you can visit the house that Dali lived and painted in for about 40 years. Its facinating to see where he lived and the landscapes that are present in so many of his paintings. If you can somehow make it to go there you will be glad you did! Its 45 minutes on a curvy mountain road to get to the coast but its beaufiful. you need reservations for Dalis house, just fyi.