You know what's always good for shoulder pain?
If it's not too bad, I recommend Aleve, or Naprosyn as it's also known.
If it gets really bad, get a referral for an orthopaedist. He will evaluate your range of motion and pain, and might give you a cortisone shot. Those are great. They're magic actually.
Hope this helps.