I had it X-rayed last week, and it was back in place, although it did make an awful "popping" noise the morning I went to hospital. The bruising and pain suggests a sublux, but they wouldn't say for sure now it's back in place. I've got to go back tomorrow to see if I need physio on my shoulder, as I don't have full range.
As for the wrist, that wasn't X-rayed because I can move my hand up and down, and from side to side. What I've found is any twisting makes it crack, and that bloody hurts!
The lesson learned is that I shouldn't be allowed to leave the house.