diff options
| author | Tyler McGavran <tyler.taggerung@gmail.com> | 2024-01-21 21:11:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-21 19:11:13 -0700 |
| commit | e63ea937d2c84583bcf53e14b03411683dcbcc02 (patch) | |
| tree | db661ead0c8e1579745579afcfd79d4e2bd8507a /src/save.c | |
| parent | 27e0f763e0b84dcb87071b7bc26109a0e1ee3ecb (diff) | |
Match a couple functions (#558)
The matches in code_80057C60 required changes to several other
function signatures. Thankfully that didn't cause any problems
Diffstat (limited to 'src/save.c')
| -rw-r--r-- | src/save.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/save.c b/src/save.c index c052fdf82..6392764d3 100644 --- a/src/save.c +++ b/src/save.c @@ -761,21 +761,16 @@ s32 func_800B6088(s32 arg0) { return osPfsReadWriteFile(&gControllerPak1FileHandle, gControllerPak1FileNote, PFS_WRITE, arg0 * 0x80 /* 0x80 == sizeof(struct_8018EE10_entry) */, sizeof(struct_8018EE10_entry), (u8*) temp_v1); } -#ifdef NON_MATCHING -// Register allocation issues u8 func_800B60E8(s32 page) { - s32 multiplier = page + 1; - s32 checksum = 0; - u8 *addr = &((u8 *) D_800DC714)[page << 8]; s32 i; - for (i = 0; i < 0x100; i++) { - checksum = (*addr++ * multiplier + i) + checksum; + u32 checksum = 0; + u8 *addr; + + for (i = 0, addr = (u8*) &((u8*)D_800DC714)[page * 256]; i < 256; i++) { + checksum += (*addr++ * (page + 1) + i); } return checksum; } -#else -GLOBAL_ASM("asm/non_matchings/save/func_800B60E8.s") -#endif s32 func_800B6178(s32 arg0) { s32 var_v0; |