From 5c8abccbe94c433db0a70e764b66f1ebcd86a555 Mon Sep 17 00:00:00 2001
From: olebeck <31539311+olebeck@users.noreply.github.com>
Date: Thu, 11 Sep 2025 21:20:01 +0200
Subject: [PATCH] change the default disk & cd path, update the paf library

---
 CONFIG/vita/CMakeLists.txt     | 8 ++------
 CONFIG/vita/include/pafinc.h   | 4 ----
 CONFIG/vita/include/scetypes.h | 0
 CONFIG/vita/src/app.cpp        | 2 +-
 CONFIG/vita/src/main.cpp       | 2 +-
 ISLE/vita/config.cpp           | 4 ++--
 6 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 CONFIG/vita/include/pafinc.h
 delete mode 100644 CONFIG/vita/include/scetypes.h

diff --git a/CONFIG/vita/CMakeLists.txt b/CONFIG/vita/CMakeLists.txt
index 948a8993..b74748ad 100644
--- a/CONFIG/vita/CMakeLists.txt
+++ b/CONFIG/vita/CMakeLists.txt
@@ -7,8 +7,8 @@ include("${VITASDK}/share/vita.cmake" REQUIRED)
 include(FetchContent)
 FetchContent_Declare(
   ScePaf_External
-  URL https://github.com/olebeck/ScePaf/releases/download/v17/ScePaf-1.0.0.zip
-  URL_HASH SHA256=8547bb98dcba623634e7701fc98172063bd0a77facebfe4932f43c17ff5f4da9
+  URL https://github.com/olebeck/ScePaf/releases/download/v20/ScePaf-1.0.0.zip
+  URL_HASH SHA256=e96b917d5f627db62cf173f90785b2bdab7e936f79e0a59ccdf9253b96120dff
   UPDATE_DISCONNECTED TRUE
 )
 FetchContent_MakeAvailable(ScePaf_External)
@@ -69,10 +69,6 @@ target_link_libraries(isle-config PRIVATE
   iniparser_paf
 )
 
-target_include_directories(isle-config PUBLIC
-  include
-)
-
 vita_create_self(isle-config.self isle-config
   CONFIG exports.yml
   UNSAFE
diff --git a/CONFIG/vita/include/pafinc.h b/CONFIG/vita/include/pafinc.h
deleted file mode 100644
index 2ee441d5..00000000
--- a/CONFIG/vita/include/pafinc.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// clang-format off
-#include <stdarg.h>
-#include <paf.h>
-// clang-format on
diff --git a/CONFIG/vita/include/scetypes.h b/CONFIG/vita/include/scetypes.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/CONFIG/vita/src/app.cpp b/CONFIG/vita/src/app.cpp
index 5a73e267..7a33962f 100644
--- a/CONFIG/vita/src/app.cpp
+++ b/CONFIG/vita/src/app.cpp
@@ -1,4 +1,4 @@
-#include "pafinc.h"
+#include <paf.h>
 
 #include <app_settings.h>
 #include <iniparser.h>
diff --git a/CONFIG/vita/src/main.cpp b/CONFIG/vita/src/main.cpp
index 154efa21..f406a3f2 100644
--- a/CONFIG/vita/src/main.cpp
+++ b/CONFIG/vita/src/main.cpp
@@ -1,4 +1,4 @@
-#include "pafinc.h"
+#include <paf.h>
 
 #include <psp2/kernel/clib.h>
 #include <psp2/kernel/modulemgr.h>
diff --git a/ISLE/vita/config.cpp b/ISLE/vita/config.cpp
index 8ebb3b3e..40979ba2 100644
--- a/ISLE/vita/config.cpp
+++ b/ISLE/vita/config.cpp
@@ -7,7 +7,7 @@ void VITA_SetupDefaultConfigOverrides(dictionary* p_dictionary)
 {
 	SDL_Log("Overriding default config for VITA");
 
-	iniparser_set(p_dictionary, "isle:diskpath", "ux0:data/isledecomp/isle/DATA/disk");
-	iniparser_set(p_dictionary, "isle:cdpath", "ux0:data/isledecomp/isle");
+	iniparser_set(p_dictionary, "isle:diskpath", "ux0:data/isledecomp/isle/disk");
+	iniparser_set(p_dictionary, "isle:cdpath", "ux0:data/isledecomp/isle/cd");
 	iniparser_set(p_dictionary, "isle:MSAA", "4");
 }