Merge branch 'pcm720-master'

62 files changed, 426 insertions, 81 deletions

diff --git a/README.md b/README.md
index bd1b8f0..1a29bfe 100644
--- a/README.md
+++ b/README.md
@@ -1,46 +1,54 @@
-### RetroArch mod for hakchi ###
+### RetroArch module for hakchi ###
 
-This is hakchi/hakchi2 module which adds the RetroArch emulator to your NES Mini.
+This is a hakchi/hakchi2 module which adds libretro cores and RetroArch front-end to your NES Mini.
 
 It will automatically detect unsupported NES games and run them instead of the default emulator. Save states will work as usual.
 
 It can also run games for other consoles. This pack already contains the following cores:
-- fceumm (NES, many mappers, UNIF support)
-- nestopia (NES, FDS)
-- snes9x2010 (SNES)
-- gambatte_libretro (GB, GBC)
-- mednafen_gba (GBA)
-- genesis_plus_gx (SMS/Genesis/MD)
-- mupen64plus (N64)
-
-Available executables and arguments:
-
-
-         - /bin/retroarch-clover <core> <rom> <clover_args>
-           runs RetroArch with specified core,
-           designed for executing from clover shell, 
-           so it parses all clover arguments (saves, aspect ratio, etc.)
-         - /bin/gb <rom> <clover_args>
-           runs "gambatte" core
-         - /bin/gbc <rom> <clover_args>
-           runs "gambatte" core
-         - /bin/gba <rom> <clover_args>
-           runs "mednafen_gba" core
-         - /bin/md <rom> <clover_args>
-           runs "genesis_plus_gx" core
-         - /bin/nes <rom> <clover_args>
-           runs "fceumm" core
-         - /bin/sms <rom> <clover_args>
-           runs "emux_sms" core
-         - /bin/snes <rom> <clover_args>
-           runs "snes9x2010" core
-         - /bin/n64 <rom> <clover_args>
-           runs "mupen64plus" core
-         - /bin/retroarch-mini [core] [rom] [args]
-           runs RetroArch directly, without clover intergration
-         - /bin/retroarch
-           RetroArch itself
-          
+- 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):
+- 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)
+
+Executables and arguments for all available cores:
+
+        - /bin/retroarch-clover <core> <rom> <clover_args>
+          runs RetroArch with specified core,
+          designed for executing from clover shell, 
+          so it parses all clover arguments (saves, aspect ratio, etc.)
+        - /bin/gb <rom> <clover_args>
+          runs "gambatte" core
+        - /bin/gbc <rom> <clover_args>
+          runs "gambatte" core
+        - /bin/gba <rom> <clover_args>
+          runs "mgba" core
+        - /bin/md <rom> <clover_args>
+          runs "genesis_plus_gx" core
+        - /bin/sms <rom> <clover_args>
+          runs "genesis_plus_gx" core
+        - /bin/gg <rom> <clover_args>
+          runs "genesis_plus_gx" core
+        - /bin/nes <rom> <clover_args>
+          runs "fceumm" core or "nestopia" core
+        - /bin/snes <rom> <clover_args>
+          runs "snes9x2010" core
+        - /bin/n64 <rom> <clover_args>
+          runs "mupen64plus" core or "glupen64" core
+        - /bin/a26 <rom> <clover_args>
+          runs "stella" core
+        - /bin/pce <rom> <clover_args>
+          runs "mednafen_pce_fast" core
+        - /bin/retroarch-mini [core] [rom] [args]
+          runs RetroArch directly, without clover intergration
+        - /bin/retroarch
+          RetroArch binary
 
 Sometimes default emulator of NES Mini is not working with some games when it should. So you can just add "--retroarch" command line argument to use RetroArch.
 
@@ -49,11 +57,26 @@ Known issues:
 - 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 game
 
+The following changes were made in this fork: 
+- Added Stella core for Atari 2600 emulation
+- System dir is now '~/system'
+- Core info dir is now '~/info'
+- RGUI default browser dir is now '/usr/share/games/nes/kachikachi' instead of '/'
+- Disabled bilinear filtering for every preset
+- Enabled integer scaling
+- Greyscale palette for Gambatte core
+- Use mGBA as GBA core
+- Added mednafen_pce_fast as PCE/TG16 core
+- Enter RetroArch in-game menu by pressing Select + Start
+- Added template for adding new cores via hakchi module system
+- Cores are now represented as additional modules
 
 NES Mini port by madmonkey
 
 NES Mini shell integration by Cluster
 
+Various additions, tweaks and fixes by pcm720
+
 RetroArch/libretro project: https://www.libretro.com
 
 (c) 2017
