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/intro.s | |
| parent | 943931f86f50b946145548b0bee9663724e14980 (diff) | |
| parent | a2e49c4d5c275b28b6485d404e305a98c935d022 (diff) | |
merge upstream, fix non-conflict in trade.s
Diffstat (limited to 'asm/intro.s')
| -rw-r--r-- | asm/intro.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/intro.s b/asm/intro.s index 2d8a626b4..62951aa55 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -306,10 +306,10 @@ c2_copyright_1: @ 80EC820 cmp r0, 0 bne _080EC858 bl sub_8054A28 - bl ResetSaveCounters + bl Save_ResetSaveCounters movs r0, 0 - bl sub_80DA4FC - ldr r0, _080EC85C @ =gUnknown_30053A0 + bl Save_LoadGameData + ldr r0, _080EC85C @ =gSaveFileStatus ldrh r0, [r0] cmp r0, 0 beq _080EC846 @@ -328,7 +328,7 @@ _080EC858: pop {r0} bx r0 .align 2, 0 -_080EC85C: .4byte gUnknown_30053A0 +_080EC85C: .4byte gSaveFileStatus _080EC860: .4byte gSaveBlock2Ptr thumb_func_end c2_copyright_1 |