Merge pull request #2 from TheOtherGuys-Hakchi-Projects/1.7.1

Merge development 1.7.1 to master branch

makefile

@@ -1,6 +1,6 @@
-all: out/Hakchi_Retroarch_Neo_v1_7_0a.hmod
+all: out/Hakchi_Retroarch_Neo_v1_7_1a.hmod
 
-out/Hakchi_Retroarch_Neo_v1_7_0a.hmod:
+out/Hakchi_Retroarch_Neo_v1_7_1a.hmod:
 	mkdir -p out/
 	cd mod/; tar -czvf "../$@" *
 	touch "$@"

mod/bin/retroarch-clover

@@ -1,8 +1,14 @@
 #!/bin/sh
 
 # Kill it! Kill it with fire!
+
+source /etc/preinit
+script_init
+
 pkill -KILL clover-mcp
 
+decodepng "$rootfs/share/retroarch/assets/RAloading-min.png" > /dev/fb0;
+
 core="$1"
 rom="$2"
 shift 2

mod/bin/retroarch-clover-child

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+source /etc/preinit
+script_init
+
 HOME=/etc/libretro
 corename=$1
 core=$HOME/core/$1_libretro.so
@@ -12,6 +15,7 @@ rsram="/var/cache/retroarch/$id.srm"
 rsav="/var/cache/retroarch/$id.sav"
 t_suffix=_time.txt
 demo_time=30
