From d46aa8d289411653185663f9a8f44a00aeb33fd5 Mon Sep 17 00:00:00 2001
From: Garrett Brown <themagnificentmrb@gmail.com>
Date: Tue, 5 Dec 2023 22:43:06 +0000
Subject: [PATCH] Updated by kodi-game-scripting

https://github.com/kodi-game/kodi-game-scripting/
---
 depends/common/pcsx-rearmed/pcsx-rearmed.txt  |  2 +-
 depends/windows/mingw/mingw.sha256            |  2 +-
 depends/windows/mingw/mingw.txt               |  2 +-
 game.libretro.pcsx-rearmed/addon.xml.in       |  4 +-
 .../resource.language.en_gb/strings.po        | 64 +++++++++++++++----
 .../resources/settings.xml                    | 25 +++++---
 6 files changed, 72 insertions(+), 27 deletions(-)

diff --git a/depends/common/pcsx-rearmed/pcsx-rearmed.txt b/depends/common/pcsx-rearmed/pcsx-rearmed.txt
index 21331bc..91fced7 100644
--- a/depends/common/pcsx-rearmed/pcsx-rearmed.txt
+++ b/depends/common/pcsx-rearmed/pcsx-rearmed.txt
@@ -1 +1 @@
-pcsx-rearmed https://github.com/libretro/pcsx_rearmed/archive/4373e29de72c917dbcd04ec2a5fb685e69d9def3.tar.gz
+pcsx-rearmed https://github.com/libretro/pcsx_rearmed/archive/162bbc5e3cc5415a0bce81c553bc95db19b618ec.tar.gz
diff --git a/depends/windows/mingw/mingw.sha256 b/depends/windows/mingw/mingw.sha256
index b4768dc..3398fc6 100644
--- a/depends/windows/mingw/mingw.sha256
+++ b/depends/windows/mingw/mingw.sha256
@@ -1 +1 @@
-4013a9d5e51b448343efc24fc6a324cc999bb96b4c01b13a6bd3c661bb5c8a82
+fa75120560563a311241c05882016978bd35612692c7f0d39815a27837bff27d
diff --git a/depends/windows/mingw/mingw.txt b/depends/windows/mingw/mingw.txt
index b79b9bd..b9bc4cf 100644
--- a/depends/windows/mingw/mingw.txt
+++ b/depends/windows/mingw/mingw.txt
@@ -1 +1 @@
-mingw http://mirrors.kodi.tv/build-deps/win32/msys2/msys2-base-x86_64-20210725.tar.xz
+mingw https://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20231026.tar.xz
diff --git a/game.libretro.pcsx-rearmed/addon.xml.in b/game.libretro.pcsx-rearmed/addon.xml.in
index cac2471..c45c828 100644
--- a/game.libretro.pcsx-rearmed/addon.xml.in
+++ b/game.libretro.pcsx-rearmed/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="game.libretro.pcsx-rearmed"
 		name="Sony - PlayStation (PCSX ReARMed)"
-		version="23.0.0.49"
+		version="23.0.0.50"
 		provider-name="PCSX Team, notaz, Exophase">
 	<requires>
 		<import addon="game.libretro" version="1.0.0"/>
@@ -15,7 +15,7 @@
 	<extension point="kodi.gameclient"
 			library_@PLATFORM@="@LIBRARY_FILENAME@">
 		<platforms>PlayStation</platforms>
-		<extensions>bin|cue|img|mdf|pbp|toc|cbn|m3u|chd</extensions>
+		<extensions>bin|cue|img|mdf|pbp|toc|cbn|m3u|chd|iso|exe</extensions>
 		<supports_vfs>false</supports_vfs>
 		<supports_standalone>false</supports_standalone>
 		<requires_opengl>false</requires_opengl>
diff --git a/game.libretro.pcsx-rearmed/resources/language/resource.language.en_gb/strings.po b/game.libretro.pcsx-rearmed/resources/language/resource.language.en_gb/strings.po
index b02670e..3657da7 100644
--- a/game.libretro.pcsx-rearmed/resources/language/resource.language.en_gb/strings.po
+++ b/game.libretro.pcsx-rearmed/resources/language/resource.language.en_gb/strings.po
@@ -56,10 +56,6 @@ msgctxt "#30007"
 msgid "Dithering Pattern"
 msgstr ""
 
