From b074c095893a1b36a73044ffa06b18692f95d46e Mon Sep 17 00:00:00 2001
From: Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com>
Date: Sat, 18 Feb 2017 23:51:47 +0300
Subject: Nintendo Sixty Foooouuuur!

---
 README.md                                          |  20 ++--
 makehmod.bat                                       |   7 +-
 retroarch.hmod/bin/gb                              |   2 +-
 retroarch.hmod/bin/gba                             |   2 +-
 retroarch.hmod/bin/n64                             |   2 +-
 retroarch.hmod/bin/nes                             |   2 +-
 retroarch.hmod/bin/retroarch-watchdog              |  51 +++++-----
 retroarch.hmod/bin/sms                             |   2 +-
 retroarch.hmod/bin/snes                            |   2 +-
 .../libretro/core/bsnes_cplusplus98_libretro.so    | Bin 728776 -> 0 bytes
 .../core/bsnes_mercury_accuracy_libretro.so        | Bin 1421412 -> 0 bytes
 .../core/bsnes_mercury_performance_libretro.so     | Bin 1456028 -> 0 bytes
 .../etc/libretro/core/emux_sms_libretro.so         | Bin 47392 -> 0 bytes
 .../etc/libretro/core/glupen64_libretro.so         | Bin 0 -> 1332452 bytes
 .../etc/libretro/core/mupen64plus_libretro.so      | Bin 0 -> 1514108 bytes
 retroarch.hmod/etc/libretro/retroarch.cfg          | 106 +++++++++++----------
 retroarch.hmod/etc/libretro/shaders/scanline.glslp |   4 +-
 retroarch.hmod/readme.txt                          |  18 ++--
 18 files changed, 122 insertions(+), 96 deletions(-)
 delete mode 100644 retroarch.hmod/etc/libretro/core/bsnes_cplusplus98_libretro.so
 delete mode 100644 retroarch.hmod/etc/libretro/core/bsnes_mercury_accuracy_libretro.so
 delete mode 100644 retroarch.hmod/etc/libretro/core/bsnes_mercury_performance_libretro.so
 delete mode 100644 retroarch.hmod/etc/libretro/core/emux_sms_libretro.so
 create mode 100644 retroarch.hmod/etc/libretro/core/glupen64_libretro.so
 create mode 100644 retroarch.hmod/etc/libretro/core/mupen64plus_libretro.so

diff --git a/README.md b/README.md
index 389d4fb..ab4071b 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,13 @@ This is hakchi/hakchi2 module which adds the RetroArch emulator 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:
-- emux_sms
-- fceumm
-- gambatte_libretro
-- genesis_plus_gx
-- nestopia
-- snes9x2010
+- 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:
 
@@ -35,7 +36,12 @@ Available executables and arguments:
         - /bin/retroarch
           RetroArch itself
 
-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.
+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.
+
+Known issues:
+- Nintendo 64 save-states are not working, battery backup working 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 game
 
 
 NES Mini port by madmonkey
diff --git a/makehmod.bat b/makehmod.bat
index b90eab8..aa5d3c9 100644
--- a/makehmod.bat
+++ b/makehmod.bat
@@ -10,11 +10,12 @@ if EXIST "%modname%" del /F /Q "%modname%"
 tar -czvf "%modname%" *
 if ERRORLEVEL 9009 goto notar
 if NOT ERRORLEVEL 0 goto error
-if NOT EXIST "..\%outdir%" md "..\%outdir%"
+cd ..
+if NOT EXIST "%outdir%" md "%outdir%"
 if NOT ERRORLEVEL 0 goto error
-if EXIST "..\%outdir%\%modname%" del /F /Q "..\%outdir%\%modname%"
+if EXIST "%outdir%\%modname%" del /F /S /Q "%outdir%\%modname%"
 if NOT ERRORLEVEL 0 goto error
-move /Y "%modname%" "..\%outdir%"
+move /Y "%moddir%\%modname%" "%outdir%"
 if not ERRORLEVEL 0 goto error
 echo Done!
 goto end
