From a9c5519a7bf7122e1d11fde7499538af988cac1c Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Sat, 1 Jun 2024 14:27:40 -0700 Subject: [PATCH 01/16] fix: don't init jukebox if no audio output selected --- Source/Core/Core/HW/EXI_DeviceSlippi.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp index 63d4b15677..21dff81719 100644 --- a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp +++ b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp @@ -3362,13 +3362,13 @@ void CEXISlippi::ConfigureJukebox() // Exclusive WASAPI and the Jukebox do not play nicely, so we just don't bother enabling // the Jukebox in that scenario - why bother doing the processing work when it's not even // possible to play it? -#ifdef _WIN32 + // Jukebox will also respect no audio output std::string backend = SConfig::GetInstance().sBackend; - if (backend.find(BACKEND_EXCLUSIVE_WASAPI) != std::string::npos) + if (backend.find(BACKEND_EXCLUSIVE_WASAPI) != std::string::npos || + backend.find(BACKEND_NULLSOUND) != std::string::npos) { return; } -#endif bool jukeboxEnabled = SConfig::GetInstance().bSlippiJukeboxEnabled; int systemVolume = SConfig::GetInstance().m_IsMuted ? 0 : SConfig::GetInstance().m_Volume; From ff2d4d15b9d5ba24b6789a7943cbbfc7782980e0 Mon Sep 17 00:00:00 2001 From: Nicolet Date: Wed, 5 Jun 2024 17:48:33 -0700 Subject: [PATCH 02/16] feat: add `--slippi-spectator-port` cmd line option for setting spectate server port (#421) fixes #419 --- Source/Core/DolphinWX/Main.cpp | 5 +++++ Source/Core/DolphinWX/Main.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 7740ba4f06..c266fb9cc5 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -141,6 +141,8 @@ bool DolphinApp::OnInit() if (m_select_video_backend && !m_video_backend_name.empty()) SConfig::GetInstance().m_strVideoBackend = WxStrToStr(m_video_backend_name); + if (m_select_slippi_spectator_port && m_slippi_spectator_port >= 1024 && m_slippi_spectator_port < 65536) + SConfig::GetInstance().m_spectator_local_port = m_slippi_spectator_port; #ifdef IS_PLAYBACK // Fallback to a default config file path if the user fails to provide one @@ -320,6 +322,8 @@ void DolphinApp::OnInitCmdLine(wxCmdLineParser &parser) wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL}, {wxCMD_LINE_OPTION, "a", "audio_emulation", "Low level (LLE) or high level (HLE) audio", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL}, + {wxCMD_LINE_OPTION, nullptr, "slippi-spectator-port", "Port to use for the Slippi spectate server (1024 - 65535, default: 51441)", + wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL}, #ifdef IS_PLAYBACK {wxCMD_LINE_OPTION, "i", "slippi-input", "Path to Slippi replay config file (default: Slippi/playback.txt)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL}, @@ -389,6 +393,7 @@ bool DolphinApp::OnCmdLineParsed(wxCmdLineParser &parser) m_confirm_stop = parser.Found("confirm", &m_confirm_setting); m_select_video_backend = parser.Found("video_backend", &m_video_backend_name); m_select_audio_emulation = parser.Found("audio_emulation", &m_audio_emulation_name); + m_select_slippi_spectator_port = parser.Found("slippi-spectator-port", &m_slippi_spectator_port); #ifdef IS_PLAYBACK m_select_slippi_input = parser.Found("slippi-input", &m_slippi_input_name); m_hide_seekbar = parser.Found("hide-seekbar"); diff --git a/Source/Core/DolphinWX/Main.h b/Source/Core/DolphinWX/Main.h index 4611c54968..99fbabbbc7 100644 --- a/Source/Core/DolphinWX/Main.h +++ b/Source/Core/DolphinWX/Main.h @@ -49,6 +49,7 @@ class DolphinApp : public wxApp bool m_show_version = false; bool m_select_video_backend = false; bool m_select_slippi_input = false; + bool m_select_slippi_spectator_port = false; bool m_select_output_directory = false; bool m_select_output_filename_base = false; bool m_select_audio_emulation = false; @@ -59,6 +60,7 @@ class DolphinApp : public wxApp wxString m_video_backend_name; wxString m_audio_emulation_name; wxString m_slippi_input_name; + long m_slippi_spectator_port; wxString m_output_directory; wxString m_output_filename_base; wxString m_user_path; From 7fafd4db9f353fb6cd6da1e096ab07f2f38e300a Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Wed, 5 Jun 2024 22:35:24 -0700 Subject: [PATCH 03/16] release(playback): v3.4.2 --- Source/Core/Common/Version.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp index d8e3f5a5cc..61fb36b0b2 100644 --- a/Source/Core/Common/Version.cpp +++ b/Source/Core/Common/Version.cpp @@ -26,7 +26,7 @@ #ifndef IS_PLAYBACK #define SLIPPI_REV_STR "3.4.0" // netplay version #else -#define SLIPPI_REV_STR "3.4.1" // playback version +#define SLIPPI_REV_STR "3.4.2" // playback version #endif #ifdef IS_PLAYBACK const std::string scm_rev_str = "Faster Melee - Slippi (" SLIPPI_REV_STR ") - Playback"; From fd1bf76b2ac8643e4c8ef443c5543a8e5352fefb Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Sun, 30 Jun 2024 13:49:36 -0400 Subject: [PATCH 04/16] fix: UCF 0.84 1.0 cardinal on cstick the UCF code for 1.0 cardinals is applied in playback because it affects gameplay and we didn't realize that the raw cstick values needed to be saved and restored in order for the cardinals code to work. because of the order of the codes, if you input a cstick value that would need a 1.0 adjustment, UCF would clobber the replay input with the current input meaning you could input smashes and aerials with your controller during playback, causing a desync --- Data/PlaybackGeckoCodes/GALE01r2.ini | 26 ++++++++++++++---------- Data/PlaybackGeckoCodes/GALJ01r2.ini | 26 ++++++++++++++---------- Data/Sys/GameSettings/GALE01r2.ini | 14 +++++++------ Data/Sys/GameSettings/GALJ01r2.ini | 14 +++++++------ Externals/SlippiLib/SlippiGame.cpp | 3 +++ Externals/SlippiLib/SlippiGame.h | 3 +++ Source/Core/Core/HW/EXI_DeviceSlippi.cpp | 4 +++- 7 files changed, 55 insertions(+), 35 deletions(-) diff --git a/Data/PlaybackGeckoCodes/GALE01r2.ini b/Data/PlaybackGeckoCodes/GALE01r2.ini index 4a09634c8e..94f05bdb59 100644 --- a/Data/PlaybackGeckoCodes/GALE01r2.ini +++ b/Data/PlaybackGeckoCodes/GALE01r2.ini @@ -165,7 +165,7 @@ BE8100B0 806DAFC0 38800005 38A00001 3D808000 618C55F0 7D8903A6 4E800421 -7F63DB78 38800197 +7F63DB78 388001A7 38A00000 3D808000 618C55F0 7D8903A6 4E800421 887B0000 @@ -177,7 +177,7 @@ BE8100B0 806DAFC0 BA8100B0 800100E4 382100E0 7C0803A6 881F0008 00000000 -C206B0DC 00000049 #Playback/Core/RestoreGameFrame.asm +C206B0DC 0000004B #Playback/Core/RestoreGameFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 8BBF000C 7FA3EB78 @@ -189,10 +189,10 @@ C206B0DC 00000049 #Playback/Core/RestoreGameFrame.asm 7D8903A6 4E800421 7C741B78 2C140000 41820010 8879056F -2C030000 418201D4 +2C030000 418201E4 389B0007 88BF000C -1CA50064 7C842A14 -1CB40032 7F442A14 +1CA50068 7C842A14 +1CB40034 7F442A14 807A0004 907F0620 807A0008 907F0624 807A000C 907F0638 @@ -215,6 +215,8 @@ C206B0DC 00000049 #Playback/Core/RestoreGameFrame.asm 1C84000C 7E832214 887A002C 98740002 887A002D 98740003 +887A0032 98740004 +887A0033 98740005 8879056F 2C030000 4182004C 807A002E 2C03FFFF 41820040 @@ -1021,7 +1023,7 @@ C216E74C 0000010A #Recording/SendGameInfo.asm 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600770 3D808037 +38600780 3D808037 618CF1E4 7D8903A6 4E800421 7C7E1B78 93DB0000 38600000 @@ -1035,7 +1037,7 @@ C216E74C 0000010A #Recording/SendGameInfo.asm 987E0001 38600036 987E0002 386002F8 B07E0003 38600037 -987E0005 38600040 +987E0005 38600042 B07E0006 38600038 987E0008 38600054 B07E0009 38600039 @@ -1051,7 +1053,7 @@ B07E0015 3860003D 38600010 987E001A 38600204 B07E001B 38600036 987E001D -3C600310 60630000 +3C600311 60630000 907E001E 387E0022 7FE4FB78 38A00138 3D808000 618C31F4 @@ -1333,12 +1335,12 @@ A07F2088 B07D0053 800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 -C206B0E0 0000002C #Recording/SendGamePreFrame.asm +C206B0E0 0000002E #Recording/SendGamePreFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820120 +2C030000 41820130 8B7F000C 806DB64C 83A30000 838DB650 7FBDE214 38600037 @@ -1372,8 +1374,10 @@ B07D0031 80640030 1C9B000C 7C832214 88640002 987D003B 88640003 987D0040 +88640004 987D0041 +88640005 987D0042 807F1830 907D003C -838DB650 3B9C0041 +838DB650 3B9C0043 938DB650 BA8100B0 800100E4 382100E0 7C0803A6 881F2219 diff --git a/Data/PlaybackGeckoCodes/GALJ01r2.ini b/Data/PlaybackGeckoCodes/GALJ01r2.ini index 0d9f05c882..8b3f391041 100644 --- a/Data/PlaybackGeckoCodes/GALJ01r2.ini +++ b/Data/PlaybackGeckoCodes/GALJ01r2.ini @@ -164,7 +164,7 @@ BE8100B0 806DAFC0 38800005 38A00001 3D808000 618C55F0 7D8903A6 4E800421 -7F63DB78 38800197 +7F63DB78 388001A7 38A00000 3D808000 618C55F0 7D8903A6 4E800421 887B0000 @@ -176,7 +176,7 @@ BE8100B0 806DAFC0 BA8100B0 800100E4 382100E0 7C0803A6 881F0008 00000000 -C206B0DC 00000049 #Playback/Core/RestoreGameFrame.asm +C206B0DC 0000004B #Playback/Core/RestoreGameFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 8BBF000C 7FA3EB78 @@ -188,10 +188,10 @@ C206B0DC 00000049 #Playback/Core/RestoreGameFrame.asm 7D8903A6 4E800421 7C741B78 2C140000 41820010 8879056F -2C030000 418201D4 +2C030000 418201E4 389B0007 88BF000C -1CA50064 7C842A14 -1CB40032 7F442A14 +1CA50068 7C842A14 +1CB40034 7F442A14 807A0004 907F0620 807A0008 907F0624 807A000C 907F0638 @@ -214,6 +214,8 @@ C206B0DC 00000049 #Playback/Core/RestoreGameFrame.asm 1C84000C 7E832214 887A002C 98740002 887A002D 98740003 +887A0032 98740004 +887A0033 98740005 8879056F 2C030000 4182004C 807A002E 2C03FFFF 41820040 @@ -1020,7 +1022,7 @@ C216E74C 0000010A #Recording/SendGameInfo.asm 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600770 3D808037 +38600780 3D808037 618CF1E4 7D8903A6 4E800421 7C7E1B78 93DB0000 38600000 @@ -1034,7 +1036,7 @@ C216E74C 0000010A #Recording/SendGameInfo.asm 987E0001 38600036 987E0002 386002F8 B07E0003 38600037 -987E0005 38600040 +987E0005 38600042 B07E0006 38600038 987E0008 38600054 B07E0009 38600039 @@ -1050,7 +1052,7 @@ B07E0015 3860003D 38600010 987E001A 38600204 B07E001B 38600036 987E001D -3C600310 60630000 +3C600311 60630000 907E001E 387E0022 7FE4FB78 38A00138 3D808000 618C31F4 @@ -1332,12 +1334,12 @@ A07F2088 B07D0053 800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 -C206B0E0 0000002C #Recording/SendGamePreFrame.asm +C206B0E0 0000002E #Recording/SendGamePreFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820120 +2C030000 41820130 8B7F000C 806DB64C 83A30000 838DB650 7FBDE214 38600037 @@ -1371,8 +1373,10 @@ B07D0031 80640030 1C9B000C 7C832214 88640002 987D003B 88640003 987D0040 +88640004 987D0041 +88640005 987D0042 807F1830 907D003C -838DB650 3B9C0041 +838DB650 3B9C0043 938DB650 BA8100B0 800100E4 382100E0 7C0803A6 881F2219 diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini index b366df7163..3f4a8b9191 100644 --- a/Data/Sys/GameSettings/GALE01r2.ini +++ b/Data/Sys/GameSettings/GALE01r2.ini @@ -784,7 +784,7 @@ C216E74C 0000010A #Recording/SendGameInfo.asm 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600770 3D808037 +38600780 3D808037 618CF1E4 7D8903A6 4E800421 7C7E1B78 93DB0000 38600000 @@ -798,7 +798,7 @@ C216E74C 0000010A #Recording/SendGameInfo.asm 987E0001 38600036 987E0002 386002F8 B07E0003 38600037 -987E0005 38600040 +987E0005 38600042 B07E0006 38600038 987E0008 38600054 B07E0009 38600039 @@ -814,7 +814,7 @@ B07E0015 3860003D 38600010 987E001A 38600204 B07E001B 38600036 987E001D -3C600310 60630000 +3C600311 60630000 907E001E 387E0022 7FE4FB78 38A00138 3D808000 618C31F4 @@ -1096,12 +1096,12 @@ A07F2088 B07D0053 800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 -C206B0E0 0000002C #Recording/SendGamePreFrame.asm +C206B0E0 0000002E #Recording/SendGamePreFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820120 +2C030000 41820130 8B7F000C 806DB64C 83A30000 838DB650 7FBDE214 38600037 @@ -1135,8 +1135,10 @@ B07D0031 80640030 1C9B000C 7C832214 88640002 987D003B 88640003 987D0040 +88640004 987D0041 +88640005 987D0042 807F1830 907D003C -838DB650 3B9C0041 +838DB650 3B9C0043 938DB650 BA8100B0 800100E4 382100E0 7C0803A6 881F2219 diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index a306c55488..9d6f555213 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -783,7 +783,7 @@ C216E74C 0000010A #Recording/SendGameInfo.asm 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600770 3D808037 +38600780 3D808037 618CF1E4 7D8903A6 4E800421 7C7E1B78 93DB0000 38600000 @@ -797,7 +797,7 @@ C216E74C 0000010A #Recording/SendGameInfo.asm 987E0001 38600036 987E0002 386002F8 B07E0003 38600037 -987E0005 38600040 +987E0005 38600042 B07E0006 38600038 987E0008 38600054 B07E0009 38600039 @@ -813,7 +813,7 @@ B07E0015 3860003D 38600010 987E001A 38600204 B07E001B 38600036 987E001D -3C600310 60630000 +3C600311 60630000 907E001E 387E0022 7FE4FB78 38A00138 3D808000 618C31F4 @@ -1095,12 +1095,12 @@ A07F2088 B07D0053 800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 -C206B0E0 0000002C #Recording/SendGamePreFrame.asm +C206B0E0 0000002E #Recording/SendGamePreFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820120 +2C030000 41820130 8B7F000C 806DB64C 83A30000 838DB650 7FBDE214 38600037 @@ -1134,8 +1134,10 @@ B07D0031 80640030 1C9B000C 7C832214 88640002 987D003B 88640003 987D0040 +88640004 987D0041 +88640005 987D0042 807F1830 907D003C -838DB650 3B9C0041 +838DB650 3B9C0043 938DB650 BA8100B0 800100E4 382100E0 7C0803A6 881F2219 diff --git a/Externals/SlippiLib/SlippiGame.cpp b/Externals/SlippiLib/SlippiGame.cpp index d9776a6d3c..a19737a5d2 100644 --- a/Externals/SlippiLib/SlippiGame.cpp +++ b/Externals/SlippiLib/SlippiGame.cpp @@ -234,6 +234,9 @@ namespace Slippi { p.joystickYRaw = readByte(data, idx, maxSize, 0); + p.cstickXRaw = readByte(data, idx, maxSize, 0); + p.cstickYRaw = readByte(data, idx, maxSize, 0); + // Add player data to frame std::unordered_map* target; target = isFollower ? &frame->followers : &frame->players; diff --git a/Externals/SlippiLib/SlippiGame.h b/Externals/SlippiLib/SlippiGame.h index 89e07116cb..a1ba3c09b3 100644 --- a/Externals/SlippiLib/SlippiGame.h +++ b/Externals/SlippiLib/SlippiGame.h @@ -64,6 +64,9 @@ namespace Slippi { uint8_t joystickXRaw; uint8_t joystickYRaw; + + uint8_t cstickXRaw; + uint8_t cstickYRaw; } PlayerFrameData; typedef struct FrameData { diff --git a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp index 21dff81719..9459ac4abd 100644 --- a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp +++ b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp @@ -969,7 +969,7 @@ void CEXISlippi::prepareCharacterFrameData(Slippi::FrameData *frame, u8 port, u8 source = isFollower ? frame->followers : frame->players; // This must be updated if new data is added - int characterDataLen = 50; + int characterDataLen = 52; // Check if player exists if (!source.count(port)) @@ -1004,6 +1004,8 @@ void CEXISlippi::prepareCharacterFrameData(Slippi::FrameData *frame, u8 port, u8 m_read_queue.push_back(data.joystickXRaw); m_read_queue.push_back(data.joystickYRaw); appendWordToBuffer(&m_read_queue, *(u32 *)&data.percent); + m_read_queue.push_back(data.cstickXRaw); + m_read_queue.push_back(data.cstickYRaw); // NOTE TO DEV: If you add data here, make sure to increase the size above } From 2c9f126f5d8fa260a34dd9551e2e32e2757c9c2b Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Sun, 30 Jun 2024 23:57:00 -0400 Subject: [PATCH 05/16] chore: build codeset for lgl --- Data/Sys/GameSettings/GALE01r2.ini | 163 +++++++++++++++-------------- Data/Sys/GameSettings/GALJ01r2.ini | 163 +++++++++++++++-------------- 2 files changed, 172 insertions(+), 154 deletions(-) diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini index 3f4a8b9191..04a444eaa5 100644 --- a/Data/Sys/GameSettings/GALE01r2.ini +++ b/Data/Sys/GameSettings/GALE01r2.ini @@ -4797,7 +4797,7 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm 3D80801B 618C136C 7D8903A6 4E800420 38600001 00000000 -C21A45B8 000001FF #Online/Slippi Online Scene/main.asm +C21A45B8 00000208 #Online/Slippi Online Scene/main.asm 3BA30004 7C0802A6 90010004 9421FF20 BE8100B0 3C80803E @@ -4808,7 +4808,7 @@ BE8100B0 3C80803E 986DAFEC 986DAFE0 38600008 480001C1 7C8802A6 4800002D -48000F88 80830000 +48000FD4 80830000 5485467A 2C050048 40820014 548401BA 7C840734 7C841A14 @@ -4878,8 +4878,8 @@ BA8100B0 800100E4 04030000 4800062D 48000969 20000000 80490880 804D68D0 -05030000 48000C7D -48000CBD 50000000 +05030000 48000CC9 +48000D09 50000000 48000019 48000015 FF000000 4E800021 81940000 4E800021 @@ -5025,7 +5025,7 @@ B07B0001 38600000 7D8903A6 4E800421 3C808047 60849D30 38600001 98640005 -887F0003 480006E9 +887F0003 48000735 986DAFC9 886DAFA0 2C030003 40820020 887F0003 38800001 @@ -5033,14 +5033,14 @@ B07B0001 38600000 38800000 988DAFC9 4800003C 3A800000 3AA00000 7E83A378 -480006AD 2C030000 +480006F9 2C030000 41820008 3AB50001 3A940001 2C140004 4180FFE4 2C150001 4182000C 38600000 986DAFC9 3E808047 62949DA4 887F0003 -48000675 2C030000 +480006C1 2C030000 41820018 38600001 98740000 38600000 9874005D 48000014 @@ -5218,97 +5218,106 @@ BE8100B0 38600000 BE8100B0 3FE08047 63FF9DA4 887F0004 2C030001 41820010 -2C030002 4182007C -480000C4 38600000 -3D808003 618C3BD8 +2C030002 418200C8 +48000110 38600000 +3D808004 618C0AF0 7D8903A6 4E800421 7C7B1B78 38600001 -3D808003 618C3BD8 -7D8903A6 4E800421 -7C1B1800 41810080 -41800084 38600000 -3D808003 618C42B4 +3D808004 618C0AF0 7D8903A6 4E800421 -7C7B1B78 38600001 -3D808003 618C42B4 -7D8903A6 4E800421 -7C1B1800 41800048 -4181004C 48000050 +2C1B002D 4081000C +2C03002D 41810014 +2C1B002D 418100C4 +2C03002D 418100B4 38600000 3D808003 618C3BD8 7D8903A6 -4E800421 2C030000 -40820024 38600001 +4E800421 7C7B1B78 +38600001 3D808003 +618C3BD8 7D8903A6 +4E800421 7C1B1800 +41810080 41800084 +38600000 3D808003 +618C42B4 7D8903A6 +4E800421 7C7B1B78 +38600001 3D808003 +618C42B4 7D8903A6 +4E800421 7C1B1800 +41800048 4181004C +48000050 38600000 3D808003 618C3BD8 7D8903A6 4E800421 -2C030000 40820010 -48000014 38600000 -48000010 38600001 -48000008 3860FFFF -BA8100B0 800100E4 -382100E0 7C0803A6 -4E800020 7C0802A6 -90010004 9421FF20 -BE8100B0 7C7D1B78 -3FE08047 63FF9DA4 -1FDD00A8 7FDEFA14 -887F0004 2C030000 -418200B0 3C608046 -6063B6A0 886324D0 -889F0006 7C032000 -40820098 887E0058 -2C030003 4182008C -887F0004 2C030007 -40820040 887F0006 -2C030001 40820024 -887F0000 1C6300A8 -7C63FA14 8863005F -889E005F 7C032000 -41820058 4800005C -887F0000 7C03E800 -41820048 4800004C -887F0006 2C030001 -40820028 7FE3FB78 -3D808016 618C54A0 -7D8903A6 4E800421 -889E005F 7C032000 -41820020 48000014 -887E005D 2C030000 -41820010 48000004 -38600000 48000008 -38600001 BA8100B0 +2C030000 40820024 +38600001 3D808003 +618C3BD8 7D8903A6 +4E800421 2C030000 +40820010 48000014 +38600000 48000010 +38600001 48000008 +3860FFFF BA8100B0 800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 9421FF20 BE8100B0 -83E30010 887F0006 -2C030000 40820014 -3D808001 618C74BC -7D8903A6 4E800421 +7C7D1B78 3FE08047 +63FF9DA4 1FDD00A8 +7FDEFA14 887F0004 +2C030000 418200B0 +3C608046 6063B6A0 +886324D0 889F0006 +7C032000 40820098 +887E0058 2C030003 +4182008C 887F0004 +2C030007 40820040 +887F0006 2C030001 +40820024 887F0000 +1C6300A8 7C63FA14 +8863005F 889E005F +7C032000 41820058 +4800005C 887F0000 +7C03E800 41820048 +4800004C 887F0006 +2C030001 40820028 +7FE3FB78 3D808016 +618C54A0 7D8903A6 +4E800421 889E005F +7C032000 41820020 +48000014 887E005D +2C030000 41820010 +48000004 38600000 +48000008 38600001 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 9421FF20 BE8100B0 83E30010 -38600000 3D808000 -618C5610 7D8903A6 -4E800421 7C7E1B78 -887E0000 2C030004 -41820018 3C808047 -60849D30 38600001 -98640005 48000038 887F0006 2C030000 -41820018 3C808047 -60849D30 38600003 -98640005 48000018 -4BFFFC5D 3C808047 -60849D30 38600005 -98640005 BA8100B0 +40820014 3D808001 +618C74BC 7D8903A6 +4E800421 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 +7C0802A6 90010004 +9421FF20 BE8100B0 +83E30010 38600000 +3D808000 618C5610 +7D8903A6 4E800421 +7C7E1B78 887E0000 +2C030004 41820018 +3C808047 60849D30 +38600001 98640005 +48000038 887F0006 +2C030000 41820018 +3C808047 60849D30 +38600003 98640005 +48000018 4BFFFC11 +3C808047 60849D30 +38600005 98640005 BA8100B0 800100E4 382100E0 7C0803A6 -38600028 987E0000 -60000000 00000000 +4E800020 BA8100B0 +800100E4 382100E0 +7C0803A6 38600028 +987E0000 00000000 04005694 4E800020 #Online/Static/AdjustNullCharID.asm C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm 7C0802A6 90010004 diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index 9d6f555213..be62b0882e 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -4796,7 +4796,7 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm 3D80801B 618C136C 7D8903A6 4E800420 38600001 00000000 -C21A45B8 000001FF #Online/Slippi Online Scene/main.asm +C21A45B8 00000208 #Online/Slippi Online Scene/main.asm 3BA30004 7C0802A6 90010004 9421FF20 BE8100B0 3C80803E @@ -4807,7 +4807,7 @@ BE8100B0 3C80803E 986DAFEC 986DAFE0 38600008 480001C1 7C8802A6 4800002D -48000F88 80830000 +48000FD4 80830000 5485467A 2C050048 40820014 548401BA 7C840734 7C841A14 @@ -4877,8 +4877,8 @@ BA8100B0 800100E4 04030000 4800062D 48000969 20000000 80490880 804D68D0 -05030000 48000C7D -48000CBD 50000000 +05030000 48000CC9 +48000D09 50000000 48000019 48000015 FF000000 4E800021 81940000 4E800021 @@ -5024,7 +5024,7 @@ B07B0001 38600000 7D8903A6 4E800421 3C808047 60849D30 38600001 98640005 -887F0003 480006E9 +887F0003 48000735 986DAFC9 886DAFA0 2C030003 40820020 887F0003 38800001 @@ -5032,14 +5032,14 @@ B07B0001 38600000 38800000 988DAFC9 4800003C 3A800000 3AA00000 7E83A378 -480006AD 2C030000 +480006F9 2C030000 41820008 3AB50001 3A940001 2C140004 4180FFE4 2C150001 4182000C 38600000 986DAFC9 3E808047 62949DA4 887F0003 -48000675 2C030000 +480006C1 2C030000 41820018 38600001 98740000 38600000 9874005D 48000014 @@ -5217,97 +5217,106 @@ BE8100B0 38600000 BE8100B0 3FE08047 63FF9DA4 887F0004 2C030001 41820010 -2C030002 4182007C -480000C4 38600000 -3D808003 618C3BD8 +2C030002 418200C8 +48000110 38600000 +3D808004 618C0AF0 7D8903A6 4E800421 7C7B1B78 38600001 -3D808003 618C3BD8 -7D8903A6 4E800421 -7C1B1800 41810080 -41800084 38600000 -3D808003 618C42B4 +3D808004 618C0AF0 7D8903A6 4E800421 -7C7B1B78 38600001 -3D808003 618C42B4 -7D8903A6 4E800421 -7C1B1800 41800048 -4181004C 48000050 +2C1B002D 4081000C +2C03002D 41810014 +2C1B002D 418100C4 +2C03002D 418100B4 38600000 3D808003 618C3BD8 7D8903A6 -4E800421 2C030000 -40820024 38600001 +4E800421 7C7B1B78 +38600001 3D808003 +618C3BD8 7D8903A6 +4E800421 7C1B1800 +41810080 41800084 +38600000 3D808003 +618C42B4 7D8903A6 +4E800421 7C7B1B78 +38600001 3D808003 +618C42B4 7D8903A6 +4E800421 7C1B1800 +41800048 4181004C +48000050 38600000 3D808003 618C3BD8 7D8903A6 4E800421 -2C030000 40820010 -48000014 38600000 -48000010 38600001 -48000008 3860FFFF -BA8100B0 800100E4 -382100E0 7C0803A6 -4E800020 7C0802A6 -90010004 9421FF20 -BE8100B0 7C7D1B78 -3FE08047 63FF9DA4 -1FDD00A8 7FDEFA14 -887F0004 2C030000 -418200B0 3C608046 -6063B6A0 886324D0 -889F0006 7C032000 -40820098 887E0058 -2C030003 4182008C -887F0004 2C030007 -40820040 887F0006 -2C030001 40820024 -887F0000 1C6300A8 -7C63FA14 8863005F -889E005F 7C032000 -41820058 4800005C -887F0000 7C03E800 -41820048 4800004C -887F0006 2C030001 -40820028 7FE3FB78 -3D808016 618C54A0 -7D8903A6 4E800421 -889E005F 7C032000 -41820020 48000014 -887E005D 2C030000 -41820010 48000004 -38600000 48000008 -38600001 BA8100B0 +2C030000 40820024 +38600001 3D808003 +618C3BD8 7D8903A6 +4E800421 2C030000 +40820010 48000014 +38600000 48000010 +38600001 48000008 +3860FFFF BA8100B0 800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 9421FF20 BE8100B0 -83E30010 887F0006 -2C030000 40820014 -3D808001 618C74BC -7D8903A6 4E800421 +7C7D1B78 3FE08047 +63FF9DA4 1FDD00A8 +7FDEFA14 887F0004 +2C030000 418200B0 +3C608046 6063B6A0 +886324D0 889F0006 +7C032000 40820098 +887E0058 2C030003 +4182008C 887F0004 +2C030007 40820040 +887F0006 2C030001 +40820024 887F0000 +1C6300A8 7C63FA14 +8863005F 889E005F +7C032000 41820058 +4800005C 887F0000 +7C03E800 41820048 +4800004C 887F0006 +2C030001 40820028 +7FE3FB78 3D808016 +618C54A0 7D8903A6 +4E800421 889E005F +7C032000 41820020 +48000014 887E005D +2C030000 41820010 +48000004 38600000 +48000008 38600001 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 9421FF20 BE8100B0 83E30010 -38600000 3D808000 -618C5610 7D8903A6 -4E800421 7C7E1B78 -887E0000 2C030004 -41820018 3C808047 -60849D30 38600001 -98640005 48000038 887F0006 2C030000 -41820018 3C808047 -60849D30 38600003 -98640005 48000018 -4BFFFC5D 3C808047 -60849D30 38600005 -98640005 BA8100B0 +40820014 3D808001 +618C74BC 7D8903A6 +4E800421 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 +7C0802A6 90010004 +9421FF20 BE8100B0 +83E30010 38600000 +3D808000 618C5610 +7D8903A6 4E800421 +7C7E1B78 887E0000 +2C030004 41820018 +3C808047 60849D30 +38600001 98640005 +48000038 887F0006 +2C030000 41820018 +3C808047 60849D30 +38600003 98640005 +48000018 4BFFFC11 +3C808047 60849D30 +38600005 98640005 BA8100B0 800100E4 382100E0 7C0803A6 -38600028 987E0000 -60000000 00000000 +4E800020 BA8100B0 +800100E4 382100E0 +7C0803A6 38600028 +987E0000 00000000 04005694 4E800020 #Online/Static/AdjustNullCharID.asm C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm 7C0802A6 90010004 From b34367ccf000f4895528935e6c6d1ac11bb1676c Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Fri, 5 Jul 2024 13:16:54 -0400 Subject: [PATCH 06/16] chore: build codeset for lgl display --- Data/Sys/GameSettings/GALE01r2.ini | 54 +++++++++++++++++++ Data/Sys/GameSettings/GALJ01r2.ini | 54 +++++++++++++++++++ .../Slippi/InjectionLists/list_netplay.json | 7 +++ 3 files changed, 115 insertions(+) diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini index 04a444eaa5..b560a92f61 100644 --- a/Data/Sys/GameSettings/GALE01r2.ini +++ b/Data/Sys/GameSettings/GALE01r2.ini @@ -1598,6 +1598,60 @@ C216E904 0000004C #Online/Core/InitPause.asm 800100E4 382100E0 7C0803A6 4E800020 881F0001 00000000 +C22F70C4 00000035 #Online/Core/LGLExceededGameEnd.asm +48000054 4E800021 +3F333333 00000000 +428C0000 3F800000 +000000FF D7A5FFFF +FAFA78FF 596F7500 +4F707000 25732045 +78636565 64656420 +4C656467 65204772 +6162204C 696D6974 +206F6620 25643A20 +25640000 7C0802A6 +90010004 9421FF20 +BE8100B0 7C9F2378 +7CBE2B78 7CDD3378 +3B200000 4BFFFF91 +7F0802A6 3C608048 +80639D30 5463443E +2C030208 408200F0 +886DAFA0 2C030003 +418200E4 38600000 +3D808004 618C0AF0 +7D8903A6 4E800421 +7C7C1B78 38600001 +3D808004 618C0AF0 +7D8903A6 4E800421 +7C7B1B78 2C1C002D +4081000C 2C1B002D +418100A4 2C1C002D +3B400000 7F97E378 +41810018 2C1B002D +3B400001 7F77DB78 +41810008 48000080 +806DB61C 88630000 +7C03D000 3B200002 +3AD80018 3AB80020 +40820020 3B200006 +3AD80014 3AB8001C +3C608046 6063B6A0 +388000FD 988324D5 +806DB61C 80630912 +7EC4B378 38A00001 +38D80010 38F80024 +7EA8AB78 3920002D +7EEABB78 C0380000 +C0580004 C0780008 +C0D8000C 3D808000 +618C56B4 7D8903A6 +4E800421 7FE4FB78 +7FC5F378 7FA6EB78 +7F23CB78 BA8100B0 +800100E4 382100E0 +7C0803A6 38FF0000 +60000000 00000000 C21A5014 0000005C #Online/Core/LoopEngineForRollback.asm 41A20014 3D80801A 618C5024 7D8903A6 diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index be62b0882e..8096bcc175 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -1597,6 +1597,60 @@ C216E904 0000004C #Online/Core/InitPause.asm 800100E4 382100E0 7C0803A6 4E800020 881F0001 00000000 +C22F70C4 00000035 #Online/Core/LGLExceededGameEnd.asm +48000054 4E800021 +3F333333 00000000 +428C0000 3F800000 +000000FF D7A5FFFF +FAFA78FF 596F7500 +4F707000 25732045 +78636565 64656420 +4C656467 65204772 +6162204C 696D6974 +206F6620 25643A20 +25640000 7C0802A6 +90010004 9421FF20 +BE8100B0 7C9F2378 +7CBE2B78 7CDD3378 +3B200000 4BFFFF91 +7F0802A6 3C608048 +80639D30 5463443E +2C030208 408200F0 +886DAFA0 2C030003 +418200E4 38600000 +3D808004 618C0AF0 +7D8903A6 4E800421 +7C7C1B78 38600001 +3D808004 618C0AF0 +7D8903A6 4E800421 +7C7B1B78 2C1C002D +4081000C 2C1B002D +418100A4 2C1C002D +3B400000 7F97E378 +41810018 2C1B002D +3B400001 7F77DB78 +41810008 48000080 +806DB61C 88630000 +7C03D000 3B200002 +3AD80018 3AB80020 +40820020 3B200006 +3AD80014 3AB8001C +3C608046 6063B6A0 +388000FD 988324D5 +806DB61C 80630912 +7EC4B378 38A00001 +38D80010 38F80024 +7EA8AB78 3920002D +7EEABB78 C0380000 +C0580004 C0780008 +C0D8000C 3D808000 +618C56B4 7D8903A6 +4E800421 7FE4FB78 +7FC5F378 7FA6EB78 +7F23CB78 BA8100B0 +800100E4 382100E0 +7C0803A6 38FF0000 +60000000 00000000 C21A5014 0000005C #Online/Core/LoopEngineForRollback.asm 41A20014 3D80801A 618C5024 7D8903A6 diff --git a/Data/Sys/Slippi/InjectionLists/list_netplay.json b/Data/Sys/Slippi/InjectionLists/list_netplay.json index 71b9f580ce..a914113e19 100644 --- a/Data/Sys/Slippi/InjectionLists/list_netplay.json +++ b/Data/Sys/Slippi/InjectionLists/list_netplay.json @@ -637,6 +637,13 @@ "Annotation": "Online/Core/InitPause.asm", "Tags": "" }, + { + "InjectionAddress": "802F70C4", + "Name": "Required: Slippi Online", + "Codetype": "Auto", + "Annotation": "Online/Core/LGLExceededGameEnd.asm", + "Tags": "" + }, { "InjectionAddress": "801A5014", "Name": "Required: Slippi Online", From 45a1983e61e0009ab7293a63d82c101b31f9d474 Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Fri, 5 Jul 2024 15:12:16 -0400 Subject: [PATCH 07/16] chore: build codeset --- Data/Sys/GameSettings/GALE01r2.ini | 103 ++++++++++++++--------------- Data/Sys/GameSettings/GALJ01r2.ini | 103 ++++++++++++++--------------- 2 files changed, 102 insertions(+), 104 deletions(-) diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini index b560a92f61..037daf8268 100644 --- a/Data/Sys/GameSettings/GALE01r2.ini +++ b/Data/Sys/GameSettings/GALE01r2.ini @@ -1598,60 +1598,59 @@ C216E904 0000004C #Online/Core/InitPause.asm 800100E4 382100E0 7C0803A6 4E800020 881F0001 00000000 -C22F70C4 00000035 #Online/Core/LGLExceededGameEnd.asm -48000054 4E800021 +C22F70C4 00000034 #Online/Core/LGLExceededGameEnd.asm +48000058 4E800021 3F333333 00000000 -428C0000 3F800000 -000000FF D7A5FFFF -FAFA78FF 596F7500 -4F707000 25732045 -78636565 64656420 -4C656467 65204772 -6162204C 696D6974 -206F6620 25643A20 -25640000 7C0802A6 -90010004 9421FF20 -BE8100B0 7C9F2378 -7CBE2B78 7CDD3378 -3B200000 4BFFFF91 -7F0802A6 3C608048 -80639D30 5463443E -2C030208 408200F0 -886DAFA0 2C030003 -418200E4 38600000 -3D808004 618C0AF0 -7D8903A6 4E800421 -7C7C1B78 38600001 -3D808004 618C0AF0 +428C0000 42700000 +3F800000 000000FF +D7A5FFFF FAFA78FF +596F7500 4F70706F +6E656E74 00257320 +45786365 65646564 +204C6564 67652047 +72616220 4C696D69 +74206F66 20256400 +7C0802A6 90010004 +9421FF20 BE8100B0 +7C9F2378 7CBE2B78 +7CDD3378 3B200000 +4BFFFF8D 7F0802A6 +3C608048 80639D30 +5463443E 2C030208 +408200E8 886DAFA0 +2C030003 418200DC +38600000 3D808004 +618C0AF0 7D8903A6 +4E800421 7C7C1B78 +38600001 3D808004 +618C0AF0 7D8903A6 +4E800421 7C7B1B78 +2C1C002D 4081000C +2C1B002D 4181009C +2C1C002D 3B400000 +41810014 2C1B002D +3B400001 41810008 +48000080 806DB61C +88630000 7C03D000 +3B200002 3AF8001C +3AD80024 C0780008 +40820024 3B200006 +3AF80018 3AD80020 +C078000C 3C608046 +6063B6A0 388000FD +988324D5 806DB61C +80630912 7EE4BB78 +38A00001 38D80014 +38F8002D 7EC8B378 +3920002D C0380000 +C0580004 C0D80010 +3D808000 618C56B4 7D8903A6 4E800421 -7C7B1B78 2C1C002D -4081000C 2C1B002D -418100A4 2C1C002D -3B400000 7F97E378 -41810018 2C1B002D -3B400001 7F77DB78 -41810008 48000080 -806DB61C 88630000 -7C03D000 3B200002 -3AD80018 3AB80020 -40820020 3B200006 -3AD80014 3AB8001C -3C608046 6063B6A0 -388000FD 988324D5 -806DB61C 80630912 -7EC4B378 38A00001 -38D80010 38F80024 -7EA8AB78 3920002D -7EEABB78 C0380000 -C0580004 C0780008 -C0D8000C 3D808000 -618C56B4 7D8903A6 -4E800421 7FE4FB78 -7FC5F378 7FA6EB78 -7F23CB78 BA8100B0 -800100E4 382100E0 -7C0803A6 38FF0000 -60000000 00000000 +7FE4FB78 7FC5F378 +7FA6EB78 7F23CB78 +BA8100B0 800100E4 +382100E0 7C0803A6 +38FF0000 00000000 C21A5014 0000005C #Online/Core/LoopEngineForRollback.asm 41A20014 3D80801A 618C5024 7D8903A6 diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index 8096bcc175..41204409eb 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -1597,60 +1597,59 @@ C216E904 0000004C #Online/Core/InitPause.asm 800100E4 382100E0 7C0803A6 4E800020 881F0001 00000000 -C22F70C4 00000035 #Online/Core/LGLExceededGameEnd.asm -48000054 4E800021 +C22F70C4 00000034 #Online/Core/LGLExceededGameEnd.asm +48000058 4E800021 3F333333 00000000 -428C0000 3F800000 -000000FF D7A5FFFF -FAFA78FF 596F7500 -4F707000 25732045 -78636565 64656420 -4C656467 65204772 -6162204C 696D6974 -206F6620 25643A20 -25640000 7C0802A6 -90010004 9421FF20 -BE8100B0 7C9F2378 -7CBE2B78 7CDD3378 -3B200000 4BFFFF91 -7F0802A6 3C608048 -80639D30 5463443E -2C030208 408200F0 -886DAFA0 2C030003 -418200E4 38600000 -3D808004 618C0AF0 -7D8903A6 4E800421 -7C7C1B78 38600001 -3D808004 618C0AF0 +428C0000 42700000 +3F800000 000000FF +D7A5FFFF FAFA78FF +596F7500 4F70706F +6E656E74 00257320 +45786365 65646564 +204C6564 67652047 +72616220 4C696D69 +74206F66 20256400 +7C0802A6 90010004 +9421FF20 BE8100B0 +7C9F2378 7CBE2B78 +7CDD3378 3B200000 +4BFFFF8D 7F0802A6 +3C608048 80639D30 +5463443E 2C030208 +408200E8 886DAFA0 +2C030003 418200DC +38600000 3D808004 +618C0AF0 7D8903A6 +4E800421 7C7C1B78 +38600001 3D808004 +618C0AF0 7D8903A6 +4E800421 7C7B1B78 +2C1C002D 4081000C +2C1B002D 4181009C +2C1C002D 3B400000 +41810014 2C1B002D +3B400001 41810008 +48000080 806DB61C +88630000 7C03D000 +3B200002 3AF8001C +3AD80024 C0780008 +40820024 3B200006 +3AF80018 3AD80020 +C078000C 3C608046 +6063B6A0 388000FD +988324D5 806DB61C +80630912 7EE4BB78 +38A00001 38D80014 +38F8002D 7EC8B378 +3920002D C0380000 +C0580004 C0D80010 +3D808000 618C56B4 7D8903A6 4E800421 -7C7B1B78 2C1C002D -4081000C 2C1B002D -418100A4 2C1C002D -3B400000 7F97E378 -41810018 2C1B002D -3B400001 7F77DB78 -41810008 48000080 -806DB61C 88630000 -7C03D000 3B200002 -3AD80018 3AB80020 -40820020 3B200006 -3AD80014 3AB8001C -3C608046 6063B6A0 -388000FD 988324D5 -806DB61C 80630912 -7EC4B378 38A00001 -38D80010 38F80024 -7EA8AB78 3920002D -7EEABB78 C0380000 -C0580004 C0780008 -C0D8000C 3D808000 -618C56B4 7D8903A6 -4E800421 7FE4FB78 -7FC5F378 7FA6EB78 -7F23CB78 BA8100B0 -800100E4 382100E0 -7C0803A6 38FF0000 -60000000 00000000 +7FE4FB78 7FC5F378 +7FA6EB78 7F23CB78 +BA8100B0 800100E4 +382100E0 7C0803A6 +38FF0000 00000000 C21A5014 0000005C #Online/Core/LoopEngineForRollback.asm 41A20014 3D80801A 618C5024 7D8903A6 From 76557a039a96e20935775035b0515520eb6e80bc Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Fri, 5 Jul 2024 15:32:16 -0400 Subject: [PATCH 08/16] chore: build codeset bug fix --- Data/Sys/GameSettings/GALE01r2.ini | 2 +- Data/Sys/GameSettings/GALJ01r2.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini index 037daf8268..e68cabc5c5 100644 --- a/Data/Sys/GameSettings/GALE01r2.ini +++ b/Data/Sys/GameSettings/GALE01r2.ini @@ -1634,7 +1634,7 @@ D7A5FFFF FAFA78FF 88630000 7C03D000 3B200002 3AF8001C 3AD80024 C0780008 -40820024 3B200006 +40820014 3B200006 3AF80018 3AD80020 C078000C 3C608046 6063B6A0 388000FD diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index 41204409eb..afe26c6dbf 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -1633,7 +1633,7 @@ D7A5FFFF FAFA78FF 88630000 7C03D000 3B200002 3AF8001C 3AD80024 C0780008 -40820024 3B200006 +40820014 3B200006 3AF80018 3AD80020 C078000C 3C608046 6063B6A0 388000FD From 212204c4ce7bfef0e47ab3537c4b8690f33c856b Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Mon, 8 Jul 2024 10:17:56 -0400 Subject: [PATCH 09/16] release(n/p): v3.4.1 / v3.4.3 --- Source/Core/Common/Version.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp index 61fb36b0b2..cabcd4d786 100644 --- a/Source/Core/Common/Version.cpp +++ b/Source/Core/Common/Version.cpp @@ -24,9 +24,9 @@ //" " BUILD_TYPE_STR " " SCM_DESC_STR; //#endif #ifndef IS_PLAYBACK -#define SLIPPI_REV_STR "3.4.0" // netplay version +#define SLIPPI_REV_STR "3.4.1" // netplay version #else -#define SLIPPI_REV_STR "3.4.2" // playback version +#define SLIPPI_REV_STR "3.4.3" // playback version #endif #ifdef IS_PLAYBACK const std::string scm_rev_str = "Faster Melee - Slippi (" SLIPPI_REV_STR ") - Playback"; From d895bfe96872b391c0a5a4821ec808ec08205ee6 Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Mon, 8 Jul 2024 20:52:53 -0700 Subject: [PATCH 10/16] fix(ci): move to macos-13 runners --- .github/workflows/pr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 6df037f176..de76e651dc 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -293,7 +293,7 @@ jobs: artifact_name: macOS-playback build_config: playback name: "macOS ${{ matrix.build_type }}" - runs-on: macos-11 + runs-on: macos-13 steps: - name: "Checkout" uses: actions/checkout@v3 From 70328610bd751858d5677576dd3b2ebf9ced37a6 Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Mon, 8 Jul 2024 20:56:06 -0700 Subject: [PATCH 11/16] release: v3.4.1 | v3.4.3 --- Source/Core/Common/Version.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp index cabcd4d786..ded80b787c 100644 --- a/Source/Core/Common/Version.cpp +++ b/Source/Core/Common/Version.cpp @@ -23,6 +23,9 @@ //#else //" " BUILD_TYPE_STR " " SCM_DESC_STR; //#endif +// release commit notes +// if releasing both builds, use `release: {combined_version}` or `release: {netplay_version} | {playback_version}` +// for releasing a single build, use `release(netplay): {netplay_version}` or `release(playback): {playback_version}` #ifndef IS_PLAYBACK #define SLIPPI_REV_STR "3.4.1" // netplay version #else From 40c22ba974813c2e1379aebdb654bb2e5a1e06c3 Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Mon, 29 Jul 2024 18:15:48 -0400 Subject: [PATCH 12/16] chore: build codeset https://github.com/project-slippi/slippi-ssbm-asm/commit/572e3f3340a07e92f2bc110e0899048af372c429 --- Data/Sys/GameSettings/GALE01r2.ini | 590 +++++++++++++++-------------- Data/Sys/GameSettings/GALJ01r2.ini | 590 +++++++++++++++-------------- 2 files changed, 594 insertions(+), 586 deletions(-) diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini index e68cabc5c5..04d1892c1c 100644 --- a/Data/Sys/GameSettings/GALE01r2.ini +++ b/Data/Sys/GameSettings/GALE01r2.ini @@ -4850,7 +4850,7 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm 3D80801B 618C136C 7D8903A6 4E800420 38600001 00000000 -C21A45B8 00000208 #Online/Slippi Online Scene/main.asm +C21A45B8 0000020C #Online/Slippi Online Scene/main.asm 3BA30004 7C0802A6 90010004 9421FF20 BE8100B0 3C80803E @@ -4861,7 +4861,7 @@ BE8100B0 3C80803E 986DAFEC 986DAFE0 38600008 480001C1 7C8802A6 4800002D -48000FD4 80830000 +48000FF0 80830000 5485467A 2C050048 40820014 548401BA 7C840734 7C841A14 @@ -4893,7 +4893,7 @@ BE8100B0 3C80803E BE8100B0 3C808045 6084ABF0 886DAEF8 98640006 48000159 -7C8802A6 48000BA5 +7C8802A6 48000BB9 7C6802A6 90640018 3D808000 618C56B8 7D8903A6 4E800421 @@ -4928,11 +4928,11 @@ BA8100B0 800100E4 03030000 00000000 00000000 05000000 00000000 00000000 -04030000 4800062D -48000969 20000000 +04030000 48000641 +4800097D 20000000 80490880 804D68D0 -05030000 48000CC9 -48000D09 50000000 +05030000 48000CDD +48000D1D 50000000 48000019 48000015 FF000000 4E800021 81940000 4E800021 @@ -4970,7 +4970,7 @@ BE8100B0 7C7E1B78 7F6802A6 7F63DB78 3880001C 3D808000 618CC160 7D8903A6 -4E800421 4800093D +4E800421 48000951 7C6802A6 907B0018 38600003 987B0000 38600001 B07B0001 @@ -4984,7 +4984,7 @@ BE8100B0 7C7E1B78 2C030000 40820000 886DAFCA 2C030000 41820020 48000004 -480007E5 3C808047 +480007F9 3C808047 60849D30 38600005 98640005 48000018 3C808047 60849D30 @@ -5012,7 +5012,7 @@ BE8100B0 7C7F1B78 4E800421 7C7E1B78 887E0001 889E0002 7C032000 4082001C -48000705 3C808047 +48000719 3C808047 60849D30 38600005 98640005 4800001C 38600000 3D80801A @@ -5040,337 +5040,341 @@ BE8100B0 3D80801B 3D808000 618C5610 7D8903A6 4E800421 7C7F1B78 886DAFA0 -2C030000 4082011C +2C030000 40820130 887F0000 2C030000 -40820010 38600001 -4BFFFF4D 48000104 -4BFFFC9D 7F6802A6 -3C808046 6084B6A0 -88640008 987B0017 -480006DD 7C7C1B78 -2C1C0000 40800014 -887B0006 38630001 -987B0006 48000060 -9B9B0005 A09B0001 -38840006 7F9B21AE -387C0003 7C9B18AE -38A40001 7CBB19AE -1C9C0002 38840010 -A07F026A 7C7B232E -889B0000 38840001 -38600002 7C841B96 -7C052000 4080002C -A07B0001 38630001 -B07B0001 38600000 -987B0006 3C808047 -60849D30 38600006 -98640005 4800006C -38600000 4BFFFE99 -38600001 3D808037 -618CF1E4 7D8903A6 -4E800421 7C7E1B78 -386000BA 987E0000 -7FC3F378 38800001 -38A00001 3D808000 -618C55F0 7D8903A6 -4E800421 7FC3F378 -3D808037 618CF1B0 -7D8903A6 4E800421 +41820018 808DB61C +88640011 2C030001 +41820008 48000010 +38600001 4BFFFF39 +480000B4 4BFFFC89 +7F6802A6 3C808046 +6084B6A0 88640008 +987B0017 480006DD +7C7C1B78 2C1C0000 +40800014 887B0006 +38630001 987B0006 +48000060 9B9B0005 +A09B0001 38840006 +7F9B21AE 387C0003 +7C9B18AE 38A40001 +7CBB19AE 1C9C0002 +38840010 A07F026A +7C7B232E 889B0000 +38840001 38600002 +7C841B96 7C052000 +4080002C A07B0001 +38630001 B07B0001 +38600000 987B0006 3C808047 60849D30 -38600001 98640005 -887F0003 48000735 -986DAFC9 886DAFA0 -2C030003 40820020 -887F0003 38800001 -2C030000 40820008 -38800000 988DAFC9 -4800003C 3A800000 -3AA00000 7E83A378 -480006F9 2C030000 -41820008 3AB50001 -3A940001 2C140004 -4180FFE4 2C150001 -4182000C 38600000 -986DAFC9 3E808047 -62949DA4 887F0003 -480006C1 2C030000 -41820018 38600001 -98740000 38600000 -9874005D 48000014 -38600000 98740000 -38600001 9874005D -886DAFA0 2C030003 -4182000C 2C030000 -4082000C 38600000 -98740004 38600000 -986DAFCA 38600004 +38600006 98640005 +4800006C 38600000 +4BFFFE85 38600001 3D808037 618CF1E4 7D8903A6 4E800421 -7C7E1B78 386000BC +7C7E1B78 386000BA 987E0000 7FC3F378 38800001 38A00001 3D808000 618C55F0 7D8903A6 4E800421 -7FC3F378 38800004 -38A00000 3D808000 -618C55F0 7D8903A6 -4E800421 3C80804D -807E0000 90645F90 7FC3F378 3D808037 618CF1B0 7D8903A6 -4E800421 7FE3FB78 +4E800421 3C808047 +60849D30 38600001 +98640005 887F0003 +48000735 986DAFC9 +886DAFA0 2C030003 +40820020 887F0003 +38800001 2C030000 +40820008 38800000 +988DAFC9 4800003C +3A800000 3AA00000 +7E83A378 480006F9 +2C030000 41820008 +3AB50001 3A940001 +2C140004 4180FFE4 +2C150001 4182000C +38600000 986DAFC9 +3E808047 62949DA4 +887F0003 480006C1 +2C030000 41820018 +38600001 98740000 +38600000 9874005D +48000014 38600000 +98740000 38600001 +9874005D 886DAFA0 +2C030003 4182000C +2C030000 4082000C +38600000 98740004 +38600000 986DAFCA +38600004 3D808037 +618CF1E4 7D8903A6 +4E800421 7C7E1B78 +386000BC 987E0000 +7FC3F378 38800001 +38A00001 3D808000 +618C55F0 7D8903A6 +4E800421 7FC3F378 +38800004 38A00000 +3D808000 618C55F0 +7D8903A6 4E800421 +3C80804D 807E0000 +90645F90 7FC3F378 3D808037 618CF1B0 7D8903A6 4E800421 -BA8100B0 800100E4 -382100E0 7C0803A6 -4E800020 4E800021 -01780101 01FF2121 -FF2121EE 0000EE00 -7C0802A6 90010004 -9421FF20 BE8100B0 -38600000 3D808000 -618C5610 7D8903A6 -4E800421 7C7E1B78 -83ED8840 3BFF0598 -886DAFA0 2C030003 -40820048 3BA00000 -1CBD0024 38650069 -7C7F18AE 38630001 -38850060 7C9F20AE -3D808000 618C56B0 +7FE3FB78 3D808037 +618CF1B0 7D8903A6 +4E800421 BA8100B0 +800100E4 382100E0 +7C0803A6 4E800020 +4E800021 01780101 +01FF2121 FF2121EE +0000EE00 7C0802A6 +90010004 9421FF20 +BE8100B0 38600000 +3D808000 618C5610 7D8903A6 4E800421 -1C9D0024 38840063 -7C7F21AE 3BBD0001 -2C1D0004 4180FFC4 -3C608049 60630888 -4BFFFF65 7C8802A6 -38A00010 3D808000 -618C31F4 7D8903A6 -4E800421 3C808049 -60840888 887F0060 -98640005 887F0063 -9864000B 887F0084 -98640008 887F0087 -9864000E 38600000 -9864FFFF 9864FFFB -887E0264 2C030000 -418200F4 887E0003 -1C630024 386302C5 -7F7E18AE 38600002 -98640002 38600001 -9864FFFB 98640006 -98640007 98640009 -9864000A 9864000C -9864000D 9864000F -98640010 3BA00000 -3B800000 1C7D0024 -38630069 7C7F18AE -7C03D800 40820030 -1CBD0024 38A50060 -7CBF28AE 38DC0005 -7CA621AE 1CBD0024 -38A50063 7CBF28AE -38DC000B 7CA621AE -3B9C0001 3BBD0001 -2C1D0004 4180FFB8 -9B840003 3BA00000 -3B800000 1C7D0024 -38630069 7C7F18AE -7C03D800 41820030 -1CBD0024 38A50060 -7CBF28AE 38DC0008 -7CA621AE 1CBD0024 -38A50063 7CBF28AE -38DC000E 7CA621AE -3B9C0001 3BBD0001 -2C1D0004 4180FFB8 -9B840004 3C808043 -60842078 887F0060 -90640014 887F0063 -98640018 887F0084 -9064001C 887F0087 -98640020 887E0264 -2C030000 41820024 -887F00A8 90640024 -887F00AB 98640028 -887F00CC 9064002C -887F00CF 98640030 -A07F000E 9064000C -3D808001 618C8254 -7D8903A6 4E800421 -386000C7 3D808001 -618C8C2C 7D8903A6 -4E800421 38600004 -3D808001 618C7700 +7C7E1B78 83ED8840 +3BFF0598 886DAFA0 +2C030003 40820048 +3BA00000 1CBD0024 +38650069 7C7F18AE +38630001 38850060 +7C9F20AE 3D808000 +618C56B0 7D8903A6 +4E800421 1C9D0024 +38840063 7C7F21AE +3BBD0001 2C1D0004 +4180FFC4 3C608049 +60630888 4BFFFF65 +7C8802A6 38A00010 +3D808000 618C31F4 7D8903A6 4E800421 -3860001C 3D808002 -618C6F2C 7D8903A6 -4E800421 3A800000 -1C140024 7FF5FB78 -7EB50214 3D808000 -618C569C 7D8903A6 -4E800421 88950060 -7C840774 7C041800 -41820028 38600000 -3D808000 618C56A0 +3C808049 60840888 +887F0060 98640005 +887F0063 9864000B +887F0084 98640008 +887F0087 9864000E +38600000 9864FFFF +9864FFFB 887E0264 +2C030000 418200F4 +887E0003 1C630024 +386302C5 7F7E18AE +38600002 98640002 +38600001 9864FFFB +98640006 98640007 +98640009 9864000A +9864000C 9864000D +9864000F 98640010 +3BA00000 3B800000 +1C7D0024 38630069 +7C7F18AE 7C03D800 +40820030 1CBD0024 +38A50060 7CBF28AE +38DC0005 7CA621AE +1CBD0024 38A50063 +7CBF28AE 38DC000B +7CA621AE 3B9C0001 +3BBD0001 2C1D0004 +4180FFB8 9B840003 +3BA00000 3B800000 +1C7D0024 38630069 +7C7F18AE 7C03D800 +41820030 1CBD0024 +38A50060 7CBF28AE +38DC0008 7CA621AE +1CBD0024 38A50063 +7CBF28AE 38DC000E +7CA621AE 3B9C0001 +3BBD0001 2C1D0004 +4180FFB8 9B840004 +3C808043 60842078 +887F0060 90640014 +887F0063 98640018 +887F0084 9064001C +887F0087 98640020 +887E0264 2C030000 +41820024 887F00A8 +90640024 887F00AB +98640028 887F00CC +9064002C 887F00CF +98640030 A07F000E +9064000C 3D808001 +618C8254 7D8903A6 +4E800421 386000C7 +3D808001 618C8C2C +7D8903A6 4E800421 +38600004 3D808001 +618C7700 7D8903A6 +4E800421 3860001C +3D808002 618C6F2C 7D8903A6 4E800421 -3D808000 618C56A8 +3A800000 1C140024 +7FF5FB78 7EB50214 +3D808000 618C569C 7D8903A6 4E800421 -3A940001 2C140006 -3AB50024 4180FFB0 -A07F000E 3D808022 -618C519C 7D8903A6 -4E800421 7C641B78 -38600001 3D808000 +88950060 7C840774 +7C041800 41820028 +38600000 3D808000 618C56A0 7D8903A6 4E800421 3D808000 618C56A8 7D8903A6 -4E800421 3D808002 -618C7168 7D8903A6 -4E800421 BA8100B0 +4E800421 3A940001 +2C140006 3AB50024 +4180FFB0 A07F000E +3D808022 618C519C +7D8903A6 4E800421 +7C641B78 38600001 +3D808000 618C56A0 +7D8903A6 4E800421 +3D808000 618C56A8 +7D8903A6 4E800421 +3D808002 618C7168 +7D8903A6 4E800421 +BA8100B0 800100E4 +382100E0 7C0803A6 +4E800020 7C0802A6 +90010004 9421FF20 +BE8100B0 3C808047 +60849D30 38600003 +98640005 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 9421FF20 BE8100B0 -3C808047 60849D30 -38600003 98640005 +38600000 3D808000 +618C5610 7D8903A6 +4E800421 7C7F1B78 +83CD8840 3BDE0598 +7FC3F378 389F025C +38A00138 3D808000 +618C31F4 7D8903A6 +4E800421 7FC3F378 +3D808000 618C5694 +7D8903A6 4E800421 +3D808017 618CEB30 +7D8903A6 4E800421 +889F02BC 98830000 +889F02BF 98830001 +38800000 98830002 +38800003 98830005 +38800078 98830004 +3C80803D 6084DEC8 +8084000C 887F02E0 +98640002 38602121 +B0640003 3C808049 +60840880 887F02E3 +98640016 7FE3FB78 +3D808037 618CF1B0 +7D8903A6 4E800421 BA8100B0 800100E4 382100E0 7C0803A6 -4E800020 7C0802A6 -90010004 9421FF20 -BE8100B0 38600000 -3D808000 618C5610 +4E800020 4E800021 +7C0802A6 90010004 +9421FF20 BE8100B0 +3FE08047 63FF9DA4 +887F0004 2C030001 +41820010 2C030002 +418200C8 48000110 +38600000 3D808004 +618C0AF0 7D8903A6 +4E800421 7C7B1B78 +38600001 3D808004 +618C0AF0 7D8903A6 +4E800421 2C1B002D +4081000C 2C03002D +41810014 2C1B002D +418100C4 2C03002D +418100B4 38600000 +3D808003 618C3BD8 7D8903A6 4E800421 -7C7F1B78 83CD8840 -3BDE0598 7FC3F378 -389F025C 38A00138 -3D808000 618C31F4 +7C7B1B78 38600001 +3D808003 618C3BD8 7D8903A6 4E800421 -7FC3F378 3D808000 -618C5694 7D8903A6 -4E800421 3D808017 -618CEB30 7D8903A6 -4E800421 889F02BC -98830000 889F02BF -98830001 38800000 -98830002 38800003 -98830005 38800078 -98830004 3C80803D -6084DEC8 8084000C -887F02E0 98640002 -38602121 B0640003 -3C808049 60840880 -887F02E3 98640016 -7FE3FB78 3D808037 -618CF1B0 7D8903A6 -4E800421 BA8100B0 -800100E4 382100E0 -7C0803A6 4E800020 -4E800021 7C0802A6 -90010004 9421FF20 -BE8100B0 3FE08047 -63FF9DA4 887F0004 -2C030001 41820010 -2C030002 418200C8 -48000110 38600000 -3D808004 618C0AF0 +7C1B1800 41810080 +41800084 38600000 +3D808003 618C42B4 7D8903A6 4E800421 7C7B1B78 38600001 -3D808004 618C0AF0 +3D808003 618C42B4 7D8903A6 4E800421 -2C1B002D 4081000C -2C03002D 41810014 -2C1B002D 418100C4 -2C03002D 418100B4 +7C1B1800 41800048 +4181004C 48000050 38600000 3D808003 618C3BD8 7D8903A6 -4E800421 7C7B1B78 -38600001 3D808003 -618C3BD8 7D8903A6 -4E800421 7C1B1800 -41810080 41800084 -38600000 3D808003 -618C42B4 7D8903A6 -4E800421 7C7B1B78 -38600001 3D808003 -618C42B4 7D8903A6 -4E800421 7C1B1800 -41800048 4181004C -48000050 38600000 +4E800421 2C030000 +40820024 38600001 3D808003 618C3BD8 7D8903A6 4E800421 -2C030000 40820024 -38600001 3D808003 -618C3BD8 7D8903A6 -4E800421 2C030000 -40820010 48000014 -38600000 48000010 -38600001 48000008 -3860FFFF BA8100B0 +2C030000 40820010 +48000014 38600000 +48000010 38600001 +48000008 3860FFFF +BA8100B0 800100E4 +382100E0 7C0803A6 +4E800020 7C0802A6 +90010004 9421FF20 +BE8100B0 7C7D1B78 +3FE08047 63FF9DA4 +1FDD00A8 7FDEFA14 +887F0004 2C030000 +418200B0 3C608046 +6063B6A0 886324D0 +889F0006 7C032000 +40820098 887E0058 +2C030003 4182008C +887F0004 2C030007 +40820040 887F0006 +2C030001 40820024 +887F0000 1C6300A8 +7C63FA14 8863005F +889E005F 7C032000 +41820058 4800005C +887F0000 7C03E800 +41820048 4800004C +887F0006 2C030001 +40820028 7FE3FB78 +3D808016 618C54A0 +7D8903A6 4E800421 +889E005F 7C032000 +41820020 48000014 +887E005D 2C030000 +41820010 48000004 +38600000 48000008 +38600001 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 9421FF20 BE8100B0 -7C7D1B78 3FE08047 -63FF9DA4 1FDD00A8 -7FDEFA14 887F0004 -2C030000 418200B0 -3C608046 6063B6A0 -886324D0 889F0006 -7C032000 40820098 -887E0058 2C030003 -4182008C 887F0004 -2C030007 40820040 -887F0006 2C030001 -40820024 887F0000 -1C6300A8 7C63FA14 -8863005F 889E005F -7C032000 41820058 -4800005C 887F0000 -7C03E800 41820048 -4800004C 887F0006 -2C030001 40820028 -7FE3FB78 3D808016 -618C54A0 7D8903A6 -4E800421 889E005F -7C032000 41820020 -48000014 887E005D -2C030000 41820010 -48000004 38600000 -48000008 38600001 +83E30010 887F0006 +2C030000 40820014 +3D808001 618C74BC +7D8903A6 4E800421 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 9421FF20 BE8100B0 83E30010 +38600000 3D808000 +618C5610 7D8903A6 +4E800421 7C7E1B78 +887E0000 2C030004 +41820020 38600001 +4BFFF56D 3C808047 +60849D30 38600001 +98640005 48000038 887F0006 2C030000 -40820014 3D808001 -618C74BC 7D8903A6 -4E800421 BA8100B0 +41820018 3C808047 +60849D30 38600003 +98640005 48000018 +4BFFFC09 3C808047 +60849D30 38600005 +98640005 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 -7C0802A6 90010004 -9421FF20 BE8100B0 -83E30010 38600000 -3D808000 618C5610 -7D8903A6 4E800421 -7C7E1B78 887E0000 -2C030004 41820018 -3C808047 60849D30 -38600001 98640005 -48000038 887F0006 -2C030000 41820018 -3C808047 60849D30 -38600003 98640005 -48000018 4BFFFC11 -3C808047 60849D30 -38600005 98640005 BA8100B0 800100E4 382100E0 7C0803A6 -4E800020 BA8100B0 -800100E4 382100E0 -7C0803A6 38600028 -987E0000 00000000 +38600028 987E0000 +60000000 00000000 04005694 4E800020 #Online/Static/AdjustNullCharID.asm C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm 7C0802A6 90010004 diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index afe26c6dbf..6ccc116add 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -4849,7 +4849,7 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm 3D80801B 618C136C 7D8903A6 4E800420 38600001 00000000 -C21A45B8 00000208 #Online/Slippi Online Scene/main.asm +C21A45B8 0000020C #Online/Slippi Online Scene/main.asm 3BA30004 7C0802A6 90010004 9421FF20 BE8100B0 3C80803E @@ -4860,7 +4860,7 @@ BE8100B0 3C80803E 986DAFEC 986DAFE0 38600008 480001C1 7C8802A6 4800002D -48000FD4 80830000 +48000FF0 80830000 5485467A 2C050048 40820014 548401BA 7C840734 7C841A14 @@ -4892,7 +4892,7 @@ BE8100B0 3C80803E BE8100B0 3C808045 6084ABF0 886DAEF8 98640006 48000159 -7C8802A6 48000BA5 +7C8802A6 48000BB9 7C6802A6 90640018 3D808000 618C56B8 7D8903A6 4E800421 @@ -4927,11 +4927,11 @@ BA8100B0 800100E4 03030000 00000000 00000000 05000000 00000000 00000000 -04030000 4800062D -48000969 20000000 +04030000 48000641 +4800097D 20000000 80490880 804D68D0 -05030000 48000CC9 -48000D09 50000000 +05030000 48000CDD +48000D1D 50000000 48000019 48000015 FF000000 4E800021 81940000 4E800021 @@ -4969,7 +4969,7 @@ BE8100B0 7C7E1B78 7F6802A6 7F63DB78 3880001C 3D808000 618CC160 7D8903A6 -4E800421 4800093D +4E800421 48000951 7C6802A6 907B0018 38600003 987B0000 38600001 B07B0001 @@ -4983,7 +4983,7 @@ BE8100B0 7C7E1B78 2C030000 40820000 886DAFCA 2C030000 41820020 48000004 -480007E5 3C808047 +480007F9 3C808047 60849D30 38600005 98640005 48000018 3C808047 60849D30 @@ -5011,7 +5011,7 @@ BE8100B0 7C7F1B78 4E800421 7C7E1B78 887E0001 889E0002 7C032000 4082001C -48000705 3C808047 +48000719 3C808047 60849D30 38600005 98640005 4800001C 38600000 3D80801A @@ -5039,337 +5039,341 @@ BE8100B0 3D80801B 3D808000 618C5610 7D8903A6 4E800421 7C7F1B78 886DAFA0 -2C030000 4082011C +2C030000 40820130 887F0000 2C030000 -40820010 38600001 -4BFFFF4D 48000104 -4BFFFC9D 7F6802A6 -3C808046 6084B6A0 -88640008 987B0017 -480006DD 7C7C1B78 -2C1C0000 40800014 -887B0006 38630001 -987B0006 48000060 -9B9B0005 A09B0001 -38840006 7F9B21AE -387C0003 7C9B18AE -38A40001 7CBB19AE -1C9C0002 38840010 -A07F026A 7C7B232E -889B0000 38840001 -38600002 7C841B96 -7C052000 4080002C -A07B0001 38630001 -B07B0001 38600000 -987B0006 3C808047 -60849D30 38600006 -98640005 4800006C -38600000 4BFFFE99 -38600001 3D808037 -618CF1E4 7D8903A6 -4E800421 7C7E1B78 -386000BA 987E0000 -7FC3F378 38800001 -38A00001 3D808000 -618C55F0 7D8903A6 -4E800421 7FC3F378 -3D808037 618CF1B0 -7D8903A6 4E800421 +41820018 808DB61C +88640011 2C030001 +41820008 48000010 +38600001 4BFFFF39 +480000B4 4BFFFC89 +7F6802A6 3C808046 +6084B6A0 88640008 +987B0017 480006DD +7C7C1B78 2C1C0000 +40800014 887B0006 +38630001 987B0006 +48000060 9B9B0005 +A09B0001 38840006 +7F9B21AE 387C0003 +7C9B18AE 38A40001 +7CBB19AE 1C9C0002 +38840010 A07F026A +7C7B232E 889B0000 +38840001 38600002 +7C841B96 7C052000 +4080002C A07B0001 +38630001 B07B0001 +38600000 987B0006 3C808047 60849D30 -38600001 98640005 -887F0003 48000735 -986DAFC9 886DAFA0 -2C030003 40820020 -887F0003 38800001 -2C030000 40820008 -38800000 988DAFC9 -4800003C 3A800000 -3AA00000 7E83A378 -480006F9 2C030000 -41820008 3AB50001 -3A940001 2C140004 -4180FFE4 2C150001 -4182000C 38600000 -986DAFC9 3E808047 -62949DA4 887F0003 -480006C1 2C030000 -41820018 38600001 -98740000 38600000 -9874005D 48000014 -38600000 98740000 -38600001 9874005D -886DAFA0 2C030003 -4182000C 2C030000 -4082000C 38600000 -98740004 38600000 -986DAFCA 38600004 +38600006 98640005 +4800006C 38600000 +4BFFFE85 38600001 3D808037 618CF1E4 7D8903A6 4E800421 -7C7E1B78 386000BC +7C7E1B78 386000BA 987E0000 7FC3F378 38800001 38A00001 3D808000 618C55F0 7D8903A6 4E800421 -7FC3F378 38800004 -38A00000 3D808000 -618C55F0 7D8903A6 -4E800421 3C80804D -807E0000 90645F90 7FC3F378 3D808037 618CF1B0 7D8903A6 -4E800421 7FE3FB78 +4E800421 3C808047 +60849D30 38600001 +98640005 887F0003 +48000735 986DAFC9 +886DAFA0 2C030003 +40820020 887F0003 +38800001 2C030000 +40820008 38800000 +988DAFC9 4800003C +3A800000 3AA00000 +7E83A378 480006F9 +2C030000 41820008 +3AB50001 3A940001 +2C140004 4180FFE4 +2C150001 4182000C +38600000 986DAFC9 +3E808047 62949DA4 +887F0003 480006C1 +2C030000 41820018 +38600001 98740000 +38600000 9874005D +48000014 38600000 +98740000 38600001 +9874005D 886DAFA0 +2C030003 4182000C +2C030000 4082000C +38600000 98740004 +38600000 986DAFCA +38600004 3D808037 +618CF1E4 7D8903A6 +4E800421 7C7E1B78 +386000BC 987E0000 +7FC3F378 38800001 +38A00001 3D808000 +618C55F0 7D8903A6 +4E800421 7FC3F378 +38800004 38A00000 +3D808000 618C55F0 +7D8903A6 4E800421 +3C80804D 807E0000 +90645F90 7FC3F378 3D808037 618CF1B0 7D8903A6 4E800421 -BA8100B0 800100E4 -382100E0 7C0803A6 -4E800020 4E800021 -01780101 01FF2121 -FF2121EE 0000EE00 -7C0802A6 90010004 -9421FF20 BE8100B0 -38600000 3D808000 -618C5610 7D8903A6 -4E800421 7C7E1B78 -83ED8840 3BFF0598 -886DAFA0 2C030003 -40820048 3BA00000 -1CBD0024 38650069 -7C7F18AE 38630001 -38850060 7C9F20AE -3D808000 618C56B0 +7FE3FB78 3D808037 +618CF1B0 7D8903A6 +4E800421 BA8100B0 +800100E4 382100E0 +7C0803A6 4E800020 +4E800021 01780101 +01FF2121 FF2121EE +0000EE00 7C0802A6 +90010004 9421FF20 +BE8100B0 38600000 +3D808000 618C5610 7D8903A6 4E800421 -1C9D0024 38840063 -7C7F21AE 3BBD0001 -2C1D0004 4180FFC4 -3C608049 60630888 -4BFFFF65 7C8802A6 -38A00010 3D808000 -618C31F4 7D8903A6 -4E800421 3C808049 -60840888 887F0060 -98640005 887F0063 -9864000B 887F0084 -98640008 887F0087 -9864000E 38600000 -9864FFFF 9864FFFB -887E0264 2C030000 -418200F4 887E0003 -1C630024 386302C5 -7F7E18AE 38600002 -98640002 38600001 -9864FFFB 98640006 -98640007 98640009 -9864000A 9864000C -9864000D 9864000F -98640010 3BA00000 -3B800000 1C7D0024 -38630069 7C7F18AE -7C03D800 40820030 -1CBD0024 38A50060 -7CBF28AE 38DC0005 -7CA621AE 1CBD0024 -38A50063 7CBF28AE -38DC000B 7CA621AE -3B9C0001 3BBD0001 -2C1D0004 4180FFB8 -9B840003 3BA00000 -3B800000 1C7D0024 -38630069 7C7F18AE -7C03D800 41820030 -1CBD0024 38A50060 -7CBF28AE 38DC0008 -7CA621AE 1CBD0024 -38A50063 7CBF28AE -38DC000E 7CA621AE -3B9C0001 3BBD0001 -2C1D0004 4180FFB8 -9B840004 3C808043 -60842078 887F0060 -90640014 887F0063 -98640018 887F0084 -9064001C 887F0087 -98640020 887E0264 -2C030000 41820024 -887F00A8 90640024 -887F00AB 98640028 -887F00CC 9064002C -887F00CF 98640030 -A07F000E 9064000C -3D808001 618C8254 -7D8903A6 4E800421 -386000C7 3D808001 -618C8C2C 7D8903A6 -4E800421 38600004 -3D808001 618C7700 +7C7E1B78 83ED8840 +3BFF0598 886DAFA0 +2C030003 40820048 +3BA00000 1CBD0024 +38650069 7C7F18AE +38630001 38850060 +7C9F20AE 3D808000 +618C56B0 7D8903A6 +4E800421 1C9D0024 +38840063 7C7F21AE +3BBD0001 2C1D0004 +4180FFC4 3C608049 +60630888 4BFFFF65 +7C8802A6 38A00010 +3D808000 618C31F4 7D8903A6 4E800421 -3860001C 3D808002 -618C6F2C 7D8903A6 -4E800421 3A800000 -1C140024 7FF5FB78 -7EB50214 3D808000 -618C569C 7D8903A6 -4E800421 88950060 -7C840774 7C041800 -41820028 38600000 -3D808000 618C56A0 +3C808049 60840888 +887F0060 98640005 +887F0063 9864000B +887F0084 98640008 +887F0087 9864000E +38600000 9864FFFF +9864FFFB 887E0264 +2C030000 418200F4 +887E0003 1C630024 +386302C5 7F7E18AE +38600002 98640002 +38600001 9864FFFB +98640006 98640007 +98640009 9864000A +9864000C 9864000D +9864000F 98640010 +3BA00000 3B800000 +1C7D0024 38630069 +7C7F18AE 7C03D800 +40820030 1CBD0024 +38A50060 7CBF28AE +38DC0005 7CA621AE +1CBD0024 38A50063 +7CBF28AE 38DC000B +7CA621AE 3B9C0001 +3BBD0001 2C1D0004 +4180FFB8 9B840003 +3BA00000 3B800000 +1C7D0024 38630069 +7C7F18AE 7C03D800 +41820030 1CBD0024 +38A50060 7CBF28AE +38DC0008 7CA621AE +1CBD0024 38A50063 +7CBF28AE 38DC000E +7CA621AE 3B9C0001 +3BBD0001 2C1D0004 +4180FFB8 9B840004 +3C808043 60842078 +887F0060 90640014 +887F0063 98640018 +887F0084 9064001C +887F0087 98640020 +887E0264 2C030000 +41820024 887F00A8 +90640024 887F00AB +98640028 887F00CC +9064002C 887F00CF +98640030 A07F000E +9064000C 3D808001 +618C8254 7D8903A6 +4E800421 386000C7 +3D808001 618C8C2C +7D8903A6 4E800421 +38600004 3D808001 +618C7700 7D8903A6 +4E800421 3860001C +3D808002 618C6F2C 7D8903A6 4E800421 -3D808000 618C56A8 +3A800000 1C140024 +7FF5FB78 7EB50214 +3D808000 618C569C 7D8903A6 4E800421 -3A940001 2C140006 -3AB50024 4180FFB0 -A07F000E 3D808022 -618C519C 7D8903A6 -4E800421 7C641B78 -38600001 3D808000 +88950060 7C840774 +7C041800 41820028 +38600000 3D808000 618C56A0 7D8903A6 4E800421 3D808000 618C56A8 7D8903A6 -4E800421 3D808002 -618C7168 7D8903A6 -4E800421 BA8100B0 +4E800421 3A940001 +2C140006 3AB50024 +4180FFB0 A07F000E +3D808022 618C519C +7D8903A6 4E800421 +7C641B78 38600001 +3D808000 618C56A0 +7D8903A6 4E800421 +3D808000 618C56A8 +7D8903A6 4E800421 +3D808002 618C7168 +7D8903A6 4E800421 +BA8100B0 800100E4 +382100E0 7C0803A6 +4E800020 7C0802A6 +90010004 9421FF20 +BE8100B0 3C808047 +60849D30 38600003 +98640005 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 9421FF20 BE8100B0 -3C808047 60849D30 -38600003 98640005 +38600000 3D808000 +618C5610 7D8903A6 +4E800421 7C7F1B78 +83CD8840 3BDE0598 +7FC3F378 389F025C +38A00138 3D808000 +618C31F4 7D8903A6 +4E800421 7FC3F378 +3D808000 618C5694 +7D8903A6 4E800421 +3D808017 618CEB30 +7D8903A6 4E800421 +889F02BC 98830000 +889F02BF 98830001 +38800000 98830002 +38800003 98830005 +38800078 98830004 +3C80803D 6084DEC8 +8084000C 887F02E0 +98640002 38602121 +B0640003 3C808049 +60840880 887F02E3 +98640016 7FE3FB78 +3D808037 618CF1B0 +7D8903A6 4E800421 BA8100B0 800100E4 382100E0 7C0803A6 -4E800020 7C0802A6 -90010004 9421FF20 -BE8100B0 38600000 -3D808000 618C5610 +4E800020 4E800021 +7C0802A6 90010004 +9421FF20 BE8100B0 +3FE08047 63FF9DA4 +887F0004 2C030001 +41820010 2C030002 +418200C8 48000110 +38600000 3D808004 +618C0AF0 7D8903A6 +4E800421 7C7B1B78 +38600001 3D808004 +618C0AF0 7D8903A6 +4E800421 2C1B002D +4081000C 2C03002D +41810014 2C1B002D +418100C4 2C03002D +418100B4 38600000 +3D808003 618C3BD8 7D8903A6 4E800421 -7C7F1B78 83CD8840 -3BDE0598 7FC3F378 -389F025C 38A00138 -3D808000 618C31F4 +7C7B1B78 38600001 +3D808003 618C3BD8 7D8903A6 4E800421 -7FC3F378 3D808000 -618C5694 7D8903A6 -4E800421 3D808017 -618CEB30 7D8903A6 -4E800421 889F02BC -98830000 889F02BF -98830001 38800000 -98830002 38800003 -98830005 38800078 -98830004 3C80803D -6084DEC8 8084000C -887F02E0 98640002 -38602121 B0640003 -3C808049 60840880 -887F02E3 98640016 -7FE3FB78 3D808037 -618CF1B0 7D8903A6 -4E800421 BA8100B0 -800100E4 382100E0 -7C0803A6 4E800020 -4E800021 7C0802A6 -90010004 9421FF20 -BE8100B0 3FE08047 -63FF9DA4 887F0004 -2C030001 41820010 -2C030002 418200C8 -48000110 38600000 -3D808004 618C0AF0 +7C1B1800 41810080 +41800084 38600000 +3D808003 618C42B4 7D8903A6 4E800421 7C7B1B78 38600001 -3D808004 618C0AF0 +3D808003 618C42B4 7D8903A6 4E800421 -2C1B002D 4081000C -2C03002D 41810014 -2C1B002D 418100C4 -2C03002D 418100B4 +7C1B1800 41800048 +4181004C 48000050 38600000 3D808003 618C3BD8 7D8903A6 -4E800421 7C7B1B78 -38600001 3D808003 -618C3BD8 7D8903A6 -4E800421 7C1B1800 -41810080 41800084 -38600000 3D808003 -618C42B4 7D8903A6 -4E800421 7C7B1B78 -38600001 3D808003 -618C42B4 7D8903A6 -4E800421 7C1B1800 -41800048 4181004C -48000050 38600000 +4E800421 2C030000 +40820024 38600001 3D808003 618C3BD8 7D8903A6 4E800421 -2C030000 40820024 -38600001 3D808003 -618C3BD8 7D8903A6 -4E800421 2C030000 -40820010 48000014 -38600000 48000010 -38600001 48000008 -3860FFFF BA8100B0 +2C030000 40820010 +48000014 38600000 +48000010 38600001 +48000008 3860FFFF +BA8100B0 800100E4 +382100E0 7C0803A6 +4E800020 7C0802A6 +90010004 9421FF20 +BE8100B0 7C7D1B78 +3FE08047 63FF9DA4 +1FDD00A8 7FDEFA14 +887F0004 2C030000 +418200B0 3C608046 +6063B6A0 886324D0 +889F0006 7C032000 +40820098 887E0058 +2C030003 4182008C +887F0004 2C030007 +40820040 887F0006 +2C030001 40820024 +887F0000 1C6300A8 +7C63FA14 8863005F +889E005F 7C032000 +41820058 4800005C +887F0000 7C03E800 +41820048 4800004C +887F0006 2C030001 +40820028 7FE3FB78 +3D808016 618C54A0 +7D8903A6 4E800421 +889E005F 7C032000 +41820020 48000014 +887E005D 2C030000 +41820010 48000004 +38600000 48000008 +38600001 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 9421FF20 BE8100B0 -7C7D1B78 3FE08047 -63FF9DA4 1FDD00A8 -7FDEFA14 887F0004 -2C030000 418200B0 -3C608046 6063B6A0 -886324D0 889F0006 -7C032000 40820098 -887E0058 2C030003 -4182008C 887F0004 -2C030007 40820040 -887F0006 2C030001 -40820024 887F0000 -1C6300A8 7C63FA14 -8863005F 889E005F -7C032000 41820058 -4800005C 887F0000 -7C03E800 41820048 -4800004C 887F0006 -2C030001 40820028 -7FE3FB78 3D808016 -618C54A0 7D8903A6 -4E800421 889E005F -7C032000 41820020 -48000014 887E005D -2C030000 41820010 -48000004 38600000 -48000008 38600001 +83E30010 887F0006 +2C030000 40820014 +3D808001 618C74BC +7D8903A6 4E800421 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 9421FF20 BE8100B0 83E30010 +38600000 3D808000 +618C5610 7D8903A6 +4E800421 7C7E1B78 +887E0000 2C030004 +41820020 38600001 +4BFFF56D 3C808047 +60849D30 38600001 +98640005 48000038 887F0006 2C030000 -40820014 3D808001 -618C74BC 7D8903A6 -4E800421 BA8100B0 +41820018 3C808047 +60849D30 38600003 +98640005 48000018 +4BFFFC09 3C808047 +60849D30 38600005 +98640005 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 -7C0802A6 90010004 -9421FF20 BE8100B0 -83E30010 38600000 -3D808000 618C5610 -7D8903A6 4E800421 -7C7E1B78 887E0000 -2C030004 41820018 -3C808047 60849D30 -38600001 98640005 -48000038 887F0006 -2C030000 41820018 -3C808047 60849D30 -38600003 98640005 -48000018 4BFFFC11 -3C808047 60849D30 -38600005 98640005 BA8100B0 800100E4 382100E0 7C0803A6 -4E800020 BA8100B0 -800100E4 382100E0 -7C0803A6 38600028 -987E0000 00000000 +38600028 987E0000 +60000000 00000000 04005694 4E800020 #Online/Static/AdjustNullCharID.asm C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm 7C0802A6 90010004 From 2d63a484999c3032fd7c6f6a4d2d4b1f60a96604 Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Tue, 30 Jul 2024 13:16:24 -0400 Subject: [PATCH 13/16] fix: prevent loading savestates when connected --- Source/Core/Core/State.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index 9e3afb32d2..11d04bd625 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" @@ -190,6 +191,10 @@ void LoadFromBuffer(std::vector& buffer) OSD::AddMessage("Loading savestates is disabled in multiplayer Netplay lobbies to prevent desyncs"); return; } + else if (IsOnline()) + { + return; // No loading states when online on slippi either + } bool wasUnpaused = Core::PauseAndLock(true); @@ -532,6 +537,10 @@ void LoadAs(const std::string& filename) OSD::AddMessage("Loading savestates is disabled in multiplayer Netplay lobbies to prevent desyncs"); return; } + else if (IsOnline()) + { + return; // No loading states when online on slippi either + } // Stop the core while we load the state bool wasUnpaused = Core::PauseAndLock(true); From 8e9b34cf652ca9048aa1097f5b9e7cfc3acf026e Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Tue, 30 Jul 2024 14:04:54 -0400 Subject: [PATCH 14/16] release(netplay): v3.4.2 --- Source/Core/Common/Version.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp index ded80b787c..714857194f 100644 --- a/Source/Core/Common/Version.cpp +++ b/Source/Core/Common/Version.cpp @@ -27,7 +27,7 @@ // if releasing both builds, use `release: {combined_version}` or `release: {netplay_version} | {playback_version}` // for releasing a single build, use `release(netplay): {netplay_version}` or `release(playback): {playback_version}` #ifndef IS_PLAYBACK -#define SLIPPI_REV_STR "3.4.1" // netplay version +#define SLIPPI_REV_STR "3.4.2" // netplay version #else #define SLIPPI_REV_STR "3.4.3" // playback version #endif From eaa4a6f567cac102e956519b5d78f948551e208d Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Mon, 9 Sep 2024 12:53:21 -0700 Subject: [PATCH 15/16] ci: install DirectX SDK redist from choco --- .github/workflows/pr-build.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index de76e651dc..c6d4832794 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -89,19 +89,12 @@ jobs: uses: actions/cache@v3 with: path: | - ./Tools/DX/ ./CodeSignTool/ key: ${{ runner.os }}-${{ secrets.CACHE_CONTROL }} - - name: "Download DirectX SDK" - working-directory: ${{ github.workspace }} + - name: "Install DirectX SDK Redist" shell: powershell run: | - if (!(Test-Path ".\Tools\DX\DXSDK_Jun10.exe" -PathType Leaf)) { Invoke-WebRequest -Uri https://github.com/project-slippi/Ishiiruka/releases/download/v2.2.5/DXSDK_Jun10.exe -UseBasicParsing -OutFile ".\Tools\DX\DXSDK_Jun10.exe" } - - name: "Install DirectX SDK" - working-directory: ${{ github.workspace }} - shell: cmd - run: | - .\Tools\DX\DXSDK_Jun10.exe /U /F + choco install directx-sdk - name: 'Fetch Git Tags' shell: bash if: success() From 5980277d9b2dc60eba603c8975737e3c0a78f0f9 Mon Sep 17 00:00:00 2001 From: Pascal Lasnier <43880390+pylasnier@users.noreply.github.com> Date: Tue, 17 Sep 2024 05:43:52 +0000 Subject: [PATCH 16/16] fix: update lib name to slippi_rust_extensions for Cargo 1.79 compat (#424) Dashes to underscores in lib name to build with Cargo 1.79 --- Externals/SlippiRustExtensions | 2 +- Source/Core/DolphinWX/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals/SlippiRustExtensions b/Externals/SlippiRustExtensions index 1e9fbf1147..47d4ebf73a 160000 --- a/Externals/SlippiRustExtensions +++ b/Externals/SlippiRustExtensions @@ -1 +1 @@ -Subproject commit 1e9fbf11479e20cd07a75f67888c138c7893bc24 +Subproject commit 47d4ebf73ab4debc5cb06da5ce11a1af209ccdad diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index e2afe261e6..90f9a87e4e 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -145,7 +145,7 @@ if(wxWidgets_FOUND) endif() corrosion_import_crate(MANIFEST_PATH ${CMAKE_SOURCE_DIR}/Externals/SlippiRustExtensions/Cargo.toml ${RUST_FEATURES}) - target_link_libraries("${DOLPHIN_EXE}" PUBLIC slippi-rust-extensions) + target_link_libraries("${DOLPHIN_EXE}" PUBLIC slippi_rust_extensions) if(APPLE) include(BundleUtilities)