-msgctxt "#30008"
-msgid "Frame Duping (Speedup)"
-msgstr ""
-
 msgctxt "#30009"
 msgid "Threaded Rendering"
 msgstr ""
@@ -88,10 +84,6 @@ msgctxt "#30015"
 msgid "(GPU) Show Interlaced Video"
 msgstr ""
 
-msgctxt "#30016"
-msgid "(GPU) Enhanced Resolution (Slow)"
-msgstr ""
-
 msgctxt "#30017"
 msgid "(GPU) Enhanced Resolution Speed Hack"
 msgstr ""
@@ -168,10 +160,6 @@ msgctxt "#30035"
 msgid "Rumble Effects"
 msgstr ""
 
-msgctxt "#30036"
-msgid "Multitap Mode (Restart)"
-msgstr ""
-
 msgctxt "#30037"
 msgid "NegCon Twist Deadzone"
 msgstr ""
@@ -220,6 +208,54 @@ msgctxt "#30048"
 msgid "(Speed Hack) Disable GTE Flags"
 msgstr ""
 
-msgctxt "#30049"
-msgid "(Speed Hack) Disable CPU/GTE Stalls"
+msgctxt "#30050"
+msgid "(GPU) Screen centering"
+msgstr ""
+
+msgctxt "#30051"
+msgid "(GPU) Manual screen centering X"
+msgstr ""
+
+msgctxt "#30052"
+msgid "(GPU) Manual screen centering Y"
+msgstr ""
+
+msgctxt "#30053"
+msgid "(GPU) Enhanced Resolution"
+msgstr ""
+
+msgctxt "#30054"
+msgid "Threaded SPU"
+msgstr ""
+
+msgctxt "#30055"
+msgid "DualShock Analog Mode Toggle Key Combo"
+msgstr ""
+
+msgctxt "#30056"
+msgid "Multitap Mode"
+msgstr ""
+
+msgctxt "#30057"
+msgid "Player 1 Lightgun Crosshair"
+msgstr ""
+
+msgctxt "#30058"
+msgid "Player 2 Lightgun Crosshair"
+msgstr ""
+
+msgctxt "#30059"
+msgid "Konami Gun X Axis Offset"
+msgstr ""
+
+msgctxt "#30060"
+msgid "Konami Gun Y Axis Offset"
+msgstr ""
+
+msgctxt "#30061"
+msgid "Exception and Breakpoint Emulation"
+msgstr ""
+
+msgctxt "#30062"
+msgid "Disable CPU/GTE Stalls"
 msgstr ""
diff --git a/game.libretro.pcsx-rearmed/resources/settings.xml b/game.libretro.pcsx-rearmed/resources/settings.xml
index c28b521..5e448bc 100644
--- a/game.libretro.pcsx-rearmed/resources/settings.xml
+++ b/game.libretro.pcsx-rearmed/resources/settings.xml
@@ -8,15 +8,17 @@
 		<setting label="30005" type="select" id="pcsx_rearmed_drc" values="enabled|disabled" default="enabled"/>
 		<setting label="30006" type="select" id="pcsx_rearmed_psxclock" values="57|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100" default="57"/>
 		<setting label="30007" type="select" id="pcsx_rearmed_dithering" values="enabled|disabled" default="enabled"/>
-		<setting label="30008" type="select" id="pcsx_rearmed_duping_enable" values="enabled|disabled" default="enabled"/>
 		<setting label="30009" type="select" id="pcsx_rearmed_gpu_thread_rendering" values="disabled|sync|async" default="disabled"/>
 		<setting label="30010" type="select" id="pcsx_rearmed_frameskip_type" values="disabled|auto|auto_threshold|fixed_interval" default="disabled"/>
 		<setting label="30011" type="select" id="pcsx_rearmed_frameskip_threshold" values="33|15|18|21|24|27|30|36|39|42|45|48|51|54|57|60" default="33"/>
 		<setting label="30012" type="select" id="pcsx_rearmed_frameskip_interval" values="3|1|2|4|5|6|7|8|9|10" default="3"/>
 		<setting label="30013" type="select" id="pcsx_rearmed_display_internal_fps" values="disabled|enabled" default="disabled"/>
 		<setting label="30014" type="select" id="pcsx_rearmed_gpu_slow_llists" values="auto|disabled|enabled" default="auto"/>
