diff options
| author | paul <nintendo6496@googlemail.com> | 2018-11-24 19:57:36 +0100 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-11-24 19:57:36 +0100 |
| commit | 4744a7d96ec21fc9480165061990ba98a774a469 (patch) | |
| tree | 0c24d7e392d5cc4302e6ed6381b2a2dc047a2b3a /asm/script_menu.s | |
| parent | 284bbf91af43b0c9928865894cbc1d3001e57c16 (diff) | |
| parent | fecda40501d39c633435fe2777ebc93d92233ca1 (diff) | |
Merge remote-tracking branch 'upstream/master'
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 |