diff --git a/adrenaline_compat.h b/adrenaline_compat.h index 02b071d..bb0143e 100644 --- a/adrenaline_compat.h +++ b/adrenaline_compat.h @@ -19,8 +19,8 @@ #ifndef __ADRENALINE_COMPAT_H__ #define __ADRENALINE_COMPAT_H__ -#define ADRENALINE_VERSION_MAJOR 6 -#define ADRENALINE_VERSION_MINOR 9 +#define ADRENALINE_VERSION_MAJOR 7 +#define ADRENALINE_VERSION_MINOR 0 #define ADRENALINE_VERSION ((ADRENALINE_VERSION_MAJOR << 16) | ADRENALINE_VERSION_MINOR) #define xstr(s) #s @@ -183,7 +183,7 @@ typedef struct { #define ADRENALINE_ADDRESS 0xABCDE000 #define DRAW_NATIVE 0xABCDEF00 -#define NATIVE_FRAMEBUFFER 0x0A000000 +#define NATIVE_FRAMEBUFFER 0x0A400000 #define CONVERT_ADDRESS(addr) (0x68000000 + (addr & 0x0FFFFFFF)) diff --git a/bubble/pkg/sce_module/adrenaline_user.suprx b/bubble/pkg/sce_module/adrenaline_user.suprx index c7da5f4..f03fdfc 100644 Binary files a/bubble/pkg/sce_module/adrenaline_user.suprx and b/bubble/pkg/sce_module/adrenaline_user.suprx differ diff --git a/cef/btcnf/pspbtcnf_recovery/pspbtcnf.txt b/cef/btcnf/pspbtcnf_recovery/pspbtcnf.txt index faf551e..db79449 100644 --- a/cef/btcnf/pspbtcnf_recovery/pspbtcnf.txt +++ b/cef/btcnf/pspbtcnf_recovery/pspbtcnf.txt @@ -33,7 +33,6 @@ $/kd/chkreg.prx VUP $/kd/mesg_led_01g.prx VGUPAEM $/kd/semawm.prx V $/kd/amctrl.prx VGPAEM -$/kd/npdrm.prx VPEM $/kd/iofilemgr_dnas.prx VGPAEM $/kd/mediaman.prx VGUA $/kd/np9660.prx EM diff --git a/cef/systemctrl/init_patch.c b/cef/systemctrl/init_patch.c index 477eb4a..6af370f 100644 --- a/cef/systemctrl/init_patch.c +++ b/cef/systemctrl/init_patch.c @@ -193,9 +193,13 @@ int sceKernelStartModulePatched(SceUID modid, SceSize argsize, void *argp, int * plugindone = 1; - char *file = NULL; - int type = sceKernelInitKeyConfig(); + + if (type == PSP_INIT_KEYCONFIG_VSH && !sceKernelFindModuleByName661("scePspNpDrm_Driver")) { + goto START_MODULE; + } + + char *file = NULL; if (type == PSP_INIT_KEYCONFIG_VSH && !config.notusexmbplugins) { file = "ms0:/seplugins/vsh.txt"; } else if (type == PSP_INIT_KEYCONFIG_GAME && !config.notusegameplugins) { diff --git a/readme.md b/readme.md index c4f045b..61fcc84 100644 --- a/readme.md +++ b/readme.md @@ -42,6 +42,10 @@ For 6.61 Adrenaline-6.4 or higher, you can use the `System Update` in the XMB to Changelog --------- +### Changelog v7 +- Fixed issue where plugins were loaded in recovery mode. +- Moved native display buffer to a different location, so GePatch works for some more games. + ### Changelog v6.9 - Added support for native resolution patches. diff --git a/user/flash0/kd/pspbtrnf.bin b/user/flash0/kd/pspbtrnf.bin index d73e832..9a4f592 100644 Binary files a/user/flash0/kd/pspbtrnf.bin and b/user/flash0/kd/pspbtrnf.bin differ diff --git a/user/flash0/kd/systemctrl.prx b/user/flash0/kd/systemctrl.prx index 7271641..3db539d 100644 Binary files a/user/flash0/kd/systemctrl.prx and b/user/flash0/kd/systemctrl.prx differ