From 1f9217f7dfa0a64cbef7b839c128d1653c9dd4e3 Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Fri, 17 Dec 2021 21:36:05 -0800 Subject: [PATCH] pull in project-slippi/Ishiiruka/commit/8df16c43cfef689f1bcaca0da5526b334bfe3994 fix chat bug which could cause other EXI commands to run --- Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp | 4 +--- Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp index 0955517557..6ae1194dcb 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp @@ -2446,9 +2446,7 @@ std::vector CEXISlippi::loadPremadeText(u8* payload) playerName = defaultNames[port]; #endif - u8 paramId = payload[1] == 0x83 ? - 0x88 : - payload[1]; // TODO: Figure out what the hell is going on and fix this + u8 paramId = payload[1]; if (paramId == SlippiPremadeText::CHAT_MSG_CHAT_DISABLED) { diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h index 1f7efcbfc2..2b55c20e4f 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h +++ b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h @@ -132,8 +132,8 @@ private: {CMD_GCT_LENGTH, 0x0}, {CMD_GCT_LOAD, 0x4}, {CMD_GET_DELAY, 0x0}, - {CMD_PREMADE_TEXT_LENGTH, 0x0}, - {CMD_PREMADE_TEXT_LOAD, 0x4}, + {CMD_PREMADE_TEXT_LENGTH, 0x2}, + {CMD_PREMADE_TEXT_LOAD, 0x2}, }; struct WriteMessage