summaryrefslogtreecommitdiff
path: root/mm/src/code
diff options
context:
space:
mode:
authorGarrett Cox <garrettjcox@gmail.com>2024-10-09 10:13:27 -0500
committerGarrett Cox <garrettjcox@gmail.com>2024-10-09 14:25:39 -0500
commitad6553882928c71b2c5e1aa2adcc5b7aa189ec07 (patch)
tree34a1c8a319f3c3e265601b07e87b5cbf50161356 /mm/src/code
parentde1cbbb6226076ae9ca0626c58c3fc3f99dacaab (diff)
Small tweaks and increase save buffer size
Diffstat (limited to 'mm/src/code')
-rw-r--r--mm/src/code/z_sram_NES.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/src/code/z_sram_NES.c b/mm/src/code/z_sram_NES.c
index c3c1d00ff..b6b89bc25 100644
--- a/mm/src/code/z_sram_NES.c
+++ b/mm/src/code/z_sram_NES.c
@@ -1412,7 +1412,7 @@ void func_8014546C(SramContext* sramCtx) {
if (gSaveContext.flashSaveAvailable) {
memcpy(sramCtx->saveBuf, &gSaveContext, sizeof(Save));
- memcpy(&sramCtx->saveBuf[0x2000], &gSaveContext.save, sizeof(Save));
+ memcpy(&sramCtx->saveBuf[HALF_SAVE_BUFFER_SIZE], &gSaveContext.save, sizeof(Save));
}
}
}
@@ -1435,7 +1435,7 @@ void func_80145698(SramContext* sramCtx) {
gSaveContext.save.saveInfo.checksum = Sram_CalcChecksum(&gSaveContext.save, sizeof(Save));
if (gSaveContext.flashSaveAvailable) {
memcpy(sramCtx->saveBuf, &gSaveContext, sizeof(Save));
- memcpy(&sramCtx->saveBuf[0x2000], &gSaveContext.save, sizeof(Save));
+ memcpy(&sramCtx->saveBuf[HALF_SAVE_BUFFER_SIZE], &gSaveContext.save, sizeof(Save));
}
}
@@ -1566,7 +1566,7 @@ void func_801457CC(GameState* gameState, SramContext* sramCtx) {
if (sp6E == 1) {
// backup save
- memcpy(&sramCtx->saveBuf[0x2000], &gSaveContext.save, sizeof(Save));
+ memcpy(&sramCtx->saveBuf[HALF_SAVE_BUFFER_SIZE], &gSaveContext.save, sizeof(Save));
Sram_SyncWriteToFlash(sramCtx, gFlashSaveStartPages[sp64], gFlashSpecialSaveNumPages[sp64]);
} else if (!sp6E) {
// main save
@@ -1586,7 +1586,7 @@ void func_801457CC(GameState* gameState, SramContext* sramCtx) {
(oldCheckSum != phi_s2)) {
SysFlashrom_ReadData(sramCtx->saveBuf, gFlashSaveStartPages[sp64], gFlashSaveNumPages[sp64]);
memcpy(&gSaveContext.save, sramCtx->saveBuf, sizeof(Save));
- memcpy(&sramCtx->saveBuf[0x2000], &gSaveContext.save, sizeof(Save));
+ memcpy(&sramCtx->saveBuf[HALF_SAVE_BUFFER_SIZE], &gSaveContext.save, sizeof(Save));
Sram_SyncWriteToFlash(sramCtx, gFlashSaveStartPages[sp64], gFlashSpecialSaveNumPages[sp64]);
}
}
@@ -1805,7 +1805,7 @@ void Sram_CopySave(FileSelectState* fileSelect2, SramContext* sramCtx) {
if (SysFlashrom_ReadData(&sramCtx->saveBuf[0], gFlashSaveStartPages[fileSelect->selectedFileIndex * 2],
gFlashSaveNumPages[fileSelect->selectedFileIndex * 2])) {}
- if (SysFlashrom_ReadData(&sramCtx->saveBuf[0x2000], gFlashSaveStartPages[fileSelect->selectedFileIndex * 2 + 1],
+ if (SysFlashrom_ReadData(&sramCtx->saveBuf[HALF_SAVE_BUFFER_SIZE], gFlashSaveStartPages[fileSelect->selectedFileIndex * 2 + 1],
gFlashSaveNumPages[fileSelect->selectedFileIndex * 2 + 1])) {}
// copy buffer to save context
@@ -1875,7 +1875,7 @@ void Sram_InitSave(FileSelectState* fileSelect2, SramContext* sramCtx) {
GameInteractor_ExecuteOnSaveInit(fileSelect->buttonIndex);
memcpy(sramCtx->saveBuf, &gSaveContext.save, sizeof(Save));
- memcpy(&sramCtx->saveBuf[0x2000], &gSaveContext.save, sizeof(Save));
+ memcpy(&sramCtx->saveBuf[HALF_SAVE_BUFFER_SIZE], &gSaveContext.save, sizeof(Save));
for (i = 0; i < ARRAY_COUNT(gSaveContext.save.saveInfo.playerData.newf); i++) {
fileSelect->newf[fileSelect->buttonIndex][i] = gSaveContext.save.saveInfo.playerData.newf[i];