+debug=0
 shift 2
 
 while [ $# -gt 0 ]; do
@@ -31,6 +35,8 @@ while [ $# -gt 0 ]; do
   [ "$1" == "--save-time-path" ] && timefile_save=$2
   [ "$1" == "--replay-inputs" ] && demo=1
   [ "$1" == "--decorative-frame-path" ] && frame=$2
+  [ "$1" == "--debug-usb" ] && debug=1
+  [ "$1" == "--debug-nand" ] && debug=2
   shift
 done
 
@@ -58,6 +64,9 @@ else
   [ ! -z "$sram" ] && [ -f "$sram" ] && cp -f "$sram" "$rsram"
 fi
 
+#Refresh the framebuffer incase there is some left over FB process
+decodepng "$rootfs/share/retroarch/assets/RAloading-min.png" > /dev/fb0;
+
 smooth=$(cat /etc/libretro/$filter.smooth)
 sed -i -e 's/video_smooth = "[^"]*"/video_smooth = "'$smooth'"/g' /etc/libretro/retroarch.cfg
 ratio=$(cat /etc/libretro/$filter.ratio)
@@ -83,7 +92,15 @@ tm=0
 sync
 echo 3 > /proc/sys/vm/drop_caches
 
-retroarch -c "$HOME/retroarch.cfg" -vfL "$core" "$rom" $extra &
+if [ "$debug" == "0" ]; then #Default
+  retroarch -c "$HOME/retroarch.cfg" -vfL "$core" "$rom" $extra &
+fi 
+if [ "$debug" == "1" ]; then #Verbose USB mode
+  retroarch -c "$HOME/retroarch.cfg" -vfL "$core" "$rom" $extra > /media/$(rom)_RetroArch.log 2>&1 &
+fi 
+if [ "$debug" == "2" ]; then #Verbose NAND mode
+  retroarch -c "$HOME/retroarch.cfg" -vfL "$core" "$rom" $extra > /tmp/$(rom)_RetroArch.log 2>&1 &
+fi 
 rpid=$!
 
 [ ! -z "$save" ] && mkdir -p $(dirname "$save")

mod/bin/retroarch-mini

@@ -1,6 +1,14 @@
 #!/bin/sh
+
+source /etc/preinit
+script_init
+
 export HOME=/etc/libretro
+
+decodepng "$rootfs/share/retroarch/assets/RAloading-min.png" > /dev/fb0;
+
 mkdir -p /var/cache/retroarch/
+
 if [ "$1" == "null" ]; then
   exec retroarch -c "$HOME/retroarch.cfg" -vf
 else

mod/etc/libretro/.config/retroarch/config/GLupeN64 GLES2/GLupeN64 GLES2.cfg

@@ -0,0 +1,2 @@
+video_force_srgb_disable = "true"
+video_smooth = "true"

mod/etc/libretro/.config/retroarch/config/Mupen64Plus/Mupen64Plus.cfg

@@ -0,0 +1,2 @@
+video_force_srgb_disable = "true"
+video_smooth = "true"

mod/etc/libretro/.config/retroarch/config/PCSX-ReARMed/PCSX-ReARMed.cfg

@@ -0,0 +1,2 @@
+video_force_srgb_disable = "true"
+video_smooth = "true"

mod/etc/libretro/.config/retroarch/config/remaps/NINTENDO 64 FPS/Nintendo 64 FPS.rmp

@@ -0,0 +1,6 @@
+input_player1_r = "12"
+input_player1_l2 = "11"
+input_libretro_device_p1 = "5"
+input_player1_analog_dpad_mode = "0"
+input_libretro_device_p2 = "5"
+input_player2_analog_dpad_mode = "1"

mod/etc/libretro/.config/retroarch/config/remaps/NINTENDO 64 STANDARD/Nintendo 64 Standard.rmp

@@ -0,0 +1,4 @@
+input_libretro_device_p1 = "5"
+input_player1_analog_dpad_mode = "1"
+input_libretro_device_p2 = "5"
+input_player2_analog_dpad_mode = "1"

mod/etc/libretro/retroarch-core-options.cfg

@@ -30,25 +30,57 @@ gambatte_gb_link_network_server_ip_octet1 = "0"
 gambatte_gb_link_network_server_ip_octet2 = "0"
 gambatte_gb_link_network_server_ip_octet3 = "0"
 gambatte_gb_link_network_server_ip_octet4 = "0"
+glupen64-cpucore = "dynamic_recompiler"
+glupen64-rspmode = "HLE"
+glupen64-43screensize = "320x240"
+glupen64-169screensize = "640x360"
+glupen64-aspect = "4:3"
+glupen64-BilinearMode = "standard"
+glupen64-EnableFBEmulation = "False"
+glupen64-EnableCopyColorToRDRAM = "Off"
+glupen64-EnableCopyDepthToRDRAM = "Off"
+glupen64-EnableHWLighting = "False"
+glupen64-CorrectTexrectCoords = "Off"
+glupen64-EnableNativeResTexrects = "False"
+glupen64-EnableLegacyBlending = "True"
+glupen64-EnableFragmentDepthWrite = "False"
+glupen64-EnableShadersStorage = "False"
+glupen64-CropMode = "Off"
+glupen64-txFilterMode = "None"
+glupen64-txEnhancementMode = "None"
+glupen64-txFilterIgnoreBG = "False"
+glupen64-txHiresEnable = "False"
+glupen64-txHiresFullAlphaChannel = "False"
+glupen64-astick-deadzone = "15"
+glupen64-astick-sensitivity = "100"
+glupen64-r-cbutton = "C1"
+glupen64-l-cbutton = "C2"
+glupen64-d-cbutton = "C3"
+glupen64-u-cbutton = "C4"
+glupen64-CountPerOp = "0"
+glupen64-pak1 = "memory"
+glupen64-pak2 = "memory"
+glupen64-pak3 = "memory"
+glupen64-pak4 = "memory"
 mupen64-cpucore = "dynamic_recompiler"
-mupen64-audio-buffer-size = "2048"
+mupen64-audio-buffer-size = "1024"
 mupen64-astick-deadzone = "15"
 glupen64-pak1 = "memory"
 mupen64-pak1 = "memory"
 mupen64-pak2 = "memory"
-mupen64-pak3 = "none"
-mupen64-pak4 = "none"
+mupen64-pak3 = "memory"
+mupen64-pak4 = "memory"
 mupen64-disable_expmem = "enabled"
-mupen64-gfxplugin-accuracy = "veryhigh"
+mupen64-gfxplugin-accuracy = "low"
 mupen64-gfxplugin = "auto"
 mupen64-rspplugin = "auto"
-mupen64-screensize = "640x480"
+mupen64-screensize = "320x240"
 mupen64-aspectratiohint = "normal"
 mupen64-filtering = "automatic"
 mupen64-polyoffset-factor = "-3.0"
 mupen64-polyoffset-units = "-3.0"
 mupen64-angrylion-vioverlay = "disabled"
-mupen64-virefresh = "1500"
+mupen64-virefresh = "2200"
 mupen64-bufferswap = "off"
 mupen64-framerate = "fullspeed"
 mupen64-vcache-vbo = "off"

mod/etc/libretro/retroarch.cfg

@@ -216,7 +216,7 @@ rgui_show_start_screen = "false"
 menu_navigation_wraparound_enable = "true"
 menu_navigation_browser_filter_supported_extensions_enable = "false"
 menu_show_advanced_settings = "true"
-input_overlay_enable = "false"
+input_overlay_enable = "true"
 input_overlay_enable_autopreferred = "true"
 input_overlay_hide_in_menu = "true"
 network_cmd_enable = "false"

mod/install

@@ -3,4 +3,7 @@ chmod +x $rootfs/bin/*
 chmod +x $rootfs/usr/bin/*
 mkdir -p $rootfs/etc/libretro/system
 [ -f "/newroot/usr/share/kachikachi/fds_bios.bin" ] && cp -f /newroot/usr/share/kachikachi/fds_bios.bin $rootfs/etc/libretro/system/disksys.rom
+mkdir -p $rootfs/etc/options_menu/retroarch/default_files
+copy $rootfs/etc/libretro/retroarch.cfg $rootfs/etc/options_menu/retroarch/default_files/
+copy $rootfs/etc/libretro/retroarch-core-options.cfg $rootfs/etc/options_menu/retroarch/default_files/
 return 1

mod/readme.txt → mod/readme.md

@@ -1,5 +1,5 @@
 -----------------------
-Name: RetroArch Neo 1.7.0
+Name: RetroArch Neo 1.7.1c
 Creator: TheOtherGuys
 Category: RetroArch
 -----------------------

mod/share/retroarch/built_in_64_PSX_optimisation/config/GLupeN64 GLES2/GLupeN64 GLES2.cfg

@@ -0,0 +1,2 @@
+video_force_srgb_disable = "true"
+video_smooth = "true"

mod/share/retroarch/built_in_64_PSX_optimisation/config/Mupen64Plus/Mupen64Plus.cfg

@@ -0,0 +1,2 @@
+video_force_srgb_disable = "true"
+video_smooth = "true"

mod/share/retroarch/built_in_64_PSX_optimisation/config/PCSX-ReARMed/PCSX-ReARMed.cfg

@@ -0,0 +1,2 @@
+video_force_srgb_disable = "true"
+video_smooth = "true"

mod/share/retroarch/built_in_64_PSX_optimisation/config/remaps/NINTENDO 64 FPS/Nintendo 64 FPS.rmp

@@ -0,0 +1,6 @@
+input_player1_r = "12"
+input_player1_l2 = "11"
+input_libretro_device_p1 = "5"
+input_player1_analog_dpad_mode = "0"
+input_libretro_device_p2 = "5"
+input_player2_analog_dpad_mode = "1"

mod/share/retroarch/built_in_64_PSX_optimisation/config/remaps/NINTENDO 64 STANDARD/Nintendo 64 Standard.rmp

@@ -0,0 +1,4 @@
+input_libretro_device_p1 = "5"
+input_player1_analog_dpad_mode = "1"
+input_libretro_device_p2 = "5"
+input_player2_analog_dpad_mode = "1"

mod/usr/bin/clover-canoe-shvc

@@ -2,8 +2,13 @@
 
 set -x
 
+source /etc/preinit
+script_init
+
 export MALI_NOCLEAR=1
 
+decodepng "$rootfs/share/retroarch/assets/loading-min.png" > /dev/fb0;
+
 decorative_options()
 {
   local fn="$1_options.txt"

mod/usr/bin/clover-kachikachi

@@ -1,8 +1,14 @@
 #!/bin/sh
 
 set -x
+
+source /etc/preinit
+script_init
+
 export MALI_NOCLEAR=1
 
+decodepng "$rootfs/share/retroarch/assets/loading-min.png" > /dev/fb0;
+
 supported_mappers="0 1 2 3 4 5 7 9 10 86 87 184"
 emulator=retroarch
 

readme.md

@@ -1,5 +1,5 @@
 -----------------------
-# RetroArch Neo 1.7.0
+# RetroArch Neo 1.7.1a
 -----------------------
 
 RetroArch Neo consists of merged code from both the Original Team & 'TheOtherGuys'