falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleaned code

This commit is contained in:
Henny022p 2021-02-19 06:13:08 +01:00
parent 9f3cc47f99
commit 91ce8f1cf8
2 changed files with 9 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
asm/non_matching/code_0807CC3C/sub_0807CF88.inc
View File

@ -1,71 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
push {r4, r5, r6, r7, lr}
sub sp, #8
adds r7, r1, #0
bl sub_0807D1C4
adds r6, r0, #0
ldr r0, _0807D004 @ =0x4D435A33
mov r5, sp
str r0, [sp, #4]
add r0, sp, #4
movs r1, #4
bl sub_0807D1A4
adds r4, r0, #0
lsls r4, r4, #0x10
lsrs r4, r4, #0x10
ldrh r1, [r6]
adds r0, r7, #0
bl sub_0807D1A4
adds r4, r4, r0
lsls r4, r4, #0x10
lsrs r4, r4, #0x10
mov r0, sp
strh r4, [r0]
lsls r4, r4, #0x10
asrs r4, r4, #0x10
rsbs r4, r4, #0
strh r4, [r5, #2]
ldrh r0, [r6, #6]
ldrh r2, [r6]
adds r1, r7, #0
bl sub_0807D20C
adds r4, r0, #0
cmp r4, #0
beq _0807CFDC
ldrh r0, [r6, #2]
mov r1, sp
bl sub_0807D184
adds r4, r0, #0
_0807CFDC:
ldrh r0, [r6, #8]
ldrh r2, [r6]
adds r1, r7, #0
bl sub_0807D20C
cmp r0, #0
beq _0807CFF2
ldrh r0, [r6, #4]
mov r1, sp
bl sub_0807D184
_0807CFF2:
movs r1, #0
cmp r4, #0
bne _0807CFFC
cmp r0, #0
beq _0807CFFE
_0807CFFC:
movs r1, #1
_0807CFFE:
adds r0, r1, #0
add sp, #8
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0807D004: .4byte 0x4D435A33
.syntax divided

18
src/code_0807CC3C.c
View File

@ -73,32 +73,32 @@ NONMATCH("asm/non_matching/code_0807CC3C/sub_0807D008.inc", u32 sub_0807D008(u32
u32 set_0;
char auStack32[8];
struct_0807D1C4* thing;
struct_0807D1C4* unk_s;
u32 t1;
u32 t2;
u32 ret;
u32 temp;
thing = sub_0807D1C4(param_1);
t1 = sub_0807D0EC(thing->field_0x2, auStack32);
unk_s = sub_0807D1C4(param_1);
t1 = sub_0807D0EC(unk_s->field_0x2, auStack32);
if (t1 == 2) {
if ((sub_0807D1D8(thing->field_0x6, (char*)saveFile, thing->field_0x0) == 0) ||
(sub_0807D0A0((u16*)auStack32, (u16*)saveFile, (u32)thing->field_0x0) == 0)) {
if ((sub_0807D1D8(unk_s->field_0x6, (char*)saveFile, unk_s->field_0x0) == 0) ||
(sub_0807D0A0((u16*)auStack32, (u16*)saveFile, (u32)unk_s->field_0x0) == 0)) {
t1 = 0;
} else {
return 1;
}
}
t2 = sub_0807D0EC(thing->field_0x4, auStack32);
t2 = sub_0807D0EC(unk_s->field_0x4, auStack32);
if (t2 == 2) {
if ((sub_0807D1D8(thing->field_0x8, (char*)saveFile, thing->field_0x0) != 0) &&
(sub_0807D0A0((u16*)auStack32, (u16*)saveFile, (u32)thing->field_0x0) != 0)) {
if ((sub_0807D1D8(unk_s->field_0x8, (char*)saveFile, unk_s->field_0x0) != 0) &&
(sub_0807D0A0((u16*)auStack32, (u16*)saveFile, (u32)unk_s->field_0x0) != 0)) {
return 1;
}
t2 = 0;
}
set_0 = 0;
CpuSet(&set_0, saveFile, thing->field_0x0 >> 2 | CPU_SET_SRC_FIXED | CPU_SET_32BIT);
CpuSet(&set_0, saveFile, unk_s->field_0x0 >> 2 | CPU_SET_SRC_FIXED | CPU_SET_32BIT);
temp = t1 | t2;
ret = 0;
if (temp == 0) {