-		<setting label="30015" type="select" id="pcsx_rearmed_neon_interlace_enable" values="disabled|enabled" default="disabled"/>
-		<setting label="30016" type="select" id="pcsx_rearmed_neon_enhancement_enable" values="disabled|enabled" default="disabled"/>
+		<setting label="30050" type="select" id="pcsx_rearmed_screen_centering" values="auto|game|borderless|manual" default="auto"/>
+		<setting label="30051" type="select" id="pcsx_rearmed_screen_centering_x" values="0|-16|-14|-12|-10|-8|-6|-4|-2|2|4|6|8|10|12|14|16" default="0"/>
+		<setting label="30052" type="select" id="pcsx_rearmed_screen_centering_y" values="0|-16|-15|-14|-13|-12|-11|-10|-9|-8|-7|-6|-5|-4|-3|-2|-1|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16" default="0"/>
+		<setting label="30015" type="select" id="pcsx_rearmed_neon_interlace_enable_v2" values="auto|disabled|enabled" default="auto"/>
+		<setting label="30053" type="select" id="pcsx_rearmed_neon_enhancement_enable" values="disabled|enabled" default="disabled"/>
 		<setting label="30017" type="select" id="pcsx_rearmed_neon_enhancement_no_main" values="disabled|enabled" default="disabled"/>
 		<setting label="30018" type="select" id="pcsx_rearmed_gpu_peops_odd_even_bit" values="disabled|enabled" default="disabled"/>
 		<setting label="30019" type="select" id="pcsx_rearmed_gpu_peops_expand_screen_width" values="disabled|enabled" default="disabled"/>
@@ -34,21 +36,28 @@
 		<setting label="30031" type="select" id="pcsx_rearmed_spu_interpolation" values="simple|gaussian|cubic|off" default="simple"/>
 		<setting label="30032" type="select" id="pcsx_rearmed_nocdaudio" values="enabled|disabled" default="enabled"/>
 		<setting label="30033" type="select" id="pcsx_rearmed_noxadecoding" values="enabled|disabled" default="enabled"/>
+		<setting label="30054" type="select" id="pcsx_rearmed_spu_thread" values="disabled|enabled" default="disabled"/>
 		<setting label="30034" type="select" id="pcsx_rearmed_analog_axis_modifier" values="circle|square" default="circle"/>
 		<setting label="30035" type="select" id="pcsx_rearmed_vibration" values="enabled|disabled" default="enabled"/>
-		<setting label="30036" type="select" id="pcsx_rearmed_multitap" values="disabled|port 1|port 2|ports 1 and 2" default="disabled"/>
+		<setting label="30055" type="select" id="pcsx_rearmed_analog_combo" values="l1+r1+select|disabled|l1+r1+start|l1+r1+l3|l1+r1+r3|l3+r3" default="l1+r1+select"/>
+		<setting label="30056" type="select" id="pcsx_rearmed_multitap" values="disabled|port 1|port 2|ports 1 and 2" default="disabled"/>
 		<setting label="30037" type="select" id="pcsx_rearmed_negcon_deadzone" values="0|3|5|7|10|13|15|17|20|23|25|27|30" default="0"/>
 		<setting label="30038" type="select" id="pcsx_rearmed_negcon_response" values="linear|quadratic|cubic" default="linear"/>
 		<setting label="30039" type="select" id="pcsx_rearmed_input_sensitivity" values="1.00|0.05|0.10|0.15|0.20|0.25|0.30|0.35|0.40|0.45|0.50|0.55|0.60|0.65|0.70|0.75|0.80|0.85|0.90|0.95|1.05|1.10|1.15|1.20|1.25|1.30|1.35|1.40|1.45|1.50|1.55|1.60|1.65|1.70|1.75|1.80|1.85|1.90|1.95|2.00" default="1.00"/>
