diff options
author | paul <nintendo6496@googlemail.com> | 2018-10-06 17:51:44 +0200 |
---|---|---|
committer | paul <nintendo6496@googlemail.com> | 2018-10-06 17:51:44 +0200 |
commit | 0aa555d13499fb5f446b5c42d3d7c5166225edc4 (patch) | |
tree | 7a73f77a735323c7967cc80d056b070b2fd687c7 /asm/clear_save_data_screen.s | |
parent | efebe909c604beff57c7e2481a0de83dfe084d21 (diff) | |
parent | 2cb551cf0df29e2602d6a80c16f8bac0a136b134 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/clear_save_data_screen.s')
-rw-r--r-- | asm/clear_save_data_screen.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index 4dbebc1ba..c5381bbf2 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -167,7 +167,7 @@ _080F56C0: bl BeginNormalPaletteFade ldr r0, _080F56F8 @ =sub_80F558C bl SetVBlankCallback - ldr r1, _080F56FC @ =gUnknown_3005090 + ldr r1, _080F56FC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -188,7 +188,7 @@ _080F56EC: .align 2, 0 _080F56F4: .4byte 0x0000ffff _080F56F8: .4byte sub_80F558C -_080F56FC: .4byte gUnknown_3005090 +_080F56FC: .4byte gTasks _080F5700: .4byte sub_80F5708 _080F5704: .4byte gUnknown_203AB54 thumb_func_end sub_80F55DC |