Merge pull request #1027 from r3claimer/dev

Add more Dolphin SA features
ROCKNIX · Dec 26, 2024 · 886cfcf · 886cfcf
2 parents e68f253 + c523b13
commit 886cfcf
Show file tree

Hide file tree

Showing 4 changed files with 130 additions and 3 deletions.
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/SD865/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/SD865/SUPPORTED_EMULATORS_AND_CORES.md
@@ -71,7 +71,7 @@ This document describes all available systems emulators and cores available for
 |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>|
 |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**retroarch:** DoubleCherryGB<br>|
 |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**retroarch:** DoubleCherryGB<br>|
-|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .iso .gcz .ciso .wbfs .rvz .dol|**dolphin:** dolphin-sa-gc (default)<br>**dolphin:** dolphin-qt-gc<br>**retroarch:** dolphin<br>|
+|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .iso .gcz .ciso .wbfs .rvz .dol|**dolphin:** dolphin-sa-gc<br>**dolphin:** dolphin-qt-gc (default)<br>**retroarch:** dolphin<br>|
 |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .unif .unf .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|
 |Nintendo|Nintendo 3DS (3ds)|2010|`3ds`|.3ds .3dsx .elf .axf .cci .cxi .app|**lime3ds:** lime3ds-sa (default)<br>|
 |Nintendo|Nintendo 64 (n64)|1996|`n64`|.z64 .n64 .v64 .zip .7z|**retroarch:** mupen64plus_next (default)<br>**retroarch:** parallel_n64<br>**mupen64plus:** mupen64plus-sa<br>|
@@ -84,7 +84,7 @@ This document describes all available systems emulators and cores available for
 |Nintendo|Super Nintendo (Hacks) (snesh)|1991|`snesh`|.smc .fig .sfc .swc .zip .7z|**retroarch:** snes9x (default)<br>**retroarch:** snes9x2010<br>**retroarch:** snes9x2002<br>**retroarch:** snes9x2005_plus<br>**retroarch:** beetle_supafaust<br>**retroarch:** bsnes_mercury_performance<br>**retroarch:** bsnes<br>**retroarch:** bsnes_hd_beta<br>|
 |Nintendo|Super Nintendo (snes)|1991|`snes`|.smc .fig .sfc .swc .zip .7z|**retroarch:** snes9x (default)<br>**retroarch:** snes9x2010<br>**retroarch:** snes9x2002<br>**retroarch:** snes9x2005_plus<br>**retroarch:** beetle_supafaust<br>**retroarch:** bsnes_mercury_accuracy<br>**retroarch:** bsnes_mercury_balanced<br>**retroarch:** bsnes_mercury_performance<br>**retroarch:** bsnes<br>**retroarch:** bsnes_hd_beta<br>**retroarch:** bsnes_mercury_accuracy<br>**retroarch:** bsnes_mercury_balanced<br>**retroarch:** bsnes_mercury_accuracy<br>**retroarch:** bsnes_mercury_balanced<br>|
 |Nintendo|Virtual Boy (virtualboy)|1995|`virtualboy`|.vb .zip .7z|**retroarch:** beetle_vb (default)<br>|
-|Nintendo|Wii (wii)|2006|`wii`|.gcm .iso .gcz .ciso .wbfs .rvz .dol .wad|**dolphin:** dolphin-sa-wii (default)<br>**dolphin:** dolphin-qt-gc<br>**retroarch:** dolphin<br>|
+|Nintendo|Wii (wii)|2006|`wii`|.gcm .iso .gcz .ciso .wbfs .rvz .dol .wad|**dolphin:** dolphin-sa-wii<br>**dolphin:** dolphin-qt-wii (default)<br>**retroarch:** dolphin<br>|
 |Palm, Inc.|Palm OS (palm)|1996|`palm`|.prc .pqa .img .pdb .zip|**retroarch:** mu (default)<br>|
 |Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
 |Philips|CD-i (cdi)|1991|`cdi`|.chd .cue .iso|**retroarch:** same_cdi (default)<br>|

diff --git a/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh b/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh
@@ -85,6 +85,10 @@ SHADERM=$(get_setting shader_mode "${PLATFORM}" "${GAME}")
 SHADERP=$(get_setting shader_precompile "${PLATFORM}" "${GAME}")
 VSYNC=$(get_setting vsync "${PLATFORM}" "${GAME}")
 SKIPBIOS=$(get_setting use_bios "${PLATFORM}" "${GAME}")
