*Replaced WiiPowers NSMB patch with WIP which is using now the internal wip patch system like PoP (fixes NSMB playing)

HBC/META.XML

@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>2.0 r1038</version>
+		<version>2.0 r1039</version>
-		<release_date>201101091047</release_date>
+		<release_date>201101091722</release_date>
 		<no_ios_reload/>
 		<short_description>Loads games from USB-devices</short_description>
 		<long_description>USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times.

source/GameBootProcess.cpp

@@ -54,6 +54,7 @@ static u32 BootPartition(char * dolpath, u8 videoselected, u8 languageChoice, u8
 
     /* If a wip file is loaded for this game this does nothing - Dimok */
     PoPPatch();
+    NSMBPatch();
 
     /* Setup low memory */
     __Disc_SetLowMem();

source/patches/gamepatches.c

@@ -15,37 +15,76 @@ bool Anti_002_fix(u8 * Address, int Size)
             sizeof(PatchData));
 }
 
-/** Thanks to WiiPower **/
+bool NSMBPatch()
-bool NSMBPatch(u8 * Address, int Size)
 {
-    if (IOS_GetVersion() == 222 || IOS_GetVersion() == 223) return false; // Don't use this when using Hermes, it'll use the BCA fix instead...
+    WIP_Code * CodeList = NULL;
 
-    if (memcmp("SMNE", (char *) 0x80000000, 4) == 0)
+    if (memcmp("SMNE01", (char *) 0x80000000, 6) == 0)
     {
-        u8 SearchPattern[32] = { 0x94, 0x21, 0xFF, 0xD0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x34, 0x39, 0x61,
+        CodeList = malloc(3 * sizeof(WIP_Code));
-                0x00, 0x30, 0x48, 0x12, 0xD7, 0x89, 0x7C, 0x7B, 0x1B, 0x78, 0x7C, 0x9C, 0x23, 0x78, 0x7C, 0xBD, 0x2B,
+        if(!CodeList)
-                0x78 };
-        u8 PatchData[32] = { 0x4E, 0x80, 0x00, 0x20, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x34, 0x39, 0x61, 0x00,
-                0x30, 0x48, 0x12, 0xD7, 0x89, 0x7C, 0x7B, 0x1B, 0x78, 0x7C, 0x9C, 0x23, 0x78, 0x7C, 0xBD, 0x2B, 0x78 };
-        return PatchDOL(Address, Size, (const u8 *) &SearchPattern, sizeof(SearchPattern), (const u8 *) &PatchData,
-                sizeof(PatchData));
-
-    }
-    else if (memcmp("SMN", (char *) 0x80000000, 3) == 0)
-    {
-        u8 SearchPattern[4] = { 0x7A, 0x6B, 0x6F, 0x6A };
-        u8 PatchData[32] = { 0x4E, 0x80, 0x00, 0x20, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x34, 0x39, 0x61, 0x00,
-                0x30, 0x48, 0x12, 0xD9, 0x39, 0x7C, 0x7B, 0x1B, 0x78, 0x7C, 0x9C, 0x23, 0x78, 0x7C, 0xBD, 0x2B, 0x78 };
-        return PatchDOL(Address, Size, (const u8 *) &SearchPattern, sizeof(SearchPattern), (const u8 *) &PatchData,
-                sizeof(PatchData));
-    }
             return false;
+
+        CodeList[0].offset = 0x001AB610;
+        CodeList[0].srcaddress = 0x9421FFD0;
+        CodeList[0].dstaddress = 0x4E800020;
+        CodeList[1].offset = 0x001CED53;
+        CodeList[1].srcaddress = 0xDA000000;
+        CodeList[1].dstaddress = 0x71000000;
+        CodeList[2].offset = 0x001CED6B;
+        CodeList[2].srcaddress = 0xDA000000;
+        CodeList[2].dstaddress = 0x71000000;
+
+    }
+    else if (memcmp("SMNP01", (char *) 0x80000000, 6) == 0)
+    {
+        CodeList = malloc(3 * sizeof(WIP_Code));
+        if(!CodeList)
+            return false;
+
+        CodeList[0].offset = 0x001AB750;
+        CodeList[0].srcaddress = 0x9421FFD0;
+        CodeList[0].dstaddress = 0x4E800020;
+        CodeList[1].offset = 0x001CEE90;
+        CodeList[1].srcaddress = 0x38A000DA;
+        CodeList[1].dstaddress = 0x38A00071;
+        CodeList[2].offset = 0x001CEEA8;
+        CodeList[2].srcaddress = 0x388000DA;
+        CodeList[2].dstaddress = 0x38800071;
+    }
+    else if (memcmp("SMNJ01", (char *) 0x80000000, 6) == 0)
+    {
+        CodeList = malloc(3 * sizeof(WIP_Code));
+        if(!CodeList)
+            return false;
+
+        CodeList[0].offset = 0x001AB420;
+        CodeList[0].srcaddress = 0x9421FFD0;
+        CodeList[0].dstaddress = 0x4E800020;
+        CodeList[1].offset = 0x001CEB63;
+        CodeList[1].srcaddress = 0xDA000000;
+        CodeList[1].dstaddress = 0x71000000;
+        CodeList[2].offset = 0x001CEB7B;
+        CodeList[2].srcaddress = 0xDA000000;
+        CodeList[2].dstaddress = 0x71000000;
+    }
+
+    if (CodeList && set_wip_list(CodeList, 3) == false)
+    {
+        free(CodeList);
+        CodeList = NULL;
+        return false;
+    }
+
+
+    return CodeList != NULL;
 }
 
 bool PoPPatch()
 {
-    if (memcmp("SPX", (char *) 0x80000000, 3) == 0 || memcmp("RPW", (char *) 0x80000000, 3) == 0)
+    if (memcmp("SPX", (char *) 0x80000000, 3) != 0 && memcmp("RPW", (char *) 0x80000000, 3) != 0)
-    {
+        return false;
+
     WIP_Code * CodeList = malloc(5 * sizeof(WIP_Code));
     CodeList[0].offset = 0x007AAC6A;
     CodeList[0].srcaddress = 0x7A6B6F6A;
@@ -67,9 +106,10 @@ bool PoPPatch()
     {
         free(CodeList);
         CodeList = NULL;
-        }
-    }
         return false;
+    }
+
+    return true;
 }
 
 /** Insert the individual gamepatches above with the patterns and patch data **/

source/patches/gamepatches.h

@@ -8,7 +8,7 @@ extern "C" {
 #include <gccore.h>
 
 bool Anti_002_fix(u8 * Address, int Size);
-bool NSMBPatch(u8 * Address, int Size);
+bool NSMBPatch();
 bool PoPPatch();
 bool Search_and_patch_Video_Modes(u8 * Address, u32 Size, GXRModeObj* Table[]);
 void VideoModePatcher(u8 * dst, int len, u8 videoSelected);

source/patches/wip.cpp

@@ -108,6 +108,8 @@ extern "C" int load_wip_code(u8 *gameid)
 
     if (!fp) return -1;
 
+    free_wip();
+
     char line[255];
     gprintf("\nLoading WIP code from %s.\n", filepath);
 

source/usbloader/apploader.c

@@ -49,8 +49,6 @@ void gamepatches( u8 * dst, int len, u8 videoSelected, u8 languageChoice, u8 pat
     if ( patchcountrystring == 1 )
         PatchCountryStrings( dst, len );
 
-    NSMBPatch( dst, len );
-
     do_wip_code( ( u8 * ) dst, len );
 
     if ( fix002 == 2 )