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/start_menu.s | |
| parent | efebe909c604beff57c7e2481a0de83dfe084d21 (diff) | |
| parent | 2cb551cf0df29e2602d6a80c16f8bac0a136b134 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/start_menu.s')
| -rw-r--r-- | asm/start_menu.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/start_menu.s b/asm/start_menu.s index be76f5ae8..263e27504 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -586,7 +586,7 @@ sub_806F1F0: @ 806F1F0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0806F210 @ =gUnknown_3005098 + ldr r1, _0806F210 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -596,7 +596,7 @@ sub_806F1F0: @ 806F1F0 beq _0806F238 b _0806F24E .align 2, 0 -_0806F210: .4byte gUnknown_3005098 +_0806F210: .4byte gTasks+0x8 _0806F214: bl InUnionRoom cmp r0, 0x1 @@ -1858,7 +1858,7 @@ sub_806FBB8: @ 806FBB8 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0806FBEC @ =gUnknown_3005098 + ldr r1, _0806FBEC @ =gTasks+0x8 adds r5, r0, r1 ldr r0, _0806FBF0 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1880,7 +1880,7 @@ _0806FBE2: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806FBEC: .4byte gUnknown_3005098 +_0806FBEC: .4byte gTasks+0x8 _0806FBF0: .4byte gUnknown_2037AB8 _0806FBF4: .4byte _0806FBF8 .align 2, 0 |