through sub_812D388

This commit is contained in:
PikalaxALT
2018-11-25 18:32:21 -05:00
parent 5b30b664be
commit 83dc744b85
3 changed files with 28 additions and 148 deletions
-146
View File
@@ -5,152 +5,6 @@
.text
thumb_func_start sub_812D304
sub_812D304: @ 812D304
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
movs r4, 0
ldr r0, _0812D378 @ =gSaveBlock1Ptr
mov r9, r0
mov r6, r9
ldr r5, _0812D37C @ =0x00003a54
movs r0, 0x4
negs r0, r0
mov r8, r0
ldr r0, _0812D380 @ =0xffffc003
mov r12, r0
ldr r7, _0812D384 @ =0x00003a55
_0812D322:
ldr r1, [r6]
lsls r3, r4, 2
adds r1, r3
adds r1, r5
ldrb r2, [r1]
mov r0, r8
ands r0, r2
strb r0, [r1]
ldr r1, [r6]
adds r1, r3
adds r3, r1, r5
ldrh r2, [r3]
mov r0, r12
ands r0, r2
strh r0, [r3]
adds r1, r7
ldrb r2, [r1]
movs r0, 0x3F
ands r0, r2
strb r0, [r1]
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xF
bls _0812D322
mov r0, r9
ldr r2, [r0]
ldr r0, _0812D37C @ =0x00003a54
adds r2, r0
ldrb r1, [r2]
movs r0, 0x4
negs r0, r0
ands r0, r1
movs r1, 0x2
orrs r0, r1
strb r0, [r2]
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0812D378: .4byte gSaveBlock1Ptr
_0812D37C: .4byte 0x00003a54
_0812D380: .4byte 0xffffc003
_0812D384: .4byte 0x00003a55
thumb_func_end sub_812D304
thumb_func_start sub_812D388
sub_812D388: @ 812D388
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
movs r5, 0
ldr r0, _0812D410 @ =gSaveBlock1Ptr
mov r12, r0
ldr r7, _0812D414 @ =0x00003a54
movs r1, 0x4
negs r1, r1
mov r10, r1
ldr r6, _0812D418 @ =0xffffc003
mov r9, r6
movs r0, 0x1
mov r8, r0
_0812D3AA:
mov r1, r12
ldr r2, [r1]
lsls r3, r5, 2
adds r2, r3
adds r2, r7
ldrb r1, [r2]
mov r0, r10
ands r0, r1
movs r1, 0x2
orrs r0, r1
strb r0, [r2]
movs r4, 0
adds r5, 0x1
str r5, [sp]
adds r5, r3, 0
_0812D3C8:
mov r6, r12
ldr r2, [r6]
adds r2, r5
adds r2, r7
ldrh r3, [r2]
lsls r0, r3, 18
lsrs r0, 20
mov r1, r8
lsls r1, r4
orrs r1, r0
ldr r6, _0812D41C @ =0x00000fff
adds r0, r6, 0
ands r1, r0
lsls r1, 2
mov r0, r9
ands r0, r3
orrs r0, r1
strh r0, [r2]
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x5
bls _0812D3C8
ldr r1, [sp]
lsls r0, r1, 24
lsrs r5, r0, 24
cmp r5, 0xF
bls _0812D3AA
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0812D410: .4byte gSaveBlock1Ptr
_0812D414: .4byte 0x00003a54
_0812D418: .4byte 0xffffc003
_0812D41C: .4byte 0x00000fff
thumb_func_end sub_812D388
thumb_func_start sub_812D420
sub_812D420: @ 812D420
push {r4-r7,lr}
+3 -2
View File
@@ -574,6 +574,7 @@ struct FameCheckerSaveData
{
/*3a54*/ u16 unk_0_0:2;
u16 unk_0_2:12;
u16 unk_0_E:2;
};
#define MAP_OBJECTS_COUNT 16
@@ -640,8 +641,8 @@ struct SaveBlock1
/*0x3A14*/ u8 seen2[DEX_FLAGS_NO];
/*0x3A48*/ u8 filler_3a48[4];
/*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH];
/*0x3A54*/ struct FameCheckerSaveData fameChecker[17];
/*0x3A98*/ u8 filler3A94[0x2A0];
/*0x3A54*/ struct FameCheckerSaveData fameChecker[16];
/*0x3A94*/ u8 filler3A94[0x2A4];
u32 unkArray[4][3];
};
+25
View File
@@ -646,3 +646,28 @@ bool8 sub_812D1A8(u8 a0)
}
return r5;
}
void sub_812D304(void)
{
u8 r4;
for (r4 = 0; r4 < 16; r4++)
{
gSaveBlock1Ptr->fameChecker[r4].unk_0_0 = 0;
gSaveBlock1Ptr->fameChecker[r4].unk_0_2 = 0;
gSaveBlock1Ptr->fameChecker[r4].unk_0_E = 0;
}
gSaveBlock1Ptr->fameChecker[0].unk_0_0 = 2;
}
void sub_812D388(void)
{
u8 r5, r4;
for (r5 = 0; r5 < 16; r5++)
{
gSaveBlock1Ptr->fameChecker[r5].unk_0_0 = 2;
for (r4 = 0; r4 < 6; r4++)
{
gSaveBlock1Ptr->fameChecker[r5].unk_0_2 |= (1 << r4);
}
}
}