As soon as Peter came into the pub

[Bassim]

Would you please correct the mistakes in my sentence? I am often in doubt if I should use "come" or "go" in these kinds of sentences.

As soon as Peter came into the pub, his friends raised their beer glasses in salute and shouted his name above the noise.

 

[GoesStation]

"Came" is appropriate because the rest of the sentence is from the point of view of the inside of the pub.

 

[Skrej]

A la 'Norm!'.