move ram save variables to C

This commit is contained in:
DizzyEggg
2017-09-03 15:39:33 +02:00
parent a3f602f17c
commit ddf85539c1
7 changed files with 117 additions and 212 deletions

View File

@@ -6,156 +6,6 @@
.text
thumb_func_start sub_815355C
sub_815355C: @ 815355C
push {r4-r7,lr}
ldr r5, =gFastSaveSection
ldr r0, =gUnknown_0203ABBC
str r0, [r5]
adds r7, r0, 0
ldr r0, =gFlashMemoryPresent
ldr r4, [r0]
cmp r4, 0x1
beq _0815358C
b _081535C8
.pool
_0815357C:
ldrb r1, [r7, 0xA]
ldrb r0, [r7, 0xB]
adds r1, r0
ldrb r0, [r7, 0xC]
adds r1, r0
ldrb r0, [r7, 0xD]
adds r0, r1
b _081535CA
_0815358C:
bl UpdateSaveAddresses
ldr r0, =gRamSaveSectionLocations
bl GetSaveValidStatus
ldr r0, =gSaveCounter
ldr r1, [r0]
ands r1, r4
lsls r0, r1, 3
subs r0, r1
lsls r0, 17
lsrs r6, r0, 16
movs r4, 0
_081535A6:
adds r0, r4, r6
lsls r0, 24
lsrs r0, 24
ldr r1, [r5]
bl DoReadFlashWholeSection
ldr r0, [r5]
ldr r1, =0x00000ff4
adds r0, r1
ldrh r0, [r0]
cmp r0, 0
beq _0815357C
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0xD
bls _081535A6
_081535C8:
movs r0, 0
_081535CA:
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_815355C
thumb_func_start sub_81535DC
sub_81535DC: @ 81535DC
push {r4-r6,lr}
adds r6, r1, 0
lsls r0, 24
lsrs r1, r0, 24
movs r2, 0xE2
lsls r2, 24
adds r0, r2
lsrs r0, 24
cmp r0, 0x1
bhi _08153608
ldr r4, =gUnknown_0203ABBC
movs r3, 0x80
lsls r3, 5
adds r0, r1, 0
movs r1, 0
adds r2, r4, 0
bl ReadFlash
ldr r1, [r4]
ldr r0, =0x0000b39d
cmp r1, r0
beq _08153614
_08153608:
movs r0, 0xFF
b _0815362A
.pool
_08153614:
movs r3, 0
ldr r5, =0x00000ffb
adds r2, r4, 0x4
_0815361A:
adds r0, r6, r3
adds r1, r2, r3
ldrb r1, [r1]
strb r1, [r0]
adds r3, 0x1
cmp r3, r5
ble _0815361A
movs r0, 0x1
_0815362A:
pop {r4-r6}
pop {r1}
bx r1
.pool
thumb_func_end sub_81535DC
thumb_func_start sub_8153634
sub_8153634: @ 8153634
push {r4-r7,lr}
adds r5, r1, 0
lsls r0, 24
lsrs r6, r0, 24
movs r1, 0xE2
lsls r1, 24
adds r0, r1
lsrs r0, 24
cmp r0, 0x1
bhi _08153680
ldr r7, =gUnknown_0203ABBC
ldr r0, =0x0000b39d
adds r3, r7, 0
stm r3!, {r0}
movs r2, 0
ldr r4, =0x00000ffb
_08153654:
adds r0, r3, r2
adds r1, r5, r2
ldrb r1, [r1]
strb r1, [r0]
adds r2, 0x1
cmp r2, r4
ble _08153654
adds r0, r6, 0
adds r1, r7, 0
bl ProgramFlashSectorAndVerify
cmp r0, 0
bne _08153680
movs r0, 0x1
b _08153682
.pool
_08153680:
movs r0, 0xFF
_08153682:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_8153634
thumb_func_start sub_8153688
sub_8153688: @ 8153688
push {r4,lr}

View File

@@ -594,7 +594,7 @@ sub_8179514: @ 8179514
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, =gUnknown_0203ABBC
ldr r4, =gSaveDataBuffer
movs r3, 0x80
lsls r3, 5
movs r1, 0