diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:32:58 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:32:58 -0500 |
commit | 65e35eb2195277214cfaecec183a2fba64e8e538 (patch) | |
tree | c073aceff1ceba29fdb4d65767a18a07c15c7117 /src/field/map_obj_lock.c | |
parent | 6675a6782f3c9be808672aa12c061f1d3f1f5d2e (diff) | |
parent | aa13f45ebb79aed62171fbfe654d8b542fc9aa6c (diff) |
Merge branch 'master' into decompile_data
Diffstat (limited to 'src/field/map_obj_lock.c')
-rw-r--r-- | src/field/map_obj_lock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/map_obj_lock.c b/src/field/map_obj_lock.c index 91feaf177..954fcb446 100644 --- a/src/field/map_obj_lock.c +++ b/src/field/map_obj_lock.c @@ -6,7 +6,7 @@ #include "script_movement.h" #include "task.h" -extern u16 gScriptFacing; +extern u16 gSpecialVar_Facing; bool8 walkrun_is_standing_still(void) { @@ -109,7 +109,7 @@ void unref_sub_8064E5C(void) void sub_8064EAC(void) { - FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], gScriptFacing); + FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], gSpecialVar_Facing); } void sub_8064ED4(void) |