diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-15 17:18:05 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-15 17:18:05 +0100 |
commit | 1e79d53d2f913c65295b2547549d2c4ed849122b (patch) | |
tree | de6e74a23a65f5d7ebc7e4a7305742b08b6e71c0 /asm/map_obj_lock.s | |
parent | 0310be30079c657f3a21da64683bdf9ac1d4d394 (diff) | |
parent | 055a419830c0725a629f971b0299c89082c192fd (diff) |
merge daycare with master
Diffstat (limited to 'asm/map_obj_lock.s')
-rw-r--r-- | asm/map_obj_lock.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s index ee60814f5..2270051c2 100644 --- a/asm/map_obj_lock.s +++ b/asm/map_obj_lock.s @@ -256,7 +256,7 @@ sub_8098574: @ 8098574 lsls r0, 2 ldr r1, =gMapObjects adds r0, r1 - ldr r1, =gScriptFacing + ldr r1, =gSpecialVar_Facing ldrb r1, [r1] bl FieldObjectFaceOppositeDirection pop {r0} |