PM sent

There is no diode on the Advance or the Auto Up/Down button (since they are sort of a special switch)
while the Reset HSTD switch is connected to the Switch matrix with the other game switches, so the diode is needed.

Though your Advance switch is bad, since the contacts only work in column, there is no middle contact to connect to connect the power wire [yellow or solid white] and the bottom contact [dark green].

Otherwise, your picture is correct.

//-- Wiring Info --//
Advance (2 & 3 or 5 & 4)
1 - N/C - 6
2 - Pwr - 5
3 - DkGrn - 4

Auto Up/Down (2 & 1 or 5 & 6)
1 - Blu - 6
2 - Pwr - 5
3 - N/C - 4

Reset HSTD (1 or 3 diode to 5, & 4)
1 - N/C - 6
2 - >D> - 5
3 - Grn - 4