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/field_message_box.s | |
| parent | efebe909c604beff57c7e2481a0de83dfe084d21 (diff) | |
| parent | 2cb551cf0df29e2602d6a80c16f8bac0a136b134 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/field_message_box.s')
| -rw-r--r-- | asm/field_message_box.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/field_message_box.s b/asm/field_message_box.s index 13e81b7cc..78a5f8c8c 100644 --- a/asm/field_message_box.s +++ b/asm/field_message_box.s @@ -35,7 +35,7 @@ sub_8069370: @ 8069370 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08069394 @ =gUnknown_3005090 + ldr r1, _08069394 @ =gTasks adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -47,7 +47,7 @@ sub_8069370: @ 8069370 beq _0806939E b _08069402 .align 2, 0 -_08069394: .4byte gUnknown_3005090 +_08069394: .4byte gTasks _08069398: cmp r0, 0x2 beq _080693EA |