Correctly handle ExtData when copying savefiles (#735)

gamestabled · May 23, 2024 · e2012dc · e2012dc
1 parent 5600a68
commit e2012dc
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/code/oot.ld b/code/oot.ld
@@ -744,6 +744,10 @@ SECTIONS
 		*(.patch_ChildCanOpenBowSubMenu)
 	}
 
+	.patch_FileSelect_CopyFile 0x2EDA04 : {
+		*(.patch_FileSelect_CopyFile)
+	}
+
 	.patch_CorrectCompassChests 0x2F161C : {
 		*(.patch_CorrectCompassChests)
 	}

diff --git a/code/src/hooks.s b/code/src/hooks.s
@@ -1051,6 +1051,14 @@ hook_AfterLoadGame:
     pop {r0-r12, lr}
     pop {r4-r6, pc}
 
+.global hook_FileSelect_CopyFile
+hook_FileSelect_CopyFile:
+    push {r0-r12, lr}
+    bl SaveFile_BeforeCopy
+    pop {r0-r12, lr}
+    sub sp,sp,#0x240
+    bx lr
+
 .global hook_SaveGame
 hook_SaveGame:
     cmp r5, #0

diff --git a/code/src/patches.s b/code/src/patches.s
@@ -1577,6 +1577,11 @@ BeforeLoadGame_patch:
 AfterLoadGame_patch:
     b hook_AfterLoadGame
 
+.section .patch_FileSelect_CopyFile
+.global FileSelect_CopyFile_patch
+FileSelect_CopyFile_patch:
+    bl hook_FileSelect_CopyFile
+
 .section .patch_SaveGame
 .global .SaveGame_patch
 SaveGame_patch:

diff --git a/code/src/savefile.c b/code/src/savefile.c
@@ -785,6 +785,12 @@ void SaveFile_SaveExtSaveData(u32 saveNumber) {
     extDataUnmount(fsa);
 }
 
+void SaveFile_BeforeCopy(s32 srcFileNum) {
+    // When the game writes the copied savefile, it calls SaveFile_SaveExtSaveData,
+    // so in order to properly copy the ExtData they first need to be loaded from the source savefile.
+    SaveFile_LoadExtSaveData(srcFileNum);
+}
+
 void SaveFile_EnforceHealthLimit(void) {
     u16 healthLimit = (gSaveContext.healthCapacity == 0) ? 2 : gSaveContext.healthCapacity;
     if (gSaveContext.health > healthLimit) {