Merge branch 'slippi' into testing/playback-debug-fast

project-slippi · Nov 4, 2024 · 64a00b5 · 64a00b5
2 parents 363661b + 5980277
commit 64a00b5
Show file tree

Hide file tree

Showing 15 changed files with 663 additions and 492 deletions.
diff --git 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()
@@ -293,7 +286,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

diff --git 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
@@ -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