Duck and Cover

Well, I managed to lose during a wilderness encounter. I told him to "wait here" and forgot to pick him up when I left the screen. Is there any way to recover him? He was carrying all of my quest items... Will he pop back to a city sometime? Can I edit his location/party member status with...