diff --git a/retroarch.hmod/bin/gb b/core_modules/gambatte.hmod/bin/gb
index bb97411..bb97411 100644..100755
--- a/retroarch.hmod/bin/gb
+++ b/core_modules/gambatte.hmod/bin/gb
diff --git a/retroarch.hmod/bin/gbc b/core_modules/gambatte.hmod/bin/gbc
index bb97411..bb97411 100644..100755
--- a/retroarch.hmod/bin/gbc
+++ b/core_modules/gambatte.hmod/bin/gbc
diff --git a/retroarch.hmod/etc/libretro/core/gambatte_libretro.so b/core_modules/gambatte.hmod/etc/libretro/core/gambatte_libretro.so
index 256bd20..256bd20 100644
--- a/retroarch.hmod/etc/libretro/core/gambatte_libretro.so
+++ b/core_modules/gambatte.hmod/etc/libretro/core/gambatte_libretro.so
diff --git a/core_modules/gambatte.hmod/etc/libretro/info/gambatte_libretro.info b/core_modules/gambatte.hmod/etc/libretro/info/gambatte_libretro.info
new file mode 100644
index 0000000..3436991
--- /dev/null
+++ b/core_modules/gambatte.hmod/etc/libretro/info/gambatte_libretro.info
@@ -0,0 +1,12 @@
+display_name = "Game Boy / Game Boy Color (Gambatte)"
+authors = "Sinamas"
+supported_extensions = "gb|gbc|dmg"
+corename = "Gambatte"
+manufacturer = "Nintendo"
+categories = "Emulator"
+systemname = "Game Boy/Game Boy Color"
+database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
+license = "GPLv2"
+permissions = ""
+display_version = "v0.5.0"
+supports_no_game = "false"
diff --git a/core_modules/gambatte.hmod/install b/core_modules/gambatte.hmod/install
new file mode 100644
index 0000000..6e0a007
--- /dev/null
+++ b/core_modules/gambatte.hmod/install
@@ -0,0 +1,4 @@
+transfer_default
+chmod +x $rootfs/bin/*
+chmod +x $rootfs/usr/bin/*
+return 1
diff --git a/core_modules/gambatte.hmod/readme.txt b/core_modules/gambatte.hmod/readme.txt
new file mode 100644
index 0000000..86daae5
--- /dev/null
+++ b/core_modules/gambatte.hmod/readme.txt
@@ -0,0 +1,15 @@
+=== Gambatte core for RetroArch ===

+

+This module will add support for Game Boy and Game Boy Color games to RetroArch

+

+Available executables and arguments:

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

+  runs "gambatte" core

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

+  runs "gambatte" core

+

+Core by libretro

+Module by pcm

+Hakchi module system by madmonkey

+NES Mini shell integration by Cluster

+(c) 2016-2017

diff --git a/retroarch.hmod/bin/md b/core_modules/genesis_plus_gx.hmod/bin/gg
index dca6d3b..dca6d3b 100644..100755
--- a/retroarch.hmod/bin/md
+++ b/core_modules/genesis_plus_gx.hmod/bin/gg
diff --git a/retroarch.hmod/bin/sms b/core_modules/genesis_plus_gx.hmod/bin/md
index dca6d3b..dca6d3b 100644..100755
--- a/retroarch.hmod/bin/sms
+++ b/core_modules/genesis_plus_gx.hmod/bin/md
diff --git a/core_modules/genesis_plus_gx.hmod/bin/sms b/core_modules/genesis_plus_gx.hmod/bin/sms
new file mode 100755
index 0000000..dca6d3b
--- /dev/null
+++ b/core_modules/genesis_plus_gx.hmod/bin/sms
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec retroarch-clover genesis_plus_gx "$@"
diff --git a/retroarch.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..bb49001 100644
--- a/retroarch.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/etc/libretro/info/genesis_plus_gx_libretro.info b/core_modules/genesis_plus_gx.hmod/etc/libretro/info/genesis_plus_gx_libretro.info
new file mode 100644
index 0000000..bade3cd
--- /dev/null
+++ b/core_modules/genesis_plus_gx.hmod/etc/libretro/info/genesis_plus_gx_libretro.info
@@ -0,0 +1,47 @@
+display_name = "Sega MS/GG/MD/CD (Genesis Plus GX)"
+authors = "Charles McDonald|Eke-Eke"
+supported_extensions = "mdx|md|smd|gen|bin|cue|iso|sms|gg|sg"
+corename = "Genesis Plus GX"
+manufacturer = "Sega"
+categories = "Emulator"
+systemname = "Sega 8/16-bit (Various)"
+database = "Sega - Game Gear|Sega - Master System - Mark III|Sega - Mega Drive - Genesis|Sega - PICO|Sega - SG-1000"
+license = "Non-commercial"
+permissions = ""
+display_version = "v1.7.4"
+supports_no_game = "false"
+firmware_count = 11
+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"
+firmware3_desc = "bios_E.sms (MasterSystem EU BIOS)"
+firmware3_path = "bios_E.sms"
+firmware3_opt = "true"
+firmware4_desc = "bios_U.sms (MasterSystem US BIOS)"
+firmware4_path = "bios_U.sms"
+firmware4_opt = "true"
+firmware5_desc = "bios_J.sms (MasterSystem JP BIOS)"
+firmware5_path = "bios_J.sms"
+firmware5_opt = "true"
+firmware6=desc = "bios.gg (GameGear BIOS)"
+firmware6_path = "bios.gg"
+firmware6_opt = "true"
+firmware7_desc = "sk.bin (Sonic & Knuckles (2 MiB) ROM)"
+firmware7_path = "sk.bin"
+firmware7_opt = "true"
+firmware8_desc = "sk2chip.bin (Sonic & Knuckles UPMEM (256 KiB) ROM)"
+firmware8_path = "sk2chip.bin"
+firmware8_opt = "true"
+firmware9_desc = "areplay.bin (Action Replay (Pro) ROM)"
+firmware9_path = "areplay.bin"
+firmware9_opt = "true"
+firmware10_desc = "ggenie.bin (Game Genie ROM)"
+firmware10_path = "ggenie.bin"
+firmware10_opt = "true"
+notes = "Suggested md5sums:|b4e76e416b887f4e7413ba76fa735f16 = sk2chip.bin|4ea493ea4e9f6c9ebfccbdb15110367e = sk.bin"
diff --git a/core_modules/genesis_plus_gx.hmod/install b/core_modules/genesis_plus_gx.hmod/install
new file mode 100644
index 0000000..6e0a007
--- /dev/null
+++ b/core_modules/genesis_plus_gx.hmod/install
@@ -0,0 +1,4 @@
+transfer_default
+chmod +x $rootfs/bin/*
+chmod +x $rootfs/usr/bin/*
+return 1
diff --git a/core_modules/genesis_plus_gx.hmod/readme.txt b/core_modules/genesis_plus_gx.hmod/readme.txt
new file mode 100644
index 0000000..5e645fa
--- /dev/null
+++ b/core_modules/genesis_plus_gx.hmod/readme.txt
@@ -0,0 +1,17 @@
+=== Genesis Plus GX core for RetroArch ===

+

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

+

+Available executables and arguments:

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

+  runs "genesis_plus_gx" core

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

+  runs "genesis_plus_gx" core

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

+  runs "genesis_plus_gx" 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/glupen64.hmod/bin/n64 b/core_modules/glupen64.hmod/bin/n64
new file mode 100755
index 0000000..374d455
--- /dev/null
+++ b/core_modules/glupen64.hmod/bin/n64
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec retroarch-clover glupen64 "$@" --ra-nosaves
diff --git a/retroarch.hmod/etc/libretro/core/glupen64_libretro.so b/core_modules/glupen64.hmod/etc/libretro/core/glupen64_libretro.so
index 368b7c7..368b7c7 100644
--- a/retroarch.hmod/etc/libretro/core/glupen64_libretro.so
+++ b/core_modules/glupen64.hmod/etc/libretro/core/glupen64_libretro.so
diff --git a/core_modules/glupen64.hmod/etc/libretro/info/glupen64_libretro.info b/core_modules/glupen64.hmod/etc/libretro/info/glupen64_libretro.info
new file mode 100644
index 0000000..453a5f0
--- /dev/null
+++ b/core_modules/glupen64.hmod/etc/libretro/info/glupen64_libretro.info
@@ -0,0 +1,12 @@
+display_name = "Nintendo 64 (GLupeN64)"
+authors = "Gonetz|Mupen64Plus Team|Libretro"
+supported_extensions = "n64|v64|z64|bin|u1|ndd"
+corename = "GLupeN64"
+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/glupen64.hmod/install b/core_modules/glupen64.hmod/install
new file mode 100644
index 0000000..6e0a007
--- /dev/null
+++ b/core_modules/glupen64.hmod/install
@@ -0,0 +1,4 @@
+transfer_default
+chmod +x $rootfs/bin/*
+chmod +x $rootfs/usr/bin/*
+return 1
diff --git a/core_modules/glupen64.hmod/readme.txt b/core_modules/glupen64.hmod/readme.txt
new file mode 100644
index 0000000..27bbe9b
--- /dev/null
+++ b/core_modules/glupen64.hmod/readme.txt
@@ -0,0 +1,13 @@
+=== GLupeN64 core for RetroArch ===

+

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

+

+Available executables and arguments:

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

+  runs "glupen64" 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/mednafen_pce_fast.hmod/bin/pce b/core_modules/mednafen_pce_fast.hmod/bin/pce
new file mode 100755
index 0000000..5592fa3
--- /dev/null
+++ b/core_modules/mednafen_pce_fast.hmod/bin/pce
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec retroarch-clover mednafen_pce_fast "$@"
diff --git a/core_modules/mednafen_pce_fast.hmod/etc/libretro/core/mednafen_pce_fast_libretro.so b/core_modules/mednafen_pce_fast.hmod/etc/libretro/core/mednafen_pce_fast_libretro.so
new file mode 100755
index 0000000..dd383d8
--- /dev/null
+++ b/core_modules/mednafen_pce_fast.hmod/etc/libretro/core/mednafen_pce_fast_libretro.so
diff --git a/core_modules/mednafen_pce_fast.hmod/etc/libretro/info/mednafen_pce_fast_libretro.info b/core_modules/mednafen_pce_fast.hmod/etc/libretro/info/mednafen_pce_fast_libretro.info
new file mode 100644
index 0000000..40ed524
--- /dev/null
+++ b/core_modules/mednafen_pce_fast.hmod/etc/libretro/info/mednafen_pce_fast_libretro.info
@@ -0,0 +1,16 @@
+display_name = "PC Engine/PCE-CD (Mednafen PCE FAST)"
+authors = "Ryphecha"
+supported_extensions = "pce|cue|ccd"
+corename = "Mednafen/Beetle PCE FAST"
+manufacturer = "NEC"
+categories = "Emulator"
+systemname = "PC Engine/PCE-CD"
+database = "NEC - PC Engine - TurboGrafx 16"
+license = "GPLv2"
+permissions = ""
+display_version = "v0.9.38.5"
+supports_no_game = "false"
+firmware_count = 1
+firmware0_desc = "syscard3.pce (PCE-CD BIOS)"
+firmware0_path = "syscard3.pce"
+firmware0_opt = "false"
diff --git a/core_modules/mednafen_pce_fast.hmod/install b/core_modules/mednafen_pce_fast.hmod/install
new file mode 100644
index 0000000..6e0a007
--- /dev/null
+++ b/core_modules/mednafen_pce_fast.hmod/install
@@ -0,0 +1,4 @@
+transfer_default
+chmod +x $rootfs/bin/*
+chmod +x $rootfs/usr/bin/*
+return 1
diff --git a/core_modules/mednafen_pce_fast.hmod/readme.txt b/core_modules/mednafen_pce_fast.hmod/readme.txt
new file mode 100644
index 0000000..3ca0c82
--- /dev/null
+++ b/core_modules/mednafen_pce_fast.hmod/readme.txt
@@ -0,0 +1,13 @@
+=== Mednafen PCE Fast core for RetroArch ===

+

+This module will add support for PC Engine / Turbografx 16 games to RetroArch

+

+Available executables and arguments:

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

+  runs "mednafen_pce_fast" 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/mgba.hmod/bin/gba b/core_modules/mgba.hmod/bin/gba
new file mode 100755
index 0000000..f118160
--- /dev/null
+++ b/core_modules/mgba.hmod/bin/gba
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec retroarch-clover mgba "$@"
diff --git a/core_modules/mgba.hmod/etc/libretro/core/mgba_libretro.so b/core_modules/mgba.hmod/etc/libretro/core/mgba_libretro.so
new file mode 100755
index 0000000..8142b71
--- /dev/null
+++ b/core_modules/mgba.hmod/etc/libretro/core/mgba_libretro.so
diff --git a/core_modules/mgba.hmod/etc/libretro/info/mgba_libretro.info b/core_modules/mgba.hmod/etc/libretro/info/mgba_libretro.info
new file mode 100644
index 0000000..fc1d87e
--- /dev/null
+++ b/core_modules/mgba.hmod/etc/libretro/info/mgba_libretro.info
@@ -0,0 +1,17 @@
+display_name = "Game Boy Advance (mGBA)"
+authors = "Jeffrey Pfau"
+supported_extensions = "gba|bin"
+corename = "mGBA"
+manufacturer = "Nintendo"
+categories = "Emulator"
+systemname = "Game Boy Advance"
+database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
+license = "MPLv2.0"
+permissions = ""
+display_version = "Git"
+supports_no_game = "false"
+firmware_count = 1
+firmware0_desc = "gba_bios.bin (GBA BIOS)"
+firmware0_path = "gba_bios.bin"
+firmware0_opt = "true"
+notes = "Suggested md5sum:|a860e8c0b6d573d191e4ec7db1b1e4f6 = gba_bios.bin"
diff --git a/core_modules/mgba.hmod/install b/core_modules/mgba.hmod/install
new file mode 100644
index 0000000..6e0a007
--- /dev/null
+++ b/core_modules/mgba.hmod/install
@@ -0,0 +1,4 @@
+transfer_default
+chmod +x $rootfs/bin/*
+chmod +x $rootfs/usr/bin/*
+return 1
diff --git a/core_modules/mgba.hmod/readme.txt b/core_modules/mgba.hmod/readme.txt
new file mode 100644
index 0000000..3c5f093
--- /dev/null
+++ b/core_modules/mgba.hmod/readme.txt
@@ -0,0 +1,13 @@
+=== mGBA core for RetroArch ===

+

+This module will add support for Game Boy Advance games to RetroArch

+

+Available executables and arguments:

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

+  runs "mgba" core

+

+Core by libretro

+Module by pcm

+Hakchi module system by madmonkey

+NES Mini shell integration by Cluster

+(c) 2016-2017

diff --git a/retroarch.hmod/bin/n64 b/core_modules/mupen64plus.hmod/bin/n64
index f59e7af..f59e7af 100644..100755
--- a/retroarch.hmod/bin/n64
+++ b/core_modules/mupen64plus.hmod/bin/n64
diff --git a/retroarch.hmod/etc/libretro/core/mupen64plus_libretro.so b/core_modules/mupen64plus.hmod/etc/libretro/core/mupen64plus_libretro.so
index 4aa6ca3..4aa6ca3 100644
--- a/retroarch.hmod/etc/libretro/core/mupen64plus_libretro.so
+++ b/core_modules/mupen64plus.hmod/etc/libretro/core/mupen64plus_libretro.so
diff --git a/core_modules/mupen64plus.hmod/etc/libretro/info/mupen64plus_libretro.info b/core_modules/mupen64plus.hmod/etc/libretro/info/mupen64plus_libretro.info
new file mode 100644
index 0000000..37d5fd6
--- /dev/null
+++ b/core_modules/mupen64plus.hmod/etc/libretro/info/mupen64plus_libretro.info
@@ -0,0 +1,12 @@
+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/install b/core_modules/mupen64plus.hmod/install
new file mode 100644
index 0000000..6e0a007
--- /dev/null
+++ b/core_modules/mupen64plus.hmod/install
@@ -0,0 +1,4 @@
+transfer_default
+chmod +x $rootfs/bin/*
+chmod +x $rootfs/usr/bin/*
+return 1
diff --git a/core_modules/mupen64plus.hmod/readme.txt b/core_modules/mupen64plus.hmod/readme.txt
new file mode 100644
index 0000000..eaf9349
--- /dev/null
+++ b/core_modules/mupen64plus.hmod/readme.txt
@@ -0,0 +1,13 @@
+=== 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/retroarch.hmod/bin/snes b/core_modules/snes9x2010.hmod/bin/snes
index 215b4ab..215b4ab 100644..100755
--- a/retroarch.hmod/bin/snes
+++ b/core_modules/snes9x2010.hmod/bin/snes
diff --git a/retroarch.hmod/etc/libretro/core/snes9x2010_libretro.so b/core_modules/snes9x2010.hmod/etc/libretro/core/snes9x2010_libretro.so
index b4df2b2..b4df2b2 100644
--- a/retroarch.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/etc/libretro/info/snes9x_libretro.info b/core_modules/snes9x2010.hmod/etc/libretro/info/snes9x_libretro.info
new file mode 100644
index 0000000..d7b3eb9
--- /dev/null
+++ b/core_modules/snes9x2010.hmod/etc/libretro/info/snes9x_libretro.info
@@ -0,0 +1,12 @@
+display_name = "SNES / Super Famicom (Snes9x)"
+authors = "Snes9x Team"
+supported_extensions = "smc|sfc|swc|fig"
+corename = "Snes9x"
+manufacturer = "Nintendo"
+categories = "Emulator"
+systemname = "Super Nintendo Entertainment System"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo"
+license = "Non-commercial"
+permissions = ""
+display_version = "1.53"
+supports_no_game = "false"
diff --git a/core_modules/snes9x2010.hmod/install b/core_modules/snes9x2010.hmod/install
new file mode 100644
index 0000000..6e0a007
--- /dev/null
+++ b/core_modules/snes9x2010.hmod/install
@@ -0,0 +1,4 @@
+transfer_default
+chmod +x $rootfs/bin/*
+chmod +x $rootfs/usr/bin/*
+return 1
diff --git a/core_modules/snes9x2010.hmod/readme.txt b/core_modules/snes9x2010.hmod/readme.txt
new file mode 100644
index 0000000..c6e96be
--- /dev/null
+++ b/core_modules/snes9x2010.hmod/readme.txt
@@ -0,0 +1,13 @@
+=== SNES9x2010 core for RetroArch ===

+

+This module will add support for Super Famicom / Super Nintendo games to RetroArch

+

+Available executables and arguments:

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

+  runs "snes9x2010" 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/stella.hmod/bin/a26 b/core_modules/stella.hmod/bin/a26
new file mode 100755
index 0000000..19d353b
--- /dev/null
+++ b/core_modules/stella.hmod/bin/a26
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec retroarch-clover stella "$@"
diff --git a/core_modules/stella.hmod/etc/libretro/core/stella_libretro.so b/core_modules/stella.hmod/etc/libretro/core/stella_libretro.so
new file mode 100755
index 0000000..f130264
--- /dev/null
+++ b/core_modules/stella.hmod/etc/libretro/core/stella_libretro.so
diff --git a/core_modules/stella.hmod/etc/libretro/info/stella_libretro.info b/core_modules/stella.hmod/etc/libretro/info/stella_libretro.info
new file mode 100644
index 0000000..37c486c
--- /dev/null
+++ b/core_modules/stella.hmod/etc/libretro/info/stella_libretro.info
@@ -0,0 +1,12 @@
+display_name = "Atari 2600 (Stella)"
+authors = "Stephen Anthony|Bradford Mott|Eckhard Stolberg|Brian Watson"
+supported_extensions = "a26|bin"
+corename = "Stella"
+manufacturer = "Atari"
+categories = "Emulator"
+systemname = "Atari 2600"
+database = "Atari - 2600"
+license = "GPLv2"
+permissions = ""
+display_version = "3.9.3"
+supports_no_game = "false"
diff --git a/core_modules/stella.hmod/install b/core_modules/stella.hmod/install
new file mode 100644
index 0000000..6e0a007
--- /dev/null
+++ b/core_modules/stella.hmod/install
@@ -0,0 +1,4 @@
+transfer_default
+chmod +x $rootfs/bin/*
+chmod +x $rootfs/usr/bin/*
+return 1
diff --git a/core_modules/stella.hmod/readme.txt b/core_modules/stella.hmod/readme.txt
new file mode 100644
index 0000000..5f4022e
--- /dev/null
+++ b/core_modules/stella.hmod/readme.txt
@@ -0,0 +1,13 @@
+=== Stella core for RetroArch ===

+

+This module will add support for Atari 2600 games to RetroArch

+

+Available executables and arguments:

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

+  runs "stella" core

+

+Core by libretro

+Module by pcm

+Hakchi module system by madmonkey

+NES Mini shell integration by Cluster

+(c) 2016-2017

diff --git a/libretro_core_template.hmod/install b/libretro_core_template.hmod/install
new file mode 100755
index 0000000..7c0ca75
--- /dev/null
+++ b/libretro_core_template.hmod/install
@@ -0,0 +1,3 @@
+core_name=<>_libretro.so
+copy "$transferpath/$core_name" "$rootfs/etc/libretro/core/$core_name"
+return 1
diff --git a/libretro_core_template.hmod/readme.txt b/libretro_core_template.hmod/readme.txt
new file mode 100755
index 0000000..7819be9
--- /dev/null
+++ b/libretro_core_template.hmod/readme.txt
@@ -0,0 +1,8 @@
+Use this template to add and remove your own cores:

+1. Make a backup of libretro_core_template.hmod folder

+2. Copy your *.so file to libretro_core_template.hmod folder and rename the folder to something more meaningful (e.g., <core name>.hmod)

+3. Open "install" and "uninstall" scripts with Notepad++ or Sublime Text and change the <> to your core name

+Example:

+The core name is fb_alpha_libretro.so:

+1. Copy your fb_alpha_libretro.so file to libretro_core_template.hmod folder and rename the folder to fb_alpha.hmod

+2. Open "install" and "uninstall" scripts with Notepad++ or Sublime Text and change the <> to fb_alpha

diff --git a/libretro_core_template.hmod/uninstall b/libretro_core_template.hmod/uninstall
new file mode 100755
index 0000000..02f6b44
--- /dev/null
+++ b/libretro_core_template.hmod/uninstall
@@ -0,0 +1,2 @@
+core_name=<>_libretro.so
+rm "$rootfs/etc/libretro/core/$core_name"
diff --git a/makehmod.bat b/makehmod.bat
index aa5d3c9..8453cfd 100644
--- a/makehmod.bat
+++ b/makehmod.bat
@@ -1,6 +1,6 @@
 @echo off

-set moddir=retroarch.hmod

-set modname=retroarch.hmod

+set moddir=retroarch_mod.hmod

+set modname=retroarch_mod.hmod

 set outdir=output

 for %%x in (%*) do set outdir=%1

 

@@ -28,4 +28,4 @@ goto end
 echo Error %ERRORLEVEL%

 goto end

 

-:end
\ No newline at end of file
+:end

diff --git a/makemod.sh b/makemod.sh
index 22724ba..87ab5f5 100755
--- a/makemod.sh
+++ b/makemod.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-moddir=retroarch.hmod
-modname=retroarch.hmod
+moddir=retroarch_mod.hmod
+modname=retroarch_mod.hmod
 outdir=output
 [ -z "$1" ] || outdir=$1
 cd "$moddir"
diff --git a/retroarch.hmod/bin/gba b/retroarch.hmod/bin/gba
deleted file mode 100644
index 3ef42e0..0000000
--- a/retroarch.hmod/bin/gba
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec retroarch-clover mednafen_gba "$@"
diff --git a/retroarch.hmod/bin/nes b/retroarch.hmod/bin/nes
index ca0f380..ca0f380 100644..100755
--- a/retroarch.hmod/bin/nes
+++ b/retroarch.hmod/bin/nes
diff --git a/retroarch.hmod/bin/retroarch-clover b/retroarch.hmod/bin/retroarch-clover
index 7cee66b..7cee66b 100644..100755
--- a/retroarch.hmod/bin/retroarch-clover
+++ b/retroarch.hmod/bin/retroarch-clover
diff --git a/retroarch.hmod/bin/retroarch-mini b/retroarch.hmod/bin/retroarch-mini
index 7d166de..7d166de 100644..100755
--- a/retroarch.hmod/bin/retroarch-mini
+++ b/retroarch.hmod/bin/retroarch-mini
diff --git a/retroarch.hmod/bin/retroarch-watchdog b/retroarch.hmod/bin/retroarch-watchdog
index f43a8ab..5608e83 100644..100755
--- a/retroarch.hmod/bin/retroarch-watchdog
+++ b/retroarch.hmod/bin/retroarch-watchdog
@@ -32,9 +32,9 @@ rm -f /var/cache/*.state /var/cache/*.auto /var/cache/*.srm
 [ ! -z "$sram" ] && [ -f "$sram" ] && cp -f "$sram" "$rsram" && echo cp -f "$sram" "$rsram"
 
 # core provided ratio for CRT mode
-[ "$filter" == "crt720" ] && ratio=21 && smooth=true && crt=1
+[ "$filter" == "crt720" ] && ratio=21 && smooth=false && crt=1
 # core provided ratio for 4:3 mode
-[ "$filter" == "gpu720" ] && ratio=21 && smooth=true
+[ "$filter" == "gpu720" ] && ratio=21 && smooth=false
 # pixel perfect - 1:1 for pixel perfect mode
 [ "$filter" == "ppu" ] && ratio=20 && smooth=false
 
@@ -43,7 +43,9 @@ rm -f /var/cache/*.state /var/cache/*.auto /var/cache/*.srm
 
 # set aspect ratio in config
 [ -z "$ratio" ] || sed -i -e 's/aspect_ratio_index = "[^"]*"/aspect_ratio_index = "'$ratio'"/g' /etc/libretro/retroarch.cfg
-[ -z "$smooth" ] || sed -i -e 's/video_smooth = "[^"]*"/video_smooth = "'$smooth'"/g' /etc/libretro/retroarch.cfg
+
+# Don't write filtering option in config
+#[ -z "$smooth" ] || sed -i -e 's/video_smooth = "[^"]*"/video_smooth = "'$smooth'"/g' /etc/libretro/retroarch.cfg
 
 # enable shader scanlines if need
 if [ "$crt" == "1" ]; then
diff --git a/retroarch.hmod/etc/libretro/core/mednafen_gba_libretro.so b/retroarch.hmod/etc/libretro/core/mednafen_gba_libretro.so
deleted file mode 100644
index 7b3a5c9..0000000
--- a/retroarch.hmod/etc/libretro/core/mednafen_gba_libretro.so
+++ /dev/null
diff --git a/retroarch.hmod/etc/libretro/info/fceumm_libretro.info b/retroarch.hmod/etc/libretro/info/fceumm_libretro.info
new file mode 100644
index 0000000..446b4ac
--- /dev/null
+++ b/retroarch.hmod/etc/libretro/info/fceumm_libretro.info
@@ -0,0 +1,17 @@
+display_name = "NES / Famicom (FCEUmm)"
+authors = "FCEU Team|CaH4e3"
+supported_extensions = "fds|nes|unif"
+corename = "FCEUmm"
+manufacturer = "Nintendo"
+categories = "Emulator"
+systemname = "Nintendo Entertainment System"
+database = "Nintendo - Nintendo Entertainment System|Nintendo - Famicom Disk System"
+license = "GPLv2"
+permissions = ""
+display_version = "SVN"
+supports_no_game = "false"
+firmware_count = 1
+firmware0_desc = "disksys.rom (Famicom Disk System BIOS)"
+firmware0_path = "disksys.rom"
+firmware0_opt = "false"
+notes = "Suggested md5sum:|CA30B50F880EB660A320674ED365EF7A = disksys.rom"
diff --git a/retroarch.hmod/etc/libretro/info/nestopia_libretro.info b/retroarch.hmod/etc/libretro/info/nestopia_libretro.info
new file mode 100644
index 0000000..da7f802
--- /dev/null
+++ b/retroarch.hmod/etc/libretro/info/nestopia_libretro.info
@@ -0,0 +1,17 @@
+display_name = "NES / Famicom (Nestopia UE)"
+authors = "Martin Freij|R. Belmont|R. Danbrook"
+supported_extensions = "nes|fds"
+corename = "Nestopia UE"
+manufacturer = "Nintendo"
+categories = "Emulator"
+systemname = "Nintendo Entertainment System"
+database = "Nintendo - Nintendo Entertainment System|Nintendo - Famicom Disk System"
+license = "GPLv2"
+permissions = ""
+display_version = "v1.47-WIP"
+supports_no_game = "false"
+firmware_count = 1
+firmware0_desc = "disksys.rom (Famicom Disk System BIOS)"
+firmware0_path = "disksys.rom"
+firmware0_opt = "false"
+notes = "Suggested md5sum:|CA30B50F880EB660A320674ED365EF7A = disksys.rom"
diff --git a/retroarch.hmod/etc/libretro/retroarch-core-options.cfg b/retroarch.hmod/etc/libretro/retroarch-core-options.cfg
index d042cdd..6578ed7 100644
--- a/retroarch.hmod/etc/libretro/retroarch-core-options.cfg
+++ b/retroarch.hmod/etc/libretro/retroarch-core-options.cfg
@@ -21,7 +21,7 @@ fceumm_overscan = "enabled"
 fceumm_aspect = "8:7 PAR"
 snes9x_next_overclock = "Disabled(10MHz)"
 gambatte_gb_colorization = "disabled"
-gambatte_gb_internal_palette = "GBC - Blue"
+gambatte_gb_internal_palette = "GBC - Greyscale"
 gambatte_gbc_color_correction = "enabled"
 gambatte_gb_hwmode = "Auto"
 gambatte_gb_link_mode = "Not Connected"
diff --git a/retroarch.hmod/etc/libretro/retroarch.cfg b/retroarch.hmod/etc/libretro/retroarch.cfg
index 437edbd..bf07e0a 100644
--- a/retroarch.hmod/etc/libretro/retroarch.cfg
+++ b/retroarch.hmod/etc/libretro/retroarch.cfg
@@ -1,4 +1,4 @@
-system_directory = "/tmp"
+system_directory = "~/system"
 input_driver = "udev"
 input_joypad_driver = "udev"
 input_autodetect_enable = "true"
@@ -7,7 +7,7 @@ input_libretro_device_p1 = "5"
 input_libretro_device_p2 = "5"
 core_updater_buildbot_assets_url = "http://buildbot.libretro.com/assets/"
 libretro_directory = "~/core"
-libretro_info_path = "~/.config/retroarch/cores"
+libretro_info_path = "~/info"
 content_database_path = "~/.config/retroarch/database/rdb"
 cheat_database_path = "~/.config/retroarch/cheats"
 content_history_path = "~/content_history.lpl"
@@ -27,7 +27,7 @@ playlist_directory = "~/.config/retroarch/playlists"
 audio_filter_dir = "/"
 savefile_directory = "/var/cache"
 savestate_directory = "/var/cache"
-rgui_browser_directory = "/"
+rgui_browser_directory = "/usr/share/games/nes/kachikachi"
 rgui_config_directory = "~/.config/retroarch/config"
 overlay_directory = "~/.config/retroarch/overlay"
 screenshot_directory = "~/.config/retroarch/screenshots"
@@ -60,7 +60,7 @@ input_bind_timeout = "5"
 input_turbo_period = "6"
 input_duty_cycle = "3"
 input_max_users = "2"
-input_menu_toggle_gamepad_combo = "3"
+input_menu_toggle_gamepad_combo = "4"
 audio_latency = "64"
 audio_block_frames = "0"
 rewind_granularity = "1"
@@ -176,8 +176,8 @@ video_aspect_ratio_auto = "false"
 video_allow_rotate = "true"
 video_windowed_fullscreen = "true"
 video_crop_overscan = "true"
-video_scale_integer = "false"
-video_smooth = "true"
+video_scale_integer = "true"
+video_smooth = "false"
 video_force_aspect = "true"
 video_threaded = "false"
 video_shared_context = "false"
diff --git a/retroarch.hmod/etc/libretro/bios/NstDatabase.xml b/retroarch.hmod/etc/libretro/system/NstDatabase.xml
index d724eee..d724eee 100644
--- a/retroarch.hmod/etc/libretro/bios/NstDatabase.xml
+++ b/retroarch.hmod/etc/libretro/system/NstDatabase.xml
diff --git a/retroarch.hmod/readme.txt b/retroarch.hmod/readme.txt
index da30bc8..18ff3e7 100644
--- a/retroarch.hmod/readme.txt
+++ b/retroarch.hmod/readme.txt
@@ -1,7 +1,7 @@
-=== RetroArch mod for hakchi ===

-version 0.1

+=== RetroArch module for hakchi ===

+version 0.2_mod

 

-This is hakchi/hakchi2 module which adds the RetroArch emulator to your NES Mini.

+This is a hakchi/hakchi2 module which adds libretro cores and RetroArch frontend to your NES Mini.

 

 It will automatically detect unsupported NES games and run them instead of the default emulator. Save states will work as usual.

 

@@ -9,38 +9,19 @@ It can also run games for other consoles. This pack already contains the followi
 

 - fceumm (NES, many mappers, UNIF support)

 - nestopia (NES, FDS)

-- snes9x2010 (SNES)

-- gambatte_libretro (GB, GBC)

-- mednafen_gba (GBA)

-- genesis_plus_gx (SMS/Genesis/MD)

-- mupen64plus (N64)

 

 Available executables and arguments:

 

-- retroarch-clover <core> <rom> <clover_args>

+- /bin/retroarch-clover <core> <rom> <clover_args>

   runs RetroArch with specified core,

   designed for executing from clover shell, 

-	so it parses all clover arguments (saves, aspect ratio, etc.)

-- /bin/gb <rom> <clover_args>

-  runs "gambatte" core

-- /bin/gbc <rom> <clover_args>

-  runs "gambatte" core

-- /bin/gba <rom> <clover_args>

-  runs "mednafen_gba" core

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

-  runs "genesis_plus_gx" core

+  so it parses all clover arguments (saves, aspect ratio, etc.)

 - /bin/nes <rom> <clover_args>

-  runs "fceumm" core

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

-  runs "emux_sms" core

-- /bin/snes <rom> <clover_args>

-  runs "snes9x2010" core

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

-  runs "mupen64plus" core

+  runs "fceumm" core or "nestopia" for FDS games

 - /bin/retroarch-mini [core] [rom] [args]

   runs RetroArch directly, without clover intergration

 - /bin/retroarch

-  RetroArch itself

+  RetroArch binary

 

 Sometimes default emulator of NES mini is not working with some games when it should. So you can just add "--retroarch" command line argument to use RetroArch.

 

@@ -49,6 +30,8 @@ Known issues:
 - Default CRT filter is not working, scanlines shader added instead, only for NES

 - It's recommended to turn your NES Mini off from shell, not during game

 

+Cores by libretro

 NES Mini port by madmonkey

 NES Mini shell integration by Cluster

+Additional modules by pcm

 (c) 2017

diff --git a/retroarch.hmod/usr/bin/clover-kachikachi b/retroarch.hmod/usr/bin/clover-kachikachi
index 9406ef0..9406ef0 100644..100755
--- a/retroarch.hmod/usr/bin/clover-kachikachi
+++ b/retroarch.hmod/usr/bin/clover-kachikachi