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

Fixed NESC scanlines and such

makefile

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

mod/bin/retroarch-clover-child

@@ -16,6 +16,7 @@ rsav="/var/cache/retroarch/$id.sav"
 t_suffix=_time.txt
 demo_time=30
 debug=0
+logend="_RetroArch.log"
 shift 2
 
 while [ $# -gt 0 ]; do
@@ -83,6 +84,15 @@ overlay2=$(echo "$overlay2" | sed 's/\//\\\//g')
 sed -i -e 's/overlay0_overlay = "[^"]*"/overlay0_overlay = "'$overlay1'"/g' /etc/libretro/.config/retroarch/overlay/scanlines.cfg
 sed -i -e 's/overlay0_desc0_overlay = "[^"]*"/overlay0_desc0_overlay = "'$overlay2'"/g' /etc/libretro/.config/retroarch/overlay/scanlines.cfg
 
+# Prevent RetroArch from fucking up the scanlines on NESC...
+if grep -Fxq "input_overlay_enable = \"true\"" /etc/libretro/retroarch.cfg
+then
+  if grep -Fxq "overlay0_overlay = \"\"" /etc/libretro/.config/retroarch/overlay/scanlines.cfg
+  then
+    sed -i -e 's/overlay0_overlay = "[^"]*"/overlay0_overlay = "scanlines.png"/g' /etc/libretro/.config/retroarch/overlay/scanlines.cfg
+  fi
+fi
+
 # Start timestamp
 ts=$(date +"%s")
 tm=0
@@ -92,14 +102,16 @@ tm=0
 sync
 echo 3 > /proc/sys/vm/drop_caches
 
+
+
 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 &
+  retroarch -c "$HOME/retroarch.cfg" -vfL "$core" "$rom" $extra > /media/"$filename"_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 &
+  retroarch -c "$HOME/retroarch.cfg" -vfL "$core" "$rom" $extra > /tmp/"$filename"_RetroArch.log 2>&1 &
 fi 
 rpid=$!
 

mod/readme.md

@@ -6,20 +6,17 @@ Category: RetroArch
 
 RetroArch Neo consists of merged code from both the Original Team & 'TheOtherGuys'
 
-The Neo Additions contain a set of very clever & carefully calculated optimizations to clear & ensure
-more memory is always available for emulation via RetroArch.
-This minimizes potential slowdowns, as well as allows for more reliable game play.
+The Neo build should be considered the standard default 'stable' release for hakchi for your NESC & SNESC.
 
-Feedback from the Community at large will always be most paramount as far as future changes for the better!
+RetroArch Neo allows you to add libretro cores to your NESC & SNESC to allow you to emulate different consoles and other SNES emulators.
 
+## What's new in RetroArch 'Neo' 1.7.1c
 
-Note: Now works with both the NESC & SNESC!
-
-
-This is a hakchi/hakchi2 module which adds libretro cores and RetroArch frontend to your NES/SNES Mini.
-If using older than 2.20 Hakchi, this will not work on your NES/SNES Mini properly.
-
-It can also run games for other consoles.
+ - Added the 64/PSX optimisations by default. (Also bundled them so they can be reloaded using a option choice
+ - Added --debug-usb and --debug-nand to RA so if you add this to the end of the exec command it will log your games log file to /media/GAME_retroarch.log or /tmp/GAME_retroarch.log
+ - Kept input polling method to 2
+ - Added "Loading..." screen to the canoe emulator too
+ - Added "RetroArch Loading..." screen when launching via retroarch
 
 
 
@@ -67,15 +64,17 @@ RetroArch binary:
 ```
 <br>
 
+#### **Neo Build Additions by:**
+##### 'TheOtherGuys':
+CompCom, Swingflip, Viral_DNA
+
+#### Special Thanks to Friends & Testers of 'TheOtherGuys'
+DefKorns, Advokaten, Bslenul, DarkDev1, Princess_Daphie, ThanosRD
 
 #### **Original Team:**
 ##### Compiled & Updated by:
 Cluster, KMFDManic, madmonkey, pcm
 <br><br>
-
-#### **Neo Build Additions by:**
-##### 'TheOtherGuys':
-CompCom, Swingflip, Viral_DNA
 <br><br>
 
 Cores by libretro

readme.md

@@ -4,20 +4,17 @@
 
 RetroArch Neo consists of merged code from both the Original Team & 'TheOtherGuys'
 
-The Neo Additions contain a set of very clever & carefully calculated optimizations to clear & ensure
-more memory is always available for emulation via RetroArch.
-This minimizes potential slowdowns, as well as allows for more reliable game play.
+The Neo build should be considered the standard default 'stable' release for hakchi for your NESC & SNESC.
 
-Feedback from the Community at large will always be most paramount as far as future changes for the better!
+RetroArch Neo allows you to add libretro cores to your NESC & SNESC to allow you to emulate different consoles and other SNES emulators.
 
+## What's new in RetroArch 'Neo' 1.7.1c
 
-Note: Now works with both the NESC & SNESC!
-
-
-This is a hakchi/hakchi2 module which adds libretro cores and RetroArch frontend to your NES/SNES Mini.
-If using older than 2.20 Hakchi, this will not work on your NES/SNES Mini properly.
-
-It can also run games for other consoles.
+ - Added the 64/PSX optimisations by default. (Also bundled them so they can be reloaded using a option choice
+ - Added --debug-usb and --debug-nand to RA so if you add this to the end of the exec command it will log your games log file to /media/GAME_retroarch.log or /tmp/GAME_retroarch.log
+ - Kept input polling method to 2
+ - Added "Loading..." screen to the canoe emulator too
+ - Added "RetroArch Loading..." screen when launching via retroarch
 
 
 
@@ -28,53 +25,55 @@ fceumm (NES, many mappers, UNIF support)
 nestopia (NES, FDS)
 ```
 
-
+<br>
 Available executables and arguments to run Cores:
 
 ```
 /bin/fceumm <core> <rom> <clover_args>
 /bin/nestopia <core> <rom> <clover_args>
 ```
 
-
+<br>
 Runs RetroArch with specified core (it parses all clover arguments: saves, aspect ratio, etc.), designed for executing from clover shell:
 
 ```
 /bin/retroarch-clover <core> <rom> <clover_args>
 ```
 
-
+<br>
 Runs "fceumm" core or "nestopia" for FDS games:
 
 ```
 /bin/nes <rom> <clover_args>
 ```
 
-
+<br>
 Runs RetroArch directly, without clover integration:
 
 ```
 /bin/retroarch-mini [core] [rom] [args]
 ```
 
-
+<br>
 RetroArch binary:
 
 ```
 /bin/retroarch
 ```
+<br>
 
+#### **Neo Build Additions by:**
+##### 'TheOtherGuys':
+CompCom, Swingflip, Viral_DNA
 
+#### Special Thanks to Friends & Testers of 'TheOtherGuys'
+DefKorns, Advokaten, Bslenul, DarkDev1, Princess_Daphie, ThanosRD
 
 #### **Original Team:**
 ##### Compiled & Updated by:
 Cluster, KMFDManic, madmonkey, pcm
-
-
-#### **Neo Build Additions by:**
-##### 'TheOtherGuys':
-CompCom, Swingflip, Viral_DNA
-
+<br><br>
+<br><br>
 
 Cores by libretro