diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 12:18:17 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 12:18:17 -0400 |
| commit | 9377dc23e2dcb8a293d8c0d1193c4d708045e08d (patch) | |
| tree | 45eca3d96fe89f574a4f187bd82c9aedf1f614e4 /asm/fldeff_sweetscent.s | |
| parent | 714d387cbd8e3a9a9e5b522eed42c8132d41e0b0 (diff) | |
through sub_8111F8C
Diffstat (limited to 'asm/fldeff_sweetscent.s')
| -rw-r--r-- | asm/fldeff_sweetscent.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s index dfa734b91..6783e1bbb 100644 --- a/asm/fldeff_sweetscent.s +++ b/asm/fldeff_sweetscent.s @@ -155,7 +155,7 @@ sub_80DE1D0: @ 80DE1D0 lsls r5, r0, 3 ldr r6, _080DE21C @ =gTasks+0x8 adds r2, r5, r6 - ldr r0, _080DE220 @ =gUnknown_2037AB8 + ldr r0, _080DE220 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -182,7 +182,7 @@ sub_80DE1D0: @ 80DE1D0 b _080DE26C .align 2, 0 _080DE21C: .4byte gTasks+0x8 -_080DE220: .4byte gUnknown_2037AB8 +_080DE220: .4byte gPaletteFade _080DE224: .4byte gUnknown_203AAB0 _080DE228: adds r0, r6, 0 @@ -229,7 +229,7 @@ sub_80DE274: @ 80DE274 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080DE2B0 @ =gUnknown_2037AB8 + ldr r0, _080DE2B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -253,7 +253,7 @@ _080DE2AA: pop {r0} bx r0 .align 2, 0 -_080DE2B0: .4byte gUnknown_2037AB8 +_080DE2B0: .4byte gPaletteFade _080DE2B4: .4byte gUnknown_203AAB0 _080DE2B8: .4byte gUnknown_20371F8 _080DE2BC: .4byte gUnknown_81BE564 |