diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-13 23:19:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-13 23:19:57 -0500 |
| commit | 159bb37bbe9d960f0d2a3da9736e1be5eefb8290 (patch) | |
| tree | 44e6d447e57941a77623253884304c3174b72886 /src/save_failed_screen.c | |
| parent | 9d3345a6d69c38bf31014df69c52583c877eed24 (diff) | |
| parent | 9a932cd9c3089c03adada30ace4c79a84bf73cf0 (diff) | |
Merge branch 'master' into fix_saveblock_reorder
Diffstat (limited to 'src/save_failed_screen.c')
| -rw-r--r-- | src/save_failed_screen.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index e7bdc3400..9b32a938f 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -363,9 +363,10 @@ static bool8 VerifySectorWipe(u16 sector) ReadFlash(sector, 0, (u8 *)ptr, SECTOR_SIZE); - for (i = 0; i < 0x400; i++, ptr++) + // 1/4 because ptr is u32 + for (i = 0; i < SECTOR_SIZE / 4; i++, ptr++) if (*ptr) - return TRUE; + return TRUE; // Sector has nonzero data, failed return FALSE; } @@ -375,6 +376,7 @@ static bool8 WipeSector(u16 sector) u16 i, j; bool8 failed = TRUE; + // Attempt to wipe sector with an arbitrary attempt limit of 130 for (i = 0; failed && i < 130; i++) { for (j = 0; j < SECTOR_SIZE; j++) |