From 4f1bf265f8f6083450bca1c5a6911e9c85757168 Mon Sep 17 00:00:00 2001
From: Nikhil Narayana <nikhil.narayana@live.com>
Date: Sun, 29 May 2022 23:15:09 -0700
Subject: [PATCH] pull in
 project-slippi/Ishiiruka/commit/a96830ad313924b35797d5cd5842860e88cc9cf9

---
 Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
index 7db6490991..98422bb98f 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
@@ -2323,10 +2323,13 @@ void CEXISlippi::prepareOnlineMatchState()
     // Overwrite player character choices
     for (auto& s : orderedSelections)
     {
+      if (!s.isCharacterSelected)
+      {
+        continue;
+      }
       if (areAllSameTeam)
       {
-        // Overwrite teamId
-        // TODO: overwrite color
+        // Overwrite teamId. Color is overwritten by ASM
         s.teamId = teamAssignments[s.playerIdx];
       }