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/script_menu.s | |
| parent | 2ed26ab8fcd4e302ab4aac6bb01dba7b5c985914 (diff) | |
| parent | bc6416ddd96182d5f786add8d1c1945a2f82f2b9 (diff) | |
Merge pull request #22 from PikalaxALT/quest_log
Quest log
Diffstat (limited to 'asm/script_menu.s')
| -rw-r--r-- | asm/script_menu.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/script_menu.s b/asm/script_menu.s index 7707a7f52..239e6860f 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -453,7 +453,7 @@ sub_809CC98: @ 809CC98 lsls r0, 3 ldr r1, _0809CCC4 @ =gTasks+0x8 adds r5, r0, r1 - ldr r0, _0809CCC8 @ =gUnknown_2037AB8 + ldr r0, _0809CCC8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -468,7 +468,7 @@ sub_809CC98: @ 809CC98 b _0809CD3C .align 2, 0 _0809CCC4: .4byte gTasks+0x8 -_0809CCC8: .4byte gUnknown_2037AB8 +_0809CCC8: .4byte gPaletteFade _0809CCCC: .4byte gUnknown_2039988 _0809CCD0: movs r1, 0xA |