Update memory cards, add missing XInput DLL, and fix HDD image path

.github/workflows/build-package.yaml

@@ -1,22 +1,22 @@
-name: "build-lambda-package"
-on:
-  push:
-    branches:
-      - master
-      - 'releases/*'
-
-jobs:
-  units:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-    - name: Build installer
-      run: |
-        make
-    - name: Archive artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: pxsx2-installer-archive
-        path: build/*
-
+name: "build-lambda-package"
+on:
+  push:
+    branches:
+      - master
+      - 'releases/*'
+
+jobs:
+  units:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+    - name: Build installer
+      run: |
+        make
+    - name: Archive artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: pxsx2-installer-archive
+        path: build/*
+

.github/workflows/package-release.yaml

@@ -1,21 +1,21 @@
-name: "package-release"
-on:
-  release:
-    types: [published]
-
-jobs:
-  units:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-    - name: Build final archive
-      run: |
-        make zip
-    - name: upload archive to release
-      uses: softprops/action-gh-release@v1
-      if: ${{startsWith(github.ref, 'refs/tags/') }}
-      with:
-          files: build/archive/PCSX2-Installer.zip
-          fail_on_unmatched_files: true
-
+name: "package-release"
+on:
+  release:
+    types: [published]
+
+jobs:
+  units:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+    - name: Build final archive
+      run: |
+        make zip
+    - name: upload archive to release
+      uses: softprops/action-gh-release@v1
+      if: ${{startsWith(github.ref, 'refs/tags/') }}
+      with:
+          files: build/PCSX2-Installer.zip
+          fail_on_unmatched_files: true
+

.gitignore

@@ -1,8 +1,8 @@
-# Idea
-.idea
-
-# build
-build/**
-
-# keep files
-!.gitkeep
+# Idea
+.idea
+
+# build
+build/**
+
+# keep files
+!.gitkeep

Makefile

@@ -1,12 +1,12 @@
-default: build
-
-zip: build
-	mkdir -p build/archive/
-	cd build/ && zip -qr archive/PCSX2-Installer.zip * -x archive/
-
-build: clean
-	@cd include/ && zip -qr ../build/include.zip * && cd -
-	cp -r bin/ install.bat build/
-
-clean:
-	rm -rf build/*
+default: build
+
+zip: build
+	cd build/ && zip -r PCSX2-Installer.zip PCSX2-1.7/ && cd -
+
+build: clean
+	mkdir -p build/PCSX2-1.7/
+	@cd include/ && zip -qr ../build/PCSX2-1.7/include.zip * && cd -
+	cp -r bin/ install.bat build/PCSX2-1.7/
+
+clean:
+	rm -rf build/*

bin/setup.ps1

@@ -14,10 +14,25 @@ Write-Host @"
 
 "@
 
+$Shell = New-Object -ComObject "WScript.Shell"
 $7zipPath = "$env:ProgramFiles\7-Zip\7z.exe"
+$workingDirectory = Get-Location
+Join-Path -Path $workingDirectory -ChildPath 'inis\PCSX2.ini'
+Join-Path -Path $workingDirectory -ChildPath 'hdd\'
+$newPath = (Join-Path -Path $workingDirectory -ChildPath 'hdd\AllSocomMaps.raw')
+(Get-Content -path (Join-Path -Path $workingDirectory -ChildPath 'inis\PCSX2.ini') -Raw) -replace '\.\\hdd\\AllSocomMaps\.raw', "$newPath"
+Exit 1
 
 if (-not (Test-Path -Path $7zipPath -PathType Leaf)) {
     Write-Host -ForegroundColor Red -BackgroundColor Black "You are missing 7-Zip which is required. Please download and install it before running this script."
+	$helpText = @"
+It appears that 7-Zip is not installed on your PC which is required to continue.`n`n
+Press Yes to automatically download the installer
+Press No to exit 
+"@
+	if ($Shell.Popup($helpText,0, "Error", 4) -eq 6) {
+		Start-Process "https://www.7-zip.org/a/7z2201-x64.exe"
+	}
 	Exit 1
 }
 
@@ -54,6 +69,10 @@ Remove-Item hdd.zip -Force
 
 Write-Host Configuring PCSX2...
 Expand-Archive include.zip -DestinationPath . -Force
+$newPath = (Join-Path -Path $workingDirectory -ChildPath 'hdd\AllSocomMaps.raw')
+$pcsxConfigPath = (Join-Path -Path $workingDirectory -ChildPath 'inis\PCSX2.ini')
+(Get-Content -path $pcsxConfigPath -Raw) -replace '\.\\hdd\\AllSocomMaps\.raw', "$newPath" | Set-Content -Path $pcsxConfigPath
+
 Remove-Item include.zip -Force
 
 Write-Host Cleaning up...
@@ -71,5 +90,5 @@ If you wish to use a different folder, you may do so within the PCSX2 settings.
 `n`nFor additional guides and support, visit our website https://psrewired.com
 "@
 
-$Shell = New-Object -ComObject "WScript.Shell"
+
 $Shell.Popup($helpText,0, "Installation Complete!", 0)

include/inis/PCSX2.ini

@@ -377,7 +377,7 @@ SlomoScalar = 0.5
 
 [MemoryCards]
 Slot1_Enable = true
-Slot1_Filename = Mcd001.ps2
+Slot1_Filename = Socom.ps2
 Slot2_Enable = true
 Slot2_Filename = Mcd002.ps2
 Multitap1_Slot2_Enable = false