Skip to content

Commit

Permalink
v6.6
Browse files Browse the repository at this point in the history
  • Loading branch information
TheOfficialFloW committed Jul 11, 2018
1 parent 5de024a commit 06dcde1
Show file tree
Hide file tree
Showing 8 changed files with 16,305 additions and 15,429 deletions.
674 changes: 674 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion adrenaline_compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#define __ADRENALINE_COMPAT_H__

#define ADRENALINE_VERSION_MAJOR 6
#define ADRENALINE_VERSION_MINOR 5
#define ADRENALINE_VERSION_MINOR 6
#define ADRENALINE_VERSION ((ADRENALINE_VERSION_MAJOR << 16) | ADRENALINE_VERSION_MINOR)

#define xstr(s) #s
Expand Down
Binary file modified bubble/pkg/sce_module/adrenaline_user.suprx
Binary file not shown.
34 changes: 17 additions & 17 deletions cef/include/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,40 +51,40 @@

#define MAKE_SYSCALL_FUNCTION(a, n) \
{ \
u32 func = a; \
_sw(0x03E00008, func); \
_sw(0x0000000C | (n << 6), func + 4); \
u32 _func_ = a; \
_sw(0x03E00008, _func_); \
_sw(0x0000000C | (n << 6), _func_ + 4); \
}

#define REDIRECT_FUNCTION(a, f) \
{ \
u32 func = a; \
_sw(0x08000000 | (((u32)(f) >> 2) & 0x03FFFFFF), func); \
_sw(0, func + 4); \
u32 _func_ = a; \
_sw(0x08000000 | (((u32)(f) >> 2) & 0x03FFFFFF), _func_); \
_sw(0, _func_ + 4); \
}

#define MAKE_DUMMY_FUNCTION(a, r) \
{ \
u32 func = a; \
u32 _func_ = a; \
if (r == 0) { \
_sw(0x03E00008, func); \
_sw(0x00001021, func + 4); \
_sw(0x03E00008, _func_); \
_sw(0x00001021, _func_ + 4); \
} else { \
_sw(0x03E00008, func); \
_sw(0x24020000 | r, func + 4); \
_sw(0x03E00008, _func_); \
_sw(0x24020000 | r, _func_ + 4); \
} \
}

//by Davee
#define HIJACK_FUNCTION(a, f, ptr) \
{ \
u32 func = a; \
u32 _func_ = a; \
static u32 patch_buffer[3]; \
_sw(_lw(func), (u32)patch_buffer); \
_sw(_lw(func + 4), (u32)patch_buffer + 8);\
MAKE_JUMP((u32)patch_buffer + 4, func + 8); \
_sw(0x08000000 | (((u32)(f) >> 2) & 0x03FFFFFF), func); \
_sw(0, func + 4); \
_sw(_lw(_func_), (u32)patch_buffer); \
_sw(_lw(_func_ + 4), (u32)patch_buffer + 8);\
MAKE_JUMP((u32)patch_buffer + 4, _func_ + 8); \
_sw(0x08000000 | (((u32)(f) >> 2) & 0x03FFFFFF), _func_); \
_sw(0, _func_ + 4); \
ptr = (void *)patch_buffer; \
}

Expand Down
11 changes: 9 additions & 2 deletions cef/systemctrl/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -442,9 +442,16 @@ int OnModuleStart(SceModule2 *mod) {
PatchSasCore();
} else if (strcmp(modname, "DJMAX") == 0 || strcmp(modname, "djmax") == 0) {
u32 func = sctrlHENFindImport(modname, "IoFileMgrForUser", 0xE3EB004C);
if (func)
if (func) {
MAKE_DUMMY_FUNCTION(func, 0);
ClearCaches();
ClearCaches();
}
} else if (strcmp(modname, "tekken") == 0) {
u32 func = sctrlHENFindImport(modname, "scePower", 0x34F9C463);
if (func) {
MAKE_DUMMY_FUNCTION(func, 222);
ClearCaches();
}
} else if (strcmp(modname, "KHBBS_patch") == 0) {
MAKE_DUMMY_FUNCTION(mod->entry_addr, 1);
ClearCaches();
Expand Down
30,997 changes: 15,598 additions & 15,399 deletions cef/updater/adrenaline_user.h

Large diffs are not rendered by default.

16 changes: 6 additions & 10 deletions cef/updater/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,17 @@ int main(void) {
ErrorExit(5000, "This update can only be applied with v6.4 or higher.\n");
}

if (sctrlSEGetVersion() >= 0x00060005) {
if (sctrlSEGetVersion() >= 0x00060006) {
ErrorExit(5000, "This update or a higher one was already applied.\n");
}

printf("6.61 Adrenaline-6.5 Installer\n");
printf("6.61 Adrenaline-6.6 Installer\n");
printf("Changes:\n\n");

if (sctrlSEGetVersion() < 0x00060005) {
printf("- Added updated inferno driver by codestation which improves performance of CSO reading.\n");
printf("- Added option to choose USB device.\n");
printf("- Added xmc0: option.\n");
printf("- Fixed little bug in msfs.\n");
printf("- Removed savestate version restriction, old savestates will not disappear anymore.\n");
printf("\n");
}
printf("- Fixed bug from previous update that caused black screen in other DJ max games.\n");
printf("- Inferno driver was not included correcty, now it is.\n");
printf("- Tekken 6 can now be played with any CPU speed.\n");
printf("\n");

printf("Press X to install, R to exit.\n\n");

Expand Down
Binary file modified user/flash0/kd/systemctrl.prx
Binary file not shown.

1 comment on commit 06dcde1

@d3m3vilurr
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cool. fast fix :)

Please sign in to comment.