FDS BIOS is now copied to RetroArch system dir during installation.0.4

Added PicoDrive core, some cores from BuildBot were replaced with cores from Lakka for RPi 2/3.
Removed mupen64plus (too slow).

29 files changed, 88 insertions, 44 deletions

diff --git a/README.md b/README.md
index 7def832..39fdb18 100644
--- a/README.md
+++ b/README.md
@@ -8,15 +8,15 @@ It can also run games for other consoles. This pack already contains the followi
 - fceumm (Famicom/Nintendo Entertainment System, many mappers, UNIF support)
 - nestopia (Famicom/Nintendo Entertainment System, Famicom Disk System)
 
-And the following cores are available as additional modules (in core_modules folder):
+The following cores are available as additional modules (in core_modules folder):
 - snes9x2010 (Super Famicom/Super Nintendo)
 - gambatte_libretro (Game Boy, Game Boy Color)
 - mgba (Game Boy Advance)
 - genesis_plus_gx (Sega Master System, Genesis/Mega Drive, Game Gear)
-- mupen64plus (Nintendo 64)
 - stella (Atari 2600)
 - mednafen_pce_fast (PC Engine/Turbografx 16)
 - fb_alpha and fb_alpha_cps2 (various arcade machines)
+- picodrive (Sega Master System, Genesis/Mega Drive, Game Gear, Sega 32X)
 
 ## How to use this
 