diff --git a/retroarch.hmod/bin/gb b/retroarch.hmod/bin/gb
index bb97411..408b46b 100644
--- a/retroarch.hmod/bin/gb
+++ b/retroarch.hmod/bin/gb
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec retroarch-clover gambatte "$@"
+exec retroarch-clover gambatte "$@" --ra-allow-crt
diff --git a/retroarch.hmod/bin/gba b/retroarch.hmod/bin/gba
index 3ef42e0..0796c9b 100644
--- a/retroarch.hmod/bin/gba
+++ b/retroarch.hmod/bin/gba
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec retroarch-clover mednafen_gba "$@"
+exec retroarch-clover mednafen_gba "$@" --ra-allow-crt
diff --git a/retroarch.hmod/bin/n64 b/retroarch.hmod/bin/n64
index 3ecc32f..f59e7af 100644
--- a/retroarch.hmod/bin/n64
+++ b/retroarch.hmod/bin/n64
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec retroarch-clover mupen64plus "$@"
+exec retroarch-clover mupen64plus "$@" --ra-nosaves
diff --git a/retroarch.hmod/bin/nes b/retroarch.hmod/bin/nes
index 7fb6453..ca0f380 100644
--- a/retroarch.hmod/bin/nes
+++ b/retroarch.hmod/bin/nes
@@ -7,4 +7,4 @@ if [ "$extension" == "fds" ]; then
   cp -f /usr/share/kachikachi/fds_bios.bin /tmp/disksys.rom
 fi
 
-exec retroarch-clover "$core" "$@"
+exec retroarch-clover "$core" "$@" --ra-allow-crt
diff --git a/retroarch.hmod/bin/retroarch-watchdog b/retroarch.hmod/bin/retroarch-watchdog
index 75de199..71a9423 100644
--- a/retroarch.hmod/bin/retroarch-watchdog
+++ b/retroarch.hmod/bin/retroarch-watchdog
@@ -9,47 +9,50 @@ autosave="/var/cache/$id.state.auto"
 rsram="/var/cache/$id.srm"
 shift 3
 
