[szyzygy]

Ok, I fixed it. Got the panel off and was able to stick a screwdriver where the spring is on the backside of the latch. I popped it up, and with my other hand on the outside of the door, turned the cam back to the proper position.
Sprayed some WD40 in there for good measure.

I think the issue was there is an alarm rod that became unattached to the main locking rod. The alarm rod has a little hex screw that is used to tighten it to the main rod and it was loose. So I put it back and tightened it up. There was also a little rubber thing that was on the main lock rod, and there was a spot in the door panel where it looked like it was supposed to go, so I wedged it in there. I bet it's some sort of noise reducing piece.

I opened and closed the door, and locked and unlocked it many times, seems to work like a charm now. Actually sounds and feels better than before.

Thanks for your help everyone.

On a relate topic, is there a way to open up the window switch thing? My passenger side won't go up (unless you apply a ton of force to it).