diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 21:18:34 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 21:18:34 -0400 |
commit | f43de6e5826b30335a843413c4f3043d7f6d5395 (patch) | |
tree | 880867e0d39569b5a8be546b1e2b0e2bd8021024 /asm/field_camera.s | |
parent | 3b3423d1a751134ff7941b41bad72e0e75314647 (diff) | |
parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) |
Merge branch 'master' into lilycove_lady
Diffstat (limited to 'asm/field_camera.s')
-rw-r--r-- | asm/field_camera.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/field_camera.s b/asm/field_camera.s index cead2954c..35359f444 100644 --- a/asm/field_camera.s +++ b/asm/field_camera.s @@ -1082,7 +1082,7 @@ CameraPanningCB_PanAhead: @ 808A360 b _0808A3FC .pool _0808A374: - ldr r0, =gUnknown_02037590 + ldr r0, =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x1 bne _0808A394 |