So my window that wouldn't go up... Apparently the window lock completely locks out the passenger side window. Driver side window still works, but the passenger side is rendered useless from either door.
I hit the window lock when I was cleaning the car and the passenger window was down. Dumb dumb dumb. Crappy design, and I hate window locks. But still, dumb dumb dumb. One more of these .