diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 20:54:49 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 20:54:49 -0400 |
| commit | d4d8f876e55f5dd1df792e0124d9fb488976151a (patch) | |
| tree | 94664c7d3241b52aee3f08496f8f234eb3b3dc82 /asm/field_control_avatar.s | |
| parent | bff89725ec31f87c296ec45f107f81dfe3cd54d6 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Merge branch 'master' into battle_dome_cards
Diffstat (limited to 'asm/field_control_avatar.s')
| -rw-r--r-- | asm/field_control_avatar.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 0e83f4b80..5c515ae3d 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -44,7 +44,7 @@ process_overworld_input: @ 809BF08 lsls r2, 16 lsrs r2, 16 mov r8, r2 - ldr r0, =gUnknown_02037590 + ldr r0, =gPlayerAvatar ldrb r6, [r0, 0x3] ldrb r0, [r0, 0x2] mov r9, r0 @@ -567,7 +567,7 @@ _0809C32E: .pool _0809C33C: movs r4, 0 - ldr r1, =gUnknown_02032308 + ldr r1, =gLinkPlayerMapObjects _0809C340: ldrb r0, [r1] cmp r0, 0x1 @@ -1368,7 +1368,7 @@ _0809CA04: bl sub_80B215C bl AdjustFriendship_step bl sub_81D4998 - ldr r0, =gUnknown_02037590 + ldr r0, =gPlayerAvatar ldrb r1, [r0] movs r0, 0x40 ands r0, r1 |