-		<setting label="30040" type="select" id="pcsx_rearmed_gunconadjustx" values="0|-25|-24|-23|-22|-21|-20|-19|-18|-17|-16|-15|-14|-13|-12|-11|-10|-9|-8|-7|-6|-5|-4|-3|-2|-1|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25" default="0"/>
-		<setting label="30041" type="select" id="pcsx_rearmed_gunconadjusty" values="0|-25|-24|-23|-22|-21|-20|-19|-18|-17|-16|-15|-14|-13|-12|-11|-10|-9|-8|-7|-6|-5|-4|-3|-2|-1|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25" default="0"/>
+		<setting label="30057" type="select" id="pcsx_rearmed_crosshair1" values="disabled|blue|green|red|white" default="disabled"/>
+		<setting label="30058" type="select" id="pcsx_rearmed_crosshair2" values="disabled|blue|green|red|white" default="disabled"/>
+		<setting label="30059" type="select" id="pcsx_rearmed_konamigunadjustx" values="0|-40|-39|-38|-37|-36|-35|-34|-33|-32|-31|-30|-29|-28|-27|-26|-25|-24|-23|-22|-21|-20|-19|-18|-17|-16|-15|-14|-13|-12|-11|-10|-9|-8|-7|-6|-5|-4|-3|-2|-1|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40" default="0"/>
+		<setting label="30060" type="select" id="pcsx_rearmed_konamigunadjusty" values="0|-40|-39|-38|-37|-36|-35|-34|-33|-32|-31|-30|-29|-28|-27|-26|-25|-24|-23|-22|-21|-20|-19|-18|-17|-16|-15|-14|-13|-12|-11|-10|-9|-8|-7|-6|-5|-4|-3|-2|-1|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40" default="0"/>
+		<setting label="30040" type="select" id="pcsx_rearmed_gunconadjustx" values="0|-40|-39|-38|-37|-36|-35|-34|-33|-32|-31|-30|-29|-28|-27|-26|-25|-24|-23|-22|-21|-20|-19|-18|-17|-16|-15|-14|-13|-12|-11|-10|-9|-8|-7|-6|-5|-4|-3|-2|-1|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40" default="0"/>
+		<setting label="30041" type="select" id="pcsx_rearmed_gunconadjusty" values="0|-40|-39|-38|-37|-36|-35|-34|-33|-32|-31|-30|-29|-28|-27|-26|-25|-24|-23|-22|-21|-20|-19|-18|-17|-16|-15|-14|-13|-12|-11|-10|-9|-8|-7|-6|-5|-4|-3|-2|-1|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40" default="0"/>
 		<setting label="30042" type="select" id="pcsx_rearmed_gunconadjustratiox" values="1.00|0.75|0.76|0.77|0.78|0.79|0.80|0.81|0.82|0.83|0.84|0.85|0.86|0.87|0.88|0.89|0.90|0.91|0.92|0.93|0.94|0.95|0.96|0.97|0.98|0.99|1.01|1.02|1.03|1.04|1.05|1.06|1.07|1.08|1.09|1.10|1.11|1.12|1.13|1.14|1.15|1.16|1.17|1.18|1.19|1.20|1.21|1.22|1.23|1.24|1.25" default="1.00"/>
 		<setting label="30043" type="select" id="pcsx_rearmed_gunconadjustratioy" values="1.00|0.75|0.76|0.77|0.78|0.79|0.80|0.81|0.82|0.83|0.84|0.85|0.86|0.87|0.88|0.89|0.90|0.91|0.92|0.93|0.94|0.95|0.96|0.97|0.98|0.99|1.01|1.02|1.03|1.04|1.05|1.06|1.07|1.08|1.09|1.10|1.11|1.12|1.13|1.14|1.15|1.16|1.17|1.18|1.19|1.20|1.21|1.22|1.23|1.24|1.25" default="1.00"/>
-		<setting label="30044" type="select" id="pcsx_rearmed_icache_emulation" values="disabled|enabled" default="disabled"/>
+		<setting label="30044" type="select" id="pcsx_rearmed_icache_emulation" values="enabled|disabled" default="enabled"/>
+		<setting label="30061" type="select" id="pcsx_rearmed_exception_emulation" values="disabled|enabled" default="disabled"/>
 		<setting label="30045" type="select" id="pcsx_rearmed_nocompathacks" values="disabled|enabled" default="disabled"/>
 		<setting label="30046" type="select" id="pcsx_rearmed_nosmccheck" values="disabled|enabled" default="disabled"/>
 		<setting label="30047" type="select" id="pcsx_rearmed_gteregsunneeded" values="disabled|enabled" default="disabled"/>
 		<setting label="30048" type="select" id="pcsx_rearmed_nogteflags" values="disabled|enabled" default="disabled"/>
-		<setting label="30049" type="select" id="pcsx_rearmed_nostalls" values="disabled|enabled" default="disabled"/>
+		<setting label="30062" type="select" id="pcsx_rearmed_nostalls" values="disabled|enabled" default="disabled"/>
 	</category>
 </settings>