Finally get rid of PLAYER_COLOR. ColorP1Command and ColorP2Command no longer exist. The last thing that was being diffused with player color in the code was something in the Oni score display. I have also removed the commented code in ScreenSelectMusic.cpp (the score is hidden in _fallback anyways). Since I'm sure you can diffuse ScoreDisplayOni Numbers, but I can't seem to find any references to them in the metrics.

src/ScoreDisplayOni.cpp

@@ -27,11 +27,6 @@ ScoreDisplayOni::ScoreDisplayOni()
 void ScoreDisplayOni::Init( const PlayerState* pPlayerState, const PlayerStageStats* pPlayerStageStats ) 
 {
 	ScoreDisplay::Init( pPlayerState, pPlayerStageStats );
-
-	// TODO: Remove use of PlayerNumber.
-	PlayerNumber pn = pPlayerState->m_PlayerNumber;
-
-	m_text.RunCommands( CommonMetrics::PLAYER_COLOR.GetValue(pn) );
 }