+EFBACCESS=$(get_setting skip_efb_cpu_access "${PLATFORM}" "${GAME}")
+EFBTEXTURE=$(get_setting store_efb_to_texture_only "${PLATFORM}" "${GAME}")
+XFBTEXTURE=$(get_setting store_xfb_to_texture_only "${PLATFORM}" "${GAME}")
+WHACK=$(get_setting widescreen_hack "${PLATFORM}" "${GAME}")
 
 # Set the cores to use
 CORES=$(get_setting "cores" "${PLATFORM}" "${GAME}")
@@ -209,7 +213,6 @@ fi
     sed -i '/WaitForShadersBeforeStarting =/c\WaitForShadersBeforeStarting = True' /storage/.config/dolphin-emu/GFX.ini
   fi
 
-
   # Show FPS
   if [ "$FPS" = "true" ]; then
     sed -i '/ShowFPS/c\ShowFPS = True' /storage/.config/dolphin-emu/GFX.ini
@@ -224,6 +227,34 @@ fi
     sed -i '/SkipIPL/c\SkipIPL = True' /storage/.config/dolphin-emu/Dolphin.ini
   fi
 
+  # Skip EFB CPU Access
+  if [ "$EFBACCESS" = "false" ]; then
+    sed -i '/EFBAccessEnable =/c\EFBAccessEnable = False' /storage/.config/dolphin-emu/GFX.ini
+  else
+    sed -i '/EFBAccessEnable =/c\EFBAccessEnable = True' /storage/.config/dolphin-emu/GFX.ini
+  fi
+
+  # Store EFB to texture only
+  if [ "$EFBTEXTURE" = "false" ]; then
+    sed -i '/EFBToTextureEnable =/c\EFBToTextureEnable = False' /storage/.config/dolphin-emu/GFX.ini
+  else
+    sed -i '/EFBToTextureEnable =/c\EFBToTextureEnable = True' /storage/.config/dolphin-emu/GFX.ini
+  fi
+
+  # Store EFB to texture only
+  if [ "$XFBTEXTURE" = "false" ]; then
+    sed -i '/XFBToTextureEnable =/c\XFBToTextureEnable = False' /storage/.config/dolphin-emu/GFX.ini
+  else
+    sed -i '/XFBToTextureEnable =/c\XFBToTextureEnable = True' /storage/.config/dolphin-emu/GFX.ini
+  fi
+
+  # Widescreen Hack
+  if [ "$WHACK" = "true" ]; then
+    sed -i '/wideScreenHack =/c\wideScreenHack = True' /storage/.config/dolphin-emu/GFX.ini
+  else
+    sed -i '/wideScreenHack =/c\wideScreenHack = False' /storage/.config/dolphin-emu/GFX.ini
+  fi
+
   # GC Controller Profile
   if [ "$CON" = "east" ]; then
     cp -r /storage/.config/dolphin-emu/GamecubeControllerProfiles/GCPadNew.ini.east /storage/.config/dolphin-emu/GCPadNew.ini

diff --git a/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh b/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh
@@ -78,6 +78,10 @@ HKEY=$(get_setting hotkey_enable_button "${PLATFORM}" "${GAME}")
 SHADERM=$(get_setting shader_mode "${PLATFORM}" "${GAME}")
 SHADERP=$(get_setting shader_precompile "${PLATFORM}" "${GAME}")
 VSYNC=$(get_setting vsync "${PLATFORM}" "${GAME}")
+EFBACCESS=$(get_setting skip_efb_cpu_access "${PLATFORM}" "${GAME}")
+EFBTEXTURE=$(get_setting store_efb_to_texture_only "${PLATFORM}" "${GAME}")
+XFBTEXTURE=$(get_setting store_xfb_to_texture_only "${PLATFORM}" "${GAME}")
+WHACK=$(get_setting widescreen_hack "${PLATFORM}" "${GAME}")
 
 #Set the cores to use
 CORES=$(get_setting "cores" "${PLATFORM}" "${GAME}")
@@ -239,6 +243,34 @@ fi
     sed -i '/VSync =/c\VSync = False' /storage/.config/dolphin-emu/GFX.ini
   fi
 
