diff options
Diffstat (limited to 'asm/overworld.s')
| -rw-r--r-- | asm/overworld.s | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/asm/overworld.s b/asm/overworld.s index 3c6f52f4e..ec52f7af1 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -3409,7 +3409,7 @@ sub_80565A8: @ 80565A8 thumb_func_start sub_80565B4 sub_80565B4: @ 80565B4 push {r4,lr} - ldr r0, _080565DC @ =gUnknown_2037AB8 + ldr r0, _080565DC @ =gPaletteFade ldrb r0, [r0, 0x7] lsrs r0, 7 adds r4, r0, 0 @@ -3427,7 +3427,7 @@ _080565D4: pop {r0} bx r0 .align 2, 0 -_080565DC: .4byte gUnknown_2037AB8 +_080565DC: .4byte gPaletteFade thumb_func_end sub_80565B4 thumb_func_start sub_80565E0 @@ -5161,7 +5161,7 @@ _080574A0: .4byte sub_8056534 thumb_func_start sub_80574A4 sub_80574A4: @ 80574A4 push {r4,lr} - ldr r0, _080574E8 @ =gUnknown_2037AB8 + ldr r0, _080574E8 @ =gPaletteFade ldrb r0, [r0, 0x7] lsrs r0, 7 adds r4, r0, 0 @@ -5186,13 +5186,13 @@ _080574E0: pop {r0} bx r0 .align 2, 0 -_080574E8: .4byte gUnknown_2037AB8 +_080574E8: .4byte gPaletteFade thumb_func_end sub_80574A4 thumb_func_start sub_80574EC sub_80574EC: @ 80574EC push {lr} - ldr r0, _08057500 @ =gUnknown_2037AB8 + ldr r0, _08057500 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5201,7 +5201,7 @@ sub_80574EC: @ 80574EC movs r0, 0 b _08057506 .align 2, 0 -_08057500: .4byte gUnknown_2037AB8 +_08057500: .4byte gPaletteFade _08057504: movs r0, 0x1 _08057506: @@ -5305,7 +5305,7 @@ _08057560: ldrh r0, [r0, 0x4] strh r0, [r1] bl warp_in - ldr r2, _08057610 @ =gUnknown_2037AB8 + ldr r2, _08057610 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -5333,7 +5333,7 @@ _08057600: .4byte 0xffff0000 _08057604: .4byte 0x0000ffff _08057608: .4byte gUnknown_2031DBC _0805760C: .4byte gUnknown_2031DE8 -_08057610: .4byte gUnknown_2037AB8 +_08057610: .4byte gPaletteFade _08057614: .4byte gUnknown_3005024 _08057618: .4byte sub_80574EC _0805761C: .4byte gMain @@ -5443,7 +5443,7 @@ _0805770C: b _0805772A _08057712: bl cur_mapheader_run_tileset_funcs_after_some_cpuset - ldr r2, _08057734 @ =gUnknown_2037AB8 + ldr r2, _08057734 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -5458,7 +5458,7 @@ _0805772A: strb r0, [r4] b _08057740 .align 2, 0 -_08057734: .4byte gUnknown_2037AB8 +_08057734: .4byte gPaletteFade _08057738: .4byte 0x3fffffff _0805773C: movs r0, 0x1 @@ -5613,7 +5613,7 @@ sub_8057854: @ 8057854 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0805787C @ =gUnknown_2037AB8 + ldr r0, _0805787C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5629,7 +5629,7 @@ _08057876: pop {r0} bx r0 .align 2, 0 -_0805787C: .4byte gUnknown_2037AB8 +_0805787C: .4byte gPaletteFade _08057880: .4byte sub_805671C thumb_func_end sub_8057854 @@ -7029,7 +7029,7 @@ sub_8058274: @ 8058274 strb r1, [r0] cmp r2, 0x1 beq _080582C0 - ldr r2, _080582D4 @ =gUnknown_2037AB8 + ldr r2, _080582D4 @ =gPaletteFade ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -7048,7 +7048,7 @@ _080582C4: .4byte gUnknown_3000E84 _080582C8: .4byte sub_8057DC8 _080582CC: .4byte sub_8057DA4 _080582D0: .4byte gUnknown_3000E88 -_080582D4: .4byte gUnknown_2037AB8 +_080582D4: .4byte gPaletteFade _080582D8: movs r0, 0 _080582DA: |