Added support for NAND saving in WarioWare D.I.Y. and Jam with the Band (#6)

Also improved speed of creating save files

arm9/source/patches/arm7/SaveOffsetToSdSectorAsm.h

@@ -1,25 +0,0 @@
-#pragma once
-#include "sections.h"
-#include "../SectorRemapPatchCode.h"
-#include "fileInfo.h"
-
-DEFINE_SECTION_SYMBOLS(saveoffsettosdsector);
-
-extern "C" u32 save_offset_to_sd_sector_asm(u32 saveOffset);
-
-extern u32 saveoffsettosdsector_fatDataPtr;
-
-class SaveOffsetToSdSectorPatchCode : public SectorRemapPatchCode
-{
-public:
-    SaveOffsetToSdSectorPatchCode(PatchHeap& patchHeap, const save_file_info_t* fatDataPtr)
-        : SectorRemapPatchCode(SECTION_START(saveoffsettosdsector), SECTION_SIZE(saveoffsettosdsector), patchHeap)
-    {
-        saveoffsettosdsector_fatDataPtr = (u32)fatDataPtr;
-    }
-
-    const void* GetRemapFunction() const override
-    {
-        return GetAddressAtTarget((void*)save_offset_to_sd_sector_asm);
-    }
-};

arm9/source/patches/arm7/SaveOffsetToSdSectorAsm.s

@@ -1,50 +0,0 @@
-.cpu arm7tdmi
-.section "saveoffsettosdsector", "ax"
-.syntax unified
-.thumb
-
-// r0 = save offset
-// returns sd sector in r0
-// returns cluster shift in r1
-// returns remaining sectors in cluster in lr
-.global save_offset_to_sd_sector_asm
-.type save_offset_to_sd_sector_asm, %function
-save_offset_to_sd_sector_asm:
-    push {r4,r5,lr}
-retry:
-    ldr r5, saveoffsettosdsector_fatDataPtr
-    ldmia r5!, {r1,r2,r3,r4} // clusterShift, database, clusterMask, clusterMap[0]
-    lsrs r0, r0, #9
-    adds r4, r3, #1
-    ands r3, r0
-    subs r4, r3
-    mov lr, r4 // remaining sectors in cluster
-    adds r3, r2
-    lsrs r0, r1 // cl
-1:
-    ldmia r5!, {r2,r4} // ncl, startSector
-    cmp r2, #0
-    beq out_of_bounds
-    subs r0, r2 // cl -= ncl
-    bcs 1b
-
-    adds r0, r2
-    adds r0, r4 // + startSector
-    subs r0, #2 // - 2
-    lsls r0, r1
-    adds r0, r3 // r0 = src sector
-    pop {r4,r5,pc}
-
-out_of_bounds:
-    movs r0, #0
-    pop {r4,r5,pc}
-
-.balign 4
-
-.global saveoffsettosdsector_fatDataPtr
-saveoffsettosdsector_fatDataPtr:
-    .word 0x027FFA00
-
-.pool
-
-.end

arm9/source/patches/arm7/sdk2to4/CardiTaskThreadPatch.cpp

@@ -8,8 +8,7 @@
 #include "patches/arm7/VerifySaveAsm.h"
 #include "patches/FunctionSignature.h"
 #include "patches/platform/LoaderPlatform.h"
-#include "patches/arm7/SaveOffsetToSdSectorAsm.h"
-#include "patches/OffsetToSectorRemapAsm.h"
+#include "patches/SaveOffsetToSdSectorAsm.h"
 #include "patches/arm7/CardiTaskThreadPatchAsm.h"
 #include "thumbInstructions.h"
 #include "CardiTaskThreadPatch.h"
@@ -95,14 +94,11 @@ void CardiTaskThreadPatch::ApplyPatch(PatchContext& patchContext)
     u32 patch1Size = SECTION_SIZE(patch_carditaskthread);
     void* patch1Address = patchContext.GetPatchHeap().Alloc(patch1Size);
     auto loaderPlatform = patchContext.GetLoaderPlatform();
-    const SdReadPatchCode* readPatchCode;
-    const SdWritePatchCode* writePatchCode;
-    const SectorRemapPatchCode* sectorRemapPatchCode;
-    readPatchCode = loaderPlatform->CreateSdReadPatchCode(
+    auto readPatchCode = loaderPlatform->CreateSdReadPatchCode(
         patchContext.GetPatchCodeCollection(), patchContext.GetPatchHeap());
-    writePatchCode = loaderPlatform->CreateSdWritePatchCode(
+    auto writePatchCode = loaderPlatform->CreateSdWritePatchCode(
         patchContext.GetPatchCodeCollection(), patchContext.GetPatchHeap());
-    sectorRemapPatchCode = patchContext.GetPatchCodeCollection().AddUniquePatchCode<SaveOffsetToSdSectorPatchCode>
+    auto sectorRemapPatchCode = patchContext.GetPatchCodeCollection().AddUniquePatchCode<SaveOffsetToSdSectorPatchCode>
     (
         patchContext.GetPatchHeap(),
         (const save_file_info_t*)((u32)SHARED_SAVE_FILE_INFO - 0x02F00000 + 0x02700000)

arm9/source/patches/arm7/sdk5/CardiDoTaskFromArm9Patch.cpp

@@ -5,9 +5,8 @@
 #include "patches/arm7/ReadSaveAsm.h"
 #include "patches/arm7/WriteSaveAsm.h"
 #include "patches/arm7/VerifySaveAsm.h"
-#include "patches/arm7/SaveOffsetToSdSectorAsm.h"
+#include "patches/SaveOffsetToSdSectorAsm.h"
 #include "patches/platform/LoaderPlatform.h"
-#include "patches/OffsetToSectorRemapAsm.h"
 #include "patches/arm7/CardiTaskThreadPatchAsm.h"
 #include "CardiDoTaskFromArm9Patch.h"