@@ -32,6 +32,7 @@ Please note:
 - If the file extension of your game is not supported by Hakchi2, you may need to change the path in command line arguments (in Hakchi2's game options) to make it point to the corresponding core
 - To use RetroArch for any NES game, just add "--retroarch" to command line arguments
 - To use Nestopia instead of FCEUmm, install use_nestopia.hmod module
+- To use PicoDrive for all Genesis/Mega Drive games instead of Genesis Plus GX, install use_picodrive.hmod module. Make sure that picodrive module is installed before installing use_picodrive!
 - You can re-enable bilinear filtering in RetroArch's settings (Settings —> Video —> Bilinear Filtering)
 
 ## Additional information
@@ -60,10 +61,12 @@ Executables and arguments for all available cores:
           runs "genesis_plus_gx" core
         - /bin/gg <rom> <clover_args>
           runs "genesis_plus_gx" core
+        - /bin/32x <rom> <clover_args>
+          runs "picodrive" core
         - /bin/snes <rom> <clover_args>
           runs "snes9x2010" core
         - /bin/n64 <rom> <clover_args>
-          runs "mupen64plus" core or "glupen64" core
+          runs "glupen64" core
         - /bin/a26 <rom> <clover_args>
           runs "stella" core
         - /bin/pce <rom> <clover_args>
@@ -75,7 +78,7 @@ Executables and arguments for all available cores:
 
 ## Known issues
 
-- Nintendo 64 save-states are not working, battery backups work fine
+- Nintendo 64 and CP System II save-states are not working, battery backups work fine
 - Default CRT filter is not working, scanlines shader added instead but it's not working with all systems.
 - It's recommended to turn your NES Mini off from shell, not during the game
 
diff --git a/core_modules/fb_alpha.hmod/etc/libretro/core/fb_alpha_libretro.so b/core_modules/fb_alpha.hmod/etc/libretro/core/fb_alpha_libretro.so
index 2f0939d..3710693 100755..100644
--- a/core_modules/fb_alpha.hmod/etc/libretro/core/fb_alpha_libretro.so
+++ b/core_modules/fb_alpha.hmod/etc/libretro/core/fb_alpha_libretro.so
diff --git a/core_modules/fb_alpha.hmod/readme.txt b/core_modules/fb_alpha.hmod/readme.txt
index 4ee00cb..092b49d 100644
--- a/core_modules/fb_alpha.hmod/readme.txt
+++ b/core_modules/fb_alpha.hmod/readme.txt
@@ -7,7 +7,7 @@ Available executables and arguments:
 - /bin/fba <rom> <clover_args>

   runs "fb_alpha" core

 

-Core by libretro

+Core by libretro (Lakka for Raspberry Pi 2/3)

 Module by pcm

 Hakchi module system by madmonkey

 NES Mini shell integration by Cluster

diff --git a/core_modules/genesis_plus_gx.hmod/etc/libretro/core/genesis_plus_gx_libretro.so b/core_modules/genesis_plus_gx.hmod/etc/libretro/core/genesis_plus_gx_libretro.so
index bb49001..acd5f64 100644
--- a/core_modules/genesis_plus_gx.hmod/etc/libretro/core/genesis_plus_gx_libretro.so
+++ b/core_modules/genesis_plus_gx.hmod/etc/libretro/core/genesis_plus_gx_libretro.so
diff --git a/core_modules/genesis_plus_gx.hmod/readme.txt b/core_modules/genesis_plus_gx.hmod/readme.txt
index 5e645fa..57e5ad1 100644
--- a/core_modules/genesis_plus_gx.hmod/readme.txt
+++ b/core_modules/genesis_plus_gx.hmod/readme.txt
@@ -10,7 +10,7 @@ Available executables and arguments:
 - /bin/gg <rom> <clover_args>

   runs "genesis_plus_gx" core

 

-Core by libretro

+Core by libretro (Lakka for Raspberry Pi 2/3)

 Module by pcm

 Hakchi module system by madmonkey

 NES Mini shell integration by Cluster

diff --git a/core_modules/mgba.hmod/etc/libretro/core/mgba_libretro.so b/core_modules/mgba.hmod/etc/libretro/core/mgba_libretro.so
index 8142b71..b5ea210 100755..100644
--- a/core_modules/mgba.hmod/etc/libretro/core/mgba_libretro.so
+++ b/core_modules/mgba.hmod/etc/libretro/core/mgba_libretro.so
diff --git a/core_modules/mgba.hmod/readme.txt b/core_modules/mgba.hmod/readme.txt
index 3c5f093..c6a1d07 100644
--- a/core_modules/mgba.hmod/readme.txt
+++ b/core_modules/mgba.hmod/readme.txt
@@ -6,7 +6,7 @@ Available executables and arguments:
 - /bin/gba <rom> <clover_args>

   runs "mgba" core

 

-Core by libretro

+Core by libretro (Lakka for Raspberry Pi 2/3)

 Module by pcm

 Hakchi module system by madmonkey

 NES Mini shell integration by Cluster

diff --git a/core_modules/mupen64plus.hmod/bin/n64 b/core_modules/mupen64plus.hmod/bin/n64
deleted file mode 100755
index f59e7af..0000000
--- a/core_modules/mupen64plus.hmod/bin/n64
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec retroarch-clover mupen64plus "$@" --ra-nosaves
diff --git a/core_modules/mupen64plus.hmod/etc/libretro/core/mupen64plus_libretro.so b/core_modules/mupen64plus.hmod/etc/libretro/core/mupen64plus_libretro.so
deleted file mode 100644
index 4aa6ca3..0000000
--- a/core_modules/mupen64plus.hmod/etc/libretro/core/mupen64plus_libretro.so
+++ /dev/null
diff --git a/core_modules/mupen64plus.hmod/etc/libretro/info/mupen64plus_libretro.info b/core_modules/mupen64plus.hmod/etc/libretro/info/mupen64plus_libretro.info
deleted file mode 100644
index 37d5fd6..0000000
--- a/core_modules/mupen64plus.hmod/etc/libretro/info/mupen64plus_libretro.info
+++ /dev/null
@@ -1,12 +0,0 @@
-display_name = "Nintendo 64 (Mupen64Plus)"
-authors = "Hacktarux|Mupen64Plus Team"
-supported_extensions = "n64|v64|z64|bin|u1|ndd"
-corename = "Mupen64Plus"
-manufacturer = "Nintendo"
-categories = "Emulator"
-systemname = "Nintendo 64"
-database = "Nintendo - Nintendo 64"
-license = "GPLv2"
-permissions = "dynarec_optional"
-display_version = "2.0-rc2"
-supports_no_game = "false"
diff --git a/core_modules/mupen64plus.hmod/readme.txt b/core_modules/mupen64plus.hmod/readme.txt
deleted file mode 100644
index eaf9349..0000000
--- a/core_modules/mupen64plus.hmod/readme.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-=== Mupen64Plus core for RetroArch ===

-

-This module will add support for Nintendo 64 games to RetroArch

-

-Available executables and arguments:

-- /bin/n64 <rom> <clover_args>

-  runs "mupen64plus" core

-

-Core by libretro

-Module by pcm

-Hakchi module system by madmonkey

-NES Mini shell integration by Cluster

-(c) 2016-2017

diff --git a/core_modules/picodrive.hmod/bin/32x b/core_modules/picodrive.hmod/bin/32x
new file mode 100755
index 0000000..a40abc3
--- /dev/null
+++ b/core_modules/picodrive.hmod/bin/32x
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec retroarch-clover picodrive "$@"
diff --git a/core_modules/picodrive.hmod/etc/libretro/core/picodrive_libretro.so b/core_modules/picodrive.hmod/etc/libretro/core/picodrive_libretro.so
new file mode 100644
index 0000000..cebe589
--- /dev/null
+++ b/core_modules/picodrive.hmod/etc/libretro/core/picodrive_libretro.so
diff --git a/core_modules/picodrive.hmod/etc/libretro/info/picodrive_libretro.info b/core_modules/picodrive.hmod/etc/libretro/info/picodrive_libretro.info
new file mode 100644
index 0000000..c32c2a6
--- /dev/null
+++ b/core_modules/picodrive.hmod/etc/libretro/info/picodrive_libretro.info
@@ -0,0 +1,23 @@
+display_name = "Sega MS/MD/CD/32X (PicoDrive)"
+authors = "notaz|fdave"
+supported_extensions = "bin|gen|smd|md|32x|cue|iso|sms"
+corename = "PicoDrive"
+manufacturer = "Sega"
+categories = "Emulator"
+systemname = "Sega 8/16-bit + 32X (Various)"
+database = "Sega - Master System - Mark III|Sega - Mega Drive - Genesis|Sega - PICO|Sega - 32X"
+license = "MAME"
+permissions = "dynarec_optional"
+display_version = "1.91"
+supports_no_game = "false"
+firmware_count = 3
+firmware0_desc = "bios_CD_E.bin (MegaCD EU BIOS)"
+firmware0_path = "bios_CD_E.bin"
+firmware0_opt = "false"
+firmware1_desc = "bios_CD_U.bin (SegaCD US BIOS)"
+firmware1_path = "bios_CD_U.bin"
+firmware1_opt = "false"
+firmware2_desc = "bios_CD_J.bin (MegaCD JP BIOS)"
+firmware2_path = "bios_CD_J.bin"
+firmware2_opt = "false"
+notes = "Suggested md5sums:|bios_CD_J.bin = 2efd74e3232ff260e371b99f84024f7f| bios_CD_U.bin = 278a9397d192149e84e820ac621a8edd`| bios_CD_E.bin = e66fa1dc5820d254611fdcdba0662372"
diff --git a/core_modules/mupen64plus.hmod/install b/core_modules/picodrive.hmod/install
index 6e0a007..6e0a007 100644
--- a/core_modules/mupen64plus.hmod/install
+++ b/core_modules/picodrive.hmod/install
diff --git a/core_modules/picodrive.hmod/readme.txt b/core_modules/picodrive.hmod/readme.txt
new file mode 100644
index 0000000..11404fb
--- /dev/null
+++ b/core_modules/picodrive.hmod/readme.txt
@@ -0,0 +1,13 @@
+=== PicoDrive core for RetroArch ===

+

+This module will add support for Sega Master System, Mega Drive / Genesis, Game Gear and Sega 32X games to RetroArch

+

+Available executables and arguments:

+- /bin/32x <rom> <clover_args>

+  runs "picodrive" core

+

+Core by libretro (Lakka for Raspberry Pi 2/3)

+Module by pcm

+Hakchi module system by madmonkey

+NES Mini shell integration by Cluster

+(c) 2016-2017

diff --git a/core_modules/snes9x2010.hmod/etc/libretro/core/snes9x2010_libretro.so b/core_modules/snes9x2010.hmod/etc/libretro/core/snes9x2010_libretro.so
index b4df2b2..968dc02 100644
--- a/core_modules/snes9x2010.hmod/etc/libretro/core/snes9x2010_libretro.so
+++ b/core_modules/snes9x2010.hmod/etc/libretro/core/snes9x2010_libretro.so
diff --git a/core_modules/snes9x2010.hmod/readme.txt b/core_modules/snes9x2010.hmod/readme.txt
index c6e96be..6b0d277 100644
--- a/core_modules/snes9x2010.hmod/readme.txt
+++ b/core_modules/snes9x2010.hmod/readme.txt
@@ -6,7 +6,7 @@ Available executables and arguments:
 - /bin/snes <rom> <clover_args>

   runs "snes9x2010" core

 

-Core by libretro

+Core by libretro (Lakka for Raspberry Pi 2/3)

 Module by pcm

 Hakchi module system by madmonkey

 NES Mini shell integration by Cluster

diff --git a/core_modules/stella.hmod/etc/libretro/core/stella_libretro.so b/core_modules/stella.hmod/etc/libretro/core/stella_libretro.so
index f130264..b4eb558 100755..100644
--- a/core_modules/stella.hmod/etc/libretro/core/stella_libretro.so
+++ b/core_modules/stella.hmod/etc/libretro/core/stella_libretro.so
diff --git a/core_modules/stella.hmod/readme.txt b/core_modules/stella.hmod/readme.txt
index 5f4022e..9b63c6c 100644
--- a/core_modules/stella.hmod/readme.txt
+++ b/core_modules/stella.hmod/readme.txt
@@ -6,7 +6,7 @@ Available executables and arguments:
 - /bin/a26 <rom> <clover_args>

   runs "stella" core

 

-Core by libretro

+Core by libretro (Lakka for Raspberry Pi 2/3)

 Module by pcm

 Hakchi module system by madmonkey

 NES Mini shell integration by Cluster

diff --git a/core_modules/use_nestopia.hmod/bin/nes b/core_modules/use_nestopia.hmod/bin/nes
index 2289bf9..144a985 100755
--- a/core_modules/use_nestopia.hmod/bin/nes
+++ b/core_modules/use_nestopia.hmod/bin/nes
@@ -1,6 +1,9 @@
 #!/bin/sh
-if [ ! -f /etc/libretro/system/disksys.rom ]; then
-  cp -f /usr/share/kachikachi/fds_bios.bin /etc/libretro/system/disksys.rom
+filename="$1"
+extension="${filename##*.}"
+crt=--ra-allow-crt
+if [ "$extension" == "fds" ] || [ "$extension" == "qd" ]; then
+  crt=0
 fi
 
-exec retroarch-clover nestopia "$@" --ra-allow-crt
+exec retroarch-clover nestopia "$@" $crt
diff --git a/core_modules/use_picodrive.hmod/bin/gg b/core_modules/use_picodrive.hmod/bin/gg
new file mode 100755
index 0000000..a40abc3
--- /dev/null
+++ b/core_modules/use_picodrive.hmod/bin/gg
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec retroarch-clover picodrive "$@"
diff --git a/core_modules/use_picodrive.hmod/bin/md b/core_modules/use_picodrive.hmod/bin/md
new file mode 100755
index 0000000..a40abc3
--- /dev/null
+++ b/core_modules/use_picodrive.hmod/bin/md
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec retroarch-clover picodrive "$@"
diff --git a/core_modules/use_picodrive.hmod/bin/sms b/core_modules/use_picodrive.hmod/bin/sms
new file mode 100755
index 0000000..a40abc3
--- /dev/null
+++ b/core_modules/use_picodrive.hmod/bin/sms
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec retroarch-clover picodrive "$@"
diff --git a/core_modules/use_picodrive.hmod/install b/core_modules/use_picodrive.hmod/install
new file mode 100644
index 0000000..6e0a007
--- /dev/null
+++ b/core_modules/use_picodrive.hmod/install
@@ -0,0 +1,4 @@
+transfer_default
+chmod +x $rootfs/bin/*
+chmod +x $rootfs/usr/bin/*
+return 1
diff --git a/core_modules/use_picodrive.hmod/readme.txt b/core_modules/use_picodrive.hmod/readme.txt
new file mode 100644
index 0000000..220f16c
--- /dev/null
+++ b/core_modules/use_picodrive.hmod/readme.txt
@@ -0,0 +1,20 @@
+=== Use PicoDrive instead of Genesis Plus GX ===

+

+This module will patch /bin/{md, gg, sms} files to use PicoDrive instead of Genesis Plus GX.

+Make sure that picodrive module is installed before installing this.

+

+Available executables and arguments:

+- /bin/sms <rom> <clover_args>

+  runs "picodrive" core

+- /bin/md <rom> <clover_args>

+  runs "picodrive" core

+- /bin/gg <rom> <clover_args>

+  runs "picodrive" core

+- /bin/32x <rom> <clover_args>

+  runs "picodrive" core

+

+Core by libretro (Lakka for Raspberry Pi 2/3)

+Module by pcm

+Hakchi module system by madmonkey

+NES Mini shell integration by Cluster

+(c) 2016-2017

diff --git a/retroarch.hmod/bin/nes b/retroarch.hmod/bin/nes
index 5aa3c1b..ae66cfb 100755
--- a/retroarch.hmod/bin/nes
+++ b/retroarch.hmod/bin/nes
@@ -6,11 +6,6 @@ crt=--ra-allow-crt
 if [ "$extension" == "fds" ] || [ "$extension" == "qd" ]; then
   core=nestopia
   crt=0
-  biosdir=/etc/libretro/system
-  if [ ! -f $biosdir/disksys.rom ]; then
-    mkdir -p $biosdir
-    cp -f /usr/share/kachikachi/fds_bios.bin $biosdir/disksys.rom
-  fi
 fi
 
 exec retroarch-clover "$core" "$@" $crt
diff --git a/retroarch.hmod/etc/libretro/core/nestopia_libretro.so b/retroarch.hmod/etc/libretro/core/nestopia_libretro.so
index be95787..227708a 100644
--- a/retroarch.hmod/etc/libretro/core/nestopia_libretro.so
+++ b/retroarch.hmod/etc/libretro/core/nestopia_libretro.so
diff --git a/retroarch.hmod/install b/retroarch.hmod/install
index 6e0a007..89f0f81 100644
--- a/retroarch.hmod/install
+++ b/retroarch.hmod/install
@@ -1,4 +1,6 @@
 transfer_default
 chmod +x $rootfs/bin/*
 chmod +x $rootfs/usr/bin/*
+mkdir -p $rootfs/etc/libretro/system
+cp -f /newroot/usr/share/kachikachi/fds_bios.bin $rootfs/etc/libretro/system/disksys.rom
 return 1