diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-19 19:42:32 -0500 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-19 19:42:32 -0500 |
commit | d273493cbb1ef8ecda5c87908d07fffc1d68cd6f (patch) | |
tree | a08642a5b0d91c17f1ccf7bf2d69c321ddd653d4 /asm/link.s | |
parent | fcc94f9722609ffa67c045cf8a7539690a68b080 (diff) | |
parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) |
Merge remote-tracking branch 'pret/master'
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 9ee94412d..b6eddf2b4 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 |