diff --git a/CONFIG/vita/CMakeLists.txt b/CONFIG/vita/CMakeLists.txt index b74748ad..37634292 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/v20/ScePaf-1.0.0.zip - URL_HASH SHA256=e96b917d5f627db62cf173f90785b2bdab7e936f79e0a59ccdf9253b96120dff + URL https://github.com/olebeck/ScePaf/releases/download/v21/ScePaf-1.0.0.zip + URL_HASH SHA256=357b914a5c99ea17afe0edc8787a05cbf2ecce2f1d73bb9be69f371a294b8943 UPDATE_DISCONNECTED TRUE ) FetchContent_MakeAvailable(ScePaf_External) diff --git a/CONFIG/vita/iniparser_paf/src/pafstd.h b/CONFIG/vita/iniparser_paf/src/pafstd.h index 96f9509a..fcfbcce4 100644 --- a/CONFIG/vita/iniparser_paf/src/pafstd.h +++ b/CONFIG/vita/iniparser_paf/src/pafstd.h @@ -1,13 +1,8 @@ #ifndef __PAFSTD__ #define __PAFSTD__ +#include #include -#include -#include -#include -#include -#include -#include #define malloc sce_paf_malloc #define memcpy sce_paf_memcpy @@ -15,6 +10,12 @@ #define memmove sce_paf_memmove #define free sce_paf_free #define calloc sce_paf_calloc +#define strcmp sce_paf_strcmp +#define strlen sce_paf_strlen +#define strncmp sce_paf_strncmp +#define strchr sce_paf_strchr +#define strtol sce_paf_strtol +#define atof sce_paf_atof // _ctype_ isnt called that in scelibc, so just stub the functions that are needed diff --git a/CONFIG/vita/src/app.cpp b/CONFIG/vita/src/app.cpp index 7a33962f..d4194187 100644 --- a/CONFIG/vita/src/app.cpp +++ b/CONFIG/vita/src/app.cpp @@ -106,8 +106,8 @@ struct Config { iniparser_set(dict, "extensions", NULL); iniparser_set(this->dict, "texture loader", nullptr); - SetDictString("isle:diskpath", "ux0:data/isledecomp/isle/DATA/disk"); - SetDictString("isle:cdpath", "ux0:data/isledecomp/isle"); + SetDictString("isle:diskpath", "ux0:data/isledecomp/isle/disk"); + SetDictString("isle:cdpath", "ux0:data/isledecomp/isle/cd"); SetDictString("isle:savepath", "ux0:data/isledecomp/isle"); SetDictInt("isle:MSAA", 4); diff --git a/CONFIG/vita/src/main.cpp b/CONFIG/vita/src/main.cpp index f406a3f2..7263909e 100644 --- a/CONFIG/vita/src/main.cpp +++ b/CONFIG/vita/src/main.cpp @@ -17,15 +17,6 @@ void operator delete(void* ptr, unsigned int n) int paf_main(void); -typedef struct _ScePafInit { // size is 0x18 - SceSize global_heap_size; - int a2; - int a3; - int cdlg_mode; - int heap_opt_param1; - int heap_opt_param2; -} ScePafInit; - extern "C" int module_start(SceSize args, void* argp) { int load_res; @@ -33,11 +24,9 @@ extern "C" int module_start(SceSize args, void* argp) SceSysmoduleOpt sysmodule_opt; init_param.global_heap_size = 0x1000000; - init_param.a2 = 0xEA60; - init_param.a3 = 0x40000; init_param.cdlg_mode = 0; - init_param.heap_opt_param1 = 0; - init_param.heap_opt_param2 = 0; + init_param.global_heap_alignment = 0; + init_param.global_heap_disable_assert_on_alloc_failure = 0; load_res = 0xDEADBEEF; sysmodule_opt.flags = 0;