From a2c4e06f900cd54134a4a3f8d4108a7589b0ddb6 Mon Sep 17 00:00:00 2001 From: zilmar Date: Thu, 26 Oct 2023 11:14:47 +1030 Subject: [PATCH] Android: Get rid of usage of project64_data directory --- Android/Script/buildAssets.cmd | 20 +++++++++--------- .../profiles/touchscreen.cfg | 0 .../skins/touchscreen/Outline/.nomedia | 0 .../skins/touchscreen/Outline/analog-back.png | Bin .../skins/touchscreen/Outline/analog-fore.png | Bin .../skins/touchscreen/Outline/analog.png | Bin .../touchscreen/Outline/buttonL-holdL.png | Bin .../touchscreen/Outline/buttonL-mask.png | Bin .../skins/touchscreen/Outline/buttonL.png | Bin .../touchscreen/Outline/buttonR-holdR.png | Bin .../touchscreen/Outline/buttonR-mask.png | Bin .../skins/touchscreen/Outline/buttonR.png | Bin .../touchscreen/Outline/buttonS-holdS.png | Bin .../touchscreen/Outline/buttonS-mask.png | Bin .../skins/touchscreen/Outline/buttonS.png | Bin .../touchscreen/Outline/buttonZ-holdZ.png | Bin .../touchscreen/Outline/buttonZ-mask.png | Bin .../skins/touchscreen/Outline/buttonZ.png | Bin .../skins/touchscreen/Outline/dpad-mask.png | Bin .../skins/touchscreen/Outline/dpad.png | Bin .../touchscreen/Outline/groupAB-holdA.png | Bin .../touchscreen/Outline/groupAB-holdB.png | Bin .../touchscreen/Outline/groupAB-mask.png | Bin .../skins/touchscreen/Outline/groupAB.png | Bin .../touchscreen/Outline/groupC-holdCd.png | Bin .../touchscreen/Outline/groupC-holdCl.png | Bin .../touchscreen/Outline/groupC-holdCr.png | Bin .../touchscreen/Outline/groupC-holdCu.png | Bin .../skins/touchscreen/Outline/groupC-mask.png | Bin .../skins/touchscreen/Outline/groupC.png | Bin .../skins/touchscreen/Outline/skin.ini | 0 .../skins/touchscreen/Shaded/.nomedia | 0 .../skins/touchscreen/Shaded/analog-back.png | Bin .../skins/touchscreen/Shaded/analog-fore.png | Bin .../skins/touchscreen/Shaded/analog.png | Bin .../touchscreen/Shaded/buttonL-holdL.png | Bin .../skins/touchscreen/Shaded/buttonL-mask.png | Bin .../skins/touchscreen/Shaded/buttonL.png | Bin .../touchscreen/Shaded/buttonR-holdR.png | Bin .../skins/touchscreen/Shaded/buttonR-mask.png | Bin .../skins/touchscreen/Shaded/buttonR.png | Bin .../touchscreen/Shaded/buttonS-holdS.png | Bin .../skins/touchscreen/Shaded/buttonS-mask.png | Bin .../skins/touchscreen/Shaded/buttonS.png | Bin .../touchscreen/Shaded/buttonZ-holdZ.png | Bin .../skins/touchscreen/Shaded/buttonZ-mask.png | Bin .../skins/touchscreen/Shaded/buttonZ.png | Bin .../skins/touchscreen/Shaded/dpad-mask.png | Bin .../skins/touchscreen/Shaded/dpad.png | Bin .../touchscreen/Shaded/groupAB-holdA.png | Bin .../touchscreen/Shaded/groupAB-holdB.png | Bin .../skins/touchscreen/Shaded/groupAB-mask.png | Bin .../skins/touchscreen/Shaded/groupAB.png | Bin .../touchscreen/Shaded/groupC-holdCd.png | Bin .../touchscreen/Shaded/groupC-holdCl.png | Bin .../touchscreen/Shaded/groupC-holdCr.png | Bin .../touchscreen/Shaded/groupC-holdCu.png | Bin .../skins/touchscreen/Shaded/groupC-mask.png | Bin .../skins/touchscreen/Shaded/groupC.png | Bin .../skins/touchscreen/Shaded/skin.ini | 0 60 files changed, 10 insertions(+), 10 deletions(-) rename Android/assets/{project64_data => }/profiles/touchscreen.cfg (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/.nomedia (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/analog-back.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/analog-fore.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/analog.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/buttonL-holdL.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/buttonL-mask.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/buttonL.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/buttonR-holdR.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/buttonR-mask.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/buttonR.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/buttonS-holdS.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/buttonS-mask.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/buttonS.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/buttonZ-holdZ.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/buttonZ-mask.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/buttonZ.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/dpad-mask.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/dpad.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/groupAB-holdA.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/groupAB-holdB.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/groupAB-mask.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/groupAB.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/groupC-holdCd.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/groupC-holdCl.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/groupC-holdCr.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/groupC-holdCu.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/groupC-mask.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/groupC.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Outline/skin.ini (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/.nomedia (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/analog-back.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/analog-fore.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/analog.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/buttonL-holdL.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/buttonL-mask.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/buttonL.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/buttonR-holdR.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/buttonR-mask.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/buttonR.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/buttonS-holdS.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/buttonS-mask.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/buttonS.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/buttonZ-holdZ.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/buttonZ-mask.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/buttonZ.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/dpad-mask.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/dpad.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/groupAB-holdA.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/groupAB-holdB.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/groupAB-mask.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/groupAB.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/groupC-holdCd.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/groupC-holdCl.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/groupC-holdCr.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/groupC-holdCu.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/groupC-mask.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/groupC.png (100%) rename Android/assets/{project64_data => }/skins/touchscreen/Shaded/skin.ini (100%) diff --git a/Android/Script/buildAssets.cmd b/Android/Script/buildAssets.cmd index 962dded9a..f5c682ab6 100644 --- a/Android/Script/buildAssets.cmd +++ b/Android/Script/buildAssets.cmd @@ -8,29 +8,29 @@ set base_dir=%cd% cd /d %origdir% echo Building Lang files -xcopy "%base_dir%/Lang" "%base_dir%/Android/assets/project64_data/Lang/" /D /I /F /Y /E +xcopy "%base_dir%/Lang" "%base_dir%/Android/assets/Lang/" /D /I /F /Y /E IF %ERRORLEVEL% NEQ 0 (exit /B 1) echo Copy config files -IF NOT EXIST "%base_dir%/Android/assets/project64_data/Config/" mkdir "%base_dir%/Android/assets/project64_data/Config/" -copy "%base_dir%\Config\Audio.rdb" "%base_dir%\Android\assets\project64_data\Config\" +IF NOT EXIST "%base_dir%/Android/assets/Config/" mkdir "%base_dir%/Android/assets/Config/" +copy "%base_dir%\Config\Audio.rdb" "%base_dir%\Android\assets\Config\" IF %ERRORLEVEL% NEQ 0 (exit /B 1) -copy "%base_dir%\Config\Video.rdb" "%base_dir%\Android\assets\project64_data\Config\" +copy "%base_dir%\Config\Video.rdb" "%base_dir%\Android\assets\Config\" IF %ERRORLEVEL% NEQ 0 (exit /B 1) -copy "%base_dir%\Config\Project64.rdb" "%base_dir%\Android\assets\project64_data\Config\" +copy "%base_dir%\Config\Project64.rdb" "%base_dir%\Android\assets\Config\" IF %ERRORLEVEL% NEQ 0 (exit /B 1) -copy "%base_dir%\Config\Project64.rdx" "%base_dir%\Android\assets\project64_data\Config\" +copy "%base_dir%\Config\Project64.rdx" "%base_dir%\Android\assets\Config\" IF %ERRORLEVEL% NEQ 0 (exit /B 1) -IF NOT EXIST "%base_dir%/Android/assets/project64_data/Config/Cheats/" mkdir "%base_dir%/Android/assets/project64_data/Config/Cheats/" -xcopy "%base_dir%/Config/Cheats" "%base_dir%/Android/assets/project64_data/Config/Cheats/" /D /I /F /Y /E +IF NOT EXIST "%base_dir%/Android/assets/Config/Cheats/" mkdir "%base_dir%/Android/assets/Config/Cheats/" +xcopy "%base_dir%/Config/Cheats" "%base_dir%/Android/assets/Config/Cheats/" /D /I /F /Y /E IF %ERRORLEVEL% NEQ 0 (exit /B 1) -IF NOT EXIST "%base_dir%/Android/assets/project64_data/Config/Enhancements/" mkdir "%base_dir%/Android/assets/project64_data/Config/Enhancements/" -xcopy "%base_dir%/Config/Enhancements" "%base_dir%/Android/assets/project64_data/Config/Enhancements/" /D /I /F /Y /E +IF NOT EXIST "%base_dir%/Android/assets/Config/Enhancements/" mkdir "%base_dir%/Android/assets/Config/Enhancements/" +xcopy "%base_dir%/Config/Enhancements" "%base_dir%/Android/assets/Config/Enhancements/" /D /I /F /Y /E IF %ERRORLEVEL% NEQ 0 (exit /B 1) IF NOT EXIST "%base_dir%/Android/app/src/main/assets/" mkdir "%base_dir%/Android/app/src/main/assets/" diff --git a/Android/assets/project64_data/profiles/touchscreen.cfg b/Android/assets/profiles/touchscreen.cfg similarity index 100% rename from Android/assets/project64_data/profiles/touchscreen.cfg rename to Android/assets/profiles/touchscreen.cfg diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/.nomedia b/Android/assets/skins/touchscreen/Outline/.nomedia similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/.nomedia rename to Android/assets/skins/touchscreen/Outline/.nomedia diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/analog-back.png b/Android/assets/skins/touchscreen/Outline/analog-back.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/analog-back.png rename to Android/assets/skins/touchscreen/Outline/analog-back.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/analog-fore.png b/Android/assets/skins/touchscreen/Outline/analog-fore.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/analog-fore.png rename to Android/assets/skins/touchscreen/Outline/analog-fore.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/analog.png b/Android/assets/skins/touchscreen/Outline/analog.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/analog.png rename to Android/assets/skins/touchscreen/Outline/analog.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonL-holdL.png b/Android/assets/skins/touchscreen/Outline/buttonL-holdL.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonL-holdL.png rename to Android/assets/skins/touchscreen/Outline/buttonL-holdL.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonL-mask.png b/Android/assets/skins/touchscreen/Outline/buttonL-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonL-mask.png rename to Android/assets/skins/touchscreen/Outline/buttonL-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonL.png b/Android/assets/skins/touchscreen/Outline/buttonL.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonL.png rename to Android/assets/skins/touchscreen/Outline/buttonL.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonR-holdR.png b/Android/assets/skins/touchscreen/Outline/buttonR-holdR.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonR-holdR.png rename to Android/assets/skins/touchscreen/Outline/buttonR-holdR.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonR-mask.png b/Android/assets/skins/touchscreen/Outline/buttonR-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonR-mask.png rename to Android/assets/skins/touchscreen/Outline/buttonR-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonR.png b/Android/assets/skins/touchscreen/Outline/buttonR.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonR.png rename to Android/assets/skins/touchscreen/Outline/buttonR.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonS-holdS.png b/Android/assets/skins/touchscreen/Outline/buttonS-holdS.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonS-holdS.png rename to Android/assets/skins/touchscreen/Outline/buttonS-holdS.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonS-mask.png b/Android/assets/skins/touchscreen/Outline/buttonS-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonS-mask.png rename to Android/assets/skins/touchscreen/Outline/buttonS-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonS.png b/Android/assets/skins/touchscreen/Outline/buttonS.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonS.png rename to Android/assets/skins/touchscreen/Outline/buttonS.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonZ-holdZ.png b/Android/assets/skins/touchscreen/Outline/buttonZ-holdZ.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonZ-holdZ.png rename to Android/assets/skins/touchscreen/Outline/buttonZ-holdZ.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonZ-mask.png b/Android/assets/skins/touchscreen/Outline/buttonZ-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonZ-mask.png rename to Android/assets/skins/touchscreen/Outline/buttonZ-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonZ.png b/Android/assets/skins/touchscreen/Outline/buttonZ.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonZ.png rename to Android/assets/skins/touchscreen/Outline/buttonZ.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/dpad-mask.png b/Android/assets/skins/touchscreen/Outline/dpad-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/dpad-mask.png rename to Android/assets/skins/touchscreen/Outline/dpad-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/dpad.png b/Android/assets/skins/touchscreen/Outline/dpad.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/dpad.png rename to Android/assets/skins/touchscreen/Outline/dpad.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupAB-holdA.png b/Android/assets/skins/touchscreen/Outline/groupAB-holdA.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupAB-holdA.png rename to Android/assets/skins/touchscreen/Outline/groupAB-holdA.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupAB-holdB.png b/Android/assets/skins/touchscreen/Outline/groupAB-holdB.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupAB-holdB.png rename to Android/assets/skins/touchscreen/Outline/groupAB-holdB.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupAB-mask.png b/Android/assets/skins/touchscreen/Outline/groupAB-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupAB-mask.png rename to Android/assets/skins/touchscreen/Outline/groupAB-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupAB.png b/Android/assets/skins/touchscreen/Outline/groupAB.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupAB.png rename to Android/assets/skins/touchscreen/Outline/groupAB.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCd.png b/Android/assets/skins/touchscreen/Outline/groupC-holdCd.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCd.png rename to Android/assets/skins/touchscreen/Outline/groupC-holdCd.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCl.png b/Android/assets/skins/touchscreen/Outline/groupC-holdCl.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCl.png rename to Android/assets/skins/touchscreen/Outline/groupC-holdCl.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCr.png b/Android/assets/skins/touchscreen/Outline/groupC-holdCr.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCr.png rename to Android/assets/skins/touchscreen/Outline/groupC-holdCr.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCu.png b/Android/assets/skins/touchscreen/Outline/groupC-holdCu.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCu.png rename to Android/assets/skins/touchscreen/Outline/groupC-holdCu.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupC-mask.png b/Android/assets/skins/touchscreen/Outline/groupC-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupC-mask.png rename to Android/assets/skins/touchscreen/Outline/groupC-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupC.png b/Android/assets/skins/touchscreen/Outline/groupC.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupC.png rename to Android/assets/skins/touchscreen/Outline/groupC.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/skin.ini b/Android/assets/skins/touchscreen/Outline/skin.ini similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/skin.ini rename to Android/assets/skins/touchscreen/Outline/skin.ini diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/.nomedia b/Android/assets/skins/touchscreen/Shaded/.nomedia similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/.nomedia rename to Android/assets/skins/touchscreen/Shaded/.nomedia diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/analog-back.png b/Android/assets/skins/touchscreen/Shaded/analog-back.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/analog-back.png rename to Android/assets/skins/touchscreen/Shaded/analog-back.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/analog-fore.png b/Android/assets/skins/touchscreen/Shaded/analog-fore.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/analog-fore.png rename to Android/assets/skins/touchscreen/Shaded/analog-fore.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/analog.png b/Android/assets/skins/touchscreen/Shaded/analog.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/analog.png rename to Android/assets/skins/touchscreen/Shaded/analog.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonL-holdL.png b/Android/assets/skins/touchscreen/Shaded/buttonL-holdL.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonL-holdL.png rename to Android/assets/skins/touchscreen/Shaded/buttonL-holdL.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonL-mask.png b/Android/assets/skins/touchscreen/Shaded/buttonL-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonL-mask.png rename to Android/assets/skins/touchscreen/Shaded/buttonL-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonL.png b/Android/assets/skins/touchscreen/Shaded/buttonL.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonL.png rename to Android/assets/skins/touchscreen/Shaded/buttonL.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonR-holdR.png b/Android/assets/skins/touchscreen/Shaded/buttonR-holdR.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonR-holdR.png rename to Android/assets/skins/touchscreen/Shaded/buttonR-holdR.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonR-mask.png b/Android/assets/skins/touchscreen/Shaded/buttonR-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonR-mask.png rename to Android/assets/skins/touchscreen/Shaded/buttonR-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonR.png b/Android/assets/skins/touchscreen/Shaded/buttonR.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonR.png rename to Android/assets/skins/touchscreen/Shaded/buttonR.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonS-holdS.png b/Android/assets/skins/touchscreen/Shaded/buttonS-holdS.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonS-holdS.png rename to Android/assets/skins/touchscreen/Shaded/buttonS-holdS.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonS-mask.png b/Android/assets/skins/touchscreen/Shaded/buttonS-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonS-mask.png rename to Android/assets/skins/touchscreen/Shaded/buttonS-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonS.png b/Android/assets/skins/touchscreen/Shaded/buttonS.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonS.png rename to Android/assets/skins/touchscreen/Shaded/buttonS.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonZ-holdZ.png b/Android/assets/skins/touchscreen/Shaded/buttonZ-holdZ.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonZ-holdZ.png rename to Android/assets/skins/touchscreen/Shaded/buttonZ-holdZ.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonZ-mask.png b/Android/assets/skins/touchscreen/Shaded/buttonZ-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonZ-mask.png rename to Android/assets/skins/touchscreen/Shaded/buttonZ-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonZ.png b/Android/assets/skins/touchscreen/Shaded/buttonZ.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonZ.png rename to Android/assets/skins/touchscreen/Shaded/buttonZ.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/dpad-mask.png b/Android/assets/skins/touchscreen/Shaded/dpad-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/dpad-mask.png rename to Android/assets/skins/touchscreen/Shaded/dpad-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/dpad.png b/Android/assets/skins/touchscreen/Shaded/dpad.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/dpad.png rename to Android/assets/skins/touchscreen/Shaded/dpad.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdA.png b/Android/assets/skins/touchscreen/Shaded/groupAB-holdA.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdA.png rename to Android/assets/skins/touchscreen/Shaded/groupAB-holdA.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdB.png b/Android/assets/skins/touchscreen/Shaded/groupAB-holdB.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdB.png rename to Android/assets/skins/touchscreen/Shaded/groupAB-holdB.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupAB-mask.png b/Android/assets/skins/touchscreen/Shaded/groupAB-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupAB-mask.png rename to Android/assets/skins/touchscreen/Shaded/groupAB-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupAB.png b/Android/assets/skins/touchscreen/Shaded/groupAB.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupAB.png rename to Android/assets/skins/touchscreen/Shaded/groupAB.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCd.png b/Android/assets/skins/touchscreen/Shaded/groupC-holdCd.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCd.png rename to Android/assets/skins/touchscreen/Shaded/groupC-holdCd.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCl.png b/Android/assets/skins/touchscreen/Shaded/groupC-holdCl.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCl.png rename to Android/assets/skins/touchscreen/Shaded/groupC-holdCl.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCr.png b/Android/assets/skins/touchscreen/Shaded/groupC-holdCr.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCr.png rename to Android/assets/skins/touchscreen/Shaded/groupC-holdCr.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCu.png b/Android/assets/skins/touchscreen/Shaded/groupC-holdCu.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCu.png rename to Android/assets/skins/touchscreen/Shaded/groupC-holdCu.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupC-mask.png b/Android/assets/skins/touchscreen/Shaded/groupC-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupC-mask.png rename to Android/assets/skins/touchscreen/Shaded/groupC-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupC.png b/Android/assets/skins/touchscreen/Shaded/groupC.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupC.png rename to Android/assets/skins/touchscreen/Shaded/groupC.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/skin.ini b/Android/assets/skins/touchscreen/Shaded/skin.ini similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/skin.ini rename to Android/assets/skins/touchscreen/Shaded/skin.ini