Yup, my (napa) fuel pump crapped out on me a week ago. Thought it was the starter so got a new one from Toyota (of course) for $169 without core exchange; nope that wasn't the fix. The (toyota) intank-fuel pump was next for $296, then the filter for $24 which did solve the problem.
moral of story-go with toyota
-When purchasing the fuel pump, the parts guy let me view the computer which shows a TSRM-like diagram that can zoom in/out to specific parts...anyhow, the list of fuel pump showed 3. I recall the parts guy pointing out that 84-85 (ending in sept 85) model had a specific pump part number while the 86 (mk2) a different.
here are the parts number I got: From TOYOTA
intank fuel pump- 23220-16084 $23.91 w/tax
intank fuel filter- 23217-16042 $296.27
starter remanufactured-28100-45050-84 $169.92