+  # Skip EFB CPU Access
+  if [ "$EFBACCESS" = "false" ]; then
+    sed -i '/EFBAccessEnable =/c\EFBAccessEnable = False' /storage/.config/dolphin-emu/GFX.ini
+  else
+    sed -i '/EFBAccessEnable =/c\EFBAccessEnable = True' /storage/.config/dolphin-emu/GFX.ini
+  fi
+
+  # Store EFB to texture only
+  if [ "$EFBTEXTURE" = "false" ]; then
+    sed -i '/EFBToTextureEnable =/c\EFBToTextureEnable = False' /storage/.config/dolphin-emu/GFX.ini
+  else
+    sed -i '/EFBToTextureEnable =/c\EFBToTextureEnable = True' /storage/.config/dolphin-emu/GFX.ini
+  fi
+
+  # Store EFB to texture only
+  if [ "$XFBTEXTURE" = "false" ]; then
+    sed -i '/XFBToTextureEnable =/c\XFBToTextureEnable = False' /storage/.config/dolphin-emu/GFX.ini
+  else
+    sed -i '/XFBToTextureEnable =/c\XFBToTextureEnable = True' /storage/.config/dolphin-emu/GFX.ini
+  fi
+
+  # Widescreen Hack
+  if [ "$WHACK" = "true" ]; then
+    sed -i '/wideScreenHack =/c\wideScreenHack = True' /storage/.config/dolphin-emu/GFX.ini
+  else
+    sed -i '/wideScreenHack =/c\wideScreenHack = False' /storage/.config/dolphin-emu/GFX.ini
+  fi
+
 # Skip bios always, it's untested for Wii
 sed -i '/SkipIPL/c\SkipIPL = True' /storage/.config/dolphin-emu/Dolphin.ini
 

diff --git a/packages/ui/emulationstation/config/common/es_features.cfg b/packages/ui/emulationstation/config/common/es_features.cfg
@@ -494,6 +494,18 @@
         <choice name="yes" value="true"/>
         <choice name="no" value="false"/>
       </feature>
+      <feature name="skip efb cpu access">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
+      <feature name="store efb to texture only">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
+      <feature name="store xfb to texture only">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
       <feature name="use bios">
         <choice name="yes" value="false"/>
         <choice name="no" value="true"/>
@@ -502,6 +514,10 @@
         <choice name="on" value="1"/>
         <choice name="off" value="0"/>
       </feature>
+      <feature name="widescreen hack">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
      </features>
     </core>
     <core name="dolphin-sa-gc">
@@ -568,6 +584,18 @@
         <choice name="yes" value="true"/>
         <choice name="no" value="false"/>
       </feature>
+      <feature name="skip efb cpu access">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
+      <feature name="store efb to texture only">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
+      <feature name="store xfb to texture only">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
       <feature name="use bios">
         <choice name="yes" value="false"/>
         <choice name="no" value="true"/>
@@ -576,6 +604,10 @@
         <choice name="on" value="1"/>
         <choice name="off" value="0"/>
       </feature>
+      <feature name="widescreen hack">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
      </features>
     </core>
     <core name="dolphin-qt-wii">
@@ -639,10 +671,26 @@
         <choice name="mode / guide" value="mode"/>
         <choice name="select" value="select"/>
       </feature>
+      <feature name="skip efb cpu access">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
+      <feature name="store efb to texture only">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
+      <feature name="store xfb to texture only">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
       <feature name="vsync">
         <choice name="on" value="1"/>
         <choice name="off" value="0"/>
       </feature>
+      <feature name="widescreen hack">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
      </features>
     </core>
     <core name="dolphin-sa-wii">
@@ -707,10 +755,26 @@
         <choice name="mode / guide" value="mode"/>
         <choice name="select" value="select"/>
       </feature>
+      <feature name="skip efb cpu access">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
+      <feature name="store efb to texture only">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
+      <feature name="store xfb to texture only">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
       <feature name="vsync">
         <choice name="on" value="1"/>
         <choice name="off" value="0"/>
       </feature>
+      <feature name="widescreen hack">
+        <choice name="yes" value="true"/>
+        <choice name="no" value="false"/>
+      </feature>
      </features>
     </core>
    </cores>