nonmatching MoveSaveBlocks_ResetHeap (i tried...)

This commit is contained in:
ProjectRevoTPP
2017-11-21 21:25:01 -05:00
parent 5dc8beb034
commit 161a37809b
2 changed files with 139 additions and 110 deletions
-96
View File
@@ -5,102 +5,6 @@
.text
thumb_func_start MoveSaveBlocks_ResetHeap
MoveSaveBlocks_ResetHeap: @ 8076C2C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x8
ldr r5, =gMain
ldr r0, [r5, 0xC]
str r0, [sp]
ldr r1, [r5, 0x10]
str r1, [sp, 0x4]
movs r0, 0
str r0, [r5, 0xC]
str r0, [r5, 0x10]
ldr r1, =gUnknown_0203CF5C
str r0, [r1]
ldr r4, =0x02000000
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r6, =0x00000f2c
adds r0, r4, 0
adds r2, r6, 0
bl memcpy
ldr r1, =gSaveBlock1Ptr
mov r10, r1
ldr r1, [r1]
ldr r7, =0x00003d88
ldr r0, =0x02000f2c
adds r2, r7, 0
bl memcpy
ldr r0, =gPokemonStoragePtr
mov r8, r0
ldr r1, [r0]
ldr r0, =0x000083d0
mov r9, r0
ldr r0, =0x02004cb4
mov r2, r9
bl memcpy
ldrb r1, [r4, 0xA]
ldrb r0, [r4, 0xB]
adds r1, r0
ldrb r0, [r4, 0xC]
adds r1, r0
ldrb r0, [r4, 0xD]
adds r0, r1
bl SetSaveBlocksPointers
ldr r1, =gSaveBlock2Ptr
ldr r0, [r1]
adds r1, r4, 0
adds r2, r6, 0
bl memcpy
mov r1, r10
ldr r0, [r1]
ldr r1, =0x02000f2c
adds r2, r7, 0
bl memcpy
mov r1, r8
ldr r0, [r1]
ldr r1, =0x02004cb4
mov r2, r9
bl memcpy
movs r1, 0xE0
lsls r1, 9
adds r0, r4, 0
bl InitHeap
ldr r0, [sp, 0x4]
str r0, [r5, 0x10]
ldr r1, [sp]
str r1, [r5, 0xC]
bl Random
adds r4, r0, 0
bl Random
lsls r4, 16
lsls r0, 16
lsrs r0, 16
adds r4, r0
adds r0, r4, 0
bl ApplyNewEncyprtionKeyToAllEncryptedData
ldr r1, =gSaveBlock2Ptr
ldr r0, [r1]
adds r0, 0xAC
str r4, [r0]
add sp, 0x8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end MoveSaveBlocks_ResetHeap
thumb_func_start sav2_x1_query_bit1
sav2_x1_query_bit1: @ 8076D24
ldr r0, =gSaveBlock2Ptr