From aaad1a274be890cb2d3302274ed1edc9c5dfb133 Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Wed, 13 Oct 2021 00:17:11 -0700 Subject: [PATCH] Playback v2.3.7; remove Normal Lag Reduction and default to auto aspect ratio --- Data/PlaybackGeckoCodes/GALE01r2.ini | 5 ----- Data/PlaybackGeckoCodes/GALJ01r2.ini | 5 ----- Source/Core/Common/Version.cpp | 2 +- Source/Core/Core/HW/EXI_DeviceSlippi.cpp | 2 ++ Source/Core/VideoCommon/VideoConfig.cpp | 4 ++++ 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Data/PlaybackGeckoCodes/GALE01r2.ini b/Data/PlaybackGeckoCodes/GALE01r2.ini index 1db7e52f1d..367ac20bef 100644 --- a/Data/PlaybackGeckoCodes/GALE01r2.ini +++ b/Data/PlaybackGeckoCodes/GALE01r2.ini @@ -9,7 +9,6 @@ FastDiscSpeed = True [Gecko_Enabled] $Required: General Codes $Required: Slippi Playback -$Recommended: Normal Lag Reduction $Optional: Show Player Names [Gecko] @@ -1037,10 +1036,6 @@ C209E090 00000011 #Common/FastForward/DynamicsFix.asm 7C0803A6 4E800020 BB010028 00000000 -$Recommended: Normal Lag Reduction [Hannes Mann] -043761EC 4800001C -04376238 48000018 - $Optional: Show Player Names [Fizzi, UnclePunch, Enzyme, jmlee337] *Show players' Slippi Online display names as HUD elements when available C216E9B4 0000009A #Playback/Show Player Names/InitInGame.asm diff --git a/Data/PlaybackGeckoCodes/GALJ01r2.ini b/Data/PlaybackGeckoCodes/GALJ01r2.ini index 27838a7309..2740d41047 100644 --- a/Data/PlaybackGeckoCodes/GALJ01r2.ini +++ b/Data/PlaybackGeckoCodes/GALJ01r2.ini @@ -9,7 +9,6 @@ FastDiscSpeed = True [Gecko_Enabled] $Required: General Codes $Required: Slippi Playback -$Recommended: Normal Lag Reduction $Optional: Show Player Names [Gecko] @@ -1037,10 +1036,6 @@ C209E090 00000011 #Common/FastForward/DynamicsFix.asm 7C0803A6 4E800020 BB010028 00000000 -$Recommended: Normal Lag Reduction [Hannes Mann] -043761EC 4800001C -04376238 48000018 - $Optional: Show Player Names [Fizzi, UnclePunch, Enzyme, jmlee337] *Show players' Slippi Online display names as HUD elements when available C216E9B4 0000009A #Playback/Show Player Names/InitInGame.asm diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp index 7b849d1994..886a35262c 100644 --- a/Source/Core/Common/Version.cpp +++ b/Source/Core/Common/Version.cpp @@ -26,7 +26,7 @@ #ifndef IS_PLAYBACK #define SLIPPI_REV_STR "2.3.2" // netplay version #else -#define SLIPPI_REV_STR "2.3.6" // playback version +#define SLIPPI_REV_STR "2.3.7" // playback version #endif #ifdef IS_PLAYBACK const std::string scm_rev_str = "Faster Melee - Slippi (" SLIPPI_REV_STR ") - Playback"; diff --git a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp index 3e9c3bbfcf..ec6bf7faba 100644 --- a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp +++ b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp @@ -1047,6 +1047,8 @@ void CEXISlippi::prepareGeckoList() {0x80218D68, true}, // Binary/LagReduction/PD+VB.bin {0x8016E9AC, true}, // Binary/Force2PCenterHud.bin {0x80030E44, true}, // Binary/DisableScreenShake.bin + {0x803761EC, true}, // Binary/NormalLagReduction.bin + {0x80376238, true}, // Binary/NormalLagReduction.bin {0x800055f0, true}, // Common/EXITransferBuffer.asm {0x800055f8, true}, // Common/GetIsFollower.asm diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 3dd8893bf7..40ec156273 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -80,7 +80,11 @@ void VideoConfig::Load(const std::string& ini_file) IniFile::Section* settings = iniFile.GetOrCreateSection("Settings"); settings->Get("wideScreenHack", &bWidescreenHack, false); +#ifdef IS_PLAYBACK + settings->Get("AspectRatio", &iAspectRatio, (int)ASPECT_AUTO); +#else settings->Get("AspectRatio", &iAspectRatio, (int)ASPECT_73_60); +#endif settings->Get("Crop", &bCrop, false); settings->Get("UseXFB", &bUseXFB, 0); settings->Get("UseRealXFB", &bUseRealXFB, 0);