diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-14 16:36:53 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-14 16:36:53 +0200 |
| commit | 3037f37cc669bec7580fe2623ce2c6ea1c4ebe76 (patch) | |
| tree | 5ee0dc775f6a4b6dda46baa8852ef78dd464528e /asm/reset_save_heap.s | |
| parent | 943931f86f50b946145548b0bee9663724e14980 (diff) | |
| parent | a2e49c4d5c275b28b6485d404e305a98c935d022 (diff) | |
merge upstream, fix non-conflict in trade.s
Diffstat (limited to 'asm/reset_save_heap.s')
| -rw-r--r-- | asm/reset_save_heap.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/reset_save_heap.s b/asm/reset_save_heap.s index ef96d8e6d..fb46afb94 100644 --- a/asm/reset_save_heap.s +++ b/asm/reset_save_heap.s @@ -28,10 +28,10 @@ sub_8079B7C: @ 8079B7C strb r0, [r1] bl SetSaveBlocksPointers bl sub_8054A28 - bl ResetSaveCounters + bl Save_ResetSaveCounters movs r0, 0 - bl sub_80DA4FC - ldr r0, _08079BF8 @ =gUnknown_30053A0 + bl Save_LoadGameData + ldr r0, _08079BF8 @ =gSaveFileStatus ldrh r0, [r0] cmp r0, 0 beq _08079BC4 @@ -59,7 +59,7 @@ _08079BC8: _08079BEC: .4byte 0x04000208 _08079BF0: .4byte gMain _08079BF4: .4byte 0x00000439 -_08079BF8: .4byte gUnknown_30053A0 +_08079BF8: .4byte gSaveFileStatus _08079BFC: .4byte gSaveBlock2Ptr _08079C00: .4byte gHeap _08079C04: .4byte sub_8056938 |