diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-15 09:19:30 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-15 09:19:30 -0500 |
| commit | f07f73e188f0ff81f313e74230d5ad055461966f (patch) | |
| tree | a6b628ac95872fbf8fedbd38b9024cb1e41a55ba /asm/intro.s | |
| parent | f12a82b068bb5871bc8ee9fd4146baa89799e645 (diff) | |
| parent | a2e49c4d5c275b28b6485d404e305a98c935d022 (diff) | |
Merge branch 'master' into quest_log
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 b3fe5a30c..af5104da3 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 |