diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-11-24 10:45:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-24 10:45:15 -0600 |
| commit | 80116a80fd98679c0449efe33c4e460947f4b8d0 (patch) | |
| tree | 312a72b8513694aab4db01941cc5d2b37b53dd4e /asm/clear_save_data_screen.s | |
| parent | 2ed26ab8fcd4e302ab4aac6bb01dba7b5c985914 (diff) | |
| parent | bc6416ddd96182d5f786add8d1c1945a2f82f2b9 (diff) | |
Merge pull request #22 from PikalaxALT/quest_log
Quest log
Diffstat (limited to 'asm/clear_save_data_screen.s')
| -rw-r--r-- | asm/clear_save_data_screen.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index c5381bbf2..84dd082f6 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -91,7 +91,7 @@ _080F5618: bl BeginNormalPaletteFade b _080F56E2 _080F562A: - ldr r0, _080F5640 @ =gUnknown_2037AB8 + ldr r0, _080F5640 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -101,7 +101,7 @@ _080F562A: bl SetVBlankCallback b _080F56E2 .align 2, 0 -_080F5640: .4byte gUnknown_2037AB8 +_080F5640: .4byte gPaletteFade _080F5644: bl sub_80F5820 b _080F56E2 @@ -296,7 +296,7 @@ _080F57B8: .align 2, 0 _080F57D0: .4byte 0x0000ffff _080F57D4: - ldr r0, _080F5808 @ =gUnknown_2037AB8 + ldr r0, _080F5808 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -318,7 +318,7 @@ _080F57FE: pop {r0} bx r0 .align 2, 0 -_080F5808: .4byte gUnknown_2037AB8 +_080F5808: .4byte gPaletteFade thumb_func_end sub_80F579C thumb_func_start sub_80F580C |