matched VerifyChecksum

This commit is contained in:
Henny022p 2021-03-02 22:41:26 +01:00
parent ffcd347ede
commit cd4a04c5ab
2 changed files with 4 additions and 50 deletions

View File

@ -1,45 +0,0 @@
.syntax unified
.text
push {r4, r5, r6, r7, lr}
adds r7, r0, #0
adds r5, r1, #0
adds r6, r2, #0
adds r0, r7, #4
movs r1, #4
bl CalculateChecksum
adds r4, r0, #0
lsls r4, r4, #0x10
lsrs r4, r4, #0x10
adds r0, r5, #0
adds r1, r6, #0
bl CalculateChecksum
adds r4, r4, r0
lsls r4, r4, #0x10
lsrs r4, r4, #0x10
ldrh r0, [r7]
cmp r0, r4
bne _0807D0DE
lsls r0, r0, #0x10
ldrh r1, [r7, #2]
rsbs r0, r0, #0
lsrs r0, r0, #0x10
cmp r1, r0
bne _0807D0DE
ldr r1, [r7, #4]
ldr r0, _0807D0E4 @ =0x4D435A33
cmp r1, r0
beq _0807D0E8
_0807D0DE:
movs r0, #0
b _0807D0EA
.align 2, 0
_0807D0E4: .4byte 0x4D435A33
_0807D0E8:
movs r0, #1
_0807D0EA:
pop {r4, r5, r6, r7, pc}
.syntax divided

View File

@ -261,21 +261,20 @@ u32 DataDoubleReadWithStatus(u32 param_1, void* data) {
return ret;
}
NONMATCH("asm/non_matching/save/sub_0807D0A0.inc", u32 VerifyChecksum(SaveFileStatus* fileStatus, u16* data, u32 size)) {
u32 ret;
u32 VerifyChecksum(SaveFileStatus* fileStatus, u16* data, u32 size) {
u32 temp;
u16 checksum;
checksum = CalculateChecksum((u16*)&fileStatus->status, 4);
checksum += CalculateChecksum(data, size);
if ((fileStatus->checksum1 != checksum) || (fileStatus->checksum2 != -(u32)fileStatus->checksum1) ||
if ((fileStatus->checksum1 != checksum) ||
(temp = fileStatus->checksum1 << 0x10, fileStatus->checksum2 != (-temp >> 0x10)) ||
(fileStatus->status != 'MCZ3')) {
return 0;
} else
return 1;
}
END_NONMATCH
u32 ReadSaveFileStatus(u32 address, SaveFileStatus* fileStatus) {
u32 ret;