diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-20 13:12:43 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-20 13:12:43 +0200 |
| commit | 3919b7130b2a8709562b012099947923a16af02d (patch) | |
| tree | fc41f69f7213aaaed914d4ceebfa58d3beb519c6 /asm/link.s | |
| parent | 67a8ac72ec8629d2d737fcd976969303bcd056f5 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Fix merge conflicts
Diffstat (limited to 'asm/link.s')
| -rw-r--r-- | asm/link.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/link.s b/asm/link.s index 42d24b53d..be4d5c4bf 100644 --- a/asm/link.s +++ b/asm/link.s @@ -27235,7 +27235,7 @@ sub_8017940: @ 8017940 ldrsh r0, [r4, r1] cmp r0, 0x8 bne _08017978 - ldr r0, =gUnknown_02037590 + ldr r0, =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x2 beq _0801796E @@ -31141,7 +31141,7 @@ bgid_upload_textbox_1: @ 8019938 thumb_func_start is_walking_or_running is_walking_or_running: @ 8019958 push {lr} - ldr r0, =gUnknown_02037590 + ldr r0, =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x2 beq _08019966 |