-scanlines=0
-[ "$corename" == "fceumm" ] && scanlines_allowed=1
-[ "$corename" == "nestopia" ] && scanlines_allowed=1
-[ "$corename" == "emux_sms" ] && scanlines_allowed=1
+crt=0
+allow_crt=0
 
 while [ $# -gt 0 ]; do
-  [ "$1" == "--load-state-file" ] && load="$2"
-  [ "$1" == "--save-on-quit" ] && save="$2"
-  [ "$1" == "--save-screenshot-on-quit" ] && screenshot="$2"
-  [ "$1" == "--save-data-backing-file" ] && sram="$2"
-  [ "$1" == "--graphic-filter" ] && filter="$2"
-  [ "$scanlines_allowed" == "1" ] && [ "$1" == "--enable-crt-scanlines" ] && scanlines=1
-  [ "$1" == "--ra-scanlines" ] && scanlines=1
+  [ "$1" == "--load-state-file" ] && load=$2
+  [ "$1" == "--save-on-quit" ] && save=$2
+  [ "$1" == "--save-screenshot-on-quit" ] && screenshot=$2
+  [ "$1" == "--save-data-backing-file" ] && sram=$2
+  [ "$1" == "--graphic-filter" ] && filter=$2
+  [ "$1" == "--enable-crt-scanlines" ] && crt=1
+  [ "$1" == "--ra-allow-crt" ] && allow_crt=1
+  [ "$1" == "--ra-extra" ] && extra=$2
+  [ "$1" == "--ra-nosaves" ] && nosaves=1
   shift
 done
 
 # saves if any
 rm -f /var/cache/*.state /var/cache/*.auto /var/cache/*.srm
-[ ! -z "$load" ] && [ -f "$load" ] && cp -f "$load" "$autosave" && echo cp -f "$load" "$autosave"
+[ ! -z "$load" ] && [ -f "$load" ] && [ -z "$nosaves" ] && cp -f "$load" "$autosave" && echo cp -f "$load" "$autosave"
 [ ! -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 && [ "$scanlines_allowed" == "1" ] && scanlines=1
+[ "$filter" == "crt720" ] && ratio=21 && smooth=true && crt=1
 # core provided ratio for 4:3 mode
 [ "$filter" == "gpu720" ] && ratio=21 && smooth=true
 # pixel perfect - 1:1 for pixel perfect mode
 [ "$filter" == "ppu" ] && ratio=20 && smooth=false
 
+# Allow scanlines only for simple systems
+[ "$allow_crt" == "1" ] || crt=0
+
 # 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
 
 # enable shader scanlines if need
-if [ "$scanlines" == "1" ]; then
+if [ "$crt" == "1" ]; then
   sed -i -e 's/video_shader = "[^"]*"/video_shader = "~\/shaders\/retroarch\.glslp"/g' /etc/libretro/retroarch.cfg
-  cp -f /etc/libretro/shaders/scanlines.glslp /etc/libretro/shaders/retroarch.glslp
+  cp -f /etc/libretro/shaders/scanline.glslp /etc/libretro/shaders/retroarch.glslp
 else
   sed -i -e 's/video_shader = "[^"]*"/video_shader = ""/g' /etc/libretro/retroarch.cfg
 fi
 
-retroarch -c "$HOME/retroarch.cfg" -vfL "$core" "$rom" &
+retroarch -c "$HOME/retroarch.cfg" -vfL "$core" "$rom" $extra &
 rpid=$!
 sleep 1
 rm -f /var/cache/*.state /var/cache/*.auto /var/cache/*.srm
@@ -70,14 +73,16 @@ done
 pkill -KILL clover-mcp
 pkill -KILL ReedPlayer-Clover
 
-# Saves! It's primary task
-mkdir -p $(dirname "$save")
-mkdir -p $(dirname "$sram")
-mkdir -p $(dirname "$screenshot")
-[ ! -z "$save" ] && [ -f "$autosave" ] && mv -f "$autosave" "$save"
-[ ! -z "$sram" ] && [ -f "$rsram" ] && mv -f "$rsram" "$sram"
+[ ! -z "$save" ] && mkdir -p $(dirname "$save")
+[ ! -z "$sram" ] && mkdir -p $(dirname "$sram")
+[ ! -z "$screenshot" ] && mkdir -p $(dirname "$screenshot")
 
-[ -z "$screenshot" ] || fbgrab -z 0 "$screenshot"
+# Screenshot! It's not so fast...
+[ -z "$screenshot" ] || [ -z "$nosaves" ] && fbgrab -z 0 "$screenshot"
+
+# Saves!
+[ ! -z "$save" ] && [ -f "$autosave" ] && [ -z "$nosaves" ] && mv -f "$autosave" "$save"
+[ ! -z "$sram" ] && [ -f "$rsram" ] && mv -f "$rsram" "$sram"
 
 # Back to shell
 clover-mcp
diff --git a/retroarch.hmod/bin/sms b/retroarch.hmod/bin/sms
index dca6d3b..e5b73ac 100644
--- a/retroarch.hmod/bin/sms
+++ b/retroarch.hmod/bin/sms
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec retroarch-clover genesis_plus_gx "$@"
+exec retroarch-clover genesis_plus_gx "$@" --ra-allow-crt
diff --git a/retroarch.hmod/bin/snes b/retroarch.hmod/bin/snes
index 215b4ab..a06b22b 100644
--- a/retroarch.hmod/bin/snes
+++ b/retroarch.hmod/bin/snes
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec retroarch-clover snes9x2010 "$@"
+exec retroarch-clover snes9x2010 "$@" --ra-allow-crt
diff --git a/retroarch.hmod/etc/libretro/core/bsnes_cplusplus98_libretro.so b/retroarch.hmod/etc/libretro/core/bsnes_cplusplus98_libretro.so
deleted file mode 100644
index a46ad3a..0000000
Binary files a/retroarch.hmod/etc/libretro/core/bsnes_cplusplus98_libretro.so and /dev/null differ
diff --git a/retroarch.hmod/etc/libretro/core/bsnes_mercury_accuracy_libretro.so b/retroarch.hmod/etc/libretro/core/bsnes_mercury_accuracy_libretro.so
deleted file mode 100644
index 90d2dc7..0000000
Binary files a/retroarch.hmod/etc/libretro/core/bsnes_mercury_accuracy_libretro.so and /dev/null differ
diff --git a/retroarch.hmod/etc/libretro/core/bsnes_mercury_performance_libretro.so b/retroarch.hmod/etc/libretro/core/bsnes_mercury_performance_libretro.so
deleted file mode 100644
index 0a5501f..0000000
Binary files a/retroarch.hmod/etc/libretro/core/bsnes_mercury_performance_libretro.so and /dev/null differ
diff --git a/retroarch.hmod/etc/libretro/core/emux_sms_libretro.so b/retroarch.hmod/etc/libretro/core/emux_sms_libretro.so
deleted file mode 100644
index 306d50e..0000000
Binary files a/retroarch.hmod/etc/libretro/core/emux_sms_libretro.so and /dev/null differ
diff --git a/retroarch.hmod/etc/libretro/core/glupen64_libretro.so b/retroarch.hmod/etc/libretro/core/glupen64_libretro.so
new file mode 100644
index 0000000..368b7c7
Binary files /dev/null and b/retroarch.hmod/etc/libretro/core/glupen64_libretro.so differ
diff --git a/retroarch.hmod/etc/libretro/core/mupen64plus_libretro.so b/retroarch.hmod/etc/libretro/core/mupen64plus_libretro.so
new file mode 100644
index 0000000..4aa6ca3
Binary files /dev/null and b/retroarch.hmod/etc/libretro/core/mupen64plus_libretro.so differ
diff --git a/retroarch.hmod/etc/libretro/retroarch.cfg b/retroarch.hmod/etc/libretro/retroarch.cfg
index 93bd7db..6eae09f 100644
--- a/retroarch.hmod/etc/libretro/retroarch.cfg
+++ b/retroarch.hmod/etc/libretro/retroarch.cfg
@@ -14,7 +14,7 @@ content_history_path = "~/content_history.lpl"
 content_music_history_path = "~/content_music_history.lpl"
 content_video_history_path = "~/content_video_history.lpl"
 content_image_history_path = "~/content_image_history.lpl"
-cursor_directory = "~/.config/retroarch/database/cursors"
+cursor_directory = ""
 screenshot_directory = "/var/cache"
 input_remapping_directory = "~/.config/retroarch/config/remaps"
 video_shader_dir = "~/shaders"
@@ -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"
@@ -59,7 +59,7 @@ input_axis_threshold = "0.500000"
 input_bind_timeout = "5"
 input_turbo_period = "6"
 input_duty_cycle = "3"
-input_max_users = "5"
+input_max_users = "2"
 input_menu_toggle_gamepad_combo = "3"
 audio_latency = "64"
 audio_block_frames = "0"
@@ -96,7 +96,7 @@ input_device_p1 = "0"
 input_player1_joypad_index = "0"
 input_player1_analog_dpad_mode = "0"
 input_device_p2 = "0"
-input_player2_joypad_index = "1"
+input_player2_joypad_index = "0"
 input_player2_analog_dpad_mode = "0"
 input_device_p3 = "0"
 input_player3_joypad_index = "2"
@@ -214,7 +214,7 @@ menu_core_enable = "true"
 menu_dynamic_wallpaper_enable = "false"
 rgui_show_start_screen = "false"
 menu_navigation_wraparound_enable = "true"
-menu_navigation_browser_filter_supported_extensions_enable = "true"
+menu_navigation_browser_filter_supported_extensions_enable = "false"
 menu_show_advanced_settings = "true"
 input_overlay_enable = "false"
 input_overlay_enable_autopreferred = "true"
@@ -251,46 +251,46 @@ soft_filter_index = "0"
 current_resolution_id = "0"
 flicker_filter_index = "0"
 input_player1_b = "z"
-input_player1_b_btn = "nul"
+input_player1_b_btn = "1"
 input_player1_b_axis = "nul"
 input_player1_y = "a"
-input_player1_y_btn = "nul"
+input_player1_y_btn = "3"
 input_player1_y_axis = "nul"
 input_player1_select = "rshift"
-input_player1_select_btn = "nul"
+input_player1_select_btn = "8"
 input_player1_select_axis = "nul"
 input_player1_start = "enter"
-input_player1_start_btn = "nul"
+input_player1_start_btn = "9"
 input_player1_start_axis = "nul"
 input_player1_up = "up"
-input_player1_up_btn = "nul"
+input_player1_up_btn = "13"
 input_player1_up_axis = "nul"
 input_player1_down = "down"
-input_player1_down_btn = "nul"
+input_player1_down_btn = "14"
 input_player1_down_axis = "nul"
 input_player1_left = "left"
-input_player1_left_btn = "nul"
+input_player1_left_btn = "11"
 input_player1_left_axis = "nul"
 input_player1_right = "right"
-input_player1_right_btn = "nul"
+input_player1_right_btn = "12"
 input_player1_right_axis = "nul"
 input_player1_a = "x"
-input_player1_a_btn = "nul"
+input_player1_a_btn = "0"
 input_player1_a_axis = "nul"
 input_player1_x = "s"
-input_player1_x_btn = "nul"
+input_player1_x_btn = "2"
 input_player1_x_axis = "nul"
 input_player1_l = "q"
-input_player1_l_btn = "nul"
+input_player1_l_btn = "4"
 input_player1_l_axis = "nul"
 input_player1_r = "w"
-input_player1_r_btn = "nul"
+input_player1_r_btn = "5"
 input_player1_r_axis = "nul"
 input_player1_l2 = "nul"
-input_player1_l2_btn = "nul"
+input_player1_l2_btn = "6"
 input_player1_l2_axis = "nul"
 input_player1_r2 = "nul"
-input_player1_r2_btn = "nul"
+input_player1_r2_btn = "7"
 input_player1_r2_axis = "nul"
 input_player1_l3 = "nul"
 input_player1_l3_btn = "nul"
@@ -300,28 +300,28 @@ input_player1_r3_btn = "nul"
 input_player1_r3_axis = "nul"
 input_player1_l_x_plus = "nul"
 input_player1_l_x_plus_btn = "nul"
-input_player1_l_x_plus_axis = "nul"
+input_player1_l_x_plus_axis = "+0"
 input_player1_l_x_minus = "nul"
 input_player1_l_x_minus_btn = "nul"
-input_player1_l_x_minus_axis = "nul"
+input_player1_l_x_minus_axis = "-0"
 input_player1_l_y_plus = "nul"
 input_player1_l_y_plus_btn = "nul"
-input_player1_l_y_plus_axis = "nul"
+input_player1_l_y_plus_axis = "+1"
 input_player1_l_y_minus = "nul"
 input_player1_l_y_minus_btn = "nul"
-input_player1_l_y_minus_axis = "nul"
+input_player1_l_y_minus_axis = "-1"
 input_player1_r_x_plus = "nul"
 input_player1_r_x_plus_btn = "nul"
-input_player1_r_x_plus_axis = "nul"
+input_player1_r_x_plus_axis = "+3"
 input_player1_r_x_minus = "nul"
 input_player1_r_x_minus_btn = "nul"
-input_player1_r_x_minus_axis = "nul"
+input_player1_r_x_minus_axis = "-3"
 input_player1_r_y_plus = "nul"
 input_player1_r_y_plus_btn = "nul"
-input_player1_r_y_plus_axis = "nul"
+input_player1_r_y_plus_axis = "+4"
 input_player1_r_y_minus = "nul"
 input_player1_r_y_minus_btn = "nul"
-input_player1_r_y_minus_axis = "nul"
+input_player1_r_y_minus_axis = "-4"
 input_player1_turbo = "nul"
 input_player1_turbo_btn = "nul"
 input_player1_turbo_axis = "nul"
@@ -428,46 +428,46 @@ input_menu_toggle = "f1"
 input_menu_toggle_btn = "nul"
 input_menu_toggle_axis = "nul"
 input_player2_b = "nul"
-input_player2_b_btn = "nul"
+input_player2_b_btn = "1"
 input_player2_b_axis = "nul"
 input_player2_y = "nul"
-input_player2_y_btn = "nul"
+input_player2_y_btn = "3"
 input_player2_y_axis = "nul"
 input_player2_select = "nul"
-input_player2_select_btn = "nul"
+input_player2_select_btn = "8"
 input_player2_select_axis = "nul"
 input_player2_start = "nul"
-input_player2_start_btn = "nul"
+input_player2_start_btn = "9"
 input_player2_start_axis = "nul"
 input_player2_up = "nul"
-input_player2_up_btn = "nul"
+input_player2_up_btn = "13"
 input_player2_up_axis = "nul"
 input_player2_down = "nul"
-input_player2_down_btn = "nul"
+input_player2_down_btn = "14"
 input_player2_down_axis = "nul"
 input_player2_left = "nul"
-input_player2_left_btn = "nul"
+input_player2_left_btn = "11"
 input_player2_left_axis = "nul"
 input_player2_right = "nul"
-input_player2_right_btn = "nul"
+input_player2_right_btn = "12"
 input_player2_right_axis = "nul"
 input_player2_a = "nul"
-input_player2_a_btn = "nul"
+input_player2_a_btn = "0"
 input_player2_a_axis = "nul"
 input_player2_x = "nul"
-input_player2_x_btn = "nul"
+input_player2_x_btn = "2"
 input_player2_x_axis = "nul"
 input_player2_l = "nul"
-input_player2_l_btn = "nul"
+input_player2_l_btn = "4"
 input_player2_l_axis = "nul"
 input_player2_r = "nul"
-input_player2_r_btn = "nul"
+input_player2_r_btn = "5"
 input_player2_r_axis = "nul"
 input_player2_l2 = "nul"
-input_player2_l2_btn = "nul"
+input_player2_l2_btn = "6"
 input_player2_l2_axis = "nul"
 input_player2_r2 = "nul"
-input_player2_r2_btn = "nul"
+input_player2_r2_btn = "7"
 input_player2_r2_axis = "nul"
 input_player2_l3 = "nul"
 input_player2_l3_btn = "nul"
@@ -477,28 +477,28 @@ input_player2_r3_btn = "nul"
 input_player2_r3_axis = "nul"
 input_player2_l_x_plus = "nul"
 input_player2_l_x_plus_btn = "nul"
-input_player2_l_x_plus_axis = "nul"
+input_player2_l_x_plus_axis = "+0"
 input_player2_l_x_minus = "nul"
 input_player2_l_x_minus_btn = "nul"
-input_player2_l_x_minus_axis = "nul"
+input_player2_l_x_minus_axis = "-0"
 input_player2_l_y_plus = "nul"
 input_player2_l_y_plus_btn = "nul"
-input_player2_l_y_plus_axis = "nul"
+input_player2_l_y_plus_axis = "+1"
 input_player2_l_y_minus = "nul"
 input_player2_l_y_minus_btn = "nul"
-input_player2_l_y_minus_axis = "nul"
+input_player2_l_y_minus_axis = "-1"
 input_player2_r_x_plus = "nul"
 input_player2_r_x_plus_btn = "nul"
-input_player2_r_x_plus_axis = "nul"
+input_player2_r_x_plus_axis = "+3"
 input_player2_r_x_minus = "nul"
 input_player2_r_x_minus_btn = "nul"
-input_player2_r_x_minus_axis = "nul"
+input_player2_r_x_minus_axis = "-3"
 input_player2_r_y_plus = "nul"
 input_player2_r_y_plus_btn = "nul"
-input_player2_r_y_plus_axis = "nul"
+input_player2_r_y_plus_axis = "+4"
 input_player2_r_y_minus = "nul"
 input_player2_r_y_minus_btn = "nul"
-input_player2_r_y_minus_axis = "nul"
+input_player2_r_y_minus_axis = "-4"
 input_player2_turbo = "nul"
 input_player2_turbo_btn = "nul"
 input_player2_turbo_axis = "nul"
@@ -1554,6 +1554,14 @@ input_player16_turbo_btn = "nul"
 input_player16_turbo_axis = "nul"
 cache_directory = "/var/cache"
 video_hard_sync_frames = "0"
+xmb_alpha_factor = "75"
+xmb_scale_factor = "100"
+xmb_theme = "0"
+xmb_menu_color_theme = "4"
+xmb_shadows_enable = "true"
+xmb_show_settings = "true"
+xmb_show_history = "true"
+xmb_font = ""
 netplay_nickname = ""
 video_filter = ""
 audio_dsp_plugin = ""
diff --git a/retroarch.hmod/etc/libretro/shaders/scanline.glslp b/retroarch.hmod/etc/libretro/shaders/scanline.glslp
index 7539ac4..f4251bc 100644
--- a/retroarch.hmod/etc/libretro/shaders/scanline.glslp
+++ b/retroarch.hmod/etc/libretro/shaders/scanline.glslp
@@ -8,6 +8,6 @@ alias0 = ""
 float_framebuffer0 = "false"
 srgb_framebuffer0 = "false"
 scale_type_x0 = "source"
-scale_x0 = "4.000000"
+scale_x0 = "3.000000"
 scale_type_y0 = "source"
-scale_y0 = "4.000000"
+scale_y0 = "3.000000"
diff --git a/retroarch.hmod/readme.txt b/retroarch.hmod/readme.txt
index df2e2af..8f7a403 100644
--- a/retroarch.hmod/readme.txt
+++ b/retroarch.hmod/readme.txt
@@ -6,12 +6,13 @@ It will automatically detect unsupported NES games and run them instead of the d
 
 It can also run games for other consoles. This pack already contains the following cores:
 
-- emux_sms
-- fceumm
-- gambatte_libretro
-- genesis_plus_gx
-- nestopia
-- snes9x2010
+- 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:
 
@@ -38,6 +39,11 @@ Available executables and arguments:
 
 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.
 
+Known issues:
+- Nintendo 64 save-states are not working, battery backup working 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 game
+
 NES Mini port by madmonkey
 NES Mini shell integration by Cluster
 (c) 2017
-- 
cgit v1.2.3