Navigation Menu

Skip to content

Commit

Permalink
Fixed Disney Skatboarding freeze on objectives
Browse files Browse the repository at this point in the history
Made some  merges and added sonic dx to always connected so it doesnt disconnect wiiugc adapter controllers.
  • Loading branch information
carnage702 committed Nov 1, 2022
1 parent 0b7a8a6 commit 2760631
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion common/include/NintendontVersion.h
Expand Up @@ -2,7 +2,7 @@
#define __NINTENDONT_VERSION_H__

#define NIN_MAJOR_VERSION 6
#define NIN_MINOR_VERSION 498
#define NIN_MINOR_VERSION 499

#define NIN_VERSION ((NIN_MAJOR_VERSION << 16) | NIN_MINOR_VERSION)

Expand Down
5 changes: 5 additions & 0 deletions kernel/Patch.c
Expand Up @@ -107,6 +107,7 @@ extern u32 drcAddress;
extern u32 drcAddressAligned;
u32 IsN64Emu = 0;
u32 isKirby = 0;
u32 isdisneyskt = 0;

// SHA-1 hashes of known DSP modules.
static const unsigned char DSPHashes[][20] =
Expand Down Expand Up @@ -1033,6 +1034,8 @@ static inline bool PADSwitchRequired()
static inline bool PADForceConnected()
{
return( (TITLE_ID) == 0x474C5A || // 007 From Russia With Love
(TITLE_ID) == 0x474153 || // sonic dx jap
(TITLE_ID) == 0x475853 || // sonic dx usa and pal
(TITLE_ID) == 0x475735 || // Need For Speed Carbon
(TITLE_ID) == 0x474f57 ); // Nedd For Speed Most Wanted
}
Expand Down Expand Up @@ -1489,6 +1492,8 @@ void DoPatches( char *Buffer, u32 Length, u32 DiscOffset )
}
/* requires lots of additional timer patches for BBA */
isKirby = (TITLE_ID == 0x474B59);
if(TITLE_ID == 0x474458)
isdisneyskt = 0x474458;

sync_before_read(Buffer, Length);

Expand Down
6 changes: 5 additions & 1 deletion kernel/PatchTimers.c
Expand Up @@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "PatchTimers.h"

extern u32 isKirby;
extern u32 isdisneyskt;

static bool write64A( u32 Offset, u64 Value, u64 CurrentValue )
{
Expand Down Expand Up @@ -298,11 +299,14 @@ bool PatchTimers(u32 FirstVal, u32 Buffer, bool checkFloats)
u32 NextP = CheckFor(Buffer, 0x38009E34);
if(NextP > 0)
{
if(isdisneyskt != 0x474458)
{
W16AH(Buffer + 2, U32_TIMER_CLOCK_MSECS_WII);
W16L(NextP + 2, U32_TIMER_CLOCK_MSECS_WII);
dbgprintf("PatchTimers:[Timer Clock addi ms] applied (0x%08X)\r\n", Buffer );
return true;
}
}
}
}
/* RADTimerRead split into subparts */
if( FirstVal == 0x3C000001 )
Expand Down
Binary file modified loader/loader.dol
Binary file not shown.

0 comments on commit 2760631

Please sign in to comment.