04 STi to 98 RS Re-Pin

Helping a Friend out with his planned swap later this summer with the re-pining of the harness.

Here is what I have so far..

Feel free to comment or PM me so i can update and finish this fully for him and others to use. At worst I will slowly get the time to finish it all up myself.

Description 04 STi Connector/Pin 98 RS Connector/Pin

1. Starter Switch B137/8 B84/86
2. AC Switch B137/16 B84/60
3. Ignition Switch B137/15 B84/85
4. Back-Up Power Supply B135/19 B84/39
5. Control Unit Power B135/5&6 B84/1&2
6. Vehicle Speed Sensor B135/27 B84/83
7. Test Mode Connector B137/14 B84/84
8. Neutral Position B137/9 B84/82
9. AC Relay Control B133/33 B84/31
10. Check Engine Light/Malf Ind B134/17 B84/58
11. Tach/ Engine Speed Output B134/23 B84/64
12. Fuel Tank Pressure Sensor B136/21 &35? B84/4 &20?
13. Fuel Tank Pressure Solenoid B134/12 B84/10
14. Drain Valve B134/13 B84/35
15. Fuel Level Sensor B136/20 B84/27
16. Fuel Tank Sensor Control Valve B134/24 Flashed out...
17. Fuel Temp Sensor B136/12 B84/25
18. Small Light Switch B137/12 Not on 98 RS
19. Blower Fan Switch B137/13 Not on 98 RS
20. Rear Defogger Switch B137/11 Not on 98 RS
21. SSM/GST Com’s. Line B137/20 B84/93????? --No Diagram & found by crossing posts
22. Fuel Pump Relay Control B???/?? B84/32 Tied to ground &/or opposite side of the fuel pump relay now needs to be ground instead of power & can be tapped off in the main relay.
23. Self Shutoff Control B???/?? B84/63 B135/19 or B137/15????
24. Cruise Control Set Light B134/16 ?
25. Main Light B134/15 ?
26. Clutch Switch B134/1 ?
27. Set/Coast Switch B136/11 ?
28. Brake Switch 1 B136/9 ?
29. Brake Switch 2 B136/8 ?
30. Resume/Accel Switch B136/10 ?
31. Main Switch B136/7 ?
32. Fuel Injector B136/3,4,5,6 B84/16,44,70,96

Throttle Control Relay needs switched 12 volt power
Injectors/Ignition needs switched 12 volt power

Need to find the RS Cruise diagram/wiring spots and the rest that is unfinished